| [vhffs-dev] [960] Improving ACL panel, merged group table into user table, rewrote Vhffs::Acl a bit |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 960
Author: gradator
Date: 2007-10-04 22:52:25 +0000 (Thu, 04 Oct 2007)
Log Message:
-----------
Improving ACL panel, merged group table into user table, rewrote Vhffs::Acl a bit
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Acl.pm
trunk/vhffs-api/src/Vhffs/Constants.pm
trunk/vhffs-api/src/examples/show_acl_per_object.pl
trunk/vhffs-panel/acl/view.pl
trunk/vhffs-panel/templates/Makefile.am
trunk/vhffs-panel/templates/acl/view.tmpl
trunk/vhffs-panel/themes/vhffs/main.css
Removed Paths:
-------------
trunk/vhffs-panel/templates/acl/view_each.tmpl
Modified: trunk/vhffs-api/src/Vhffs/Acl.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Acl.pm 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-api/src/Vhffs/Acl.pm 2007-10-04 22:52:25 UTC (rev 960)
@@ -85,9 +85,9 @@
=head2 add_acl
- die("Unable to add ACL\n") if( Vhffs::Acl::add_acl($entity, $svc, $perm, $vhffs) );
+ die("Unable to add ACL\n") if( Vhffs::Acl::add_acl($granted_oid, $svc, $perm, $vhffs) );
-Grant permission C<$perm> to user or group C<$entity> on service C<$svc>.
+Grant permission C<$perm> to user or group C<$granted_oid> on service C<$svc>.
Should be modified soon to use OIDs instead of heavy objects.
@@ -95,100 +95,101 @@
sub add_acl
{
- my ( $entity , $object , $perm , $main ) = @_;
+ my ( $granted_oid , $target_oid , $perm , $main ) = @_;
- return -1 unless(defined $entity && defined $object );
- return -2 unless( $entity->get_type == Vhffs::Constants::TYPE_USER || $entity->get_type == Vhffs::Constants::TYPE_GROUP );
+ return -1 unless(defined $granted_oid && defined $target_oid );
+ return -2 unless( $granted_oid->get_type == Vhffs::Constants::TYPE_USER || $granted_oid->get_type == Vhffs::Constants::TYPE_GROUP );
my $sql = 'INSERT INTO vhffs_acl(granted_oid, perm, target_oid) VALUES(?, ?, ?)';
my $dbh = $main->get_db_object;
- return -3 unless( $dbh->do($sql, undef, $entity->get_oid, $perm, $object->get_oid) );
+ return -3 unless( $dbh->do($sql, undef, $granted_oid->get_oid, $perm, $target_oid->get_oid) );
return 1;
}
sub update_acl
{
- my ($main, $target_oid, $granted_oid, $perm) = @_;
+ my ($main, $target_oid, $granted_oid, $perm) = @_;
- return -1 unless(defined $target_oid && defined $granted_oid && defined $perm);
+ return -1 unless(defined $target_oid && defined $granted_oid && defined $perm);
- my $sql = 'UPDATE vhffs_acl SET perm = ? WHERE target_oid=? AND granted_oid=?';
- my $dbh = $main->get_db_object;
- # If no line was updated, ACL doesn't exists => error
- return -2 unless ($dbh->do($sql, undef, $perm, $target_oid, $granted_oid) > 0);
- return 1;
+ return del_acl( $main , $target_oid, $granted_oid ) if( $perm < 0 );
+
+ my $sql = 'UPDATE vhffs_acl SET perm = ? WHERE target_oid=? AND granted_oid=?';
+ my $dbh = $main->get_db_object;
+ # If no line was updated, ACL doesn't exists => error
+ return -2 unless ($dbh->do($sql, undef, $perm, $target_oid, $granted_oid) > 0);
+ return 1;
}
sub del_acl
{
- my ( $entity , $object , $main ) = @_;
+ my ( $main, $target_oid , $granted_oid ) = @_;
- return -1 unless(defined $entity && defined $object );
+ return -1 unless(defined $main && defined $target_oid && defined $granted_oid);
- my $dbh = $main->get_db_object();
+ my $dbh = $main->get_db_object();
+ $dbh->begin_work();
+ my $sql = 'DELETE FROM vhffs_acl WHERE granted_oid=? AND target_oid=?';
+ my $sth = $dbh->prepare( $sql );
+ $sth->execute( $granted_oid, $target_oid ) or return -1;
- $dbh->begin_work();
- my $sql = 'DELETE FROM vhffs_acl WHERE granted_oid=? AND target_oid=?';
- my $sth = $dbh->prepare( $sql );
- $sth->execute( $entity->get_oid, $object->get_oid) or return -1;
-
- $sql = 'SELECT COUNT(*) FROM vhffs_acl WHERE perm IN (?, ?) AND target_oid=?';
- $sth = $dbh->prepare( $sql );
- $sth->execute(Vhffs::Constants::ACL_MANAGEACL, Vhffs::Constants::ACL_DELETE, $object->get_oid) or return -1;
- my ($count) = $sth->fetchrow();
- # We want to have at least one person who can handle ACLs
+ $sql = 'SELECT COUNT(*) FROM vhffs_acl WHERE perm>=? AND target_oid=?';
+ $sth = $dbh->prepare( $sql );
+ $sth->execute(Vhffs::Constants::ACL_MANAGEACL, $target_oid) or return -1;
+ my ($count) = $sth->fetchrow();
+
+ # We want to have at least one person who can handle ACLs
if( $count == 0 ) {
- $dbh->rollback();
- return -2;
- }
+ $dbh->rollback();
+ return -2;
+ }
- $dbh->commit();
-
+ $dbh->commit();
return 1;
}
=pod
-=head2 getall_acl_for_user_per_object
+=head2 get_object_users_acl
- my $rights = Vhffs::Acl::getall_acl_for_user_per_object($object, $vhffs);
+ my $rights = Vhffs::Acl::get_object_users_acl($object, $vhffs);
Get all users acl for a given object.
Returns an array of hashref with keys 'oid_src, name, perm'.
=cut
-sub getall_acl_for_user_per_object
+sub get_object_users_acl
{
my ( $obj , $main ) = @_;
return -1 unless( defined $obj );
- my $sql = 'SELECT acl.granted_oid, u.username AS name, acl.perm FROM vhffs_acl acl INNER JOIN vhffs_users u ON u.object_id = acl.granted_oid WHERE target_oid=? ORDER BY u.username';
- my $dbh = $main->get_db_object;
- my $sth = $dbh->prepare($sql);
- return undef unless($sth->execute($obj->get_oid));
- return $sth->fetchall_arrayref({});
+ my $sql = 'SELECT acl.granted_oid, u.username AS name, acl.perm FROM vhffs_acl acl INNER JOIN vhffs_users u ON u.object_id = acl.granted_oid WHERE target_oid=? ORDER BY u.username';
+ my $dbh = $main->get_db_object;
+ my $sth = $dbh->prepare($sql);
+ return undef unless($sth->execute($obj->get_oid));
+ return $sth->fetchall_arrayref({});
}
=pod
-=head2 getall_acl_for_group_per_object
+=head2 get_object_default_acl
- my $rights = Vhffs::Acl::getall_acl_for_group_per_object($object, $vhffs);
+ my $rights = Vhffs::Acl::get_object_default_acl($object, $vhffs);
-Get all groups acl for a given object.
-Returns an array of hashref with keys 'oid_src, name, perm'.
+Get the default acl of a given object.
+Returns an array of one hashref with keys 'oid_src, perm'.
=cut
-sub getall_acl_for_group_per_object
+sub get_object_default_acl
{
my ( $obj , $main ) = @_;
return -1 unless( defined $obj );
- my $sql = 'SELECT acl.granted_oid, g.groupname AS name, acl.perm FROM vhffs_acl acl INNER JOIN vhffs_groups g ON acl.granted_oid=g.object_id WHERE acl.target_oid=? ORDER BY g.groupname';
- my $dbh = $main->get_db_object;
+ my $sql = 'SELECT acl.granted_oid, acl.perm FROM vhffs_acl acl INNER JOIN vhffs_groups g ON acl.granted_oid=g.object_id WHERE acl.target_oid=? ORDER BY g.groupname';
+ my $dbh = $main->get_db_object;
my $sth = $dbh->prepare( $sql );
return undef unless( $sth->execute($obj->get_oid) );
return $sth->fetchall_arrayref({});
@@ -197,4 +198,3 @@
1;
-
Modified: trunk/vhffs-api/src/Vhffs/Constants.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Constants.pm 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-api/src/Vhffs/Constants.pm 2007-10-04 22:52:25 UTC (rev 960)
@@ -21,6 +21,7 @@
MODIFICATION_APPLIED => 11,
TO_DELETE => 12,
+ ACL_UNDEFINED => -1,
ACL_DENIED => 0,
ACL_VIEW => 2,
ACL_MODIFY => 4,
Modified: trunk/vhffs-api/src/examples/show_acl_per_object.pl
===================================================================
--- trunk/vhffs-api/src/examples/show_acl_per_object.pl 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-api/src/examples/show_acl_per_object.pl 2007-10-04 22:52:25 UTC (rev 960)
@@ -19,10 +19,10 @@
die("MySQL service $dbname not found\n") unless(defined $sql);
-my $acl = Vhffs::Acl::getall_acl_for_user_per_object( $sql , $princ );
+my $acl = Vhffs::Acl::get_object_users_acl( $sql , $princ );
print Dumper $acl;
-$acl = Vhffs::Acl::getall_acl_for_group_per_object( $sql , $princ );
+$acl = Vhffs::Acl::get_object_default_acl( $sql , $princ );
print Dumper $acl;
Modified: trunk/vhffs-panel/acl/view.pl
===================================================================
--- trunk/vhffs-panel/acl/view.pl 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-panel/acl/view.pl 2007-10-04 22:52:25 UTC (rev 960)
@@ -108,65 +108,41 @@
$panel->add_info( gettext('ACL updated') );
}
}
- $template = new HTML::Template( filename => $templatedir.'/panel/acl/view.tmpl' );
+ $template = new HTML::Template::Expr( filename => $templatedir.'/panel/acl/view.tmpl' , global_vars => 1 );
$panel->set_title( gettext('ACL Administration') );
# Disable ACL managment facilities if user doesn't have enough rights
$template->param( MANAGE_ACL => ($access_level >= Vhffs::Constants::ACL_MANAGEACL));
- $template->param( TEXT_ACL_USER => gettext('ACL for Users') );
- $template->param( TEXT_ACL_USER_ADD => gettext('Add an ACL for a User') );
- $template->param( TEXT_ACL_DEFAULT => gettext('Default right') );
+ $template->param( TEXT_USER => gettext('User') );
- $template->param( TEXT_USERNAME => gettext('Username:' ) );
-
+ $template->param( TEXT_DEFAULT => gettext('Default') );
+ $template->param( TEXT_ACL_UNDEF => gettext('Default') );
$template->param( TEXT_ACL_DENIED => gettext('Can\'t access') );
$template->param( TEXT_ACL_VIEW => gettext('Can view this service') );
$template->param( TEXT_ACL_MODIFY => gettext('Can modify this service') );
$template->param( TEXT_ACL_MANAGEACL => gettext('Can manage ACL for this service') );
$template->param( TEXT_ACL_DELETE => gettext('Can destroy this service') );
+ $template->param( VALUE_ACL_UNDEF => Vhffs::Constants::ACL_UNDEFINED );
$template->param( VALUE_ACL_DENIED => Vhffs::Constants::ACL_DENIED );
$template->param( VALUE_ACL_VIEW => Vhffs::Constants::ACL_VIEW );
$template->param( VALUE_ACL_MODIFY => Vhffs::Constants::ACL_MODIFY );
$template->param( VALUE_ACL_MANAGEACL => Vhffs::Constants::ACL_MANAGEACL );
$template->param( VALUE_ACL_DELETE => Vhffs::Constants::ACL_DELETE );
+ $template->param( TEXT_MODIFY => gettext('Modify') );
+
+ $template->param( TEXT_USERNAME => gettext('User:' ) );
$template->param( TEXT_ACL_LEVEL => gettext('ACL level') );
-
- $template->param( OID => $object->get_oid );
- $template->param( SEND => gettext('Send it') );
+ $template->param( TEXT_ACL_USER_ADD => gettext('Add an ACL for a User') );
+ $template->param( SEND => gettext('Add') );
- my $user_rights = Vhffs::Acl::getall_acl_for_user_per_object( $object , $vhffs );
- my $group_rights = Vhffs::Acl::getall_acl_for_group_per_object( $object , $vhffs );
+ $template->param( TARGET_OID => $object->get_oid );
- my $subtemplate = new HTML::Template::Expr( filename => $templatedir.'/panel/acl/view_each.tmpl', global_vars => 1 );
- $subtemplate->param( VALUE_ACL_DENIED => Vhffs::Constants::ACL_DENIED );
- $subtemplate->param( VALUE_ACL_VIEW => Vhffs::Constants::ACL_VIEW );
- $subtemplate->param( VALUE_ACL_MODIFY => Vhffs::Constants::ACL_MODIFY );
- $subtemplate->param( VALUE_ACL_MANAGEACL => Vhffs::Constants::ACL_MANAGEACL );
- $subtemplate->param( VALUE_ACL_DELETE => Vhffs::Constants::ACL_DELETE );
-
- $subtemplate->param( TEXT_ACL_DENIED => gettext('Can\'t access') );
- $subtemplate->param( TEXT_ACL_VIEW => gettext('Can view this service') );
- $subtemplate->param( TEXT_ACL_MODIFY => gettext('Can modify this service') );
- $subtemplate->param( TEXT_ACL_MANAGEACL => gettext('Can manage ACL for this service') );
- $subtemplate->param( TEXT_ACL_DELETE => gettext('Can destroy this service') );
- $subtemplate->param( TEXT_MODIFY => gettext('Modify') );
-
- $subtemplate->param( TARGET_OID => $object->get_oid );
-
- # fill in users' ACL
- $subtemplate->param( TEXT_TYPE => gettext('Username') );
- $subtemplate->param( rights => $user_rights );
- $template->param( USERS_TABLE => $subtemplate->output );
-
- # fill in groups' ACL
- $subtemplate->param( TEXT_TYPE => gettext('Groupname') );
- $subtemplate->param( rights => $group_rights );
- $template->param( GROUPS_TABLE => $subtemplate->output );
-
+ $template->param( ACL_DEFAULT => Vhffs::Acl::get_object_default_acl( $object , $vhffs ) );
+ $template->param( ACL_USERS => Vhffs::Acl::get_object_users_acl( $object , $vhffs ) );
}
}
Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-panel/templates/Makefile.am 2007-10-04 22:52:25 UTC (rev 960)
@@ -1,6 +1,5 @@
paneltemplatesdir = @TEMPLATESDIR@/panel
nobase_paneltemplates_DATA = \
- acl/view_each.tmpl \
acl/view.tmpl \
admin/index.tmpl \
admin/cvs/edit.tmpl \
Modified: trunk/vhffs-panel/templates/acl/view.tmpl
===================================================================
--- trunk/vhffs-panel/templates/acl/view.tmpl 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-panel/templates/acl/view.tmpl 2007-10-04 22:52:25 UTC (rev 960)
@@ -1,12 +1,63 @@
-<h2><TMPL_VAR NAME="TEXT_ACL_USER"></h2>
+<tmpl_if name="ACL_USERS">
+<div class="acltable">
+<div class="tableheader">
+ <p>
+ <span><tmpl_var name="TEXT_USER"></span>
+ <span><b><tmpl_var name="TEXT_ACL_UNDEF"></b></span>
+ <span><tmpl_var name="TEXT_ACL_DENIED"></span>
+ <span><tmpl_var name="TEXT_ACL_VIEW"></span>
+ <span><tmpl_var name="TEXT_ACL_MODIFY"></span>
+ <span><tmpl_var name="TEXT_ACL_MANAGEACL"></span>
+ <span><tmpl_var name="TEXT_ACL_DELETE"></span>
+ <span><tmpl_var name="TEXT_MODIFY"></span>
+ </p>
+</div>
+<div class="tablebody">
+<tmpl_loop name="ACL_DEFAULT">
+ <form method="post" action="view.pl">
+ <p>
+ <span><b><TMPL_VAR NAME="TEXT_DEFAULT"></b></span>
+ <span> </span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DELETE">" <tmpl_if expr="perm==VALUE_ACL_DELETE">checked="checked"</tmpl_if>/></span>
+ <span>
+ <input type="hidden" NAME="granted_oid" VALUE="<TMPL_VAR NAME="GRANTED_OID">" />
+ <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR NAME="TARGET_OID">" />
+ <input type="submit" value="<TMPL_VAR NAME="TEXT_MODIFY">" name="update_acl_submit"/>
+ </span>
+ </p>
+ </form>
+</tmpl_loop>
+<tmpl_loop name="ACL_USERS">
+ <form method="post" action="view.pl">
+ <p>
+ <span><TMPL_VAR NAME="NAME"></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_UNDEF">" <tmpl_if expr="perm==VALUE_ACL_UNDEF">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
+ <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DELETE">" <tmpl_if expr="perm==VALUE_ACL_DELETE">checked="checked"</tmpl_if>/></span>
+ <span>
+ <input type="hidden" NAME="granted_oid" VALUE="<TMPL_VAR NAME="GRANTED_OID">" />
+ <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR NAME="TARGET_OID">" />
+ <input type="submit" value="<TMPL_VAR NAME="TEXT_MODIFY">" name="update_acl_submit"/>
+ </span>
+ </p>
+ </form>
+</tmpl_loop>
+<span class="clear"> </span>
+</div>
+</div>
+</tmpl_if>
-<TMPL_VAR NAME="USERS_TABLE">
-
<tmpl_if name="MANAGE_ACL">
-<h3><TMPL_VAR NAME="TEXT_ACL_USER_ADD"></h3>
+<h2><TMPL_VAR NAME="TEXT_ACL_USER_ADD"></h2>
<form method="post" action="/acl/view.pl">
-
<p>
<label for="acl_username">
<TMPL_VAR NAME="TEXT_USERNAME">
@@ -26,12 +77,8 @@
</select>
</p>
<p class="button">
- <input type="HIDDEN" name="target_oid" value="<TMPL_VAR NAME="OID">" />
+ <input type="HIDDEN" name="target_oid" value="<TMPL_VAR NAME="TARGET_OID">" />
<input type="submit" value="<TMPL_VAR NAME="SEND">" name="add_acl_user_submit"/>
</p>
</form>
</tmpl_if>
-
-<h2><TMPL_VAR NAME="TEXT_ACL_DEFAULT"></h2>
-
-<TMPL_VAR NAME="GROUPS_TABLE">
Deleted: trunk/vhffs-panel/templates/acl/view_each.tmpl
===================================================================
--- trunk/vhffs-panel/templates/acl/view_each.tmpl 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-panel/templates/acl/view_each.tmpl 2007-10-04 22:52:25 UTC (rev 960)
@@ -1,35 +0,0 @@
-<tmpl_if name="rights">
-<div class="acltable">
-<div class="tableheader">
- <p>
- <span><tmpl_var name="TEXT_TYPE"></span>
- <span><tmpl_var name="TEXT_ACL_DENIED"></span>
- <span><tmpl_var name="TEXT_ACL_VIEW"></span>
- <span><tmpl_var name="TEXT_ACL_MODIFY"></span>
- <span><tmpl_var name="TEXT_ACL_MANAGEACL"></span>
- <span><tmpl_var name="TEXT_ACL_DELETE"></span>
- <span><tmpl_var name="TEXT_MODIFY"></span>
- </p>
-</div>
-<div class="tablebody">
-<tmpl_loop name="rights">
- <form method="post" action="view.pl">
- <p>
- <span><TMPL_VAR NAME="NAME"></span>
- <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
- <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
- <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
- <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
- <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DELETE">" <tmpl_if expr="perm==VALUE_ACL_DELETE">checked="checked"</tmpl_if>/></span>
- <span>
- <input type="hidden" NAME="granted_oid" VALUE="<TMPL_VAR NAME="GRANTED_OID">" />
- <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR NAME="TARGET_OID">" />
- <input type="submit" value="<TMPL_VAR NAME="TEXT_MODIFY">" name="update_acl_submit"/>
- </span>
- </p>
- </form>
-</tmpl_loop>
-<span class="clear"> </span>
-</div>
-</div>
-</tmpl_if>
Modified: trunk/vhffs-panel/themes/vhffs/main.css
===================================================================
--- trunk/vhffs-panel/themes/vhffs/main.css 2007-10-04 17:32:35 UTC (rev 959)
+++ trunk/vhffs-panel/themes/vhffs/main.css 2007-10-04 22:52:25 UTC (rev 960)
@@ -766,13 +766,13 @@
display:block;
float:left;
overflow:auto;
-width:77.4px;
+width:67.3px;
margin:1px;
border:1px solid #FF9999;
}
div.acltable div.tablebody input[type="submit"] {
-width:75px;
+width:60px;
height:1.7em;
}