From efbb88feee52d96ca266485ea2e9d79ce54ff39a Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 06 Jun 2014 10:41:28 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/web/admin/templates/system_config_misc_edit.htm | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/interface/web/admin/templates/system_config_misc_edit.htm b/interface/web/admin/templates/system_config_misc_edit.htm
index d585507..2fd6eef 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -81,7 +81,27 @@
<label for="customer_no_counter">{tmpl_var name='customer_no_counter_txt'}</label>
<input name="customer_no_counter" id="customer_no_counter" value="{tmpl_var name='customer_no_counter'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
</div>
+ <div class="ctrlHolder">
+ <label for="session_timeout">{tmpl_var name='session_timeout_txt'}</label>
+ <input name="session_timeout" id="session_timeout" value="{tmpl_var name='session_timeout'}" size="30" maxlength="255" type="text" class="textInput formLengthHalf" />
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='session_allow_endless_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='session_allow_endless'}
+ </div>
+ </div>
<div class="ctrlHolder">
+ <label for="min_password_length">{tmpl_var name='min_password_length_txt'}</label>
+ <input name="min_password_length" id="min_password_length" value="{tmpl_var name='min_password_length'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="min_password_strength">{tmpl_var name='min_password_strength_txt'}</label>
+ <select name="min_password_strength" id="min_password_strength" class="selectInput formLengthHalf">
+ {tmpl_var name='min_password_strength'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
<p class="label">{tmpl_var name='maintenance_mode_txt'}</p>
<div class="multiField">
{tmpl_var name='maintenance_mode'}
--
Gitblit v1.9.1