X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fplugins%2Fadmin%2Fgroups%2Fgeneric.tpl;h=c2015f6f0e021b6f30137d0d47922534192e1b26;hb=c16d7588512de02e85618a51e3f45fb0a8f72dbf;hp=99c0ad7bd233e1eb3d4870df8ce5350d3880d603;hpb=13a04c3a96a2d60c318be2e1712a363501db0e73;p=gosa.git

diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 99c0ad7bd..c2015f6f0 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,18 +40,12 @@
      </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/lists/folder_grey.png'}
-	<input type="image" name="chooseBase" src="images/lists/folder.png" class="center" title="{t}Select a base{/t}">
+       {$base}
 {/render}
      </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>
@@ -62,13 +56,13 @@
     <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>
       &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>
@@ -126,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>
@@ -141,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>
@@ -149,124 +143,71 @@
     <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>
     </tr>
-{if !$multiple_support}
-	<tr>
-	 <td colspan="2">
-		    {t}Trust mode{/t}&nbsp;
-    {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}
-
-	 </td>
-	</tr>
-
-{else}
-
-	<tr>
-	 <td colspan="2">
-    <input type="checkbox" name="use_trustmode" {if $use_trustmode} checked {/if}
-        class="center" onClick="GOsa_toggle('div_trustmode');">
-		    {t}Trust mode{/t}&nbsp;
-	<div {if !$use_trustmode} style="visibility:hidden;" {/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}
+    <tr>
+      <td colspan=2>{$trustModeDialog}</td>
+    </tr>
    </table>
 
   </td>
-  <td style="border-left:1px solid #A0A0A0">
+  <td class='left-border'>
+
    &nbsp;
   </td>
 
-  <td style="vertical-align:top;">
+  <td>
 
    <table summary="" style="width:100%">
     <tr>
-     <td style="vertical-align:top; width:50%">
-      <b><LABEL for="members">{t}Group members{/t}</LABEL></b>
-      <br>
-{render acl=$memberUidACL}
-
-	{if $multiple_support}
-	  <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>
-	{else}
-      <select style="width:100%; height:380px;" id="members" name="members[]" size=15 multiple>
-       {html_options options=$members}
-		<option disabled>&nbsp;</option>
-      </select>
-	{/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 style="width:50%">
+
+      {if $restrictedByDynGroup}
+        <b>{t}The group members are part of a dyn-group and cannot be managed!{/t}</b>
+        {if $multiple_support}
+            {render acl=$memberUidACL}
+                {$commonList}
+            {/render}
+        {else}
+            {render acl=$memberUidACL}
+                {$memberList}
+            {/render}
+        {/if}
+      {else}
+
+        {if $multiple_support}
+            <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}
+      {/if}
      </td>
     </tr> 
    </table>