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

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16646 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../admin/systems/serverService-filter.tpl    |  8 ---
 .../admin/systems/serverService-filter.xml    | 14 +++--
 .../admin/systems/serverService-list.tpl      | 47 ++++++++-------
 .../systemSelect/selectSystem-filter.tpl      | 38 ------------
 .../systemSelect/selectSystem-filter.xml      | 55 ++++-------------
 .../systemSelect/selectSystem-list.tpl        | 59 +++++++++----------
 6 files changed, 72 insertions(+), 149 deletions(-)
 delete mode 100644 gosa-plugins/systems/admin/systems/serverService-filter.tpl
 delete mode 100644 gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.tpl

diff --git a/gosa-plugins/systems/admin/systems/serverService-filter.tpl b/gosa-plugins/systems/admin/systems/serverService-filter.tpl
deleted file mode 100644
index 16ddf733c..000000000
--- a/gosa-plugins/systems/admin/systems/serverService-filter.tpl
+++ /dev/null
@@ -1,8 +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>
diff --git a/gosa-plugins/systems/admin/systems/serverService-filter.xml b/gosa-plugins/systems/admin/systems/serverService-filter.xml
index 5f848146e..a68bcc778 100644
--- a/gosa-plugins/systems/admin/systems/serverService-filter.xml
+++ b/gosa-plugins/systems/admin/systems/serverService-filter.xml
@@ -3,20 +3,22 @@
 <filterdef>
   <definition>
     <category>server</category>
-    <template>serverService-filter.tpl</template>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>name</attribute>
+    <attribute>Message</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>ServerService</backend>
       <filter>...</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>name</attribute>
-      <attribute>Message</attribute>
     </query>
-    <scope>auto</scope>
   </search>
 
 </filterdef>
diff --git a/gosa-plugins/systems/admin/systems/serverService-list.tpl b/gosa-plugins/systems/admin/systems/serverService-list.tpl
index 03d560f3c..8e4e43f4b 100644
--- a/gosa-plugins/systems/admin/systems/serverService-list.tpl
+++ b/gosa-plugins/systems/admin/systems/serverService-list.tpl
@@ -1,23 +1,28 @@
-<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><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
-        </tr></table>
-       </div>
-      </div>
-      
-      <div style='height:4px;'>
-      </div>
-      {$LIST}
-    </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>
+
+<div class="clear"></div>
 
 <input type="hidden" name="ignore">
+
diff --git a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.tpl b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.tpl
deleted file mode 100644
index 88ba5745a..000000000
--- a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.tpl
+++ /dev/null
@@ -1,38 +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>
-
-  {$SERVER}&nbsp;<LABEL for='SERVER'>{t}Show servers{/t}</LABEL><br>
-  {$WORKSTATION}&nbsp;<LABEL for='WORKSTATION'>{t}Show workstations{/t}</LABEL><br>
-  {$TERMINAL}&nbsp;<LABEL for='TERMINAL'>{t}Show terminals{/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">
-     <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/systems/admin/systems/systemSelect/selectSystem-filter.xml b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.xml
index 96c1340d4..444a238be 100644
--- a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.xml
+++ b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-filter.xml
@@ -3,62 +3,27 @@
 <filterdef>
   <definition>
     <category>server</category>
-    <template>../plugins/admin/systems/systemSelect/selectSystem-filter.tpl</template>
     <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>LDAPBlacklist</backend>
-      <filter>(&amp;(|$SERVER $WORKSTATION $TERMINAL ) $NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;(|(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal))(cn=$))</filter>
     </query>
-    <scope>auto</scope>
-  </search>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(cn=*$*)</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAPBlacklist</backend>
-      <filter>(cn=*$NAME*)</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SERVER</tag>
-    <default>true</default>
-    <set>(objectClass=goServer)</set>
-    <unset></unset>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WORKSTATION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gotoWorkstation)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TERMINAL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gotoTerminal)</set>
-  </element>
+  </search>
 
 </filterdef>
diff --git a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl
index 808ac9d2a..fb854a278 100644
--- a/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl
+++ b/gosa-plugins/systems/admin/systems/systemSelect/selectSystem-list.tpl
@@ -1,33 +1,30 @@
-<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:0px;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>
+<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
 
-<input type="hidden" name="ignore">
+<div id="mainlist">
 
-<p class='separator'>&nbsp;</p>
-  <p style="text-align:right">
-  <input type=submit name="systemSelect_save" value="{msgPool type=okButton}">
-  &nbsp;
-  <input type=submit name="systemSelect_cancel" value="{msgPool type=cancelButton}">
-</p>
+  <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>
+
+<div class="plugin-actions">
+  <button type=submit name="systemSelect_save">{msgPool type=okButton}</button>
+  <button type=submit name="systemSelect_cancel">{msgPool type=cancelButton}</button>
+</div>
-- 
2.30.2