updated filter

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16640 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl
deleted file mode 100644 (file)
index 3d47da6..0000000
--- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.tpl
+++ /dev/null
@@ -1,29 +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">
-
- <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/fai/admin/fai/classSelect/selectClass-filter.xml b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml
index a6b02bebeaf6db1c89f0ee6f7c67cb9aa6eb505f..27d4ef7db0368205b7a65398484854808b988d6e 100644 (file)
--- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml
+++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-filter.xml
@@ -3,58 +3,31 @@
 <filterdef>
   <definition>
     <category>users</category>
-    <template>../plugins/admin/fai/classSelect/selectClass-filter.tpl</template>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>cn</attribute>
+    <attribute>sn</attribute>
+    <attribute>uid</attribute>
+    <attribute>givenName</attribute>
+    <attribute>description</attribute>
+    <attribute>userPassword</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>FAIClass</backend>
-      <filter>$NAME</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>sn</attribute>
-      <attribute>uid</attribute>
-      <attribute>givenName</attribute>
-      <attribute>description</attribute>
-      <attribute>userPassword</attribute>
+      <filter>(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>*$</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>FAIClass</backend>
-      <filter>$NAME</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
-
-  <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>
+  </search>
 
 </filterdef>

diff --git a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl
index 90a61bbad183822f6c14fd9b63983fcf93466ecc..089c2099cc1755d793c8f15697efb0b625b84dcc 100644 (file)
--- a/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl
+++ b/gosa-plugins/fai/admin/fai/classSelect/selectClass-list.tpl
@@ -1,34 +1,32 @@
-<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;<input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&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;'>
 
+<div id="mainlist">
 
-<p class='separator'>&nbsp;</p>
-  <p style="text-align:right">
-  <input type=submit name="classSelect_save" value="{msgPool type=okButton}">
-  &nbsp;
-  <input type=submit name="classSelect_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="classSelect_save">{msgPool type=okButton}</button>
+  <button type=submit name="classSelect_cancel">{msgPool type=cancelButton}</button>
+</div>
 
 <input type="hidden" name="ignore">

diff --git a/gosa-plugins/fai/admin/fai/fai-filter.tpl b/gosa-plugins/fai/admin/fai/fai-filter.tpl
deleted file mode 100644 (file)
index a3b1963..0000000
--- a/gosa-plugins/fai/admin/fai/fai-filter.tpl
+++ /dev/null
@@ -1,75 +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>
-
-<div style='padding:4px;'>
-  <LABEL for='RELEASE'>{t}Release{/t}</LABEL>&nbsp;{$RELEASE}<br>
-</div>
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
-<div style='padding:4px;'>
-
-{if $allow_create}
-  <input class="center" type="image" name="branch_branch" src="plugins/fai/images/branch_small.png">
-  <a href="{$plug}&act=branch_branch">{t}Create release{/t}</a>
-  <br>
-  <input class="center" type="image" name="freeze_branch" src="plugins/fai/images/freeze.png">
-  <a href="{$plug}&act=freeze_branch">{t}Create read-only release{/t}</a>
-{else}
-  <img src="plugins/fai/images/branch_small_grey.png" alt='{t}Release{/t}' class='center'>
-  {t}Create release{/t}
-  <br>
-  <img src="plugins/fai/images/freeze_grey.png" alt='{t}Freeze{/t}' class='center'>
-  {t}Create read-only release{/t}
-{/if}
-
-{if $fai_release != $fai_base && $allow_remove}
-  <br>
-  <input class="center" type="image" name="remove_branch" src="images/lists/trash.png">
-  <a href="{$plug}&act=remove_branch">{t}Delete current release{/t}</a>
-{/if}
-
-</div>
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
-{$PROFILE}   {t}Show profiles{/t}
-<br>{$TEMPLATE}  {t}Show templates{/t}
-<br>{$SCRIPT}    {t}Show scripts{/t}
-<br>{$HOOK}      {t}Show hooks{/t}
-<br>{$VARIABLE}  {t}Show variables{/t}
-<br>{$PACKAGE}   {t}Show packages{/t}
-<br>{$PARTITION} {t}Show partitions{/t}
-{if $opsi_available}
-<br>{$NETBOOT} {t}Show netboot products{/t}
-<br>{$LOCALBOOT} {t}Show localboot products{/t}
-{/if}
-
- <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/fai/admin/fai/fai-filter.xml b/gosa-plugins/fai/admin/fai/fai-filter.xml
index df0a16c2000c9b30449756c5ec7359ce693c73c2..5285a15a21ead3e67baa6393e452ee7eda737be8 100644 (file)
--- a/gosa-plugins/fai/admin/fai/fai-filter.xml
+++ b/gosa-plugins/fai/admin/fai/fai-filter.xml
@@ -3,20 +3,43 @@
 <filterdef>
   <definition>
     <category>fai</category>
-    <template>fai-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>FAI</backend>
-      <filter>(&amp;(|$PROFILE$HOOK$TEMPLATE$SCRIPT$VARIABLE$PACKAGE$PARTITION$NETBOOT$LOCALBOOT)$NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;
+                (|  
+                  (objectClass=FAIprofile)
+                  (objectClass=FAIhook)
+                  (objectClass=FAItemplate)
+                  (objectClass=FAIscript)
+                  (objectClass=FAIvariable)
+                  (objectClass=FAIpackageList)
+                  (objectClass=FAIpartitionTable)
+                )
+                (cn=$)
+              )
+      </filter>
     </query>
-    <scope>auto</scope>
+    <query>
+      <backend>OPSIPACKAGE</backend>
+      <filter>cn=$</filter>
+    </query>
+    <autocomplete>
+      <attribute>cn</attribute>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+    </autocomplete>
   </search>
 
   <element>
@@ -27,94 +50,4 @@
     <value>Loading...</value>
   </element>
 
-  <element>
-    <type>checkbox</type>
-    <tag>NETBOOT</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(&amp;(objectClass=FAIclass)(FAIstate=__NETBOOT__))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>LOCALBOOT</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(&amp;(objectClass=FAIclass)(FAIstate=__LOCALBOOT__))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PROFILE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAIprofile)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TEMPLATE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAItemplate)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SCRIPT</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAIscript)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>HOOK</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAIhook)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>VARIABLE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAIvariable)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PACKAGE</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAIpackageList)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PARTITION</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=FAIpartitionTable)</set>
-  </element>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>(cn=*$*)</set>
-    <alphabet>false</alphabet>
-    <autocomplete>
-      <backend>FAI</backend>
-      <filter>(|(&amp;(objectClass=FAIclass)(cn=*$NAME*))(&amp;(objectClass=FAIclass)(|(FAIstate=__NETBOOT__)(FAIstate=__LOCALBOOT__))))</filter>
-      <attribute>cn</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
-    </autocomplete>
-  </element>
-
 </filterdef>

