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/sites/templates/shell_user_edit.htm | 129 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 45 deletions(-)
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index e252638..9ea5f18 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -1,46 +1,85 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_shell_user">
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_shell_user"><legend>Shell User</legend>
- <span class="wf_oneField">
- <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
- </span>
- <span class="wf_oneField">
- <label for="username" class="wf_preField">{tmpl_var name='username_txt'}</label>
- {tmpl_var name='username_prefix'}
- <input type="text" id="username" name="username" value="{tmpl_var name='username'}" size="30" maxlength="255">
- </span>
- <span class="wf_oneField">
- <label for="password" class="wf_preField">{tmpl_var name='password_txt'}</label>
- <input type="password" id="password" name="password" value="{tmpl_var name='password'}" size="30" maxlength="255" 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">
- <label for="chroot" class="wf_preField">{tmpl_var name='chroot_txt'}</label>
- <select id="chroot" name="chroot">{tmpl_var name='chroot'}</select>
- </span>
- <span class="wf_oneField">
- <label for="quota_size" class="wf_preField">{tmpl_var name='quota_size_txt'}</label>
- <input type="text" id="quota_size" name="quota_size" value="{tmpl_var name='quota_size'}" size="7" maxlength="7"> MB
- </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>
- </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','sites/shell_user_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('sites/shell_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </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">
+ <tmpl_if name="edit_disabled">
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control" disabled="disabled">
+ {tmpl_var name='parent_domain_id'}
+ </select></div>
+ <input type="hidden" name="parent_domain_id" value="{tmpl_var name='parent_domain_id_value'}" />
+ <tmpl_else>
+ <label for="parent_domain_id" class="col-sm-3 control-label">{tmpl_var name='parent_domain_id_txt'}</label>
+ <div class="col-sm-9"><select name="parent_domain_id" id="parent_domain_id" class="form-control">
+ {tmpl_var name='parent_domain_id'}
+ </select></div>
+ </tmpl_if>
+ </div>
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9">
+ <div class="input-group">
+ <span class="input-group-addon" id="username-desc">{tmpl_var name='username_prefix'}</span>
+ <input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" aria-describedby="username-desc" />
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label>
+ <div class="col-sm-9">
+ <div class="input-group">
+ <input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" />
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="button" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</button>
+ </span>
+ </div>
+ </div>
+ </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('password','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 for="chroot" class="col-sm-3 control-label">{tmpl_var name='chroot_txt'}</label>
+ <div class="col-sm-9"><select name="chroot" id="chroot" class="form-control">
+ {tmpl_var name='chroot'}
+ </select></div>
+ </div>
+ <div class="form-group">
+ <label for="quota_size" class="col-sm-3 control-label">{tmpl_var name='quota_size_txt'}</label>
+ <div class="col-sm-9"><div class="input-group"><input type="text" name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" class="form-control" aria-describedby="quota_size-desc" /><span class="input-group-addon" id="quota_size-desc">MB</span></div></div>
+ </div>
+ <div class="form-group">
+ <label for="ssh_rsa" class="col-sm-3 control-label">{tmpl_var name='ssh_rsa_txt'}</label>
+ <div class="col-sm-9"><textarea class="form-control" name="ssh_rsa" id="ssh_rsa" rows="10" cols="30">{tmpl_var name='ssh_rsa'}</textarea></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>
+
+
+ <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="sites/shell_user_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="sites/shell_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
\ No newline at end of file
--
Gitblit v1.9.1