![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9cc325)
raw | patch | inline | side by side (parent: f9cc325)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 16 Mar 2010 07:17:38 +0000 (07:17 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 16 Mar 2010 07:17:38 +0000 (07:17 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16560 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/plugins/admin/groups/group-filter.tpl b/gosa-core/plugins/admin/groups/group-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>
-
- {$PRIMARY} <LABEL for='TEMPLATES'>{t}Show primary groups{/t}</LABEL><br>
- {$SAMBA} <LABEL for='TEMPLATES'>{t}Show samba groups{/t}</LABEL><br>
- {$MAIL} <LABEL for='TEMPLATES'>{t}Show mail groups{/t}</LABEL><br>
-
- {$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-core/plugins/admin/groups/group-filter.xml b/gosa-core/plugins/admin/groups/group-filter.xml
index 0b49bfa32eed529448cd5df956ef2a504395e7ab..5b0c68908c7758874b5798ac31d73d1f4c20a495 100644 (file)
<filterdef>
<definition>
<category>groups</category>
- <template>group-filter.tpl</template>
<initial>true</initial>
+ <scope>auto</scope>
+ <default>default</default>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
+ <attribute>cn</attribute>
+ <attribute>description</attribute>
</definition>
<search>
+ <tag>default</tag>
+ <label>Default filter</label>
<query>
<backend>GroupLDAP</backend>
<filter>(&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA))</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>cn</attribute>
- <attribute>description</attribute>
</query>
- <scope>auto</scope>
+ <autocomplete>
+ <attribute>cn</attribute>
+ <frequency>0.5</frequency>
+ <characters>3</characters>
+ </autocomplete>
</search>
- <element>
- <type>checkbox</type>
- <tag>PRIMARY</tag>
- <default>true</default>
- <unset></unset>
- <set>(!(objectClass=gosaObject))</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=sambaGroupMapping)</set>
- </element>
-
- <element>
- <type>textfield</type>
- <tag>NAME</tag>
- <size>20</size>
- <maxlength>60</maxlength>
- <default></default>
- <unset></unset>
- <set>(|(cn=*$*)(description=*$*))</set>
- <alphabet>true</alphabet>
+ <search>
+ <tag>default2</tag>
+ <label>Default filter2</label>
+ <query>
+ <backend>GroupLDAP</backend>
+ <filter>(&(objectClass=posixGroup)$NAME(|$PRIMARY$MAIL$SAMBA))</filter>
+ </query>
<autocomplete>
- <backend>LDAP</backend>
- <filter>(&(objectClass=posixGroup)(|(cn=*$NAME*)(description=*$NAME*)))</filter>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
- </element>
+ </search>
</filterdef>
diff --git a/gosa-core/plugins/admin/groups/group-list.tpl b/gosa-core/plugins/admin/groups/group-list.tpl
index cf107dd6eb5e2a82005e0aecad585f571f96e274..8e4e43f4bec049e39008cc35a7156540f15fa43f 100644 (file)
<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
-<table summary="" style="width:100%;height:100%"
- <tr>
- <td style="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='min-width:250px'>
- {$FILTER}
- </td>
- </tr>
-</table>
+<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-core/plugins/admin/groups/group-list.xml b/gosa-core/plugins/admin/groups/group-list.xml
index 22b02b28ffaff6aee4f833d8d4c153fbddc322bc..641741dfeec8571d9a89cca721f7a552ec1e0544 100644 (file)
<action>
<type>sub</type>
- <image>images/lists/new.png</image>
+ <image>plugins/groups/images/groups.png[new]</image>
<label>Create</label>
<action>
<name>new</name>
<type>entry</type>
- <image>plugins/groups/images/new.png</image>
+ <image>plugins/groups/images/groups.png</image>
<label>Group</label>
</action>
</action>