Code

Updated lsit summary, replaced text with images
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 8 Aug 2007 11:21:36 +0000 (11:21 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 8 Aug 2007 11:21:36 +0000 (11:21 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7001 594d385d-05f5-0310-b6e9-bd551577e9d8

12 files changed:
html/include/focus.js
plugins/admin/applications/class_divListApplication.inc
plugins/admin/departments/class_divListDepartment.inc
plugins/admin/fai/class_divListFai.inc
plugins/admin/groups/class_divListGroup.inc
plugins/admin/mimetypes/class_divListMimeTypes.inc
plugins/admin/ogroups/class_divListOGroup.inc
plugins/admin/systems/class_divListSystem.inc
plugins/admin/users/class_divListUsers.inc
plugins/gofax/blocklists/class_divListBlocklists.inc
plugins/gofon/conference/class_divListConferences.inc
plugins/gofon/macro/class_divListMacros.inc

index edc7cda7faeee68a6c093812f09de228a14194d9..f01d1046cb4ff9d8b8bc3c8c482b016c831eb82c 100644 (file)
@@ -330,6 +330,12 @@ function adjust_height(e) {
                                suggested= inner_height-230;
                        }
                }
+
+               /* Reduce height if a list footer is set */
+               if(document.getElementById("t_scrollfoot")){
+                       suggested = suggested -20;
+               }
+
                document.getElementById("d_scrollbody").style.height=suggested+"px";
        }
        return true;
index b9f19be1a88666e9666ec848ced3700dddd2e01f..3cfeea35db5341510fa356608d4c66783d38d61e 100755 (executable)
@@ -295,10 +295,15 @@ class divListApplication extends MultiSelectWindow
       $num_deps = count($this->Added_Departments);
     }
     $num_apps = count($list);
-    $str = $num_apps." ";
-    $num_apps      != 1  ? $str.=_("Applications").", "    : $str .= _("Application").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+
+    $num_app_str = _("Number of listed applications");
+    $num_dep_str = _("Number of listed departments");
+  
+    $str = "<img class='center' src='images/select_application.png' 
+              title='".$num_app_str."' alt='".$num_app_str."'>&nbsp;".$num_apps."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png' 
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
   }
 
index d5281bfe13358c1407969479b4c66663d7f588c1..97a913380d88f60288eae22fe68a7ab769874962 100755 (executable)
@@ -202,8 +202,9 @@ class divListDepartment extends MultiSelectWindow
 
     /* Create summary string for list footer */
     $num_deps=count($list);
-    $str = $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+    $num_dep_str = _("Number of listed departments");
+    $str = "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
     $this->set_List_Bottom_Info($str);
 
   }
index d693716909f8e14afd77bcfa54be22e506fb66b7..d586dec9228bc187a1d3985f89d8c3b2fda97ac6 100644 (file)
@@ -349,38 +349,32 @@ class divListFai extends MultiSelectWindow
        $num_deps = count($this->Added_Departments);
      }
 
-     /* Profile */
-     $str = $cnts['FAIprofile']." ";
-     $cnts['FAIprofile']        != 1  ? $str.=_("Profiles").", "    : $str .= _("Profile").", ";
-
-     /* Scripts */
-     $str.= $cnts['FAIpartitionTable']." ";
-     $cnts['FAIpartitionTable'] != 1  ? $str.=_("Partitions").", "  : $str .= _("Partition").", ";
-
-     /* Scripts */
-     $str.= $cnts['FAIscript']." ";
-     $cnts['FAIscript']         != 1  ? $str.=_("Scripts").", "     : $str .= _("Script").", ";
-
-     /* Hooks */
-     $str.= $cnts['FAIhook']." ";
-     $cnts['FAIhook']           != 1  ? $str.=_("Hooks").", "       : $str .= _("Hook").", ";
-
-     /* Variables */
-     $str.= $cnts['FAIvariable']." ";
-     $cnts['FAIvariable']       != 1  ? $str.=_("Variables").", "   : $str .= _("Variable").", ";
-
-     /* Templates */
-     $str.= $cnts['FAItemplate']." ";
-     $cnts['FAItemplate']       != 1  ? $str.=_("Templates").", "   : $str .= _("Template").", ";
-
-     /* Packages */
-     $str.= $cnts['FAIpackageList']." ";
-     $cnts['FAIpackageList']    != 1  ? $str.=_("Package lists").", ": $str .= _("Package list").", ";
-
-     $str.= $num_deps." ";
-     $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+     $profile_str    = _("Number of listed profiles");
+     $partition_str  = _("Number of listed partitions");
+     $script_str     = _("Number of listed scripts");
+     $hook_str       = _("Number of listed hooks");
+     $variable_str   = _("Number of listed variables");
+     $template_str   = _("Number of listed templates");
+     $package_str    = _("Number of listed packages");
+     $dep_str        = _("Number of listed departments");
+
+     $str = "<img class='center' src='".$objects['FAIprofile']['IMG']."'
+       title='".$profile_str."' alt='".$profile_str."'>&nbsp;".$cnts['FAIprofile']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='".$objects['FAIpartitionTable']['IMG']."'
+       title='".$partition_str."' alt='".$partition_str."'>&nbsp;".$cnts['FAIpartitionTable']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='".$objects['FAIscript']['IMG']."'
+       title='".$script_str."' alt='".$script_str."'>&nbsp;".$cnts['FAIscript']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='".$objects['FAIhook']['IMG']."'
+       title='".$hook_str."' alt='".$hook_str."'>&nbsp;".$cnts['FAIhook']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='".$objects['FAIvariable']['IMG']."'
+       title='".$variable_str."' alt='".$variable_str."'>&nbsp;".$cnts['FAIvariable']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='".$objects['FAItemplate']['IMG']."'
+       title='".$template_str."' alt='".$template_str."'>&nbsp;".$cnts['FAItemplate']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='".$objects['FAIpackageList']['IMG']."'
+       title='".$package_str."' alt='".$package_str."'>&nbsp;".$cnts['FAIpackageList']."&nbsp;&nbsp;&nbsp;&nbsp;";
+     $str.= "<img class='center' src='images/folder.png'
+       title='".$dep_str."' alt='".$dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
      $this->set_List_Bottom_Info($str);
