From e85a87339f8e502d9f2ae328b790b0c80d766bd2 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 2 Mar 2010 10:21:33 +0000
Subject: [PATCH] Created auto convert script for button/image-buttons/images

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15835 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/plugins/personal/posix/generic.tpl  | 264 +++++++++---------
 .../posix/groupSelect/group-filter.tpl        |  24 +-
 .../personal/posix/groupSelect/group-list.tpl |  56 ++--
 .../plugins/personal/posix/paste_generic.tpl  | 151 +++++-----
 .../plugins/personal/posix/posix_groups.tpl   | 160 ++++++-----
 .../posix/trustSelect/trust-filter.tpl        |  30 +-
 .../personal/posix/trustSelect/trust-list.tpl |  56 ++--
 .../plugins/personal/posix/trust_machines.tpl |  43 +--
 8 files changed, 411 insertions(+), 373 deletions(-)

diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl
index a0611d516..5464d0125 100644
--- a/gosa-core/plugins/personal/posix/generic.tpl
+++ b/gosa-core/plugins/personal/posix/generic.tpl
@@ -1,118 +1,122 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
   <td style="width:50%; vertical-align:top;">
-   <h2><img class="center" alt="" align="middle" src="images/rightarrow.png" /> {t}Generic{/t}</h2>
+   <h2>{image path="images/rightarrow.png"} {t}Generic{/t}
+   </h2>
    <table summary="">
     <tr>
      <td><label for="homeDirectory">{t}Home directory{/t}</label>{$must}</td>
      <td>
-{render acl=$homeDirectoryACL checkbox=$multiple_support checked=$use_homeDirectory}
+      {render acl=$homeDirectoryACL checkbox=$multiple_support checked=$use_homeDirectory}
       <input type='text' id="homeDirectory" name="homeDirectory" size=40 maxlength=120 value="{$homeDirectory}">
-{/render}
+      {/render}
      </td>
     </tr>
     <tr>
      <td><label for="loginShell">{t}Shell{/t}</label></td>
      <td>
-{render acl=$loginShellACL checkbox=$multiple_support checked=$use_loginShell}
+      {render acl=$loginShellACL checkbox=$multiple_support checked=$use_loginShell}
       <select id="loginShell" size="1" name="loginShell">
        {html_options values=$shells output=$shells selected=$loginShell}
       </select> 
-{/render}
+      {/render}
      </td>
     </tr>
     <tr>
      <td><label for="primaryGroup">{t}Primary group{/t}</label></td>
      <td>
-{render acl=$gidNumberACL checkbox=$multiple_support checked=$use_primaryGroup}
+      {render acl=$gidNumberACL checkbox=$multiple_support checked=$use_primaryGroup}
       <select id="primaryGroup" size="1" name="primaryGroup">
        {html_options options=$secondaryGroups selected=$primaryGroup}
       </select> 
-{/render}
+      {/render}
      </td>
     </tr>
-{if !$multiple_support}
+    {if !$multiple_support}
     <tr>
      <td>{t}Status{/t}</td>
      <td>{$status}</td>
     </tr>
-{if $gotoLastSystemLogin}
+    {if $gotoLastSystemLogin}
     <tr>
      <td>{t}Last logon{/t}</td>
      <td>{$gotoLastSystemLogin}</td>
     </tr>
-{/if}
-{/if}
+    {/if}
+    {/if}
    </table>
-
-{if !$multiple_support}
-
+   
+   {if !$multiple_support}
+   
    <table summary="">
     <tr>
      <td>
-{render acl=$force_idsACL}
+      {render acl=$force_idsACL}
       <input id="force_ids" type=checkbox name="force_ids" value="1" {$force_ids} 
-			onclick="{$onClickIDS}">
-{/render}
-					</td>
-					<td>
+      onclick="{$onClickIDS}">
+      {/render}
+     </td>
+     <td>
       <label for="force_ids">{t}Force UID/GID{/t}</label>
      </td>
