msgPool

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

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index bfd86e1014432351c8fd5f6ef4737a2c3a66b68b..127948767ca4ee4eb83bdd5682e0107cc6e8104d 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -283,14 +283,52 @@ class ogroup extends plugin
       $smarty->assign("tree_image", get_template_path('images/tree.png'));
       $smarty->assign("deplist", $this->config->idepartments);
       $smarty->assign("alphabet", generate_alphabet());
-      foreach( array("dselect", "regex", "accounts", "groups", "applications",
-            "departments", "servers", "workstations", "winstations", "terminals","subtrees",
-            "printers", "phones") as $type){
+      foreach( array("dselect", "regex", "subtrees") as $type){
         $smarty->assign("$type", $ogfilter[$type]);
       }
       $smarty->assign("hint", print_sizelimit_warning());
       $smarty->assign("apply", apply_filter());
 
+      /* Build up checkboxes 
+       */
+      $ar = array(
+          "departments" => array(
+            "T" => msgPool::selectToView(_("departments")),
+            "C" => (isset($ogfilter['departments']) && ($ogfilter['departments'])),
+            "L" => sprintf(_("Show %s"),_("departments"))),
+          "accounts" => array(
+            "T" => msgPool::selectToView(_("people")),
+            "C" => (isset($ogfilter['accounts']) && ($ogfilter['accounts'])),
+            "L" => sprintf(_("Show %s"),_("people"))),
+          "groups"=> array(
+            "T" => msgPool::selectToView(_("groups")),
+            "C" => (isset($ogfilter['groups']) && ($ogfilter['groups'])),
+            "L" => sprintf(_("Show %s"),_("groups"))),
+          "applications"=> array(
+            "T" => msgPool::selectToView(_("applications")),
+            "C" => (isset($ogfilter['applications']) && ($ogfilter['applications'])),
+            "L" => sprintf(_("Show %s"),_("applications"))),
+          "servers"=> array(
+            "T" => msgPool::selectToView(_("servers")),
+            "C" => (isset($ogfilter['servers']) && ($ogfilter['servers'])),
+            "L" => sprintf(_("Show %s"),_("servers"))),
+          "workstations"=> array(
+            "T" => msgPool::selectToView(_("workstations")),
+            "C" => (isset($ogfilter['workstations']) && ($ogfilter['workstations'])),
+            "L" => sprintf(_("Show %s"),_("workstations"))),
+          "terminals"=> array(
+            "T" => msgPool::selectToView(_("terminals")),
+            "C" => (isset($ogfilter['terminals']) && ($ogfilter['terminals'])),
+            "L" => sprintf(_("Show %s"),_("terminals"))),
+          "printers"=> array(
+            "T" => msgPool::selectToView(_("printer")),
+            "C" => (isset($ogfilter['printers']) && ($ogfilter['printers'])),
+            "L" => sprintf(_("Show %s"),_("printers"))),
+          "phones"=> array(
+            "T" => msgPool::selectToView(_("phones")),
+            "C" => (isset($ogfilter['phones']) && ($ogfilter['phones'])),
+            "L" => sprintf(_("Show %s"),_("phones"))));
+      $smarty->assign("checkboxes",$ar);
       $display= $smarty->fetch (get_template_path('ogroup_objects.tpl', TRUE, dirname(__FILE__)));
       return ($display);
     }

diff --git a/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl b/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl
index ec22f87b86a6f8c42bd1fef5db45e7711717fbf3..1625b3e327199db56c5d114239a113654431a89c 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl
+++ b/gosa-core/plugins/admin/ogroups/ogroup_objects.tpl
@@ -23,17 +23,12 @@
      <table summary="" style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8">
       {$alphabet}
      </table>
-    <p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8">
-    <input type=checkbox name="departments" value="1" {$departments} onClick="mainform.submit()" title="{t}Select to see departments{/t}">{t}Show departments{/t}<br>
-    <input type=checkbox name="accounts" value="1" {$accounts} onClick="mainform.submit()" title="{t}Select to see GOsa accounts{/t}">{t}Show people{/t}<br>
-    <input type=checkbox name="groups" value="1" {$groups} onClick="mainform.submit()" title="{t}Select to see GOsa groups{/t}">{t}Show groups{/t}<br>
-    <input type=checkbox name="applications" value="1" {$applications} onClick="mainform.submit()" title="{t}Select to see applications{/t}">{t}Show applications{/t}<br>
-    <input type=checkbox name="servers" value="1" {$servers} onClick="mainform.submit()" title="{t}Select to see servers{/t}">{t}Show servers{/t}<br>
-    <input type=checkbox name="workstations" value="1" {$workstations} onClick="mainform.submit()" title="{t}Select to see workstations{/t}">{t}Show workstations{/t}<br>
-    <input type=checkbox name="terminals" value="1" {$terminals} onClick="mainform.submit()" title="{t}Select to see terminals{/t}">{t}Show terminals{/t}<br>
-    <input type=checkbox name="printers" value="1" {$printers} onClick="mainform.submit()" title="{t}Select to see printers{/t}">{t}Show printers{/t}<br>
-    <input type=checkbox name="phones" value="1" {$phones} onClick="mainform.submit()" title="{t}Select to see phones{/t}">{t}Show phones{/t}<br>
- </p>
+        <p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8">
+               {foreach from=$checkboxes item=item key=key}
+                       <input type='checkbox' {if $item.C} checked {/if} class="center" 
+                                       name="{$key}" value="1" title="{$item.T}">{$item.L}<br>
+               {/foreach}
+        </p>
  <p class="contentboxb" style="border-top:1px solid #B0B0B0; background-color:#F8F8F8">
     <input type=checkbox name="subtrees" value="1" {$subtrees} onClick="mainform.submit()" title="{t}Select to search within subtrees{/t}">{t}Search in subtrees{/t}<br>
  </p>