X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fsetup_config2.tpl;h=5b35c4ecb0c9fca889a0bfe497a9bdcd63bb3ecb;hb=bec4604aac70497f5936d2a69706bb477086ba1a;hp=5cde3b4d784b3bdd7ac385570ebc4128bff47656;hpb=c1d4c8664ae5ad6e37c85a7974bae0941a8bed57;p=gosa.git

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 5cde3b4d7..5b35c4ecb 100644
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -1,5 +1,15 @@
 <div class='default' style='margin:12px; '>  
     <p><b>{t}Samba settings{/t}</b></p>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Samba hash generator{/t}
+        </div>
+        <div class='step4_value'>
+                <input size=40 id='smbhash' name='smbhash' type='text' value='{$samba_settings.smbhash}'  >
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Samba SID{/t}
@@ -10,7 +20,7 @@
                     onClick='changeState("samba_sid");'>
                 <input size=20 id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}' disabled>
             {else}
-                <input type='checkbox' value='1' name='samba_sid_active' checked>
+                <input type='checkbox' value='1' name='samba_sid_active' checked {if !$sambaDomain_found} disabled {/if}>
                 <input size=20 id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}'  >
             {/if}
         </div>
@@ -26,7 +36,7 @@
                     onClick='changeState("samba_rid");'>
                 <input size=20 id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}' disabled>
             {else}
-                <input type='checkbox' value='1' name='samba_rid_active' checked>
+                <input type='checkbox' value='1' name='samba_rid_active' checked {if !$sambaDomain_found} disabled {/if}>
                 <input size=20 id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}'  >
             {/if}
         </div>
@@ -58,30 +68,15 @@
     </div>
 
     <p><b>{t}Additional GOsa settings{/t}</b></p>
-	
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}GID / UID min id{/t}
-        </div>
-        <div class='step4_value'>
-            {if $generic_settings.minid_active == FALSE}
-                <input type='checkbox' value='1' name='minid_active'
-                    onClick='changeState("minid");'>
-                <input style='width:90%' id='minid' name='minid' type='text' value='{$generic_settings.minid}' disabled>
-            {else}
-                <input type='checkbox' value='1' name='minid_active' checked>
-                <input style='width:90%' id='minid' name='minid' type='text' value='{$generic_settings.minid}'  >
-            {/if}
-        </div>
-    </div>
 
-    <div class='step4_container'>
+	<div class='step4_container'>
         <div class='step4_name'>
-            {t}Relaxed naming policies{/t}
+            {t}Enable Copy & Paste{/t}
         </div>
         <div class='step4_value'>
-            <select name="strict" size="1" title="">
-			{html_options options=$bool selected=$strict}
+
+            <select name="enableCopyPaste" size="1" title="">
+                {html_options options=$bool selected=$generic_settings.enableCopyPaste}
             </select>
         </div>
     </div>
@@ -97,35 +92,6 @@
         </div>
     </div>
 
