Updated hotplug selection

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

diff --git a/gosa-plugins/goto/personal/environment/hotplugSelect/class_hotplugSelect.inc b/gosa-plugins/goto/personal/environment/hotplugSelect/class_hotplugSelect.inc
index 1d3c3b51596a06411badd7e7edcddd86efe2b678..ed2b8f004f83d8c12593d8901398d5bf6db62c2d 100644 (file)
--- a/gosa-plugins/goto/personal/environment/hotplugSelect/class_hotplugSelect.inc
+++ b/gosa-plugins/goto/personal/environment/hotplugSelect/class_hotplugSelect.inc
@@ -33,13 +33,13 @@ class hotplugSelect extends management
 
     $this->storagePoints = array(get_ou("deviceRDN"));
 
-    // Build filter
-    if (session::global_is_set(get_class($this)."_filter")){
-      $filter= session::global_get(get_class($this)."_filter");
-    } else {
+#    // Build filter
+ #   if (session::global_is_set(get_class($this)."_filter")){
+  #    $filter= session::global_get(get_class($this)."_filter");
+   # } else {
       $filter = new filter(get_template_path("selectHotplug-filter.xml", true, dirname(__FILE__)));
       $filter->setObjectStorage($this->storagePoints);
-    }
+    #}
     $this->setFilter($filter);
 
   // Build headpage

diff --git a/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-filter.tpl b/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-filter.tpl
deleted file mode 100644 (file)
index e842b2b..0000000
--- a/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-filter.tpl
+++ /dev/null
@@ -1,35 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
-  {image path="images/launch.png" align="right"}{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">
-     {image path="images/lists/search.png"}&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/goto/personal/environment/hotplugSelect/selectHotplug-filter.xml b/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-filter.xml
index 500aa91d16a72931c8512bec4344b0cc7233c56f..b4847f536ac2f26ad568c58b60616e5d59ba0142 100644 (file)
--- a/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-filter.xml
+++ b/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-filter.xml
@@ -3,39 +3,28 @@
 <filterdef>
   <definition>
     <category>devices</category>
-    <template>../plugins/personal/environment/hotplugSelect/selectHotplug-filter.tpl</template>
     <initial>true</initial>
+    <scope>auto</scope>
+    <default>default</default>
+    <attribute>dn</attribute>
+    <attribute>objectClass</attribute>
+    <attribute>cn</attribute>
+    <attribute>description</attribute>
+    <attribute>gotoHotplugDevice</attribute>
   </definition>
 
   <search>
+    <tag>default</tag>
+    <label>Default filter</label>
     <query>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gotoDevice)$NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>description</attribute>
-      <attribute>gotoHotplugDevice</attribute>
+      <filter>(&amp;(objectClass=gotoDevice)(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=*$*)(description=*$*))</set>
-    <alphabet>true</alphabet>
     <autocomplete>
-      <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gotoDevice)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>
-  </element>
+  </search>
 
 </filterdef>

diff --git a/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-list.tpl b/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-list.tpl
index 583675634d621cf240a8967a85a91bb08bb85511..69f487de02f31eb91ae14c1851f9613608262719 100644 (file)
--- a/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-list.tpl
+++ b/gosa-plugins/goto/personal/environment/hotplugSelect/selectHotplug-list.tpl
@@ -1,30 +1,30 @@
-<table 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>{image path="images/rocket.png"}
-</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;'>
 
-<hr>
+<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">
 
 <div class="plugin-actions">
   <button type='submit' name='hotplugSelect_save'>{msgPool type=addButton}</button>