Merge branch 'stable-3.1'

Marius Burkard

2016-04-20 4569cae57f127afd093794310ccd290d2d9fdf36

 interface/web/admin/templates/users_user_edit.htm

@@ -14,14 +14,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="" class="form-control" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('passwort','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="col-sm-9"><input type="password" name="repeat_password" id="repeat_password" value="" class="form-control" autocomplete="off" onkeyup="checkPassMatch('passwort','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 class="col-sm-3 control-label">{tmpl_var name='modules_txt'}</label>
                <div class="col-sm-9">
@@ -32,8 +38,8 @@
                <label for="startmodule" class="col-sm-3 control-label">{tmpl_var name='startmodule_txt'}</label>
                <div class="col-sm-9"><select name="startmodule" id="startmodule" class="form-control">
                    {tmpl_var name='startmodule'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='app_theme_txt'}</label>
                <div class="col-sm-9">
@@ -54,10 +60,10 @@
            </div>
            <div class="form-group">
                <label for="language" class="col-sm-3 control-label">{tmpl_var name='language_txt'}</label>
                <div class="col-sm-9"><select name="language" id="language" class="form-control">
                <div class="col-sm-9"><select name="language" id="language" class="form-control flags">
                    {tmpl_var name='language'}
                </select>
            </div></div>
                </select></div>
            </div>
            <div class="form-group">
                <label class="col-sm-3 control-label">{tmpl_var name='lost_password_function_txt'}</label>
                <div class="col-sm-9">
@@ -69,6 +75,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','admin/users_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="admin/users_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="admin/users_list.php">{tmpl_var name='btn_cancel_txt'}</button>
        </div></div>