-					<td style="width:20px;"></td>
-					<td>
-						<label for="uidNumber">{t}UID{/t}</label>
-					</td>
-					<td>
-{render acl=$uidNumberACL}
-						<input type='text' id="uidNumber" name="uidNumber" size=9 maxlength=9 {$forceMode} value="{$uidNumber}">
-{/render}
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3"></td>
-					<td>
-						<label for="gidNumber">{t}GID{/t}</label>
-					</td>
+     <td style="width:20px;"></td>
      <td>
-{render acl=$gidNumberACL}
-						<input type='text' id="gidNumber" name="gidNumber" size=9 maxlength=9 {$forceMode} value="{$gidNumber}">
-{/render}
-					</td>
-				</tr>
+      <label for="uidNumber">{t}UID{/t}</label>
+     </td>
+     <td>
+      {render acl=$uidNumberACL}
+      <input type='text' id="uidNumber" name="uidNumber" size=9 maxlength=9 {$forceMode} value="{$uidNumber}">
+      {/render}
+     </td>
+    </tr>
+    <tr>
+     <td colspan="3"></td>
+     <td>
+      <label for="gidNumber">{t}GID{/t}</label>
+     </td>
+     <td>
+      {render acl=$gidNumberACL}
+      <input type='text' id="gidNumber" name="gidNumber" size=9 maxlength=9 {$forceMode} value="{$gidNumber}">
+      {/render}
+     </td>
+    </tr>
    </table>
-{/if}
+   {/if}
   </td>
   <td style="border-left:1px solid #A0A0A0">
-    &nbsp;
+   &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <h2><img alt="" class="center" align="middle" src="plugins/posix/images/members.png" /> {t}Group membership{/t}</h2>
+   <h2>{image path="plugins/posix/images/members.png"} {t}Group membership{/t}
+   </h2>
    {if $groups eq "too_many_for_nfs"}
-    <b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>
-    <br>
+   <b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>
+   <br>
    {/if}
-{render acl=$groupMembershipACL}
+   {render acl=$groupMembershipACL}
    <select style="width:100%; height:130px;" name="group_list[]" size=16 multiple >
-{if !$multiple_support}
+    {if !$multiple_support}
     {html_options options=$groupMembership}
-{else}
-	{foreach from=$groupMembership item=group key=key}
-		<option value="{$key}">{$group}&nbsp;({t}Common group{/t})</option>
-	{/foreach}
-	{foreach from=$groupMembership_some item=group key=key}
-		<option value="{$key}" 
-			style='color: #888888; background: #DDDDDD;background-color: #DDDDDD;'>{$group}&nbsp;({t}Groups differ{/t})</option>
-	{/foreach}
-{/if}
+    {else}
+    {foreach from=$groupMembership item=group key=key}
+    <option value="{$key}">{$group}&nbsp;({t}Common group{/t})</option>
+    {/foreach}
+    {foreach from=$groupMembership_some item=group key=key}
+    <option value="{$key}" 
+    style='color: #888888; background: #DDDDDD;background-color: #DDDDDD;'>{$group}&nbsp;({t}Groups differ{/t})</option>
+    {/foreach}
+    {/if}
    </select>
-{/render}
+   {/render}
    <br>
-{render acl=$groupMembershipACL}
-   <input type=submit value="{msgPool type=addButton}" name="edit_groupmembership" >&nbsp;
-{/render}
-{render acl=$groupMembershipACL}
-   <input type=submit value="{msgPool type=delButton}" name="delete_groupmembership" >
-{/render}
+   {render acl=$groupMembershipACL}
+   <button type='submit' name='edit_groupmembership'>{msgPool type=addButton}</button>&nbsp;
+   
+   {/render}
+   {render acl=$groupMembershipACL}
+   <button type='submit' name='delete_groupmembership'>{msgPool type=delButton}</button>
+   
+   {/render}
   </td>
  </tr>
 </table>
@@ -124,87 +128,95 @@
   <td style='width:50%;vertical-align:top'>
    {if $sshPublicKey == 1}
    {render acl=$sshPublicKeyACL}
