From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/sites/templates/web_vhost_domain_stats.htm |   29 ++++++++++++++++++++---------
 1 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/interface/web/sites/templates/web_vhost_domain_stats.htm b/interface/web/sites/templates/web_vhost_domain_stats.htm
index 096c4c1..3634c8f 100644
--- a/interface/web/sites/templates/web_vhost_domain_stats.htm
+++ b/interface/web/sites/templates/web_vhost_domain_stats.htm
@@ -11,26 +11,37 @@
 				</div>
 </div>
 </tmpl_if>
-
-
-        
             <div class="form-group">
-                <label class="col-sm-3 control-label">{tmpl_var name='stats_user_txt'}</label><p class="value">admin</p>
+                <label class="col-sm-3 control-label">{tmpl_var name='stats_user_txt'}</label>
+				<div class="col-sm-9"><div class="checkbox">&nbsp; &nbsp;admin</div></div>
             </div>
-            <div class="form-group">
+			<div class="form-group">
                 <label for="stats_password" class="col-sm-3 control-label">{tmpl_var name='stats_password_txt'}</label>
-                <div class="col-sm-6"><input type="password" name="stats_password" id="stats_password" value="{tmpl_var name='stats_password'}" autocomplete="off" class="form-control" onkeyup="checkPassMatch('stats_password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('stats_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
+                <div class="col-sm-9">
+				<div class="input-group">
+					<input type="password" name="stats_password" id="stats_password" value="{tmpl_var name='stats_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('stats_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>
-                <p class="formHint"><span id="passText">&nbsp;</span></p>
+                <span id="passText">&nbsp;</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="" autocomplete="off" class="form-control" onkeyup="checkPassMatch('stats_password','repeat_password');" /></div></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="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="stats_type" class="col-sm-3 control-label">{tmpl_var name='stats_type_txt'}</label>
                 <div class="col-sm-9"><select name="stats_type" id="stats_type" class="form-control" >

--
Gitblit v1.9.1