Updated template, list and usermanagement

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

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 06c42283eaa2294df254335234dbc6ceac6a9a47..1d128a6bba5ac5904a836e89604716d42de91643 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -33,6 +33,7 @@ class userManagement extends plugin
   var $templates            = array();
   var $got_uid              = false;
   var $CopyPasteHandler     = NULL;
+  var $SnapshotHandler     = NULL;
   var $CPPasswordChange     = ""; // Contains the entry id which should get a new password
   var $DivListUsers;
 
@@ -58,6 +59,9 @@ class userManagement extends plugin
     if ($this->config->boolValueIsTrue("main", "copyPaste")){
       $this->CopyPasteHandler= new CopyPasteHandler($this->config);
     }
+    if($this->config->get_cfg_value("enableSnapshots") == "true"){
+      $this->SnapshotHandler= new SnapshotHandler($this->config);
+    }
 
     /* Creat dialog object */
     $this->DivListUsers = new divListUsers($this->config,$this);
@@ -1001,6 +1005,9 @@ class userManagement extends plugin
     #  $this->headpage->registerElementFilter("accountProperties", "userManagement::filterProperties");
     #  $this->headpage->registerElementFilter("lockLabel", "userManagement::filterLockLabel");
     #  $this->headpage->registerElementFilter("lockImage", "userManagement::filterLockImage");
+    #  $this->headpage->setCopyPasteHandler($this->CopyPasteHandler);
+    #  $this->SnapshotHandler->setSnapshotBases($this->get_used_snapshot_bases());
+    #  $this->headpage->setSnapshotHandler($this->SnapshotHandler);
     #  $this->headpage->setFilter($this->filter);
     #}
 

diff --git a/gosa-core/plugins/admin/users/user-list.tpl b/gosa-core/plugins/admin/users/user-list.tpl
index bf5361e467edfd7c4cd0e225fef6e8775420dcb6..1aefb23a49017f58c7bc6b0b0c4028b2e1a55cf1 100644 (file)
--- a/gosa-core/plugins/admin/users/user-list.tpl
+++ b/gosa-core/plugins/admin/users/user-list.tpl
@@ -4,7 +4,7 @@
   <tr>
     <td style="vertical-align:top; width:50%;">
       <div class="contentboxh">
-        <p class="contentboxh">&nbsp;{$HEADLINE}</p>
+        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
       </div>
       
       <div class="contentboxb">

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index f8b4e874c74dfce09b8c3df407db7088afa64877..b80a1006daa5281017ada507eff0ff55cc55d442 100644 (file)
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -15,19 +15,23 @@
       <label>Users</label>
       <objectClass>gosaAccount</objectClass>
       <objectClass>!gosaUserTemplate</objectClass>
+      <category>users</category>
+      <class>user</class>
       <image>plugins/users/images/select_user.png</image>
     </objectType>
 
     <objectType>
       <label>Templates</label>
       <objectClass>gosaUserTemplate</objectClass>
+      <category>users</category>
+      <class>user</class>
       <image>plugins/users/images/select_template.png</image>
     </objectType>
 
   </definition>
 
   <table>
-    <layout>|20px||145px|100px;r|</layout>
+    <layout>|20px||145px|165px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -132,6 +136,10 @@
       <type>copypaste</type>
     </action>
 
+    <action>
+      <type>separator</type>
+    </action>
+
     <action>
       <type>snapshot</type>
     </action>
@@ -139,10 +147,6 @@
   </actionmenu>
 
   <actiontriggers snapshot="true" copypaste="true">
-    <action>
-      <type>copypaste</type>
-    </action>
-
     <action>
       <name>templatize</name>
       <type>entry</type>
@@ -151,6 +155,10 @@
       <label>Apply template</label>
     </action>
 
+    <action>
+      <type>copypaste</type>
+    </action>
+
     <action>
       <name>edit</name>
       <type>entry</type>