Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/sites/templates/database_user_edit.htm

@@ -10,40 +10,58 @@
                    <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                    <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div></div>
                    </select></div>
                </div>
            </tmpl_if>
            <tmpl_if name="is_reseller">
                <div class="form-group">
                    <label for="client_group_id" class="col-sm-3 control-label">{tmpl_var name='client_txt'}</label>
                    <div class="col-sm-9"><select name="client_group_id" id="client_group_id" class="form-control">
                        {tmpl_var name='client_group_id'}
                    </select>
                </div></div>
                    </select></div>
                </div>
            </tmpl_if>
            <div class="form-group">
         <div class="form-group">
                <label for="database_user" class="col-sm-3 control-label">{tmpl_var name='database_user_txt'}</label>
                <p class="prefix">{tmpl_var name='database_user_prefix'}</p>
                <div class="col-sm-9"><input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" /></div></div>
            <div class="form-group">
                <div class="col-sm-9">
               <div class="input-group">
                  <span class="input-group-addon" id="database_user-desc">{tmpl_var name='database_user_prefix'}</span>
                  <input type="text" name="database_user" id="database_user" value="{tmpl_var name='database_user'}" class="form-control" aria-describedby="database_user-desc" />
               </div>
            </div>
            </div>
         <div class="form-group">
                <label for="database_password" class="col-sm-3 control-label">{tmpl_var name='database_password_txt'}</label>
                <div class="col-sm-6"><input type="password" name="database_password" id="database_password" value="{tmpl_var name='database_password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" /></div><div class="col-sm-3 input-sm">&nbsp;</div><a href="javascript:void(0);" onclick="generatePassword('database_password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
                <div class="col-sm-9">
            <div class="input-group">
               <input type="database_password" name="database_password" id="database_password" value="{tmpl_var name='database_password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('database_password','repeat_password');" />
               <span class="input-group-btn">
                  <button class="btn btn-default" type="button" onclick="generatePassword('database_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="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('database_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>
        

        <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/database_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/database_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/database_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>