![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6033b24)
raw | patch | inline | side by side (parent: 6033b24)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 16 Mar 2010 08:00:59 +0000 (08:00 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Tue, 16 Mar 2010 08:00:59 +0000 (08:00 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16580 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index aa66dbfa7765d8f760884522e1db3afdef0d28ba..cfde13495aef80c3bdd2ac63f21d20bf70505efc 100644 (file)
$result ="";
for($i = 0 ; $i < strlen($types); $i++){
$type = $types[$i];
- $result.="<input class='center' type='image' src='".$conv[$type][0]."' ".
- "alt='".$conv[$type][1]."' title='".$conv[$type][1].
- "' name='listing_edit_".$conv[$type][2]."_$row' style='padding:1px'>";
-
+ $result.= image($conv[$type][0], 'listing_edit_'.$conv[$type][2].'_'.$row,$conv[$type][1]);
}
return($result);
}
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-filter.tpl b/gosa-core/plugins/admin/ogroups/ogroup-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>
-
- {$USER} <LABEL for=''>{t}user groups{/t}</LABEL><br>
- {$GROUP} <LABEL for=''>{t}nested groups{/t}</LABEL><br>
- {$APPLICATION} <LABEL for=''>{t}application groups{/t}</LABEL><br>
- {$DEPARTMENT} <LABEL for=''>{t}department groups{/t}</LABEL><br>
- {$SERVER} <LABEL for=''>{t}server groups{/t}</LABEL><br>
- {$WORKSTATION} <LABEL for=''>{t}workstation groups{/t}</LABEL><br>
- {$WINDOWS} <LABEL for=''>{t}windows workstation groups{/t}</LABEL><br>
- {$TERMINAL} <LABEL for=''>{t}terminal groups{/t}</LABEL><br>
- {$PRINTER} <LABEL for=''>{t}printer groups{/t}</LABEL><br>
- {$PHONE} <LABEL for=''>{t}phone 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/ogroups/ogroup-filter.xml b/gosa-core/plugins/admin/ogroups/ogroup-filter.xml
index 520d863613870706ac08968b40ab2a290b0cb8ca..96151f2a54936f08b8ea7dabedeb2c6944fe4e15 100644 (file)
<filterdef>
<definition>
<category>ogroups</category>
- <template>ogroup-filter.tpl</template>
<initial>true</initial>
+ <scope>auto</scope>
+ <default>default</default>
+ <attribute>dn</attribute>
+ <attribute>objectClass</attribute>
+ <attribute>cn</attribute>
+ <attribute>gosaGroupObjects</attribute>
+ <attribute>description</attribute>
</definition>
<search>
+ <tag>default</tag>
+ <label>Default filter</label>
<query>
<backend>LDAP</backend>
- <filter>(&(objectClass=gosaGroupOfNames)$NAME(|(gosaGroupObjects=[])$USER$GROUP$APPLICATION$DEPARTMENT$SERVER$WORKSTATION$WINDOWS$TERMINAL$PRINTER$PHONE))</filter>
- <attribute>dn</attribute>
- <attribute>objectClass</attribute>
- <attribute>cn</attribute>
- <attribute>gosaGroupObjects</attribute>
- <attribute>description</attribute>
+ <filter>(&(objectClass=gosaGroupOfNames)(cn=$))</filter>
</query>
- <scope>auto</scope>
+ <autocomplete>
+ <attribute>cn</attribute>
+ <frequency>0.5</frequency>
+ <characters>3</characters>
+ </autocomplete>
</search>
- <element>
- <type>checkbox</type>
- <tag>USER</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*U*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>GROUP</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*G*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>APPLICATION</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*A*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>DEPARTMENT</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*D*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>SERVER</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*S*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>WORKSTATION</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*W*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>WINDOWS</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*O*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>TERMINAL</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*T*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>PRINTER</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*P*)</set>
- </element>
-
- <element>
- <type>checkbox</type>
- <tag>PHONE</tag>
- <default>true</default>
- <unset></unset>
- <set>(gosaGroupObjects=*F*)</set>
- </element>
-
- <element>
- <type>textfield</type>
- <tag>NAME</tag>
- <size>20</size>
- <maxlength>60</maxlength>
- <default></default>
- <unset></unset>
- <set>(|(cn=*$*))</set>
- <alphabet>true</alphabet>
- <autocomplete>
+ <search>
+ <tag>default2</tag>
+ <label>Default filter2</label>
+ <query>
<backend>LDAP</backend>
- <filter>(&(objectClass=gosaGroupOfNames)(|(cn=*$NAME*)))</filter>
+ <filter>(&(objectClass=gosaGroupOfNames)(cn=$))</filter>
+ </query>
+ <autocomplete>
<attribute>cn</attribute>
<frequency>0.5</frequency>
<characters>3</characters>
</autocomplete>
- </element>
+ </search>
</filterdef>
diff --git a/gosa-core/plugins/admin/ogroups/ogroup-list.tpl b/gosa-core/plugins/admin/ogroups/ogroup-list.tpl
index 80d5e1b4f091bac1e7575fef0ef2922a03a5c023..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%" cellpadding=2>
- <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/ogroups/ogroup-list.xml b/gosa-core/plugins/admin/ogroups/ogroup-list.xml
index fc0c935ba8f7b80d4aeff47ba08f890d31787a12..f5132bb1736fb997ad1e2d07d3565496d5a4cd77 100644 (file)
<action>
<type>sub</type>
- <image>images/lists/new.png</image>
+ <image>plugins/ogroups/images/ogroup.png[new]</image>
<label>Create</label>
<action>
<name>new</name>
<type>entry</type>
- <image>plugins/ogroups/images/new.png</image>
+ <image>plugins/ogroups/images/ogroup.png</image>
<label>Group</label>
</action>
</action>