-   <h2><img alt="" class="center" align="middle" src="images/lists/key.png" /> {t}SSH keys{/t}</h2>
-   <input type=submit value="{t}Edit public ssh keys...{/t}" name="edit_sshpublickey">
+   <h2>{image path="images/lists/key.png"} {t}SSH keys{/t}
+   </h2>
+   <button type='submit' name='edit_sshpublickey'>{t}Edit public ssh keys...{/t}</button>
+   
    <div style='border-bottom:1px solid #A0A0A0;height:8px'></div>
    {/render}
    {/if}
-   <h2><img alt="" class="center" align="middle" src="plugins/posix/images/terminal_small.png" /> {t}Account{/t}</h2>
+   <h2>{image path="plugins/posix/images/terminal_small.png"} {t}Account{/t}
+   </h2>
    {include file="$pwmode.tpl"}
   </td>
   <td style="border-left:1px solid #A0A0A0">
-    &nbsp;
+   &nbsp;
   </td>
   <td style="vertical-align:top;">
-   <h2><img alt="" class="center" align="middle" src="images/lists/locked.png" /> {t}System trust{/t}</h2>
-{if !$multiple_support}
-	{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}
+   <h2>{image path="images/lists/locked.png"} {t}System trust{/t}
+   </h2>
+   {if !$multiple_support}
+   {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}
+<button type='submit' name='add_ws' id="add_ws">{msgPool type=addButton}</button>&nbsp;
+
+{/render}
+{render acl=$trustmodeACL}
+<button type='submit' name='delete_ws' id="del_ws">{msgPool type=delButton}</button>
+
+{/render}
 
 {else}
-    <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>
+<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}
+<button type='submit' name='add_ws' id="add_ws">{msgPool type=addButton}</button>&nbsp;
+
+{/render}
+{render acl=$trustmodeACL}
+<button type='submit' name='delete_ws' id="del_ws">{msgPool type=delButton}</button>
+
+{/render}
+</div>
 {/if}
-  </td>
- </tr>
+</td>
+</tr>
 </table>
 {if $multiple_support}
-	<input type="hidden" name="posix_mulitple_edit" value="1">
+<input type="hidden" name="posix_mulitple_edit" value="1">
 {/if}
 
 <input type="hidden" name="posixTab" value="posixTab">
 
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
-  <!-- // First input field on page
-	focus_field('homeDirectory');
-  -->
+<!-- // First input field on page
+focus_field('homeDirectory');
+-->
 </script>
diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl b/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl
index c115cd06c..2e2b119ec 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl
+++ b/gosa-core/plugins/personal/posix/groupSelect/group-filter.tpl
@@ -1,24 +1,26 @@
 <div class="contentboxh">
  <p class="contentboxh">
-  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+ {image path="images/launch.png" align="right"}{t}Filter{/t}
+ 
  </p>
 </div>
 
 <div class="contentboxb">
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
- {$PRIMARY}&nbsp;<LABEL for='TEMPLATES'>{t}Show primary groups{/t}</LABEL><br>
- {$SAMBA}&nbsp;<LABEL for='TEMPLATES'>{t}Show samba groups{/t}</LABEL><br>
- {$MAIL}&nbsp;<LABEL for='TEMPLATES'>{t}Show mail groups{/t}</LABEL><br>
-
+ 
+ <div style="border-top:1px solid #AAAAAA"></div>
+ 
+ {$PRIMARY}&nbsp;<label for='TEMPLATES'>{t}Show primary groups{/t}</label><br>
+ {$SAMBA}&nbsp;<label for='TEMPLATES'>{t}Show samba groups{/t}</label><br>
+ {$MAIL}&nbsp;<label for='TEMPLATES'>{t}Show mail groups{/t}</label><br>
+ 
  {$SCOPE}
-
+ 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>
    <td>
     <label for="NAME">
-     <img src="images/lists/search.png" align=middle>&nbsp;Name
+    {image path="images/lists/search.png"}&nbsp;Name
+    
     </label>
    </td>
    <td>
@@ -26,7 +28,7 @@
    </td>
   </tr>
  </table>
-
+ 
  <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
   <tr>
    <td width="100%" align="right">
diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
index 99c169e72..d06580161 100644
--- a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
+++ b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl
@@ -1,35 +1,39 @@
-<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
+{image path="images/empty.png" action="no_action_posted" value="do_nothing"}
+
 
 <table summary="" style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2>
-  <tr>
-    <td style="vertical-align:top; width:100%;">
-      <div class="contentboxh">
-        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-      </div>
-      
-      <div class="contentboxb">
-       <div style='background:white;padding:3px;'>
-        <table><tr>
-          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
-        </tr></table>
-       </div>
-      </div>
-      
-      <div style='height:4px;'>
-      </div>
-      {$LIST}
-    </td>
-    <td style='vertical-align:top;min-width:250px'>
-      {$FILTER}
-    </td>
-  </tr>
+ <tr>
+  <td style="vertical-align:top; width:100%;">
+   <div class="contentboxh">
+    <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
+   </div>
+   
+   <div class="contentboxb">
+    <div style='background:white;padding:3px;'>
+     <table><tr>
+       <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{image path="images/rocket.png"}
+       </td><td> {$ACTIONS}</td>
+     </tr></table>
+    </div>
+   </div>
+   
+   <div style='height:4px;'>
+   </div>
+   {$LIST}
+  </td>
+  <td style='vertical-align:top;min-width:250px'>
+   {$FILTER}
+  </td>
+ </tr>
 </table>
 
 <input type="hidden" value="1" name="PosixGroupDialogPosted">
 <p class="plugbottom">
-  <input type=submit name="add_groups_finish" value="{msgPool type=addButton}">
-  &nbsp;
-  <input type=submit name="add_groups_cancel" value="{msgPool type=cancelButton}">
+<button type='submit' name='add_groups_finish'>{msgPool type=addButton}</button>
+
+&nbsp;
+<button type='submit' name='add_groups_cancel'>{msgPool type=cancelButton}</button>
+
 </p>
 
 
diff --git a/gosa-core/plugins/personal/posix/paste_generic.tpl b/gosa-core/plugins/personal/posix/paste_generic.tpl
index cf286defc..ebdb9c1e7 100644
--- a/gosa-core/plugins/personal/posix/paste_generic.tpl
+++ b/gosa-core/plugins/personal/posix/paste_generic.tpl
@@ -1,78 +1,81 @@
 <table width='100%'>
