From 764173273145081b35ab76bd5d8eb6d2c3876a3f Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 5 Mar 2010 08:26:29 +0000
Subject: [PATCH] Updated posix account settings template

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16183 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../plugins/personal/posix/posix_shadow.tpl   | 171 +++++++++++-------
 1 file changed, 110 insertions(+), 61 deletions(-)

diff --git a/gosa-core/plugins/personal/posix/posix_shadow.tpl b/gosa-core/plugins/personal/posix/posix_shadow.tpl
index b0e0e1af8..f5b7af34a 100644
--- a/gosa-core/plugins/personal/posix/posix_shadow.tpl
+++ b/gosa-core/plugins/personal/posix/posix_shadow.tpl
@@ -1,66 +1,115 @@
 
   <h3>{t}Account settings{/t}</h3>
   
-   <!-- must_change_password  -->
-   {render acl=$mustchangepasswordACL checkbox=$multiple_support checked=$use_mustchangepassword}
-   <input type="checkbox" class="center" name="mustchangepassword" value="1" {$mustchangepassword}>
-   {/render}
-   {t}User must change password on first login{/t}
-   <br>
-   
-   <!-- shadowMin -->
-   {render acl=$shadowMinACL checkbox=$multiple_support checked=$use_activate_shadowMin}
-   <input type="checkbox" class="center" name="activate_shadowMin" value="1" {$activate_shadowMin}>
-   {/render}
-   {render acl=$shadowMinACL}
-   {$shadowmins}
-   {/render}
-   <br>
-   
-   <!-- activate_shadowMax -->
-   {render acl=$shadowMaxACL checkbox=$multiple_support checked=$use_activate_shadowMax}
-   <input type="checkbox" class="center" name="activate_shadowMax" value="1" {$activate_shadowMax}>
-   {/render}
-   {render acl=$shadowMaxACL}
-   {$shadowmaxs}
-   {/render}
-   <br>
-   
-   <!-- activate_shadowExpire -->
-   {render acl=$shadowExpireACL checkbox=$multiple_support checked=$use_activate_shadowExpire}
-   <table summary="{t}Password expiration settings{/t}" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-     <td>
-      <input type="checkbox" class="center" name="activate_shadowExpire" value="1" {$activate_shadowExpire}>
-      {/render}
-      {t}Password expires on{/t}&nbsp;
-      {render acl=$shadowExpireACL}
-      </td><td style='width:130px'>
-      <input type="text" id="shadowExpire" name="shadowExpire" class="date" style='width:100px' value="{$shadowExpire}">
-      {if $shadowExpireACL|regex_replace:"/[cdmr]/":"" == "w"}
-      <script type="text/javascript">
-      {literal}
-      var datepicker  = new DatePicker({ relative : 'shadowExpire', language : '{/literal}{$lang}{literal}',
-      keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false});
-      {/literal}
-      </script>
-      {/if}
-   </td></tr></table>
-   {/render}
+  <!-- must_change_password  -->
+  <div>
+   <div style='float:left;'>
+     {render acl=$mustchangepasswordACL checkbox=$multiple_support checked=$use_mustchangepassword}
+       <input type="checkbox" class="center" name="mustchangepassword" value="1" {$mustchangepassword}>
+     {/render}
+   </div>
+   <div style='padding-left: 25px;'>
+     {t}User must change password on first login{/t}
+   </div>
+  </div>
+    
+  <div class="clear"></div>  
+ 
+  <!-- shadowMin -->
+  <div>
+   <div style='float:left;'>
+     {render acl=$shadowMinACL checkbox=$multiple_support checked=$use_activate_shadowMin}
+       <input type="checkbox" class="center" name="activate_shadowMin" value="1" {$activate_shadowMin}>
+     {/render}
+   </div>
+   <div style='padding-left: 25px;'>
+     {render acl=$shadowMinACL}
+      {$shadowmins}
+     {/render}
+   </div>
+  </div>
+
+  <div class="clear"></div>  
    
