From 10ca4740a4805a0afd299ed8809a35d0f40d4c61 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 5 Mar 2010 10:34:13 +0000
Subject: [PATCH] Updated samba template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16194 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/samba/personal/samba/samba3.tpl | 94 ++++++++++----------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/gosa-plugins/samba/personal/samba/samba3.tpl b/gosa-plugins/samba/personal/samba/samba3.tpl
index b6a2257e3..54da79aa4 100644
--- a/gosa-plugins/samba/personal/samba/samba3.tpl
+++ b/gosa-plugins/samba/personal/samba/samba3.tpl
@@ -312,42 +312,43 @@
  <tr>
   <td colspan=2 style="width:50%; vertical-align:top;">
 
-   <!-- Samba policies -->
-   <table summary="{t}Access options{/t}">
-    <tr>
-     <td colspan=2>
+
+   <div>
+    <div style='float:left;'>
       {render acl=$sambaAcctFlagsXACL  checkbox=$multiple_support checked=$use_no_expiry}
        <input id="no_expiry" type=checkbox name="no_expiry" value="1" {$flagsX} class="center">
       {/render}
+    </div>
+    <div style='margin-left:25px;'>
       <label for="no_expiry">{t}The password never expires{/t}</label>
-     </td>
-    </tr>
-    <tr>
-     <td colspan=2>
+    </div>
+   </div>
+   <div class='clear'></div> 
+
+   <div>
+    <div style='float:left;'>
       {render acl=$sambaAcctFlagsNACL  checkbox=$multiple_support checked=$use_no_password_required}
        <input id="no_password_required" type=checkbox name="no_password_required" value="1" {$flagsN} class="center">
       {/render}
+    </div>
+    <div style='margin-left:25px;'>
       <label for="no_password_required">{t}Login from windows client requires no password{/t}</label>
-     </td>
-    </tr>
-<!--
-    <tr>
-     <td colspan=2 style="vertical-align:top;">
-      {render acl=$sambaPwdCanChangeACL  checkbox=$multiple_support checked=$use_allow_pwchange}
-       <input id="allow_pwchange" type=checkbox name="allow_pwchange" value="1" {$flagsP} class="center">
-      {/render}
-      <label for="allow_pwchange">{t}Allow user to change password from client{/t}</label>
-     </td>   
-    </tr>
--->
-    <tr>
-     <td colspan=2>
+    </div>
+   </div>
+   <div class='clear'></div> 
+
+   <div>
+    <div style='float:left;'>
       {render acl=$sambaAcctFlagsLACL  checkbox=$multiple_support checked=$use_temporary_disable}
        <input id="temporary_disable" type=checkbox name="temporary_disable" value="1" {$flagsD} class="center">
       {/render}
+    </div>
+    <div style='margin-left:25px;'>
       <label for="temporary_disable">{t}Lock samba account{/t}</label>
-     </td>
-    </tr>
+    </div>
+   </div>
+   <div class='clear'></div> 
+
 <!--
     <tr>
      <td>
@@ -371,21 +372,29 @@
      </td>
     </tr>
   -->
-	{if $additional_info_PwdMustChange}
-    <tr>
-     <td colspan=2 style='padding-left: 10px;'>
-	  <i>({$additional_info_PwdMustChange})</i>
-     </td>
-    </tr>
-	{/if}
-    <tr>
-     <td>
+
+   <div>
+    <div style='float:left;'>
+    </div>
+    <div style='margin-left:25px;'>
+      {if $additional_info_PwdMustChange}
+        <i>({$additional_info_PwdMustChange})</i>
+      {/if}
+    </div>
+   </div>
+   <div class='clear'></div> 
+
+   <div>
+    <div style='float:left;'>
       {render acl=$sambaKickoffTimeACL  checkbox=$multiple_support checked=$use_kickoff_time_set}
        <input id="kickoff_time_set" type=checkbox name="kickoff_time_set" value="1" {$flagsK} class="center">
       {/render}
+    </div>
+    <div style='margin-left:25px;'>
+
+      <table summary="{t}Account expiration settings{/t}"><tr><td>
       <label for="kickoff_time_set">{t}Account expires after{/t}</label>
-	 </td>
-     <td>
+      </td><td>
       {render acl=$sambaKickoffTimeACL}
         <input type="text" id="sambaKickoffTime" name="sambaKickoffTime" class="date" style='width:100px' value="{$sambaKickoffTime}">
         {if $sambaKickoffTimeACL|regex_replace:"/[cdmr]/":"" == "w"}
@@ -396,20 +405,15 @@
         </script>
         {/if}
       {/render}
-     </td>
-    </tr>
-    <tr>
-     <td colspan=2>&nbsp;</td>
-    </tr>
-    <tr>
-     <td colspan=2>
+      </td></tr></table>  
+    </div>
+   </div>
+   <div class='clear'></div> 
+
       {render acl=$sambaLogonHoursACL mode=read_active  checkbox=$multiple_support checked=$use_SetSambaLogonHours}
        {t}Samba logon times{/t}&nbsp;<button type='submit' name='SetSambaLogonHours'>{t}Edit settings...{/t}</button>
 
       {/render}
-     </td>
-    </tr>
-   </table>
    <!-- /Samba policies -->
 
   </td>
-- 
2.30.2