-	<tr>
-		<td style='vertical-align:top;'>
-			<h2>{t}Posix settings{/t}</h2>
-			<table>
-	  			<tr>
-					<td>
-		  				<label for="homeDirectory">{t}Home directory{/t}</label>
-					</td>
-					<td>
-		  				<input type='text' id="homeDirectory" name="homeDirectory" size=40 maxlength=120 value="{$homeDirectory}">
-					</td>
-	  			</tr>
-			</table>
-			<table style='width:100%;'>
-        <tr>
-         <td><label for="primaryGroup">{t}Primary group{/t}</label></td>
-         <td>
-          <select id="primaryGroup" size="1" name="primaryGroup">
-           {html_options options=$secondaryGroups selected=$primaryGroup}
-          </select> 
-         </td>
-        </tr>
-	  			<tr>
-					<td>
-					  	<input id="force_ids" type=checkbox name="force_ids" value="1"  {$force_ids}
-								 onclick="changeState('uidNumber');changeState('gidNumber');">
-					</td>
-					<td>
-						<label for="force_ids">
-						{t}Force UID/GID{/t}
-						</label>
-					</td>
-					<td>&nbsp;</td>
-					<td>
-						<label for="uidNumber">{t}UID{/t}</label>
-					</td>
-					<td>
-						<input type='text' id="uidNumber" name="uidNumber" size=9 maxlength=9 {$forceMode} value="{$uidNumber}">
-					</td>
-				</tr>
-				<tr>
-					<td colspan="3">&nbsp;</td>
-					<td>
-						<label for="gidNumber">{t}GID{/t}</label>
-					</td>
-					<td>
-						<input type='text' id="gidNumber" name="gidNumber" size=9 maxlength=9 {$forceMode} value="{$gidNumber}">
-					</td>
-				</tr>
-			</table>
-			<table width="50%">
-				<tr>
-					<td style="vertical-align:top;" colspan="4">
-						<h2><img alt="" class="center" align="middle" src="plugins/posix/images/members.png" /> {t}Group membership{/t}</h2>
-					</td>
-				</tr>
-				<tr>
-					<td style="vertical-align:top;" colspan="4">
-						
-						{if $groups eq "too_many_for_nfs"}
-							<b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>
-							<br>
-						{/if}
-						<select style="width:100%; height:130px;" name="group_list[]" size=16 multiple>
-							{html_options options=$groupMembership}
-						</select>
-						<br>
-						<input type=submit value="{msgPool type=addButton}" name="edit_groupmembership">&nbsp;
-						<input type=submit value="{msgPool type=delButton}" name="delete_groupmembership">
-					</td>
-				</tr>
-			</table>
-  		</td>
-	</tr>
+ <tr>
+  <td style='vertical-align:top;'>
+   <h2>{t}Posix settings{/t}</h2>
+   <table>
+    <tr>
+     <td>
+      <label for="homeDirectory">{t}Home directory{/t}</label>
+     </td>
+     <td>
+      <input type='text' id="homeDirectory" name="homeDirectory" size=40 maxlength=120 value="{$homeDirectory}">
+     </td>
+    </tr>
+   </table>
+   <table style='width:100%;'>
+    <tr>
+     <td><label for="primaryGroup">{t}Primary group{/t}</label></td>
+     <td>
+      <select id="primaryGroup" size="1" name="primaryGroup">
+       {html_options options=$secondaryGroups selected=$primaryGroup}
+      </select> 
+     </td>
+    </tr>
+    <tr>
+     <td>
+      <input id="force_ids" type=checkbox name="force_ids" value="1"  {$force_ids}
+      onclick="changeState('uidNumber');changeState('gidNumber');">
+     </td>
+     <td>
+      <label for="force_ids">
+      {t}Force UID/GID{/t}
+      </label>
+     </td>
+     <td>&nbsp;</td>
+     <td>
+      <label for="uidNumber">{t}UID{/t}</label>
+     </td>
+     <td>
+      <input type='text' id="uidNumber" name="uidNumber" size=9 maxlength=9 {$forceMode} value="{$uidNumber}">
+     </td>
+    </tr>
+    <tr>
+     <td colspan="3">&nbsp;</td>
+     <td>
+      <label for="gidNumber">{t}GID{/t}</label>
+     </td>
+     <td>
+      <input type='text' id="gidNumber" name="gidNumber" size=9 maxlength=9 {$forceMode} value="{$gidNumber}">
+     </td>
+    </tr>
+   </table>
+   <table width="50%">
+    <tr>
+     <td style="vertical-align:top;" colspan="4">
+      <h2>{image path="plugins/posix/images/members.png"} {t}Group membership{/t}
+      </h2>
+     </td>
+    </tr>
+    <tr>
+     <td style="vertical-align:top;" colspan="4">
+      
+      {if $groups eq "too_many_for_nfs"}
+      <b style="color:red">{t}(Warning: more than 16 groups are not supported by NFS!){/t}</b>
+      <br>
+      {/if}
+      <select style="width:100%; height:130px;" name="group_list[]" size=16 multiple>
+       {html_options options=$groupMembership}
+      </select>
+      <br>
+      <button type='submit' name='edit_groupmembership'>{msgPool type=addButton}</button>&nbsp;
+      
+      <button type='submit' name='delete_groupmembership'>{msgPool type=delButton}</button>
+      
+     </td>
+    </tr>
+   </table>
+  </td>
+ </tr>
 </table>
 <br>
 <br>
