![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4158738)
raw | patch | inline | side by side (parent: 4158738)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 16 Mar 2010 14:15:16 +0000 (14:15 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 16 Mar 2010 14:15:16 +0000 (14:15 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16638 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
diff --git a/gosa-plugins/goto/addons/goto/deploy-filter.xml b/gosa-plugins/goto/addons/goto/deploy-filter.xml
index f3952d5b9d19f874271fc9ceaf9bacfb83fe1f70..e43c402b58f41ea26304a409b03f12b98fb70f0e 100644 (file)
<filterdef>
<definition>
<category>users</category>
- <template>deploy-filter.tpl</template>
<initial>true</initial>
+ <default>default</default>
+ <scope>auto</scope>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
+ <attribute>givenName</attribute>
+ <attribute>sn</attribute>
+ <attribute>uid</attribute>
+ <attribute>userPassword</attribute>
</definition>
<search>
+ <tag>default</tag>
+ <label>Default filter</label>
<query>
<backend>GotoEvents</backend>
- <filter>(&(objectClass=gosaAccount)$TEMPLATES$NAME(|$FUNCTIONAL$SAMBA$POSIX$MAIL))</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>givenName</attribute>
- <attribute>sn</attribute>
- <attribute>uid</attribute>
- <attribute>userPassword</attribute>
+ <filter>(&(objectClass=gosaAccount)(cn=$))</filter>
</query>
- <scope>auto</scope>
</search>
</filterdef>
diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.tpl
+++ /dev/null
@@ -1,59 +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} <LABEL for='SERVER'>{t}Show servers{/t}</LABEL><br>
- {$WORKSTATION} <LABEL for='WORKSTATION'>{t}Show workstations{/t}</LABEL><br>
- {$TERMINAL} <LABEL for='TERMINAL'>{t}Show terminals{/t}</LABEL><br>
- {$BYIP} <LABEL for='TERMINAL'>{t}Filter by IP address range{/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> Name
- </label>
- </td>
- <td>
- {$NAME}
- </td>
- </tr>
- <tr>
- <td>
- <label for="IPSTART">
- <img src="images/lists/search.png" align=middle> IP Start
- </label>
- </td>
- <td>
- {$IPSTART}
- </td>
- </tr>
- <tr>
- <td>
- <label for="IPSTOP">
- <img src="images/lists/search.png" align=middle> IP Stop
- </label>
- </td>
- <td>
- {$IPSTOP}
- </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/addons/goto/events/eventTargetSystems-filter.xml b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-filter.xml
index 9ccd976da1f57fb44cacd53bafe8ac88e1dc5a4e..87a748a796ca433192ab33e5a706c53f489f0cf3 100644 (file)
<filterdef>
<definition>
<category>server</category>
- <template>../../addons/goto/events/eventTargetSystems-filter.tpl</template>
<initial>true</initial>
+ <default>default</default>
+ <scope>auto</scope>
+ <attribute>cn</attribute>
+ <attribute>description</attribute>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
</definition>
<search>
+ <tag>default</tag>
+ <label>Default filter</label>
<query>
- <backend>SystemByIp</backend>
- <filter>(&(|$SERVER $WORKSTATION $TERMINAL $OGROUP) $NAME) $IPSTART $IPSTOP $BYIP</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>cn</attribute>
- <attribute>description</attribute>
- <attribute>macAddress</attribute>
- <attribute>ipHostNumber</attribute>
- </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>SystemByIp</backend>
- <filter>(cn=*$NAME*)</filter>
- <attribute>cn</attribute>
- <frequency>0.5</frequency>
- <characters>3</characters>
- </autocomplete>
- </element>
-
- <element>
- <type>textfield</type>
- <tag>IPSTART</tag>
- <size>20</size>
- <maxlength>60</maxlength>
- <default>0.0.0.0</default>
- <unset></unset>
- <set>__IPSTART__=*$*__</set>
- <alphabet>true</alphabet>
- <autocomplete>
<backend>LDAP</backend>
- <filter>__IPSTART__=*$IPSTART*__</filter>
- <attribute>cn</attribute>
- <frequency>0.5</frequency>
- <characters>3</characters>
- </autocomplete>
- </element>
-
- <element>
- <type>textfield</type>
- <tag>IPSTOP</tag>
- <size>20</size>
- <maxlength>60</maxlength>
- <default>255.255.255.255</default>
- <unset></unset>
- <set>__IPSTOP__=*$*__</set>
- <alphabet>true</alphabet>
+ <filter>(&
+ (|
+ (objectClass=goServer)
+ (objectClass=gotoWorkstation)
+ (objectClass=gotoTerminal)
+ (objectClass=gosaGroupOfNames)
+ )
+ (cn=$)
+ )
+ </filter>
+ </query>
<autocomplete>
- <backend>LDAP</backend>
- <filter>__IPSTOP__=*$IPSTOP*__</filter>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>OGROUP</tag>
- <default>true</default>
- <set>(objectClass=gosaGroupOfNames)</set>
- <unset></unset>
- </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>
-
- <element>
- <type>checkbox</type>
- <tag>BYIP</tag>
- <default></default>
- <set>__FilterByIP__</set>
- <unset></unset>
- </element>
+ </search>
</filterdef>
diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetSystems-list.tpl
index 586a18d5dfabfcdbc3a0ef6136589a5cd081a4e6..8e4e43f4bec049e39008cc35a7156540f15fa43f 100644 (file)
-<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"> {$HEADLINE} {$SIZELIMIT}</p>
- </div>
-
- <div class="contentboxb">
- <div style='background:white;padding:3px;'>
- <table><tr>
- <td>{$ROOT} </td><td>{$BACK} </td><td>{$HOME} </td><td>{$RELOAD} </td><td>{$SEPARATOR} </td><td>{t}Base{/t} {$BASE} </td><td>{$SEPARATOR} </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} {$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/goto/addons/goto/events/eventTargetUser-filter.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.tpl
+++ /dev/null
@@ -1,37 +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>
-
- {$GROUP} <LABEL for='SERVER'>{t}Show groups{/t}</LABEL><br>
- {$USER} <LABEL for='TERMINAL'>{t}Show users{/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> 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/addons/goto/events/eventTargetUser-filter.xml b/gosa-plugins/goto/addons/goto/events/eventTargetUser-filter.xml
index 9267e214471d6f188b9b2fc32b5d62f53160a1aa..a07b4c8203ec12944cd82eb27f036daa8a20b7d2 100644 (file)
<filterdef>
<definition>
<category>server</category>
- <template>../../addons/goto/events/eventTargetUser-filter.tpl</template>
<initial>true</initial>
+ <default>default</default>
+ <scope>auto</scope>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
+ <attribute>cn</attribute>
+ <attribute>uid</attribute>
+ <attribute>description</attribute>
</definition>
<search>
+ <tag>default</tag>
+ <label>Default filter</label>
<query>
<backend>LDAP</backend>
- <filter>(&(|$USER $GROUP) $NAME)</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>cn</attribute>
- <attribute>uid</attribute>
- <attribute>description</attribute>
+ <filter>(&(|(objectClass=gosaAccount)(objectClass=posixGroup))(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>LDAP</backend>
- <filter>(cn=*$NAME*)</filter>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>GROUP</tag>
- <default>true</default>
- <set>(objectClass=posixGroup)</set>
- <unset></unset>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>USER</tag>
- <default>true</default>
- <set>(objectClass=gosaAccount)</set>
- <unset></unset>
- </element>
+ </search>
</filterdef>
diff --git a/gosa-plugins/goto/addons/goto/events/eventTargetUser-list.tpl b/gosa-plugins/goto/addons/goto/events/eventTargetUser-list.tpl
index 586a18d5dfabfcdbc3a0ef6136589a5cd081a4e6..8e4e43f4bec049e39008cc35a7156540f15fa43f 100644 (file)
-<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"> {$HEADLINE} {$SIZELIMIT}</p>
- </div>
-
- <div class="contentboxb">
- <div style='background:white;padding:3px;'>
- <table><tr>
- <td>{$ROOT} </td><td>{$BACK} </td><td>{$HOME} </td><td>{$RELOAD} </td><td>{$SEPARATOR} </td><td>{t}Base{/t} {$BASE} </td><td>{$SEPARATOR} </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} {$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/goto/addons/goto/events/target_list.tpl b/gosa-plugins/goto/addons/goto/events/target_list.tpl
index a7cd795f3f3589ea9e2f7ec7a6be74aba0971eb9..39b349cee117d330b5a8a30b668850cbcc0e19f5 100644 (file)
{$divlist}
<hr>
-<div style='text-align:right;width:100%;padding-top:5px;padding-right:5px;padding-bottom:5px;'>
- <input type='submit' name='save_target_dialog' value='{t}Apply{/t}'>
- <input type='submit' name='abort_target_dialog' value='{t}Cancel{/t}'>
+<div class="plugin-actions">
+ <button type='submit' name='save_target_dialog'>{t}Apply{/t}</button>
+ <button type='submit' name='abort_target_dialog'>{t}Cancel{/t}</button>
</div>