-
   }
 
   function Save()
index 79337f805eb40288c8917fb1bf78bb4b02d193ea..a4aa79333ab10b5544bc203cacbcc80f21069471 100644 (file)
@@ -321,12 +321,18 @@ class divListGroup extends MultiSelectWindow
     if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
-    $num_groups = count($groups);
-    $str = $num_groups." ";
-    $num_groups      != 1  ? $str.=_("Groups").", "    : $str .= _("Group").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+    $num_grps = count($groups);
+
+    $num_grp_str = _("Number of listed groups");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/select_groups.png'
+              title='".$num_grp_str."' alt='".$num_grp_str."'>&nbsp;".$num_grps."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
+
   }
 
   function Save()
index 58e319193315235c619071ead9d3658d2e42e7de..cf5f165f70ac19613aa860ca97c406437e6aece7 100755 (executable)
@@ -295,16 +295,22 @@ class divListMimeTypes extends MultiSelectWindow
       $this->AddElement(array($field0,$field1,$field2,$field3));
     }
 
+
     /* Create summary string for list footer */
     $num_deps=0;
     if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
     $num_objs = count($list);
-    $str = $num_objs." ";
-    $num_objs      != 1  ? $str.=_("Mimetypes").", "    : $str .= _("Mimetype").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+
+    $num_obj_str = _("Number of listed mimetypes");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/select_mimetype.png'
+              title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
   }
 
index 8b460ef6cbdbe07ee1833043120c8c2938d24941..d9f243fa862da30c2c403a67292bb342d6d4526a 100755 (executable)
@@ -285,17 +285,23 @@ class divListOGroup extends MultiSelectWindow
 
       $this->AddElement(array($field0,$field1,$field2,$field3,$field4));
     }
-    
+   
     /* Create summary string for list footer */
     $num_deps=0;
     if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
     $num_objs = count($list);
-    $str = $num_objs." ";
-    $num_objs      != 1  ? $str.=_("Object groups").", "    : $str .= _("Object group").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+
+    $num_obj_str = _("Number of listed object groups");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/select_ogroup.png'
+              title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
   }
 
index 894b73aa138413fb18c548930ccb9fe3a4487f74..1bc74b72d4f794a13bcddf0293d4734d1d19df4f 100644 (file)
@@ -426,46 +426,36 @@ class divListSystem extends MultiSelectWindow
       $num_deps = count($this->Added_Departments);
     }
 
-    $str ="";
+    $num_ser_str = _("Number of listed servers");
+    $num_ws_str  = _("Number of listed workstations");
+    $num_ter_str = _("Number of listed terminals");
+    $num_pho_str = _("Number of listed phones");
+    $num_prt_str = _("Number of listed printers");
+    $num_com_str = _("Number of listed network components");
+    $num_new_str = _("Number of listed new devices");
+    $num_wws_str = _("Number of listed windows workstations");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/select_server.png'
+      title='".$num_ser_str."' alt='".$num_ser_str."'>&nbsp;".$cnts['server']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_workstation.png'
+      title='".$num_ws_str."' alt='".$num_ws_str."'>&nbsp;".$cnts['workstation']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_terminal.png'
+      title='".$num_ter_str."' alt='".$num_ter_str."'>&nbsp;".$cnts['terminal']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_phone.png'
+      title='".$num_pho_str."' alt='".$num_pho_str."'>&nbsp;".$cnts['phone']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_printer.png'
+      title='".$num_prt_str."' alt='".$num_prt_str."'>&nbsp;".$cnts['printer']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_component.png'
+      title='".$num_com_str."' alt='".$num_com_str."'>&nbsp;".$cnts['component']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_newsystem.png'
+      title='".$num_new_str."' alt='".$num_new_str."'>&nbsp;".$cnts['NewDevice']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/select_winstation.png'
+      title='".$num_wws_str."' alt='".$num_wws_str."'>&nbsp;".$cnts['winstation']."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+      title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
 
