From 7990f8881b085279269d35cf9dd2787b88ae1c08 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 27 Nov 2012 14:47:43 -0500
Subject: [PATCH] Bugfix: _ispconfig_pw_crypted was ignored (stripped off in encoding method)
---
interface/web/admin/templates/users_user_edit.htm | 125 ++++++++++++++++++++++++-----------------
1 files changed, 73 insertions(+), 52 deletions(-)
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index 9e485ba..186322e 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -1,52 +1,73 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_users">
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_users"><legend>Users</legend>
- <span class="wf_oneField">
- <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
- <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="15" maxlength="30">
- </span>
- <span class="wf_oneField">
- <label for="passwort" class="wf_preField">{tmpl_var name='passwort_txt'}</label>
- <input type="password" id="passwort" name="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" onkeyup="pass_check(this.value)">
- </span>
- <span class="wf_oneField">
- <span class="wf_preField">{tmpl_var name='password_strength_txt'}</span>
- <span class="wf_passwordStrength"><div id="passBar"></div><span id="passText"> </span></span>
- </span>
- <span class="wf_oneField" style="clear:left">
- <span class="wf_label wf_preField">{tmpl_var name='modules_txt'}</span>
- <fieldset>{tmpl_var name='modules'}</fieldset>
- </span>
- <span class="wf_oneField">
- <label for="startmodule" class="wf_preField">{tmpl_var name='startmodule_txt'}</label>
- <select id="startmodule" name="startmodule">{tmpl_var name='startmodule'}</select>
- </span>
- <span class="wf_oneField">
- <span class="wf_label wf_preField">{tmpl_var name='app_theme_txt'}</span>
- <fieldset>{tmpl_var name='app_theme'}</fieldset>
- </span> <span class="wf_oneField">
- <span class="wf_label wf_preField">{tmpl_var name='typ_txt'}</span>
- <fieldset>{tmpl_var name='typ'}</fieldset>
- </span>
- <span class="wf_oneField">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
- <span class="">{tmpl_var name='active'}</span>
- </span>
- <span class="wf_oneField">
- <label for="language" class="wf_preField">{tmpl_var name='language_txt'}</label>
- <select id="language" class="withicons" name="language">{tmpl_var name='language'}</select>
- </span>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_users">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <label for="username">{tmpl_var name='username_txt'}</label>
+ <input name="username" id="username" value="{tmpl_var name='username'}" size="15" maxlength="30" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="passwort">{tmpl_var name='passwort_txt'}</label>
+ <input name="passwort" id="passwort" value="{tmpl_var name='passwort'}" size="15" maxlength="100" type="password" class="textInput" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/> <a href="javascript:void(0);" onclick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div id="passBar"></div>
+ <p class="formHint"><span id="passText"> </span></p>
+ </div>
+ <div class="ctrlHolder">
+ <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
+ <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" onkeyup="checkPassMatch('passwort','repeat_password');" />
+ </div>
+ <div id="confirmpasswordError" style="display:none;" class="confirmpassworderror">{tmpl_var name='password_mismatch_txt'}</div>
+ <div id="confirmpasswordOK" style="display:none;" class="confirmpasswordok">{tmpl_var name='password_match_txt'}</div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='modules_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='modules'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="startmodule">{tmpl_var name='startmodule_txt'}</label>
+ <select name="startmodule" id="startmodule" class="selectInput formLengthHalf">
+ {tmpl_var name='startmodule'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='app_theme_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='app_theme'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='typ_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='typ'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='active_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ <div class="ctrlHolder">
+ <label for="language">{tmpl_var name='language_txt'}</label>
+ <select name="language" id="language" class="selectInput flags">
+ {tmpl_var name='language'}
+ </select>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','admin/users_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('admin/users_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
\ No newline at end of file
--
Gitblit v1.9.1