Code

Updated list summary, using images instead of object names
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 8 Aug 2007 11:19:29 +0000 (11:19 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 8 Aug 2007 11:19:29 +0000 (11:19 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7000 594d385d-05f5-0310-b6e9-bd551577e9d8

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 55edfc77f847a96afd32afb70330e36edbfa9138..2d93cfc71e721d86fd1f3140409fad079b5f43ec 100755 (executable)
@@ -195,10 +195,10 @@ class divListApplication extends MultiSelectWindow
     $num_app_str = _("Number of listed applications");
     $num_dep_str = _("Number of listed departments");
   
-    $str = "&nbsp;<img class='center' src='images/select_application.png' 
-                    title='".$num_app_str."' alt='".$num_app_str."'>&nbsp;#".$num_apps;
-    $str.= "&nbsp;<img class='center' src='images/select_department.png' 
-                    title='".$num_dep_str."' alt='".$num_dep_str."'>&nbsp;#".$num_deps;
+    $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 ea209b428d5ebb6eb29af66e5eee8f4d93237597..e1f6cb6120c40b82f8dd3188d45e8b59ed424d67 100755 (executable)
@@ -125,8 +125,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 78c3cf05c4265e41a64b448a2cd76fa403240e24..e8e9cafd9b45c62b60e2d9328b9db4bae69da9fd 100644 (file)
@@ -259,38 +259,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 a9a26948053aefe411515f8b246acc9074e520fc..ccce7cc9b5bbe8938e1ad3d8f251dcd625052f77 100644 (file)
@@ -207,12 +207,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 949343ef5ded8ea89de348a393b7db2ef8919524..3a037d02d140a0a7c4acb44ca50f4e724b7d8b31 100755 (executable)
@@ -189,16 +189,22 @@ class divListMimeTypes extends MultiSelectWindow
       $this->AddElement(array($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 d19804b91d4b9bd92724f31cf9c5619932b1dd51..c288e6137f0c39852d9dd4b1d2fc92df74bf49e2 100755 (executable)
@@ -171,17 +171,23 @@ class divListOGroup extends MultiSelectWindow
 
       $this->AddElement(array($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 33be96ad13c0e4f3749c292ac567e156f6b13a23..f65a79c4d53eb739e131ae539e6d6415ec6669d9 100644 (file)
@@ -209,50 +209,42 @@ class divListSystem extends MultiSelectWindow
     }
 
 
-  /* Create summary string for list footer */
-     $num_deps=0;
-     if(!$this->SubSearch){
-       $num_deps = count($this->Added_Departments);
-     }
-
-    $str ="";  
-  
-     /* 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);
+    /* Create summary string for list footer */
+    $num_deps=0;
+    if(!$this->SubSearch){
+      $num_deps = count($this->Added_Departments);
+    }
 
+    $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;";
+
+    $this->set_List_Bottom_Info($str);
   }
 
   function Save()
index 0a250af9bf8170f91725fd2b4191b73544a98856..2314a077af5408918435fdbf3c4dd9167b422577 100644 (file)
@@ -266,18 +266,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 431f2fbe83cbff738486108362ea7194ad5d0662..8b85db867989b1838b1ecbb02f78341c3934e29b 100755 (executable)
@@ -114,12 +114,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 f7fa107ee2771202feb557b9182be80b9b5a0302..51e9f0efe6c1bf50f6f528772bc1eab8f1aa3803 100755 (executable)
@@ -161,11 +161,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 c2d50f6c47db72488cd15d022ddc76fb89acb279..12b709d5db64b81d4e03579d704536a87a89d1ce 100755 (executable)
@@ -133,13 +133,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()