From 32dcc8752f280299f0e364ccebcc092db8f2cb4e Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 05 Apr 2016 12:17:42 -0400
Subject: [PATCH] Changed autodetect messages from WARN to INFO in non forced mode.
---
interface/web/sites/templates/shell_user_edit.htm | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/interface/web/sites/templates/shell_user_edit.htm b/interface/web/sites/templates/shell_user_edit.htm
index e3c9ccd..e6632a5 100644
--- a/interface/web/sites/templates/shell_user_edit.htm
+++ b/interface/web/sites/templates/shell_user_edit.htm
@@ -19,13 +19,25 @@
</select></div>
</tmpl_if>
</div>
- <div class="form-group">
+ <div class="form-group">
<label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
- <div class="col-sm-2">{tmpl_var name='username_prefix'} </div>
- <div class="col-sm-7"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control"/></div></div>
- <div class="form-group">
+ <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-6"><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');"/></div><div class="col-sm-3 input-sm"> </div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+ <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>
@@ -45,7 +57,7 @@
</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"><input type="text" name="quota_size" id="quota_size" value="{tmpl_var name='quota_size'}" class="form-control" /></div><label class="col-sm-3 control-label">MB</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>
@@ -62,6 +74,6 @@
<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'}" onclick="submitForm('pageForm','sites/shell_user_edit.php');">{tmpl_var name='btn_save_txt'}</button>
+ <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