From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 23 Apr 2010 09:52:36 +0000 (+0000)
Subject: Updated styles and display
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dce7c8f72f88a4201087ed4e98f06368c5a4dd0e;p=gosa.git

Updated styles and display


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17809 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/themes/default/style.css b/gosa-core/html/themes/default/style.css
index 0c5ff65de..0618eaa50 100644
--- a/gosa-core/html/themes/default/style.css
+++ b/gosa-core/html/themes/default/style.css
@@ -1516,3 +1516,48 @@ h2 {
   font-weight:bold;
 }
 
+
+/* ACL viewer */
+
+div.acl-viewer-container {
+  border:1px solid #CCC;
+  padding:1px;
+  height:100%;
+  min-height:480px;
+  overflow-x:hidden;
+  overflow-y:auto;
+}
+
+.acl-viewer span {
+    color:red;
+}
+
+table.acl-viewer{
+    width:100%;
+}
+
+.acl-viewer td {
+    padding-top:5px;
+}
+
+tr.acl-viewer-head{
+  background: -webkit-gradient(linear, 0 0, 0 100%, from(#EEE), to(#DDD));
+  background: -moz-linear-gradient(top, #EEE, #DDD);
+}
+
+tr.acl-viewer-head td{
+  padding:6px;
+  margin:0;
+}
+
+tr.acl-viewer-blocked{
+  background:#FAA;
+}
+
+ul.acl-viewer-items, ul.acl-viewer-items li {
+  list-style:none;
+  display:inline;
+  margin:0;
+  padding:0;
+}
+
diff --git a/gosa-core/plugins/generic/references/class_aclResolver.inc b/gosa-core/plugins/generic/references/class_aclResolver.inc
index 9802d8a1e..f87c5e10b 100644
--- a/gosa-core/plugins/generic/references/class_aclResolver.inc
+++ b/gosa-core/plugins/generic/references/class_aclResolver.inc
@@ -140,42 +140,39 @@ class aclResolver
                         'autocomplete', 
                         'autocomplete.php', 
                         { minChars: 3, frequency: 0.5 });
-            </script>
+                </script>
             ".image("images/lists/submit.png","aclTargetSubmit");
 
             // Base template - each entry start with this 
             $tpl = 
                 "\n <tr class='acl-viewer-head %s'>".
                 "\n  <td>%s</td>".
-                "\n  <td colspan=2><b>%s</b>&nbsp;-&nbsp;%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'
@@ -183,15 +180,16 @@ class aclResolver
                 "\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 ACL 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();
@@ -284,6 +282,7 @@ class aclResolver
                 }
             }
             $str .= "</table>"; 
+            $str .= "</div>"; 
             $this->renderedList = $str;
         }
         return($this->renderedList);
diff --git a/gosa-core/plugins/generic/references/class_reference.inc b/gosa-core/plugins/generic/references/class_reference.inc
index 433852439..a4bcabd29 100644
--- a/gosa-core/plugins/generic/references/class_reference.inc
+++ b/gosa-core/plugins/generic/references/class_reference.inc
@@ -43,25 +43,25 @@ class reference extends plugin
         $this->referenceFilters[] = array(
             'filter' => "(&(objectClass=posixGroup)(memberUid={$this->uid}))",
             'attrs'  => array('cn' => _("Name"),'description' => _("Description")),
-            'msg'    => _("Group"));
+            'msg'    => _("Group membership"));
 
         // Check for group membership in rfc 2307 bis mode
         $this->referenceFilters[] = array(
             'filter' => "(&(objectClass=posixGroup)(member=".normalizeLdap($this->dn)."))",
             'attrs'  => array('cn' => _("Name"),'description' => _("Description")),
-            'msg'    => _("Group")." (rfc 2307 bis)");
+            'msg'    => _("Group membership")." (rfc 2307 bis)");
 
         // Check for role membership
         $this->referenceFilters[] = array(
             'filter' => "(&(objectClass=organizationalRole)(roleOccupant=".normalizeLdap($this->dn)."))",
             'attrs'  => array('cn' => _("Name"),'description' => _("Description")),
-            'msg'    => _("Role"));
+            'msg'    => _("Role membership"));
 
         // Check for objectGroup membership
         $this->referenceFilters[] = array(
             'filter' => "(&(objectClass=gosaGroupOfNames)(member=".normalizeLdap($this->dn)."))",
             'attrs'  => array('cn' => _("Name"),'description' => _("Description")),
-            'msg'    => _("Object group"));
+            'msg'    => _("Object group membership"));
 
         // Check for department manager 
         $this->referenceFilters[] = array(
@@ -115,6 +115,7 @@ class reference extends plugin
                 $list->update();    
                 $str .= "<h3>".$filter['msg']."</h3>";
                 $str .= $list->render();
+                $str .= "<div class='v-spacer'></div>";
             }
         }
 
diff --git a/gosa-core/plugins/generic/references/contents.tpl b/gosa-core/plugins/generic/references/contents.tpl
index 44228ea4a..a7f0bca61 100644
--- a/gosa-core/plugins/generic/references/contents.tpl
+++ b/gosa-core/plugins/generic/references/contents.tpl
@@ -1,8 +1,11 @@
-<table summary='{t}Object references{/t}'>
+<table summary='{t}Object references{/t}' class='reference-tab'>
     <tr>
-        <td style='width:50%;'>
+        <td style='width:48%'>
              {$objectList}
         </td>
+        <td class='right-border'>
+          &nbsp;
+        </td>
         <td>
             {$acls}
         </td>