diff --git a/gosa-plugins/fai/admin/fai/fai-list.tpl b/gosa-plugins/fai/admin/fai/fai-list.tpl
index 2782676f062a75fef12f4d3c86a60214355d6768..8e4e43f4bec049e39008cc35a7156540f15fa43f 100644 (file)
--- a/gosa-plugins/fai/admin/fai/fai-list.tpl
+++ b/gosa-plugins/fai/admin/fai/fai-list.tpl
@@ -1,26 +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>
-    <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>
+
+<div class="clear"></div>
 
 <input type="hidden" name="ignore">
+

diff --git a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl
deleted file mode 100644 (file)
index 06041ba..0000000
--- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.tpl
+++ /dev/null
@@ -1,34 +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>
-
- <div style='padding: 3px;'>  
-  {t}A maximum of 200 entries will be shown here.{/t}
- </div>
- <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/fai/admin/fai/packageSelect/selectPackage-filter.xml b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml
index febabf2851e867ae9d2390e17fa35d5335f52c2a..059ca5cf4b78b5f8cad3f83a9f7e000d19db796c 100644 (file)
--- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml
+++ b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-filter.xml
@@ -3,37 +3,25 @@
 <filterdef>
   <definition>
     <category>groups</category>
-    <template>../plugins/admin/fai/packageSelect/selectPackage-filter.tpl</template>
     <initial>true</initial>
+    <default>default</default>
+    <scope>auto</scope>
+    <attribute>SECTION</attribute>
+    <attribute>VERSION</attribute>
+    <attribute>PACKAGE</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>FAIPackages</backend>
       <filter>$NAME</filter>
-      <attribute>SECTION</attribute>
-      <attribute>VERSION</attribute>
-      <attribute>PACKAGE</attribute>
     </query>
-    <scope>auto</scope>
-  </search>
-
-  <element>
-    <type>textfield</type>
-    <tag>NAME</tag>
-    <size>20</size>
-    <maxlength>60</maxlength>
-    <default></default>
-    <unset></unset>
-    <set>*$</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>FAIPackages</backend>
-      <filter>$NAME</filter>
       <attribute>PACKAGE</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
-
+  </search>
 </filterdef>

diff --git a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl
index 1c95a3cfc6a62455ceaea20e4b13dd79d36294ed..fa469ca9c14531c0aa93454999e62dc19b99eb3c 100644 (file)
--- a/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl
+++ b/gosa-plugins/fai/admin/fai/packageSelect/selectPackage-list.tpl
@@ -1,27 +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><input class='center' type='image' src='images/lists/submit.png' align='middle' title='{t}Update{/t}' name='submit_department' alt='{t}Submit{/t}'>&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;'>
+
+<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>
 
 <hr>
 <div class="plugin-actions">