From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/admin/templates/users_user_edit.htm | 128 ++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 48 deletions(-)
diff --git a/interface/web/admin/templates/users_user_edit.htm b/interface/web/admin/templates/users_user_edit.htm
index b02af60..fb9658c 100644
--- a/interface/web/admin/templates/users_user_edit.htm
+++ b/interface/web/admin/templates/users_user_edit.htm
@@ -1,48 +1,80 @@
-<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">
- </span>
- <span class="wf_oneField">
- <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" 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>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
+<p><tmpl_var name="list_desc_txt"></p>
+
+
+
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
+ <div class="form-group">
+ <label for="passwort" class="col-sm-3 control-label">{tmpl_var name='passwort_txt'}</label>
+ <div class="col-sm-6"><input type="password" name="passwort" id="passwort" value="{tmpl_var name='passwort'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('passwort','repeat_password');"/></div><div class="col-sm-3 input-sm"> </div><a href="javascript:void(0);" onclick="generatePassword('passwort','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
+ <div class="col-sm-9 checkbox">
+ <div id="passBar"></div>
+ <span id="passText"> </span>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="repeat_password" class="col-sm-3 control-label">{tmpl_var name='repeat_password_txt'}</label>
+ <div class="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('passwort','repeat_password');" /></div></div>
+ <div class="form-group">
+ <div class="col-sm-offset-3 col-sm-9">
+ <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>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='modules_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='modules'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
+ <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
+ {tmpl_var name='startmodule'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='app_theme'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='typ_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='typ'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
+ <div class="col-sm-9"><select name="language" id="language" class="form-control flags">
+ {tmpl_var name='language'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='lost_password_function_txt'}</label>
+ <div class="col-sm-9">
+ {tmpl_var name='lost_password_function'}
+ </div>
+ </div>
+
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="admin/users_edit.php">{tmpl_var name='btn_save_txt'}</button>
+ <button class="btn btn-default formbutton-default" type="button" value="{tmpl_var name='btn_cancel_txt'}" data-load-content="admin/users_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
--
Gitblit v1.9.1