diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index 5c716d99e475f5bb39f0bcfc70380d03e4e2934b..99c0ad7bd233e1eb3d4870df8ce5350d3880d603 100644 (file)
</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}">
+{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}">
{/render}
</td>
</tr>
</tr>
{/if}
-{if $samba3 ne ""}
-
{if $multiple_support}
<tr>
<td colspan=2>
</td>
</tr>
{/if}
-{/if}
{if $pickupGroup == "true"}
<tr>
</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>
{/if}
+ <tr>
+ <td colspan=2> <div style="height:15px; width:100%; border-bottom:1px solid #909090;"></div> </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}
+ {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> </option>
+ {/if}
+ </select>
+ {/render}
+ <br>
+ {render acl=$trustmodeACL}
+ <input type="submit" id="add_ws" value="{msgPool type=addButton}" name="add_ws" {$trusthide}>
+ {/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}
+ <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> </option>
+ {/if}
+ </select>
+ {/render}
+ <br>
+ {render acl=$trustmodeACL}
+ <input type="submit" id="add_ws" value="{msgPool type=addButton}" name="add_ws" {$trusthide}>
+ {/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>
<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} ({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} ({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> </option>
</select>
+ {/if}
{/render}
<br>
- <input type=submit name="edit_membership" value="{t}Add{/t}">
+{render acl=$memberUidACL}
+ <input type=submit name="edit_membership" value="{msgPool type=addButton}">
+{/render}
- <input type=submit name="del_users" value="{t}Delete{/t}">
+{render acl=$memberUidACL}
+ <input type=submit name="del_users" value="{msgPool type=delButton}">
+{/render}
</td>
</tr>
</table>