diff --git a/gosa-core/plugins/personal/posix/posix_groups.tpl b/gosa-core/plugins/personal/posix/posix_groups.tpl
index 496773d2d..67487bd73 100644
--- a/gosa-core/plugins/personal/posix/posix_groups.tpl
+++ b/gosa-core/plugins/personal/posix/posix_groups.tpl
@@ -1,83 +1,89 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
-	<tr>
-  		<td style="vertical-align:top;">
-   			<div class="contentboxh" style="height:20px;">
-    			<p class="contentboxh" style="font-size:12px">
-     				<b>{t}Select groups to add{/t} {$hint}</b>
-   	 			</p>
-   			</div>
-   			<div class="contentboxb" style="">
-    			<p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-				 	<select style="width:100%; height:430px; margin-top:4px;" name="groups[]" size="15" multiple>
-						{html_options options=$groups}
-				 	</select>
-     				<input type=hidden name="edit_helper">
-    			</p>
-   			</div>
-  		</td>
-  		<td style="vertical-align:top; width:350px;">
-   			<div class="contentboxh" style="height:20px;">
-    			<p class="contentboxh" style="font-size:12px">
-					<img src="{$launchimage}" align="right" alt="[F]"><b>{t}Filters{/t}</b>
-				</p>
-   			</div>
-   			<div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     			<table summary="" style="width:100%;">
-      				{$alphabet}
-     			</table>
-
-				<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-					<tr>
-						<td width="50%">
-							<img alt="" src="{$tree_image}" align=middle>&nbsp;{t}Display groups of department{/t}
-						</td>
-						<td>
-							<select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
-							  {html_options options=$deplist selected=$depselect}
-							</select>
-						</td>
-					</tr>
-				</table>
-				<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-					<tr>
-						<td width="50%">
-							<img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display groups matching{/t}
-						</td>
-						<td>
-							<input type='text' name='regex' maxlength='20' value='{$regex}' 
-								title='{t}Regular expression for matching group names{/t}' onChange="mainform.submit()">
-						</td>
-					</tr>
-				</table>
-				<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-					<tr>
-						<td width="50%">
-							<img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display groups of user{/t}
-						</td>
-						<td>
-							<input type='text' name='guser' maxlength='20' value='{$guser}' 
-								title='{t}User name of which groups are shown{/t}' onChange="mainform.submit()">
-						</td>
-					</tr>
-				</table>
-				<table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-                    <tr>
-						<td>
-							<input type="checkbox" name="SubSearch" value="1" {$SubSearchCHK}
-								onClick="mainform.submit();">
-							{t}Search in subtrees{/t}
-						</td>
-					</tr>
-                </table>
-			   {$apply}
-   			</div>
-  		</td>
-	</tr>
+ <tr>
+  <td style="vertical-align:top;">
+   <div class="contentboxh" style="height:20px;">
+    <p class="contentboxh" style="font-size:12px">
+    <b>{t}Select groups to add{/t} {$hint}</b>
+    </p>
+   </div>
+   <div class="contentboxb" style="">
+    <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+    <select style="width:100%; height:430px; margin-top:4px;" name="groups[]" size="15" multiple>
+     {html_options options=$groups}
+    </select>
+    <input type=hidden name="edit_helper">
+    </p>
+   </div>
+  </td>
+  <td style="vertical-align:top; width:350px;">
+   <div class="contentboxh" style="height:20px;">
+    <p class="contentboxh" style="font-size:12px">
+    {image path="{$launchimage}" align="right"}
+    <b>{t}Filters{/t}</b>
+    </p>
+   </div>
+   <div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+    <table summary="" style="width:100%;">
+     {$alphabet}
+    </table>
+    
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+     <tr>
+      <td width="50%">
+       {image path="{$tree_image}"}&nbsp;{t}Display groups of department{/t}
+       
+      </td>
+      <td>
+       <select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+        {html_options options=$deplist selected=$depselect}
+       </select>
+      </td>
+     </tr>
+    </table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+     <tr>
+      <td width="50%">
+       {image path="{$search_image}"}&nbsp;{t}Display groups matching{/t}
+       
+      </td>
+      <td>
+       <input type='text' name='regex' maxlength='20' value='{$regex}' 
+       title='{t}Regular expression for matching group names{/t}' onChange="mainform.submit()">
+      </td>
+     </tr>
+    </table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+     <tr>
+      <td width="50%">
+       {image path="{$search_image}"}&nbsp;{t}Display groups of user{/t}
+       
+      </td>
+      <td>
+       <input type='text' name='guser' maxlength='20' value='{$guser}' 
+       title='{t}User name of which groups are shown{/t}' onChange="mainform.submit()">
+      </td>
+     </tr>
+    </table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+     <tr>
+      <td>
+       <input type="checkbox" name="SubSearch" value="1" {$SubSearchCHK}
+       onClick="mainform.submit();">
+       {t}Search in subtrees{/t}
+      </td>
+     </tr>
+    </table>
+    {$apply}
+   </div>
+  </td>
+ </tr>
 </table>
 <input type="hidden" value="1" name="PosixGroupDialogPosted">
 <p class="plugbottom">
