From 18856ea163017265c82dbbc3c59e76c3ba916504 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 15 Mar 2010 14:57:17 +0000
Subject: [PATCH] Updated macro filtering

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16536 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../gofon/gofon/macro/macro-filter.tpl        | 33 -------------
 .../gofon/gofon/macro/macro-filter.xml        | 44 +++++++++--------
 gosa-plugins/gofon/gofon/macro/macro-list.tpl | 48 +++++++++----------
 3 files changed, 47 insertions(+), 78 deletions(-)
 delete mode 100644 gosa-plugins/gofon/gofon/macro/macro-filter.tpl

diff --git a/gosa-plugins/gofon/gofon/macro/macro-filter.tpl b/gosa-plugins/gofon/gofon/macro/macro-filter.tpl
deleted file mode 100644
index d651048e1..000000000
--- a/gosa-plugins/gofon/gofon/macro/macro-filter.tpl
+++ /dev/null
@@ -1,33 +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>
-
- {$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-plugins/gofon/gofon/macro/macro-filter.xml b/gosa-plugins/gofon/gofon/macro/macro-filter.xml
index f12558efd..e15b7bd2b 100644
--- a/gosa-plugins/gofon/gofon/macro/macro-filter.xml
+++ b/gosa-plugins/gofon/gofon/macro/macro-filter.xml
@@ -2,39 +2,41 @@
 
 <filterdef>
   <definition>
-    <category>macros</category>
-    <template>macro-filter.tpl</template>
+    <category>gofonmacro</category>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>cn</attribute>
+    <attribute>description</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=goFonMacro)$NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;(objectClass=goFonMacro)(|(cn=$)(displayName=$)))</filter>
     </query>
-    <scope>auto</scope>
+    <autocomplete>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
   </search>
 
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(cn=*$*)</set>
-    <alphabet>false</alphabet>
-    <autocomplete>
+  <search>
+    <tag>visibleOnly</tag>
+    <label>Visible only</label>
+    <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=goFonMacro)(cn=*$NAME*))</filter>
+      <filter>(&amp;(objectClass=goFonMacro)(|(cn=$)(displayName=$))(goFonMacroVisible=1))</filter>
+    </query>
+    <autocomplete>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
-
+  </search>
 </filterdef>
diff --git a/gosa-plugins/gofon/gofon/macro/macro-list.tpl b/gosa-plugins/gofon/gofon/macro/macro-list.tpl
index c9d511416..8e4e43f4b 100644
--- a/gosa-plugins/gofon/gofon/macro/macro-list.tpl
+++ b/gosa-plugins/gofon/gofon/macro/macro-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%; 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><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='vertical-align:top;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