-    /* Servers  */
-    $str.= $cnts['server']." ";
-    $cnts['server']            != 1  ? $str.=_("Servers").", "     : $str .= _("Server").", ";
-
-    /* Workstations */
-    $str.= $cnts['workstation']." ";
-    $cnts['workstation']       != 1  ? $str.=_("Workstations").", ": $str .= _("Workstation").", ";
-
-    /* Terminals */
-    $str.= $cnts['terminal']." ";
-    $cnts['terminal']          != 1  ? $str.=_("Terminals").", "   : $str .= _("Terminal").", ";
-
-    /* Phones */
-    $str.= $cnts['phone']." ";
-    $cnts['phone']             != 1  ? $str.=_("Phones").", "      : $str .= _("Phone").", ";
-
-    /* Printer */
-    $str.= $cnts['printer']." ";
-    $cnts['printer']           != 1  ? $str.=_("Printers").", "    : $str .= _("Printer").", ";
-
-    /* Components */
-    $str.= $cnts['component']." ";
-    $cnts['component']         != 1  ? $str.=_("Components").", "  : $str .= _("Component").", ";
-
-    /* New devices */
-    $str.= $cnts['NewDevice']." ";
-    $cnts['NewDevice']         != 1  ? $str.=_("New devices").", " : $str .= _("New device").", ";
-
-    /* Windows workstations  */
-    $str.= $cnts['winstation']." ";
-    $cnts['winstation']        != 1  ? $str.=_("Windows workstations").", "    : $str .= _("Windows workstation").", ";
-
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
     $this->set_List_Bottom_Info($str);
-
-
-
   }
 
 
index 2c42f304c6778cfc84214f1f0a28a132bcc185da..b1d5d201ee34d74f7f76b6531be681bc1999395e 100644 (file)
@@ -366,18 +366,23 @@ class divListUsers extends MultiSelectWindow
         $users[strtolower( $val['sn']['0'].$val['uid']['0'])]=$add;
       }
     }
-    /* Create summary string for list footer */ 
+
+
+    /* Create summary string for list footer */
     $num_deps=0;
-    if(!$this->SubSearch){ 
+    if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
-    $str = $num_users." ";
-    $num_users      != 1  ? $str.=_("Users").", "     : $str .= _("User").", ";
-    $str.= $num_templates." ";
-    $num_templates  != 1  ? $str.=_("Templates").", " : $str .= _("Template").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department"); 
+    $num_users = count($list);
+
+    $num_user_str = _("Number of listed users");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/select_user.png'
+              title='".$num_user_str."' alt='".$num_user_str."'>&nbsp;".$num_users."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
   }
 
index fb27fd229104e369628e6d180db6a117efb8baf5..2e78c656bbf1171be9b80be4aa88f2ae4082702d 100755 (executable)
@@ -230,12 +230,18 @@ class divListBlocklist extends MultiSelectWindow
     if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
-    $num_lists = count($list);
-    $str = $num_lists." ";
-    $num_lists      != 1  ? $str.=_("Blocklists").", "    : $str .= _("Blocklist").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+    $num_objs = count($list);
+
+    $num_obj_str = _("Number of listed blocklists");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/list_blocklist.png'
+              title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
+
   }
 
   function Save()
index 3b7514f5c26cce67f198750be2e86f4a7c4c749b..c6632864db67485643239d7e92fe22eaf656337b 100755 (executable)
@@ -286,11 +286,16 @@ class divListConference extends MultiSelectWindow
     if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
-    $num_lists = count($list);
-    $str = $num_lists." ";
-    $num_lists      != 1  ? $str.=_("Conferences").", "    : $str .= _("Conference").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
+    $num_objs = count($list);
+
+    $num_obj_str = _("Number of listed conferences");
+    $num_dep_str = _("Number of listed departments");
+
+    $str = "<img class='center' src='images/select_conference.png'
+              title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
     $this->set_List_Bottom_Info($str);
   }
 
index 1f17e531c23bc4dcd2838925e694a9aaa6a6edb7..682e9606aa9446ad28b6be5106d0f1a77a7c5c15 100755 (executable)
@@ -259,13 +259,17 @@ class divListMacro extends MultiSelectWindow
     if(!$this->SubSearch){
       $num_deps = count($this->Added_Departments);
     }
-    $num_lists = count($list);
-    $str = $num_lists." ";
-    $num_lists      != 1  ? $str.=_("Macros").", "    : $str .= _("Macro").", ";
-    $str.= $num_deps." ";
-    $num_deps       != 1  ? $str.=_("Departments")    : $str .= _("Department");
-    $this->set_List_Bottom_Info($str);
+    $num_objs = count($list);
+
+    $num_obj_str = _("Number of listed macros");
+    $num_dep_str = _("Number of listed departments");
 
+    $str = "<img class='center' src='images/select_macro.png'
+              title='".$num_obj_str."' alt='".$num_obj_str."'>&nbsp;".$num_objs."&nbsp;&nbsp;&nbsp;&nbsp;";
+    $str.= "<img class='center' src='images/folder.png'
+              title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;".$num_deps."&nbsp;&nbsp;&nbsp;&nbsp;";
+
+    $this->set_List_Bottom_Info($str);
   }
 
   function Save()