Skip to content
GitLab
Commit 4193674d authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Revert "Fixes #3223 Cleaned setup_config2" 

This reverts commit e36e0dd7.

Needed to apply the patches for 2919
parent e36e0dd7
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1 fusiondirectory-1.2 fusiondirectory-1.1.1 fusiondirectory-1.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 52 additions and 39 deletions
+52 -39
setup/class_setupStep_Config2.inc
+ 3
− 1
View file @ 4193674d
......@@ -27,7 +27,7 @@ class Step_Config2 extends setup_step
var $sambaidmapping = FALSE;
var $header_image = "images/setup/server.png";
var $generic_settings = array( "snapshot_active" => TRUE,
var $generic_settings = array( "snapshot_active" => FALSE,
"snapshot_base" => "ou=snapshots,%base%");
var $timezone = "Europe/Paris";
......@@ -68,6 +68,8 @@ class Step_Config2 extends setup_step
$smarty = get_smarty();
$smarty->assign("generic_settings", reverse_html_entities($this->generic_settings));
$smarty->assign("bool", array(FALSE => _("No"), TRUE => _("Yes")));
foreach ($this->attributes as $attr) {
$smarty->assign($attr, reverse_html_entities($this->$attr));
}
......
setup/setup_config2.tpl
+ 49
− 38
View file @ 4193674d
<div class='default' style='margin:12px; '>
<div class='step4_container'>
<div class='step4_name'>
<label for='timezone'>{t}Timezone{/t}</label>
</div>
<div class='step4_value'>
<select id='timezone' name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%">
{foreach from=$timezones item=val}
<option {if $val == $timezone}selected{/if} value="{$val}">{$val}</option>
<div class='step4_name'>
{t}Timezone{/t}
</div>
<div class='step4_value'>
<select name='timezone' title='{t}Please choose your preferred timezone here{/t}' style="width:100%">
{foreach from=$timezones item=val}
<option {if $val == $timezone}selected{/if} value="{$val}">{$val}</option>
{/foreach}
</select>
</div>
</div>
<p><b>{t}Snapshots{/t}</b></p>
<div class='step4_container'>
<div class='step4_name'>
<label for='snapshot_active'>{t}Enable snapshots{/t}</label>
</select>
</div>
</div>
<div class='step4_value'>
<input type='checkbox' value='1'
id='snapshot_active' name='snapshot_active'
onClick='changeState("snapshot_base");'
{if $generic_settings.snapshot_active}
checked='checked'
{/if}
/>
</div>
</div>
<div class='step4_container'>
<div class='step4_name'>
<label for='snapshot_base'>{t}Snapshot base{/t}</label>
</div>
<div class='step4_value'>
<input style='width:220' id='snapshot_base' name='snapshot_base'
type='text' value='{$generic_settings.snapshot_base}'
{if $generic_settings.snapshot_active == FALSE}
disabled='disabled'
{/if}
/>
</div>
</div>
<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");'/>{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>
{else}
<div class='step4_container'>
<div class='step4_name'>
<input type='checkbox' value='1' name='snapshot_active' checked>{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}'>
</div>
</div>
</div>
{/if}
</div>
<input type='hidden' value='1' name='step6_posted'/>
<input type='hidden' value='1' name='step6_posted'>
<div style="clear:both"></div>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment