diff --git a/gosa-core/plugins/generic/references/class_aclResolver.inc b/gosa-core/plugins/generic/references/class_aclResolver.inc
index df9846ad96f2736e796099f2fedf799483ce8347..43de674ebae4e10211330703cbbd35f116a4ad8a 100644 (file)
// Autocompleter template
$autocompleter ="
- <input class='filter_textfield' placeholder='"._("Search")."...'
+ <input class='filter_textfield' placeholder='"._("Enter another user name")."...'
id='aclTarget' name='aclTarget' type='text' value=''
onChange=\"\$('aclTargetSubmit').focus();\">
$tpl =
"\n <tr class='acl-viewer-head %s'>".
"\n <td>%s</td>".
- "\n <td colspan=2><b>%s</b> - %s</td>".
+ "\n <td colspan=2><b>%s</b><div class='right'>%s</div></td>".
"\n </tr>".
- "\n %s".
- "\n <tr>".
- "\n <td colspan=3><hr></td>".
- "\n </tr>";
+ "\n %s";
// If the acl consists of a user-object-filter then this template is used.
$filter_tpl =
"\n <tr class='%s'>".
"\n <td></td>".
"\n <td><b>"._("Filter")."</b></td>".
- "\n <td><ul><li>%s</li></ul></td>".
+ "\n <td><ul class='acl-viewer-items'><li>%s</li></ul></td>".
"\n </tr>";
// Used to display ACL owner of type "group"
$gmem_tpl =
"\n <tr class='%s'>".
"\n <td></td>".
- "\n <td><b>"._("Group members")."</b></td>".
- "\n <td><ul>%s</ul></td>".
+ "\n <td><b>"._("Groups")."</b></td>".
+ "\n <td><ul class='acl-viewer-items'>%s</ul></td>".
"\n </tr>";
// Used to display ACL owner of type "user"
$umem_tpl =
"\n <tr class='%s'>".
"\n <td></td>".
- "\n <td><b>"._("Members")."</b></td>".
- "\n <td><ul>%s</ul></td>".
+ "\n <td><b>"._("Users")."</b></td>".
+ "\n <td><ul class='acl-viewer-items'>%s</ul></td>".
"\n </tr>";
// Used to display the acl contents, except 'reset' and 'role'
"\n <tr class='%s'>".
"\n <td></td>".
"\n <td><b>"._("Acls")."</b></td>".
- "\n <td><ul>%s</ul></td>".
+ "\n <td><ul class='acl-viewer-items'>%s</ul></td>".
"\n </tr>";
- $user = sprintf(_("ACL from the viewpoint of user '%s'"), "<b>".$this->validateUid."</b>");
+ $user = "<h3>".sprintf(_("List of effective ACLs for '%s'"), $this->validateUid)."</h3>";
$str = "<table summary='"._("Object permissions")."'>";
$str .= " <tr><td>".$user."</td><td>".$autocompleter."</td></tr>";
$str .= "</table>";
- $str .= "<table summary='"._("Object permissions")."' class='acl-viewer'>";
+ $str .= "<div class='acl-viewer-container'>";
+ $str .= "<table summary='"._("Object permissions")."' cellpadding='0' cellspacing='0' class='acl-viewer'>";
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
$ui = get_userinfo();
// Display the acl block in a special color if its not matching
$class="";
- if(!$gfound || !$ufound || !$match){
+ if(!($gfound || $ufound) || !$match){
$class = "acl-viewer-blocked";
}
}
}
$str .= "</table>";
+ $str .= "</div>";
$this->renderedList = $str;
}
return($this->renderedList);
function aclToString($acls)
{
- $str ="<ul>";
+ $str ="<ul class='acl-category-list'>";
foreach($acls as $name => $acl){
if($name == "0") $name = _("All");
- $str .= "<li>".$name;
- $str .= "<ul>";
+ $str .= "<li><i>".$name.":</i> ";
+ $str .= "<ul class='acl-list'>";
if(preg_match("/s/", $acl)){
- $str.="<li>"._("Grant permission to owner").'</li>';
+ $str.="<li><u>"._("Grant permission to owner").'</u></li>';
}
if(preg_match("/r/", $acl)) $str.="<li>"._("read").'</li>';
if(preg_match("/w/", $acl)) $str.="<li>"._("write").'</li>';
- if(preg_match("/c/", $acl)) $str.="<li>"._("Create").'</li>';
- if(preg_match("/d/", $acl)) $str.="<li>"._("Remove").'</li>';
- if(preg_match("/m/", $acl)) $str.="<li>"._("Move").'</li>';
+ if(preg_match("/c/", $acl)) $str.="<li>"._("create").'</li>';
+ if(preg_match("/d/", $acl)) $str.="<li>"._("remove").'</li>';
+ if(preg_match("/m/", $acl)) $str.="<li>"._("move").'</li>';
$str.= "</ul>";
}
return($str."</ul>");