From 8edabf647814a012307bbf68628e4656ecf89eff Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 30 Apr 2014 14:12:28 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/admin/templates/system_config_misc_edit.htm | 16 ++++++++++++++++
1 files changed, 16 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 de9e3c3..2fd6eef 100644
--- a/interface/web/admin/templates/system_config_misc_edit.htm
+++ b/interface/web/admin/templates/system_config_misc_edit.htm
@@ -86,6 +86,22 @@
<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