index b7810aae54307affd45606f4921bbba65d573629..679fee9a273c2eb6d471c7ed93cd20a0f8cd2a1d 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
-
-{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' style='margin:12px; '>
- <div style='float:left; width:600px;'>
- <br>
- <b>{t}Samba settings{/t}</b>
- </div>
+ <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}
{if $samba_settings.samba_sid_active == FALSE}
<input type='checkbox' value='1' name='samba_sid_active'
onClick='changeState("samba_sid");'>
- <input style='width:90%' id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}' disabled>
+ <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 style='width:90%' id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}' >
+ <input size=20 id='samba_sid' name='samba_sid' type='text' value='{$samba_settings.samba_sid}' >
{/if}
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
<div class='step4_container'>
{if $samba_settings.samba_rid_active == FALSE}
<input type='checkbox' value='1' name='samba_rid_active'
onClick='changeState("samba_rid");'>
- <input style='width:90%' id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}' disabled>
+ <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 style='width:90%' id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}' >
+ <input size=20 id='samba_rid' name='samba_rid' type='text' value='{$samba_settings.samba_rid}' >
{/if}
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
<div class='step4_container'>
<div class='step4_name'>
- {t}Samba SID mapping{/t}
- </div>
- <div class='step4_value'>
- <select name="sambaidmapping" size="1" title="">
- {html_options options=$bool selected=$sambaidmapping}
- </select>
- </div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
- </div>
- <div style='float:left; width:600px;'>
- <br>
- <b>{t}Additional GOsa settings{/t}</b>
- </div>
-
- <div class='step4_container'>
- <div class='step4_name'>
- {t}Windows workstation ou{/t}
+ {t}Workstation container{/t}
</div>
<div class='step4_value'>
{if $generic_settings.wws_ou_active == FALSE}
<input type='checkbox' value='1' name='wws_ou_active'
onClick='changeState("wws_ou");'>
- <input style='width:90%' id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' disabled>
+ <input size=40 id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' disabled>
{else}
<input type='checkbox' value='1' name='wws_ou_active' checked>
- <input style='width:90%' id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' >
+ <input size=40 id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' >
{/if}
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
-
<div class='step4_container'>
<div class='step4_name'>
- {t}GID / UID min id{/t}
+ {t}Samba SID mapping{/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 class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+ <select name="sambaidmapping" size="1" title="">
+ {html_options options=$bool selected=$sambaidmapping}
+ </select>
</div>
</div>
- <div class='step4_container'>
+ <p><b>{t}Additional GOsa settings{/t}</b></p>
+
+ <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 class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
<div class='step4_container'>
{html_options options=$bool selected=$governmentmode}
</select>
</div>
+ </div>
+
+ <p><b>{t}Mail settings{/t}</b></p>
+
+ <div class='step4_container'>
+ <div class='step4_name'>
+ {t}Mail method{/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>
+ </div>
<div class='step4_status'>
</div>
</div>
-
<div class='step4_container'>
<div class='step4_name'>
- {t}Automatic uids{/t}
+ {t}Vacation templates{/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>
+ {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='idgen_active' checked>
- <input style='width:90%' id='idgen' name='idgen' type='text' value='{$generic_settings.idgen}' >
+ <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 class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
+
<div class='step4_container'>
<div class='step4_name'>
- {t}Use account expiration{/t}
+ {t}Use Cyrus UNIX style{/t}
</div>
<div class='step4_value'>
- <select name="account_expiration" size="1" title="">
- {html_options options=$bool selected=$account_expiration}
+ <select name="cyrusunixstyle" size="1" title="">
+ {html_options options=$bool selected=$cyrusunixstyle}
</select>
</div>
- <div class='step4_status'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
- </div>
</div>
- <div class='step4_container' style='height:12em;'>
- <div class='step4_name' style='height:12em;'>
- {t}Enable snapshot functionality{/t}
- </div>
- <div class='step4_value' style='height:12em;'>
+
+
+ <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>
- <div style='float:left;width:120px;'>
- {t}Snapshot base{/t}
- </div>
- <input style='width:220' id='snapshot_base' name='snapshot_base'
- type='text' value='{$generic_settings.snapshot_base}' disabled><br>
- <div style='float:left;width:120px;'>
- {t}Ldap base{/t}
- </div>
- <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base'
- type='text' value='{$generic_settings.snapshot_ldap_base}' disabled><br>
- <div style='float:left;width:120px;'>
- {t}Server{/t}
- </div>
- <input style='width:220' id='snapshot_server' name='snapshot_server'
- type='text' value='{$generic_settings.snapshot_server}' disabled><br>
- <div style='float:left;width:120px;'>
- {t}User{/t}
- </div>
- <input style='width:220' id='snapshot_user' name='snapshot_user'
- type='text' value='{$generic_settings.snapshot_user}' disabled><br>
- <div style='float:left;width:120px;'>
- {t}Password{/t}
- </div>
- <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>
- <div style='float:left;width:120px;'>
- {t}Snapshot base{/t}
- </div>
- <input style='width:220' id='snapshot_base' name='snapshot_base'
- type='text' value='{$generic_settings.snapshot_base}'><br>
- <div style='float:left;width:120px;'>
- {t}Ldap base{/t}
- </div>
- <input style='width:220' id='snapshot_ldap_base' name='snapshot_ldap_base'
- type='text' value='{$generic_settings.snapshot_ldap_base}'><br>
- <div style='float:left;width:120px;'>
- {t}Server{/t}
- </div>
- <input style='width:220' id='snapshot_server' name='snapshot_server'
- type='text' value='{$generic_settings.snapshot_server}'><br>
- <div style='float:left;width:120px;'>
- {t}User{/t}
- </div>
- <input style='width:220' id='snapshot_user' name='snapshot_user'
- type='text' value='{$generic_settings.snapshot_user}'><br>
- <div style='float:left;width:120px;'>
- {t}Password{/t}
- </div>
- <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 class='step4_status' style='height:12em;'>
- {t}Infos in FAQ{/t}
- <img class='center' alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/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}'>
+ </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'>
+<div style="clear:both"></div>