updated filter

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

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl
deleted file mode 100644 (file)
index adc608e..0000000
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.tpl
+++ /dev/null
@@ -1,45 +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>
-
-{$DEPARTMENT}&nbsp;<LABEL for='DEPARTMENT'>{t}Show department{/t}</LABEL><br>
-{$USER}&nbsp;<LABEL for='USER'>{t}Show users{/t}</LABEL><br>
-{$GROUP}&nbsp;<LABEL for='GROUP'>{t}Show groups{/t}</LABEL><br>
-
-{$SERVER}&nbsp;<LABEL for='SERVER'>{t}Show server{/t}</LABEL><br>
-{$WORKSTATION}&nbsp;<LABEL for='WORKSTATION'>{t}Show workstation{/t}</LABEL><br>
-{$TERMINAL}&nbsp;<LABEL for='TERMINAL'>{t}Show terminal{/t}</LABEL><br>
-
-{$PRINTER}&nbsp;<LABEL for='PRINTER'>{t}Show printer{/t}</LABEL><br>
-{$PHONE}&nbsp;<LABEL for='PHONE'>{t}Show phone{/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-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
index bf646d08c1a08e4865387e0eb951144e4c10eb42..19aaa72d2ead127995c3dcdf71eb6fbcf07e3bc2 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
@@ -3,50 +3,43 @@
 <filterdef>
   <definition>
     <category>users</category>
-    <template>../plugins/admin/ogroups/objectSelect/selectObject-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>ou</attribute>
+    <attribute>uid</attribute>
+    <attribute>givenName</attribute>
+    <attribute>description</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(| $USER $GROUP $SERVER $WORKSTATION $TERMINAL $PRINTER $PHONE) $NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>sn</attribute>
-      <attribute>ou</attribute>
-      <attribute>uid</attribute>
-      <attribute>givenName</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;
+                (|
+                  (objectClass=gosaAccont) 
+                  (objectClass=posixGroup)
+                  (objectClass=goServer)
+                  (objectClass=gotoWorkstation)
+                  (objectClass=gotoTerminal)
+                  (objectClass=gotoPrinter)
+                  (objectClass=goFonHardware)
+                )
+                (cn=$)
+              )
+      </filter>
     </query>
     <query>
       <backend>LDAPDepartmentBlacklist</backend>
-      <filter>(&amp;(| $DEPARTMENT)  $NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>sn</attribute>
-      <attribute>ou</attribute>
-      <attribute>uid</attribute>
-      <attribute>givenName</attribute>
-      <attribute>description</attribute>
+      <filter>(&amp;(objectClass=gosaDepartment)(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=*$*)(sn=*$*)(givenName=*$*)(ou=*$*)(dc=*$*)(c=*$*)(l=*$*))</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(|(objectClass=gosaDepartment)(objectClass=gosaAccount)(objectClass=posixGroup)(objectClass=goServer)(objectClass=gotoWorkstation)(objectClass=gotoTerminal)(objectClass=gotoPrinter)(objectClass=goFonHardware))(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(ou=*$NAME*)(dc=*$NAME*)(c=*$NAME*)(l=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <attribute>l</attribute>
       <attribute>o</attribute>
@@ -55,70 +48,6 @@
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>USER</tag>
-    <default></default>
-    <set>(&amp;(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate)))</set>
-    <unset></unset>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>GROUP</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=posixGroup)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>DEPARTMENT</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=gosaDepartment)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SERVER</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=goServer)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>WORKSTATION</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=gotoWorkstation)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TERMINAL</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=gotoTerminal)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PRINTER</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=gotoPrinter)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>PHONE</tag>
-    <default></default>
-    <unset></unset>
-    <set>(objectClass=goFonHardware)</set>
-  </element>
+  </search>
 
 </filterdef>

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
index 7e731f25857bda67726579d25cfcfb386b6e547a..add05c6433b307bef2c953acb0325097b253c042 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-list.tpl
@@ -1,34 +1,30 @@
-<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: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='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="objectSelect_save" value="{msgPool type=okButton}">
-  &nbsp;
-  <input type=submit name="objectSelect_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="plugin-actions">
+  <button type=submit name="objectSelect_save">{msgPool type=okButton}</button>
+  <button type=submit name="objectSelect_cancel">{msgPool type=cancelButton}</button>
+</div>
 
 <input type="hidden" name="ignore">