From 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 21 May 2015 04:14:10 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/master'
---
interface/web/sites/templates/web_folder_user_edit.htm | 59 +++++++++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/interface/web/sites/templates/web_folder_user_edit.htm b/interface/web/sites/templates/web_folder_user_edit.htm
index 7defdde..e589463 100644
--- a/interface/web/sites/templates/web_folder_user_edit.htm
+++ b/interface/web/sites/templates/web_folder_user_edit.htm
@@ -1,49 +1,44 @@
-<h2><tmpl_var name="list_head_txt"></h2>
+<div class='page-header'>
+ <h1><tmpl_var name="list_head_txt"></h1>
+</div>
<p><tmpl_var name="list_desc_txt"></p>
-<div class="panel panel_web_folder_user">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels"><legend>Folder</legend>
- <div class="ctrlHolder">
- <label for="web_folder_id">{tmpl_var name='web_folder_id_txt'}</label>
- <select name="web_folder_id" id="web_folder_id" class="selectInput">
+ <legend>Folder</legend>
+ <div class="form-group">
+ <label for="web_folder_id" class="col-sm-3 control-label">{tmpl_var name='web_folder_id_txt'}</label>
+ <div class="col-sm-9"><select name="web_folder_id" id="web_folder_id" class="form-control">
{tmpl_var name='web_folder_id'}
- </select>
+ </select></div>
</div>
- <div class="ctrlHolder">
- <label for="username">{tmpl_var name='username_txt'}</label>
- <input name="username" id="username" value="{tmpl_var name='username'}" size="30" maxlength="255" type="text" class="textInput" />
+ <div class="form-group">
+ <label for="username" class="col-sm-3 control-label">{tmpl_var name='username_txt'}</label>
+ <div class="col-sm-9"><input type="text" name="username" id="username" value="{tmpl_var name='username'}" class="form-control" /></div></div>
+ <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>
- <div class="ctrlHolder">
- <label for="password">{tmpl_var name='password_txt'}</label>
- <input name="password" id="password" value="{tmpl_var name='password'}" size="30" maxlength="255" type="password" class="textInput" autocomplete="off" onkeyup="pass_check(this.value);checkPassMatch('password','repeat_password');" /> <a href="javascript:void(0);" onclick="generatePassword('password','repeat_password');">{tmpl_var name='generate_password_txt'}</a>
- </div>
- <div class="ctrlHolder">
- <p class="label">{tmpl_var name='password_strength_txt'}</p>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">{tmpl_var name='password_strength_txt'}</label>
<div id="passBar"></div>
<p class="formHint"><span id="passText"> </span></p>
</div>
- <div class="ctrlHolder">
- <label for="repeat_password">{tmpl_var name='repeat_password_txt'}</label>
- <input name="repeat_password" id="repeat_password" value="" size="15" maxlength="100" type="password" class="textInput" style="width:100px;" autocomplete="off" onkeyup="checkPassMatch('password','repeat_password');" />
- </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="ctrlHolder">
- <p class="label">{tmpl_var name='active_txt'}</p>
- <div class="multiField">
+ <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>
- </fieldset>
+
<input type="hidden" name="id" value="{tmpl_var name='id'}">
- <div class="buttonHolder buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_folder_user_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onclick="loadContent('sites/web_folder_user_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+ <div class="clear"><div class="right">
+ <button class="btn btn-default formbutton-success" type="button" value="{tmpl_var name='btn_save_txt'}" data-submit-form="pageForm" data-form-action="sites/web_folder_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/web_folder_user_list.php">{tmpl_var name='btn_cancel_txt'}</button>
+ </div></div>
--
Gitblit v1.9.1