Updated gotomasses

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

diff --git a/gosa-plugins/goto/addons/goto/deploy-filter.tpl b/gosa-plugins/goto/addons/goto/deploy-filter.tpl
index 227243dcfcf2f95419949f78b59c0e52119e8cb7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/gosa-plugins/goto/addons/goto/deploy-filter.tpl
+++ b/gosa-plugins/goto/addons/goto/deploy-filter.tpl
@@ -1,40 +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>
-
-{$TEMPLATES}&nbsp;<LABEL for='TEMPLATES'>{t}Show templates{/t}</LABEL><br>
-{$FUNCTIONAL}&nbsp;<LABEL for='FUNCTIONAL'>{t}Show functional users{/t}</LABEL><br>
-{$POSIX}&nbsp;<LABEL for='POSIX'>{t}Show POSIX users{/t}</LABEL><br>
-{$MAIL}&nbsp;<LABEL for='MAIL'>{t}Show Mail users{/t}</LABEL><br>
-{$SAMBA}&nbsp;<LABEL for='SAMBA'>{t}Show Samba users{/t}</LABEL><br>
-
- <div style="border-top:1px solid #AAAAAA"></div>
- {$SCOPE}
-
- <table summary="" 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=""  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/goto/addons/goto/deploy-filter.xml b/gosa-plugins/goto/addons/goto/deploy-filter.xml
index 5217e5175799e69195eeda524c846ad441b71252..f3952d5b9d19f874271fc9ceaf9bacfb83fe1f70 100644 (file)
--- a/gosa-plugins/goto/addons/goto/deploy-filter.xml
+++ b/gosa-plugins/goto/addons/goto/deploy-filter.xml
@@ -21,62 +21,4 @@
     <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=*$*))</set>
-    <alphabet>true</alphabet>
-    <autocomplete>
-      <backend>GotoEvents</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
-      <attribute>cn</attribute>
-      <frequency>0.5</frequency>
-      <characters>3</characters>
-    </autocomplete>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>TEMPLATES</tag>
-    <default></default>
-    <unset>(!(objectClass=gosaUserTemplate))</unset>
-    <set></set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>FUNCTIONAL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(!(|(objectClass=posixAccount)(objectClass=sambaSamAccount)(objectClass=gosaMailAccount)(objectClass=gofaxAccount)(objectClass=gofonAccount)))</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>POSIX</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=posixAccount)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>MAIL</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=gosaMailAccount)</set>
-  </element>
-
-  <element>
-    <type>checkbox</type>
-    <tag>SAMBA</tag>
-    <default>true</default>
-    <unset></unset>
-    <set>(objectClass=sambaSamAccount)</set>
-  </element>
-
 </filterdef>

diff --git a/gosa-plugins/goto/addons/goto/deploy-list.tpl b/gosa-plugins/goto/addons/goto/deploy-list.tpl
index f3bba3f7a5439a4ad019c767e12df62df7d44c33..19dec20b4ad6a26da6e31fb7a4e8f07e154fcfab 100644 (file)
--- a/gosa-plugins/goto/addons/goto/deploy-list.tpl
+++ b/gosa-plugins/goto/addons/goto/deploy-list.tpl
@@ -18,13 +18,10 @@
       <div style='height:4px;'>
       </div>
       
-      <input type="hidden" id="d_save" value="450">
+      <input type="hidden" id="d_save" value="190">
       <input type="hidden" id="d_space" value="760">
       {$LIST}
     </td>
-    <td style='vertical-align:top'>
-      {$FILTER}
-    </td>
   </tr>
 </table>
 

diff --git a/gosa-plugins/goto/addons/goto/deploy-list.xml b/gosa-plugins/goto/addons/goto/deploy-list.xml
index d747d80254354d209911f4d65d125560e4a24691..58b758af931bdf039dc3c31ee4be4277c94f15fa 100644 (file)
--- a/gosa-plugins/goto/addons/goto/deploy-list.xml
+++ b/gosa-plugins/goto/addons/goto/deploy-list.xml
@@ -21,7 +21,7 @@
   </definition>
 
   <table>
-    <layout>|||40||||</layout>
+    <layout>||120px|80px|120px;c|100px;c|180px;r|</layout>
 
     <column>
       <label>Target</label>