From e877d280990c978e4853f479ae38a06af1de2b2a Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 16 Mar 2010 14:15:47 +0000
Subject: [PATCH] updated filter

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16649 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../selectMailAddress-filter.tpl              | 40 -------------
 .../selectMailAddress-filter.xml              | 57 +++++--------------
 .../selectMailAddress-list.tpl                | 47 +++++++--------
 3 files changed, 37 insertions(+), 107 deletions(-)
 delete mode 100644 gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl

diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
deleted file mode 100644
index c6f402c5b..000000000
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
-  {image path="images/launch.png" align="right"}{t}Filter{/t}
-
- </p>
-</div>
-
-<div class="contentboxb">
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
-  {$USER}&nbsp;<LABEL for='SAMBA'>{t}Show users{/t}</LABEL><br>
-  {$GROUP}&nbsp;<LABEL for='POSIX'>{t}Show groups{/t}</LABEL><br>
-
- <div style="border-top:1px solid #AAAAAA"></div>
-
- {$SCOPE}
-
- <table summary='{t}Filter options{/t}' style="width:100%;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td>
-    <label for="NAME">
-     {image path="images/lists/search.png"}&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-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml
index 86c17bce5..05501beb9 100644
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-filter.xml
@@ -3,59 +3,32 @@
 <filterdef>
   <definition>
     <category>users</category>
-    <template>../plugins/personal/mail/mailAddressSelect/selectMailAddress-filter.tpl</template>
     <initial>true</initial>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>cn</attribute>
+    <attribute>description</attribute>
+    <attribute>mail</attribute>
+    <attribute>uid</attribute>
+    <attribute>sn</attribute>
+    <attribute>givenName</attribute>
+    <attribute>gotoHotplugDevice</attribute>
+    <default>default</default>
+    <scope>auto</scope>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaMailAccount)(|$USER$GROUP)(mail=*)$NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</attribute>
-      <attribute>mail</attribute>
-      <attribute>uid</attribute>
-      <attribute>sn</attribute>
-      <attribute>givenName</attribute>
-      <attribute>gotoHotplugDevice</attribute>
+      <filter>(&amp;(objectClass=gosaMailAccount)(mail=$))</filter>
     </query>
-    <scope>auto</scope>
-  </search>
-
-  <element>
-    <type>checkbox</type>
-    <tag>USER</tag>
-    <default>true</default>
-    <set>(&amp;(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate)))</set>
-    <unset></unset>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>GROUP</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=posixGroup)</set>
-  </element>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(|(cn=*$*)(description=*$*)(mail=*$*))</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaMailAccount)(|(cn=*$NAME*)(description=*$NAME*)(mail=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
+  </search>
 
 </filterdef>
diff --git a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl
index 836a5c207..938c2477c 100644
--- a/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl
+++ b/gosa-plugins/mail/personal/mail/mailAddressSelect/selectMailAddress-list.tpl
@@ -1,29 +1,26 @@
-<table style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2>
-  <tr>
-    <td style="vertical-align:top; 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>{image path="images/rocket.png"}
-</td><td> {$ACTIONS}</td>
-        </tr></table>
-       </div>
-      </div>
-      
-      <div style='height:4px;'>
-      </div>
-      {$LIST}
-    </td>
-    <td style='vertical-align:top;min-width:250px'>
-      {$FILTER}
-    </td>
-  </tr>
-</table>
+<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
 
+<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>
 <input type="hidden" value="1" name="PosixGroupDialogPosted">
 
 <div class="plugin-actions">
-- 
2.30.2