From 29293087f1744cc3d7e71c654a61e1a82d66702a Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 16 Mar 2010 08:00:59 +0000
Subject: [PATCH] Updated ogroup listing

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16580 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/ogroups/class_ogroupManagement.inc  |   5 +-
 .../plugins/admin/ogroups/ogroup-filter.tpl   |  45 -------
 .../plugins/admin/ogroups/ogroup-filter.xml   | 123 ++++--------------
 .../plugins/admin/ogroups/ogroup-list.tpl     |  48 +++----
 .../plugins/admin/ogroups/ogroup-list.xml     |   4 +-
 5 files changed, 50 insertions(+), 175 deletions(-)
 delete mode 100644 gosa-core/plugins/admin/ogroups/ogroup-filter.tpl

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index aa66dbfa7..cfde13495 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -195,10 +195,7 @@ class ogroupManagement extends management
     $result ="";
     for($i = 0 ; $i < strlen($types); $i++){
       $type = $types[$i];
-      $result.="<input class='center' type='image' src='".$conv[$type][0]."' ".
-        "alt='".$conv[$type][1]."' title='".$conv[$type][1].
-        "' name='listing_edit_".$conv[$type][2]."_$row' style='padding:1px'>";
-
+      $result.= image($conv[$type][0], 'listing_edit_'.$conv[$type][2].'_'.$row,$conv[$type][1]);
     }
     return($result);
   }
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl b/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl
deleted file mode 100644
index b66661c2f..000000000
--- a/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
-  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
- </p>
-</div>
-
-<div class="contentboxb">
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
- {$USER}&nbsp;<LABEL for=''>{t}user groups{/t}</LABEL><br>
- {$GROUP}&nbsp;<LABEL for=''>{t}nested groups{/t}</LABEL><br>
- {$APPLICATION}&nbsp;<LABEL for=''>{t}application groups{/t}</LABEL><br>
- {$DEPARTMENT}&nbsp;<LABEL for=''>{t}department groups{/t}</LABEL><br>
- {$SERVER}&nbsp;<LABEL for=''>{t}server groups{/t}</LABEL><br>
- {$WORKSTATION}&nbsp;<LABEL for=''>{t}workstation groups{/t}</LABEL><br>
- {$WINDOWS}&nbsp;<LABEL for=''>{t}windows workstation groups{/t}</LABEL><br>
- {$TERMINAL}&nbsp;<LABEL for=''>{t}terminal groups{/t}</LABEL><br>
- {$PRINTER}&nbsp;<LABEL for=''>{t}printer groups{/t}</LABEL><br>
- {$PHONE}&nbsp;<LABEL for=''>{t}phone groups{/t}</LABEL><br>
-
-
- {$SCOPE}
-
- <table summary='{t}Filter options{/t}' style="width:100%;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td>
-    <label for="NAME">
-     <img src="images/lists/search.png" align=middle>&nbsp;Name
-    </label>
-   </td>
-   <td>
-    {$NAME}
-   </td>
-  </tr>
- </table>
-
- <table summary='{t}Filter options{/t}'  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td width="100%" align="right">
-    {$APPLY}
-   </td>
-  </tr>
- </table>
-</div>
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-filter.xml b/gosa-core/plugins/admin/ogroups/ogroup-filter.xml
index 520d86361..96151f2a5 100644
--- a/gosa-core/plugins/admin/ogroups/ogroup-filter.xml
+++ b/gosa-core/plugins/admin/ogroups/ogroup-filter.xml
@@ -3,119 +3,42 @@
 <filterdef>
   <definition>
     <category>ogroups</category>
-    <template>ogroup-filter.tpl</template>
     <initial>true</initial>
+    <scope>auto</scope>
+    <default>default</default>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>cn</attribute>
+    <attribute>gosaGroupObjects</attribute>
+    <attribute>description</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaGroupOfNames)$NAME(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$DEPARTMENT$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE))</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>gosaGroupObjects</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;(objectClass=gosaGroupOfNames)(cn=$))</filter>
     </query>
-    <scope>auto</scope>
+    <autocomplete>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
   </search>
 
- <element>
-    <type>checkbox</type>
-    <tag>USER</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*U*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>GROUP</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*G*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>APPLICATION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*A*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>DEPARTMENT</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*D*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SERVER</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*S*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WORKSTATION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*W*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WINDOWS</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*O*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TERMINAL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*T*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PRINTER</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*P*)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PHONE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(gosaGroupObjects=*F*)</set>
-  </element>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(|(cn=*$*))</set>
-    <alphabet>true</alphabet>
-    <autocomplete>
+  <search>
+    <tag>default2</tag>
+    <label>Default filter2</label>
+    <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaGroupOfNames)(|(cn=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaGroupOfNames)(cn=$))</filter>
+    </query>
+    <autocomplete>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
+  </search>
 
 </filterdef>
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-list.tpl b/gosa-core/plugins/admin/ogroups/ogroup-list.tpl
index 80d5e1b4f..8e4e43f4b 100644
--- a/gosa-core/plugins/admin/ogroups/ogroup-list.tpl
+++ b/gosa-core/plugins/admin/ogroups/ogroup-list.tpl
@@ -1,28 +1,28 @@
 <input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
 
-<table summary="" style="width:100%;height:100%" cellpadding=2>
-  <tr>
-    <td style="width:100%;">
-      <div class="contentboxh">
-        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-      </div>
-      
-      <div class="contentboxb">
-       <div style='background:white;padding:3px;'>
-        <table><tr>
-          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
-        </tr></table>
-       </div>
-      </div>
-      
-      <div style='height:4px;'>
-      </div>
-      {$LIST}
-    </td>
-    <td style='min-width:250px'>
-      {$FILTER}
-    </td>
-  </tr>
-</table>
+<div id="mainlist">
+
+  <div class="mainlist-header">
+   <p>{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
+   <div class="mainlist-nav">
+    <table>
+     <tr>
+      <td>{$ROOT}</td>
+      <td>{$BACK}</td>
+      <td>{$HOME}</td>
+      <td>{$RELOAD}</td>
+      <td class="left-border">{t}Base{/t} {$BASE}</td>
+      <td class="left-border">{$ACTIONS}</td>
+      <td class="left-border">{$FILTER}</td>
+     </tr>
+    </table>
+   </div>
+  </div>
+
+  {$LIST}
+</div>
+
+<div class="clear"></div>
 
 <input type="hidden" name="ignore">
+
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-list.xml b/gosa-core/plugins/admin/ogroups/ogroup-list.xml
index fc0c935ba..f5132bb17 100644
--- a/gosa-core/plugins/admin/ogroups/ogroup-list.xml
+++ b/gosa-core/plugins/admin/ogroups/ogroup-list.xml
@@ -69,13 +69,13 @@
 
     <action>
      <type>sub</type>
-     <image>images/lists/new.png</image>
+     <image>plugins/ogroups/images/ogroup.png[new]</image>
      <label>Create</label>
 
      <action>
       <name>new</name>
       <type>entry</type>
-      <image>plugins/ogroups/images/new.png</image>
+      <image>plugins/ogroups/images/ogroup.png</image>
       <label>Group</label>
      </action>
     </action>
-- 
2.30.2