Merge remote-tracking branch 'ispc3master/master'

Dominik

2015-01-11 4d29e42f99f7a9b703be4764034d6794464dad26

 interface/web/admin/templates/users_user_edit.htm

@@ -19,7 +19,7 @@
            </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 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 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">
@@ -32,8 +32,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 +54,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">