From ac9d42b08d1a62de2ada320d1b94def64998da24 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 12 Mar 2010 09:06:50 +0000
Subject: [PATCH] Updated department filter.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16477 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../plugins/admin/departments/dep-filter.xml  | 31 ++++--------
 .../plugins/admin/departments/dep-list.tpl    | 47 +++++++++----------
 2 files changed, 33 insertions(+), 45 deletions(-)

diff --git a/gosa-core/plugins/admin/departments/dep-filter.xml b/gosa-core/plugins/admin/departments/dep-filter.xml
index 1b758191f..a9f2479f6 100644
--- a/gosa-core/plugins/admin/departments/dep-filter.xml
+++ b/gosa-core/plugins/admin/departments/dep-filter.xml
@@ -2,43 +2,32 @@
 
 <filterdef>
   <definition>
-    <category>departments</category>
-    <template>dep-filter.tpl</template>
+    <category>department</category>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaDepartment)$NAME)</filter>
+      <filter>(&amp;(objectClass=gosaDepartment)(|(dc=$)(ou=$)(o=$)(l=$)(c=$)))</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>ou</attribute>
       <attribute>description</attribute>
     </query>
-    <scope>one</scope>
-  </search>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>18</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(|(ou=*$*)(dc=*$*)(c=*$*)(l=*$*)(o=*$*))</set>
-    <alphabet>false</alphabet>
     <autocomplete>
-      <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaDepartment)(|(ou=*$NAME*)(dc=*$NAME*)(l=*$NAME*)(c=*$NAME*)(o=*$NAME*)))</filter>
-      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+      <attribute>ou</attribute>
       <attribute>dc</attribute>
       <attribute>c</attribute>
       <attribute>l</attribute>
       <attribute>o</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
     </autocomplete>
-  </element>
+  </search>
 
 </filterdef>
diff --git a/gosa-core/plugins/admin/departments/dep-list.tpl b/gosa-core/plugins/admin/departments/dep-list.tpl
index 80d5e1b4f..7cbddbd0c 100644
--- a/gosa-core/plugins/admin/departments/dep-list.tpl
+++ b/gosa-core/plugins/admin/departments/dep-list.tpl
@@ -1,28 +1,27 @@
 <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">
-- 
2.30.2