-  <input type=submit name="add_groups_finish" value="{msgPool type=addButton}">
-  &nbsp;
-  <input type=submit name="add_groups_cancel" value="{msgPool type=cancelButton}">
+<button type='submit' name='add_groups_finish'>{msgPool type=addButton}</button>
+
+&nbsp;
+<button type='submit' name='add_groups_cancel'>{msgPool type=cancelButton}</button>
+
 </p>
 
diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl
index 0d911338a..27927579f 100644
--- a/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl
+++ b/gosa-core/plugins/personal/posix/trustSelect/trust-filter.tpl
@@ -1,26 +1,28 @@
 <div class="contentboxh">
  <p class="contentboxh">
-  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
+ {image path="images/launch.png" align="right"}{t}Filter{/t}
+ 
  </p>
 </div>
 
 <div class="contentboxb">
-
-<div style="border-top:1px solid #AAAAAA"></div>
-
-  {$SERVER}&nbsp;{t}Show servers{/t}<br>
-  {$WORKSTATION}&nbsp;{t}Show workstations{/t}<br>
-  {$TERMINAL}&nbsp;{t}Show terminals{/t}<br>
-
-  <div style="border-top:1px solid #AAAAAA"></div>
-
-  {$SCOPE}
-
+ 
+ <div style="border-top:1px solid #AAAAAA"></div>
+ 
+ {$SERVER}&nbsp;{t}Show servers{/t}<br>
+ {$WORKSTATION}&nbsp;{t}Show workstations{/t}<br>
+ {$TERMINAL}&nbsp;{t}Show terminals{/t}<br>
+ 
+ <div style="border-top:1px solid #AAAAAA"></div>
+ 
+ {$SCOPE}
+ 
  <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
   <tr>
    <td>
     <label for="NAME">
-     <img src="images/lists/search.png" align=middle>&nbsp;Name
+    {image path="images/lists/search.png"}&nbsp;Name
+    
     </label>
    </td>
    <td>
@@ -28,7 +30,7 @@
    </td>
   </tr>
  </table>
-
+ 
  <table summary=""  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
   <tr>
    <td width="100%" align="right">
diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl
index 087cea095..d362c2c3a 100644
--- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl
+++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl
@@ -1,35 +1,39 @@
-<input type='image' src='images/empty.png' name='no_action_posted' value='do_nothing' alt='' style='width:2px;height:2px;'>
+{image path="images/empty.png" action="no_action_posted" value="do_nothing"}
+
 
 <table summary="" style="width:100%;height:100%; vertical-align:top; text-align:left;" cellpadding=2>
-  <tr>
-    <td style="vertical-align:top; width:100%;">
-      <div class="contentboxh">
-        <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
-      </div>
-      
-      <div class="contentboxb">
-       <div style='background:white;padding:3px;'>
-        <table><tr>
-          <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td><img src='images/rocket.png' alt='' class='center'></td><td> {$ACTIONS}</td>
-        </tr></table>
-       </div>
-      </div>
-      
-      <div style='height:4px;'>
-      </div>
-      {$LIST}
-    </td>
-    <td style='vertical-align:top;min-width:250px'>
-      {$FILTER}
-    </td>
-  </tr>
+ <tr>
+  <td style="vertical-align:top; width:100%;">
+   <div class="contentboxh">
+    <p class="contentboxh">&nbsp;{$HEADLINE}&nbsp;{$SIZELIMIT}</p>
+   </div>
+   
+   <div class="contentboxb">
+    <div style='background:white;padding:3px;'>
+     <table><tr>
+       <td>{$ROOT}&nbsp;</td><td>{$BACK}&nbsp;</td><td>{$HOME}&nbsp;</td><td>{$RELOAD}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{t}Base{/t} {$BASE}&nbsp;</td><td>{$SEPARATOR}&nbsp;</td><td>{image path="images/rocket.png"}
+       </td><td> {$ACTIONS}</td>
+     </tr></table>
+    </div>
+   </div>
+   
+   <div style='height:4px;'>
+   </div>
+   {$LIST}
+  </td>
+  <td style='vertical-align:top;min-width:250px'>
+   {$FILTER}
+  </td>
+ </tr>
 </table>
 
 
 <p class="plugbottom">
