X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_config1.tpl;h=695259da553c9a1b4dc5eaf25b56624b7169bde4;hb=1136e57c6caea14fc33e35256bbb523e28fb38a5;hp=376eb5c116c734da302a462ce73fc3aede8cd676;hpb=9344a78adfff20e74b35bae122944829784c2323;p=gosa.git

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 376eb5c11..695259da5 100644
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -1,12 +1,3 @@
-
-{if $warnings_cnt}
-<b><font style='color:red' >Errors:</font></b>
-{foreach from=$warnings item=val key=key}
-	<br>
-	<font style='color:red' >{$val}</font>
-{/foreach}
-{/if}
-
 <div class='default'>
     <p><b>{t}Look and feel{/t}</b></p>
 
@@ -52,7 +43,6 @@
         </div>
     </div>
 
-
 	<div class='step4_container'>
         <div class='step4_name'>
             {t}Group storage subtree{/t}
@@ -62,24 +52,71 @@
         </div>
     </div>
 
+ 	<div class='step4_container'>
+        <div class='step4_name'>
+            {t}Relaxed naming policies{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="strict" size="1" title="">
+            {html_options options=$bool selected=$strict}
+            </select>
+        </div>
+    </div>
+
+  	<div class='step4_container'>
+        <div class='step4_name'>
+            {t}Automatic uids{/t}
+        </div>
+        <div class='step4_value'>
+            {if $id_settings.idgen_active == FALSE}
+                <input type='checkbox' value='1' name='idgen_active'
+                    onClick='changeState("idgen");'>
+                <input size='20' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='idgen_active' checked>
+                <input size='20' id='idgen' name='idgen' type='text' value='{$id_settings.idgen}'  >
+            {/if}
+        </div>
+    </div>
+
+ 	<div class='step4_container'>
+        <div class='step4_name'>
+            {t}GID / UID min id{/t}
+        </div>
+        <div class='step4_value'>
+            {if $id_settings.minid_active == FALSE}
+                <input type='checkbox' value='1' name='minid_active'
+                    onClick='changeState("minid");'>
+                <input size='10' id='minid' name='minid' type='text' value='{$id_settings.minid}' disabled>
+            {else}
+                <input type='checkbox' value='1' name='minid_active' checked>
+                <input size='10' id='minid' name='minid' type='text' value='{$id_settings.minid}'  >
+            {/if}
+        </div>
+    </div>
+
     <div class='step4_container' style="margin-bottom:5px;">
         <div class='step4_name'>
             {t}Number base for people/groups{/t}
         </div>
         <div class='step4_value'>
             <input type='text' name='uidbase' maxlength='20' size='10' value='{$uidbase}'>
-	    <br>
+        </div>
+     </div>
+    <div class='step4_container' style="margin-bottom:5px;">
+        <div class='step4_name'>
+                {t}Hook for number base{/t}
+	</div>
+        <div class='step4_value'>
             {if $base_hook_active == FALSE}
                 <input type='checkbox' value='1' name='base_hook_active'
                     onClick='changeState("base_hook");'>
-                {t}Use hook{/t}
                 <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}'      disabled>
             {else}
                 <input type='checkbox' value='1' name='base_hook_active' checked>
-                {t}Use hook{/t}
                 <input id='base_hook' name='base_hook' size=40 type='text' value='{$base_hook}'  >
             {/if}
-        </div>
+     </div>
         </div>
     </div>
 
@@ -94,8 +131,6 @@
                 {html_options options=$crypt_methods selected=$encryption}
             </select>
         </div>
-        <div class='step4_status'>
-        </div>
     </div>
 
     <div class='step4_container' style='height:4em;'>
@@ -129,7 +164,7 @@
         </div>
     </div>
 
-	   <div class='step4_container'>
+    <div class='step4_container'>
         <div class='step4_name'>
                 {t}Password change hook{/t}
         </div>
@@ -137,56 +172,24 @@
             {if $pwd_rules.externalpwdhook_active == FALSE}
                 <input type='checkbox' value='1' name='externalpwdhook_active'
                     onClick='changeState("externalpwdhook");'>
-                <input id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
+                <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}' disabled>
             {else}
                 <input type='checkbox' value='1' name='externalpwdhook_active' checked>
                 <input size=40 id='externalpwdhook' name='externalpwdhook' type='text' value='{$pwd_rules.externalpwdhook}'  >
             {/if}
         </div>
     </div>
-
-    <p><b>{t}Mail settings{/t}</b></p>
-
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Mail method{/t}
+            {t}Use account expiration{/t}
         </div>
         <div class='step4_value'>
-            <select name="mail" size="1" title="">
-                <option  value="disabled">{t}disabled{/t}</option>
-                {html_options options=$mail_methods selected=$mail}
+            <select name="account_expiration" size="1" title="">
+            {html_options options=$bool selected=$account_expiration}
             </select>
         </div>
-        <div class='step4_status'>
-        </div>
-    </div>
-
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Vacation templates{/t}
-        </div>
-        <div class='step4_value'>
-            {if $mail_settings.vacationdir_active == FALSE}
-                <input type='checkbox' value='1' name='vacationdir_active'
-                    onClick='changeState("vacationdir");'>
-                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}' disabled>
-            {else}
-                <input type='checkbox' value='1' name='vacationdir_active' checked>
-                <input size=40 id='vacationdir' name='vacationdir' type='text' value='{$mail_settings.vacationdir}'  >
-            {/if}
-        </div>
     </div>
 
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Use Cyrus UNIX style{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="cyrusunixstyle" size="1" title="">
-			{html_options options=$bool selected=$cyrusunixstyle}
-            </select>
-        </div>
-    </div>
 
 <input type='hidden' value='1' name='step5_posted'>
 <!--