-	
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Automatic uids{/t}
-        </div>
-        <div class='step4_value'>
-            {if $generic_settings.idgen_active == FALSE}
-                <input type='checkbox' value='1' name='idgen_active'
-                    onClick='changeState("idgen");'>
-                <input style='width:90%' id='idgen' name='idgen' type='text' value='{$generic_settings.idgen}' disabled>
-            {else}
-                <input type='checkbox' value='1' name='idgen_active' checked>
-                <input style='width:90%' id='idgen' name='idgen' type='text' value='{$generic_settings.idgen}'  >
-            {/if}
-        </div>
-    </div>
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Use account expiration{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="account_expiration" size="1" title="">
-			{html_options options=$bool selected=$account_expiration}
-            </select>
-        </div>
-    </div>
-
-
-
     <p><b>{t}Mail settings{/t}</b></p>
 
     <div class='step4_container'>
@@ -170,56 +136,102 @@
     </div>
 
 
-
-
-
-
-	<div class='step4_container' style='height:12em;'>
-       <p><b>{t}Snapshots / Undo{/t}</b></p>
-        <div class='step4_name'  style='height:12em;width:60%;background-color:red;'>
+        <p><b>{t}Snapshots / Undo{/t}</b></p>
             {if $generic_settings.snapshot_active == FALSE}
+        <div class='step4_container'>
+         <div class='step4_name'>
                 <input type='checkbox' value='1' name='snapshot_active'
-                    onClick='	
-								changeState("snapshot_base");
-								changeState("snapshot_ldap_base");
-								changeState("snapshot_server");							
-								changeState("snapshot_user");							
-								changeState("snapshot_password");'>{t}Enable{/t}<br>
-		{t}Snapshot base{/t}&nbsp;
-		<input style='width:220' id='snapshot_base' name='snapshot_base' 
-					type='text' value='{$generic_settings.snapshot_base}' disabled><br>
-            	    {t}Ldap base{/t}&nbsp;
-				<input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
-					type='text' value='{$generic_settings.snapshot_ldap_base}' disabled><br>
-    	            {t}Server{/t}&nbsp;
-				<input style='width:220' id='snapshot_server' name='snapshot_server' 
-					type='text' value='{$generic_settings.snapshot_server}' disabled><br>
-	                {t}User{/t}&nbsp;
-				<input style='width:220' id='snapshot_user' name='snapshot_user' 
-					type='text' value='{$generic_settings.snapshot_user}' disabled><br>
-	                {t}Password{/t}&nbsp;
-				<input style='width:220' id='snapshot_password' name='snapshot_password' 
-					type='password' value='{$generic_settings.snapshot_password}' disabled>
+                    onClick='
+                                                                changeState("snapshot_base");
+                                                                changeState("snapshot_server");
+                                                                changeState("snapshot_user");
+                                                                changeState("snapshot_password");'>{t}Enable snapshots{/t}
+         </div>
+        </div>
+        <div style='margin-left:10px;'>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                {t}Snapshot base{/t}
+         </div>
+         <div class='step4_value'>
+                <input style='width:220' id='snapshot_base' name='snapshot_base'
+                                        type='text' value='{$generic_settings.snapshot_base}' disabled>
+         </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}Server{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_server' name='snapshot_server'
+                                        type='text' value='{$generic_settings.snapshot_server}' disabled>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}User{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_user' name='snapshot_user'
+                                        type='text' value='{$generic_settings.snapshot_user}' disabled>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}Password{/t}
+         </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_password' name='snapshot_password'
+                                        type='password' value='{$generic_settings.snapshot_password}' disabled>
+        </div>
+        </div>
+        </div>
+
             {else}
-                <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable{/t}<br>
-            	    {t}Snapshot base{/t}&nbsp;
-				<input style='width:220' id='snapshot_base' name='snapshot_base' 
-					type='text' value='{$generic_settings.snapshot_base}'><br>
-            	    {t}Ldap base{/t}&nbsp;
-				<input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base' 
-					type='text' value='{$generic_settings.snapshot_ldap_base}'><br>
-        	        {t}Server{/t}&nbsp;
-				<input style='width:220' id='snapshot_server' name='snapshot_server' 
-					type='text' value='{$generic_settings.snapshot_server}'><br>
-    	            {t}User{/t}&nbsp;
-				<input style='width:220' id='snapshot_user' name='snapshot_user' 
-					type='text' value='{$generic_settings.snapshot_user}'><br>
-	                {t}Password{/t}&nbsp;
-				<input style='width:220;' id='snapshot_password' name='snapshot_password' 
-					type='password' value='{$generic_settings.snapshot_password}'>
-            {/if}
+        <div class='step4_container'>
+         <div class='step4_name'>
+                <input type='checkbox' value='1' name='snapshot_active' checked>{t}Enable snapshots{/t}
         </div>
-    </div>
+        </div>
+        <div style='margin-left:10px;'>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}Snapshot base{/t}
+        </div>
+         <div class='step4_value'>
+           <input style='width:220' id='snapshot_base' name='snapshot_base'
+                                        type='text' value='{$generic_settings.snapshot_base}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}Server{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_server' name='snapshot_server'
+                                        type='text' value='{$generic_settings.snapshot_server}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                    {t}User{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220' id='snapshot_user' name='snapshot_user'
+                                        type='text' value='{$generic_settings.snapshot_user}'>
+        </div>
+        </div>
+        <div class='step4_container'>
+         <div class='step4_name'>
+                        {t}Password{/t}
+        </div>
+         <div class='step4_value'>
+                                <input style='width:220;' id='snapshot_password' name='snapshot_password'
+                                        type='password' value='{$generic_settings.snapshot_password}'>
+        </div>
+        </div>
+        </div>
+            {/if}
 </div>
 
 <input type='hidden' value='1' name='step6_posted'>