Backports from 2.7

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

diff --git a/gosa-core/plugins/admin/ogroups/generic.tpl b/gosa-core/plugins/admin/ogroups/generic.tpl
index 6c77718347af6bcaf059ce1f372074936e395388..e99cc8ac039b7e28429582de62ade2b08aedfce1 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/generic.tpl
+++ b/gosa-core/plugins/admin/ogroups/generic.tpl
@@ -1,13 +1,13 @@
-<table summary="" style="width:100%;">
+<table summary="{t}Object group{/t}" style="width:100%;">
  <tr>
-  <td style="width:50%; vertical-align:top">
+  <td style="width:50%">
    <input type="hidden" name="ogroupedit" value="1">
-   <table summary="">
+   <table summary="{t}Generic settings{/t}">
     <tr>
      <td><LABEL for="cn">{t}Group name{/t}</LABEL>{$must}</td>
      <td>
 {render acl=$cnACL}
-       <input name="cn" id="cn" size=25 maxlength=60 value="{$cn}" title="{t}Name of the group{/t}">
+       <input type='text' name="cn" id="cn" size=25 maxlength=60 value="{$cn}" title="{t}Name of the group{/t}">
 {/render}
      </td>
     </tr>
@@ -15,7 +15,7 @@
      <td><LABEL for="description">{t}Description{/t}</LABEL></td>
      <td>
 {render acl=$descriptionACL}
-       <input id="description" name="description" size=40 maxlength=80 value="{$description}" title="{t}Descriptive text for this group{/t}">
+       <input type='text' id="description" name="description" size=40 maxlength=80 value="{$description}" title="{t}Descriptive text for this group{/t}">
 {/render}
      </td>
     </tr>
@@ -26,33 +26,33 @@
      <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
      <td>
 {render acl=$baseACL}
-      <select size="1" id="base" name="base" title="{t}Choose subtree to place group in{/t}">
-       {html_options options=$bases selected=$base_select}
-      </select>
-{/render}
-{render acl=$baseACL disable_picture='images/folder_gray.png'}
-      <input type="image" name="chooseBase" src="images/folder.png" class="center" title="{t}Select a base{/t}">
+       {$base}
 {/render}
      </td>
     </tr>
    </table>
 
+    
+       <hr>
+    {$trustModeDialog}
   </td>
-  <td style="border-left:1px solid #A0A0A0; padding-left:10px;">
+  <td style='padding-left:10px;' class='left-border'>
+   {if $isRestrictedByDynGroup}
+   <b>{t}The group members are part of a dyn-group and cannot be managed!{/t}</b>
+    <br>
+    <br>
+    {/if}
+
    <b><LABEL for="members">{t}Member objects{/t}</LABEL></b>&nbsp;({$combinedObjects})
    <br>
 {render acl=$memberACL}
-   <select style="width:100%; height:450px;" id="members" name="members[]" size="15" multiple>
-    {$members}
-   </select>
-{/render}
-   <br>
-{render acl=$memberACL}
-   <input type=submit value="{msgPool type=addButton}" name="edit_membership">&nbsp;
+   {$memberList}
 {/render}
+{if !$isRestrictedByDynGroup}
 {render acl=$memberACL}
-   <input type=submit value="{msgPool type=delButton}" name="delete_membership">
+   <button type='submit' name='edit_membership'>{msgPool type=addButton}</button>&nbsp;
 {/render}
+{/if}
   </td>
  </tr>
 </table>