-  <input type=submit name="add_ws_finish" value="{msgPool type=addButton}">
-  &nbsp;
-  <input type=submit name="add_ws_cancel" value="{msgPool type=cancelButton}">
+<button type='submit' name='add_ws_finish'>{msgPool type=addButton}</button>
+
+&nbsp;
+<button type='submit' name='add_ws_cancel'>{msgPool type=cancelButton}</button>
+
 </p>
 
 <input type="hidden" name="ignore">
diff --git a/gosa-core/plugins/personal/posix/trust_machines.tpl b/gosa-core/plugins/personal/posix/trust_machines.tpl
index f7b0b2ca2..eb2198f3a 100644
--- a/gosa-core/plugins/personal/posix/trust_machines.tpl
+++ b/gosa-core/plugins/personal/posix/trust_machines.tpl
@@ -1,42 +1,47 @@
 <table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
-<tr>
+ <tr>
   <td style="vertical-align:top;">
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
-     <b>{t}Select systems to add{/t} {$hint}</b><br>
+    <b>{t}Select systems to add{/t} {$hint}</b><br>
     </p>
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <select style="width:100%; margin-top:4px; height:450px;" name="wslist[]" size="15" multiple>
-	{html_options values=$wslist output=$wslist}
-     </select>
+    <select style="width:100%; margin-top:4px; height:450px;" name="wslist[]" size="15" multiple>
+     {html_options values=$wslist output=$wslist}
+    </select>
     </p>
    </div>
   </td>
   <td style="vertical-align:top; width:350px">
    <div class="contentboxh" style="height:20px;">
-    <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{
-t}Filters{/t}</b></p>
+    <p class="contentboxh" style="font-size:12px">{image path="{$launchimage}" align="right"}
+    <b>{
+    t}Filters{/t}</b></p>
    </div>
    <div class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-     <table summary="" style="width:100%;">
-      {$alphabet}
-     </table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$tree_image}" align=middle>&nbsp;{t}Display systems of department{/t}</td>
-    <td><select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
-      {html_options options=$deplist selected=$depselect}
+    <table summary="" style="width:100%;">
+     {$alphabet}
+    </table>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%">{image path="{$tree_image}"}&nbsp;{t}Display systems of department{/t}
+      </td>
+      <td><select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+        {html_options options=$deplist selected=$depselect}
     </select></td></tr></table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%"><img alt="" src="{$search_image}" align=middle>&nbsp;{t}Display systems matching{/t}</td>
+    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8"><tr><td width="50%">{image path="{$search_image}"}&nbsp;{t}Display systems matching{/t}
+      </td>
     <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching addresses{/t}' onChange="mainform.submit()"></td></tr></table>
-   {$apply}
+    {$apply}
    </div>
   </td>
-</tr>
+ </tr>
 </table>
 
 <p class="plugbottom">
-  <input type=submit name="add_ws_finish" value="{msgPool type=addButton}">
-  &nbsp;
-  <input type=submit name="add_ws_cancel" value="{msgPool type=cancelButton}">
+<button type='submit' name='add_ws_finish'>{msgPool type=addButton}</button>
+
+&nbsp;
+<button type='submit' name='add_ws_cancel'>{msgPool type=cancelButton}</button>
+
 </p>
-- 
2.30.2