-   <!-- shadowInactive -->
-   {render acl=$shadowInactiveACL checkbox=$multiple_support checked=$use_activate_shadowInactive}
-   <input type="checkbox" class="center" name="activate_shadowInactive" value="1" {$activate_shadowInactive}>
-   {/render}
-   {render acl=$shadowInactiveACL}
-   {$shadowinactives}
-   {/render}
-   <br>
+  <!-- activate_shadowMax -->
+  <div>
+   <div style='float:left;'>
+     {render acl=$shadowMaxACL checkbox=$multiple_support checked=$use_activate_shadowMax}
+      <input type="checkbox" class="center" name="activate_shadowMax" value="1" {$activate_shadowMax}>
+     {/render}
+   </div>
+   <div style='padding-left: 25px;'>
+     {render acl=$shadowMaxACL}
+      {$shadowmaxs}
+     {/render}
+   </div>
+  </div>
+  
+  <div class="clear"></div>  
+ 
+  <!-- activate_shadowExpire -->
+  <div>
+   <div style='float:left;'>
+    {render acl=$shadowExpireACL checkbox=$multiple_support checked=$use_activate_shadowExpire}
+     <input type="checkbox" class="center" name="activate_shadowExpire" value="1" {$activate_shadowExpire}>
+    {/render}
+   </div>
+   <div style='padding-left: 25px;'>
+
+    <table summary="{t}Password expiration settings{/t}" border="0" cellpadding="0" cellspacing="0">
+     <tr>
+      <td>
+       {t}Password expires on{/t}&nbsp;
+      </td>
+      <td style='width:125px'>
+
+       {render acl=$shadowExpireACL}
+        <input type="text" id="shadowExpire" name="shadowExpire" class="date" style='width:100px' value="{$shadowExpire}">
+       {/render}
+
+       {if $shadowExpireACL|regex_replace:"/[cdmr]/":"" == "w"}
+        <script type="text/javascript">
+        {literal}
+        var datepicker  = new DatePicker({ relative : 'shadowExpire', language : '{/literal}{$lang}{literal}',
+        keepFieldEmpty : true, enableCloseEffect : false, enableShowEffect : false});
+        {/literal}
+        </script>
+       {/if}
+      </td>
+     </tr>
+    </table>
+    
+   </div>
+  </div>
+  
+  <div class="clear"></div>  
+ 
+  <!-- shadowInactive -->
+  <div>
+   <div style='float:left;'>
+    {render acl=$shadowInactiveACL checkbox=$multiple_support checked=$use_activate_shadowInactive}
+     <input type="checkbox" class="center" name="activate_shadowInactive" value="1" {$activate_shadowInactive}>
+    {/render}
+   </div>
+   <div style='padding-left: 25px;'>
+    {render acl=$shadowInactiveACL}
+     {$shadowinactives}
+    {/render}
+   </div>
+  </div>
    
-   <!-- activate_shadowWarning -->
-   {render acl=$shadowWarningACL checkbox=$multiple_support checked=$use_activate_shadowWarning}
-   <input type="checkbox" class="center" name="activate_shadowWarning" value="1" {$activate_shadowWarning}>
-   {/render}
-   {render acl=$shadowWarningACL}
-   {$shadowwarnings}
-   {/render}
+  <div class="clear"></div>  
+
+  <!-- activate_shadowWarning -->
+  <div>
+   <div style='float:left;'>
+    {render acl=$shadowWarningACL checkbox=$multiple_support checked=$use_activate_shadowWarning}
+     <input type="checkbox" class="center" name="activate_shadowWarning" value="1" {$activate_shadowWarning}>
+    {/render}
+   </div>
+   <div style='padding-left: 25px;'>
+    {render acl=$shadowWarningACL}
+     {$shadowwarnings}
+    {/render}
+   </div>
+  </div>
-- 
2.30.2