Merge branch 'stable-3.1'

Marius Burkard

2016-04-26 5152e9a75e6e0ed4dc26358e4e608ce684147b32

 interface/web/sites/templates/web_vhost_domain_stats.htm

@@ -13,13 +13,13 @@
</tmpl_if>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='stats_user_txt'}</label>
            <p class="value">&nbsp; &nbsp;admin</p>
            <div class="col-sm-9"><div class="checkbox">&nbsp; &nbsp;admin</div></div>
            </div>
         <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-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');" />
               <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('stats_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>
@@ -28,14 +28,20 @@
            </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" >