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/webdav_user_edit.htm | 45 ++++++++++++++++++++++++++++++++------------- 1 files changed, 32 insertions(+), 13 deletions(-) diff --git a/interface/web/sites/templates/webdav_user_edit.htm b/interface/web/sites/templates/webdav_user_edit.htm index 09d7d31..ee261ec 100644 --- a/interface/web/sites/templates/webdav_user_edit.htm +++ b/interface/web/sites/templates/webdav_user_edit.htm @@ -19,38 +19,57 @@ </select></div> </tmpl_if> </div> - <div class="form-group"> + <div class="form-group"> <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label> - <p class="prefix">{tmpl_var name='username_prefix'}</p> - <div class="col-sm-6"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" <tmpl_if name="edit_disabled"></div><div class="col-sm-3 input-sm">disabled="disabled"</div></tmpl_if>/> + <div class="col-sm-9"> + <div class="input-group"> + <span class="input-group-addon" id="username-desc">{tmpl_var name='username_prefix'}</span> + <input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" aria-describedby="username-desc" /> + </div> + </div> </div> - <div class="form-group"> + <div class="form-group"> <label for="password" class="col-sm-3 control-label">{tmpl_var name='password_txt'}</label> - <div class="col-sm-6"><input type="password" name="password" id="password" value="{tmpl_var name='password'}" class="form-control" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');"/></div><div class="col-sm-3 input-sm"> </div><a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a> + <div class="col-sm-9"> + <div class="input-group"> + <input type="password" name="password" id="password" value="{tmpl_var name='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('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"> </span></p> + <span id="passText"> </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('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 class="col-sm-3 control-label">{tmpl_var name='active_txt'}</label> <div class="col-sm-9"> {tmpl_var name='active'} </div> </div> - <div class="form-group"> + <div class="form-group"> <label for="dir" class="col-sm-3 control-label">{tmpl_var name='dir_txt'}</label> - <p class="prefix">webdav/</p> - <div class="col-sm-6"><input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" <tmpl_if name="edit_disabled"></div><div class="col-sm-3 input-sm">disabled="disabled"</div></tmpl_if>/> + <div class="col-sm-9"> + <div class="input-group"> + <span class="input-group-addon" id="dir-desc">webdav/</span> + <input type="text" name="dir" id="dir" value="{tmpl_var name='dir'}" class="form-control" aria-describedby="dir-desc" /> + </div> + </div> </div> - - <input type="hidden" name="id" value="{tmpl_var name='id'}"> -- Gitblit v1.9.1