X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fgeneric.tpl;h=1e3f96252dbe4f1d59fa962d357bab10b1e19f2e;hb=49f554372d40faddb32b84132c7ed2e447168839;hp=16f9c0d585af9e09fe0b67efb80f2b369eb75c15;hpb=00cab3c9e2f54f61a54feee620735b1f49213a09;p=gosa.git

diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 16f9c0d58..1e3f96252 100644
--- a/gosa-core/plugins/admin/groups/generic.tpl
+++ b/gosa-core/plugins/admin/groups/generic.tpl
@@ -1,20 +1,20 @@
 {if $multiple_support}
 <input type="hidden" value="1" name="group_mulitple_edit">
-{/if }
+{/if}
 
 
 <table summary="" style="width:100%;">
  <tr>
-  <td style="width:50%; vertical-align:top;">
+  <td style="width:50%">
    <table summary="" style="width:100%">
     <tr>
      <td><LABEL for="cn">{t}Group name{/t}</LABEL>{$must}</td>
      <td>
 {if $multiple_support}
-	<input id="dummy1" name="dummy1" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
+	<input type='text' id="dummy1" name="dummy1" size=25 maxlength=60 value="{t}Multiple edit{/t}" disabled>
 {else}
 {render acl=$cnACL}
-       <input 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>
@@ -25,7 +25,7 @@
      </td>
      <td>
 {render acl=$descriptionACL checkbox=$multiple_support checked=$use_description}
-      <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>
@@ -40,13 +40,7 @@
      </td>
      <td>
 {render acl=$baseACL checkbox=$multiple_support checked=$use_base}
-      <select id="base" size="1" 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/lists/folder.png" class="center" title="{t}Select a base{/t}">
+       {$base}
 {/render}
      </td>
     </tr>
@@ -68,14 +62,12 @@
 	<LABEL for="gidNumber">{t}Force GID{/t}</LABEL>
       &nbsp;
 {render acl=$gidNumberACL}
-      <input name="gidNumber" size=9 maxlength=9 id="gidNumber" {$forceMode} value="{$gidNumber}" title="{t}Forced ID number{/t}">
+      <input type='text' name="gidNumber" size=9 maxlength=9 id="gidNumber" {$forceMode} value="{$gidNumber}" title="{t}Forced ID number{/t}">
 {/render}
      </td>
     </tr>
 {/if}
 
-{if $samba3 ne ""}
-
 {if $multiple_support}
     <tr>
     <td colspan=2>
@@ -125,7 +117,6 @@
      </td>
     </tr>
     {/if}
-{/if}
 
 	{if $pickupGroup == "true"}
     <tr>
@@ -151,8 +142,8 @@
     </tr>
     <tr>
      <td colspan=2>
-{render acl=$nagiosGroupACL}
-      <input type=checkbox name="nagios_group" value="1" {$nagios_group}>{t}Members are in a nagios group{/t}
+{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}
 {/render}
      </td>
     </tr>
@@ -163,6 +154,7 @@
     <tr>
       <td colspan=2> <div style="height:15px; width:100%;"></div> </td>
     </tr>
+{if !$multiple_support}
 	<tr>
 	 <td colspan="2">
 		    {t}Trust mode{/t}&nbsp;
@@ -192,6 +184,43 @@
 
 	 </td>
 	</tr>
+
+{else}
+
+	<tr>
+	 <td colspan="2">
+    <input type="checkbox" name="use_trustmode" {if $use_trustmode} checked {/if}
+        class="center" onClick="$('div_trustmode').toggle();">
+		    {t}Trust mode{/t}&nbsp;
+	<div {if !$use_trustmode} style="display: none;" {/if} id="div_trustmode">
+    {render acl=$trustmodeACL}
+        <select name="trustmode" id="trustmode" size=1
+            onChange="changeSelectState('trustmode', 'wslist');
+                      changeSelectState('trustmode', 'add_ws');
+                      changeSelectState('trustmode', 'del_ws');">
+          {html_options options=$trustmodes selected=$trustmode}
+        </select>
+    {/render}
+    {render acl=$trustmodeACL}
+       <select style="width:100%" id="wslist" name="workstation_list[]" size=8 multiple {$trusthide}>
+        {html_options values=$workstations output=$workstations}
+        {if $emptyArrAccess}
+            <option disabled>&nbsp;</option>
+        {/if}
+       </select>
+    {/render}
+       <br>
+    {render acl=$trustmodeACL}
+       <input type="submit" id="add_ws" value="{msgPool type=addButton}" name="add_ws" {$trusthide}>&nbsp;
+    {/render}
+    {render acl=$trustmodeACL}
+       <input type="submit" id="del_ws" value="{msgPool type=delButton}" name="delete_ws" {$trusthide}>
+    {/render}
+		</div>
+	 </td>
+	</tr>
+
+{/if}
    </table>
 
   </td>
@@ -199,11 +228,11 @@
    &nbsp;
   </td>
 
-  <td style="vertical-align:top;">
+  <td>
 
    <table summary="" style="width:100%">
     <tr>
-     <td style="vertical-align:top; width:50%">
+     <td style="width:50%">
       <b><LABEL for="members">{t}Group members{/t}</LABEL></b>
       <br>
 {render acl=$memberUidACL}
@@ -225,9 +254,13 @@
 	{/if}
 {/render}
       <br>
+{render acl=$memberUidACL}
       <input type=submit name="edit_membership" value="{msgPool type=addButton}">
+{/render}
       &nbsp;
+{render acl=$memberUidACL}
       <input type=submit name="del_users" value="{msgPool type=delButton}">
+{/render}
      </td>
     </tr> 
    </table>