Graphs are now cached

[gosa.git] / gosa-core / plugins / admin / groups / generic.tpl

diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 0df8e52d17e61ab055f45da0f62a0d8d06ba5056..5a591fd79959a11a128343e298540bc34b4a1ef2 100644 (file)
--- a/gosa-core/plugins/admin/groups/generic.tpl
+++ b/gosa-core/plugins/admin/groups/generic.tpl
@@ -14,7 +14,7 @@
        <input type='text' id="dummy1" name="dummy1" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
 {else}
 {render acl=$cnACL}
-       <input type='text' id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}Posix name of the group{/t}">
+       <input type='text' id="cn" name="cn" size=25 maxlength=60 value="{$cn}" title="{t}POSIX name of the group{/t}">
 {/render}
 {/if}
      </td>
@@ -45,7 +45,7 @@
      </td>
     </tr>
     <tr>
-      <td colspan=2> <div style="height:15px; width:100%; border-bottom:1px solid #909090;"></div> </td>
+      <td colspan=2><hr></td>
     </tr>
     <tr>
       <td colspan=2> <div style="height:15px; width:100%;"></div> </td>
@@ -56,7 +56,7 @@
     <tr>
      <td colspan=2>
 {render acl=$gidNumberACL}
-      <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are autogenerated, select to specify manually{/t}" 
+      <input type=checkbox name="force_gid" value="1" title="{t}Normally IDs are auto-generated, select to specify manually{/t}" 
        {$force_gid} onclick="changeState('gidNumber')">
 {/render}
        <LABEL for="gidNumber">{t}Force GID{/t}</LABEL>
@@ -120,7 +120,7 @@
 
        {if $pickupGroup == "true"}
     <tr>
-      <td colspan=2> <div style="height:15px; width:100%; border-bottom:1px solid #909090;"></div> </td>
+      <td colspan=2><hr></td>
     </tr>
     <tr>
       <td colspan=2> <div style="height:15px; width:100%;"></div> </td>
@@ -135,7 +135,7 @@
        {/if}
        {if $nagios == "true"}
     <tr>
-      <td colspan=2> <div style="height:15px; width:100%; border-bottom:1px solid #909090;"></div> </td>
+      <td colspan=2><hr></td>
     </tr>
     <tr>
       <td colspan=2> <div style="height:15px; width:100%;"></div> </td>
@@ -143,13 +143,13 @@
     <tr>
      <td colspan=2>
 {render acl=$nagiosGroupACL checkbox=$multiple_support checked=$use_nagios_group}
-      <input class="center" type=checkbox name="nagios_group" value="1" {$nagios_group}>{t}Members are in a nagios group{/t}
+      <input class="center" type=checkbox name="nagios_group" value="1" {$nagios_group}>{t}Members are in a Nagios group{/t}
 {/render}
      </td>
     </tr>
        {/if}
     <tr>
-      <td colspan=2> <div style="height:15px; width:100%; border-bottom:1px solid #909090;"></div> </td>
+      <td colspan=2><hr></td>
     </tr>
     <tr>
       <td colspan=2> <div style="height:15px; width:100%;"></div> </td>
@@ -170,35 +170,29 @@
    <table summary="" style="width:100%">
     <tr>
      <td style="width:50%">
-      <b><LABEL for="members">{t}Group members{/t}</LABEL></b>
-      <br>
-
        {if $multiple_support}
-{render acl=$memberUidACL}
-         <select style="width:100%; height:380px;" id="members" name="members[]" size=15 multiple>
-               {foreach from=$memberUid_All item=name key=key}
-                       <option value="{$key}">{$name}&nbsp;({t}In all groups{/t})</option>
-               {/foreach}
-               {foreach from=$memberUid_Some item=name key=key}
-        <option value="{$key}" style='color: #888888; background: #DDDDDD;background-color: #DDDDDD;'>{$name}&nbsp;({t}Not in all groups{/t})</option>
-               {/foreach}
-         </select>
-{/render}
+        <h3>{t}Common group members{/t}</h3>
+        {render acl=$memberUidACL}
+            {$commonList}
+        {/render}
+        {render acl=$memberUidACL}
+          <button type='submit' name='edit_membership'>{msgPool type=addButton}</button>
+        {/render}
+        
+        <br>
+        <h3>{t}Partial group members{/t}</h3>
+        {render acl=$memberUidACL}
+            {$partialList}
+        {/render}
        {else}
+        <h3>{t}Group members{/t}</h3>
         {render acl=$memberUidACL}
             {$memberList}
         {/render}
+        {render acl=$memberUidACL}
+          <button type='submit' name='edit_membership'>{msgPool type=addButton}</button>
+        {/render}
        {/if}
-      <br>
-{render acl=$memberUidACL}
-      <button type='submit' name='edit_membership'>{msgPool type=addButton}</button>
-
-{/render}
-      &nbsp;
-{render acl=$memberUidACL}
-      <button type='submit' name='del_users'>{msgPool type=delButton}</button>
-
-{/render}
      </td>
     </tr> 
    </table>