From 27f9b7a14452f8d95a83946727e5642ec35da260 Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sun, 11 May 2014 21:26:47 +0800
Subject: [PATCH 1/2] add user new js
---
templates/admin/users/new.tmpl | 67 ++++++++++++++++++++++------------
1 file changed, 44 insertions(+), 23 deletions(-)
diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
index b4843a99c..0e3fee8b2 100644
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/users/new.tmpl
@@ -16,7 +16,7 @@
<div class="form-group">
<label class="col-md-3 control-label">Auth Source: </label>
<div class="col-md-7">
- <select name="logintype" class="form-control">
+ <select name="logintype" class="form-control" id="login-type">
<option value="0-0">Local</option>
{{range $key, $val := .LoginSources}}
<option value="{{$val.Type}}-{{$val.Id}}">{{$val.Name}}</option>
@@ -25,11 +25,13 @@
</div>
</div>
- <div class="form-group">
- <label class="col-md-3 control-label">Auth Login Name: </label>
- <div class="col-md-7">
- <input name="loginname" class="form-control" placeholder="Type auth login's username" value="{{.loginname}}">
- </div>
+ <div class="auth-name hidden">
+ <div class="form-group">
+ <label class="col-md-3 control-label">Auth Login Name: </label>
+ <div class="col-md-7">
+ <input name="loginname" class="form-control" placeholder="Type auth login's username" value="{{.loginname}}">
+ </div>
+ </div>
</div>
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
@@ -46,29 +48,48 @@
</div>
</div>
- <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
- <label class="col-md-3 control-label">Password: </label>
- <div class="col-md-7">
- <input name="passwd" type="password" class="form-control" placeholder="Type account's password" required="required" title="Password must contain at least 6 characters">
- </div>
- </div>
+ <div class="pwd">
+ <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
+ <label class="col-md-3 control-label">Password: </label>
+ <div class="col-md-7">
+ <input name="passwd" type="password" class="form-control" placeholder="Type account's password" required="required" title="Password must contain at least 6 characters">
+ </div>
+ </div>
- <div class="form-group {{if .Err_RetypePasswd}}has-error has-feedback{{end}}">
- <label class="col-md-3 control-label">Re-type: </label>
- <div class="col-md-7">
- <input name="retypepasswd" type="password" class="form-control" placeholder="Re-type account's password" required="required" title="Re-type Password must be same to Password">
- </div>
- </div>
- <hr/>
- <div class="form-group">
- <div class="col-md-offset-3 col-md-7">
- <button type="submit" class="btn btn-lg btn-primary">Create new account</button>
- </div>
+ <div class="form-group {{if .Err_RetypePasswd}}has-error has-feedback{{end}}">
+ <label class="col-md-3 control-label">Re-type: </label>
+ <div class="col-md-7">
+ <input name="retypepasswd" type="password" class="form-control" placeholder="Re-type account's password" required="required" title="Re-type Password must be same to Password">
+ </div>
+ </div>
</div>
+ <hr/>
+ <div class="form-group">
+ <div class="col-md-offset-3 col-md-7">
+ <button type="submit" class="btn btn-lg btn-primary">Create new account</button>
+ </div>
+ </div>
</form>
</div>
</div>
</div>
</div>
+<script>
+ $(function(){
+ $('#login-type').on("change",function(){
+ var v = $(this).val();
+ alert(v.indexOf("0-")+1);
+ if(v.indexOf("0-")+1){
+ $('.auth-name').toggleHide();
+ $(".pwd").find("input").attr("required","required")
+ .end().toggleShow();
+ }else{
+ $(".pwd").find("input").removeAttr("required")
+ .end().toggleHide();
+ $('.auth-name').toggleShow();
+ }
+ });
+ });
+</script>
{{template "base/footer" .}}
\ No newline at end of file
From fd7b0a2ba4f83acf876c1797326a5c8133998cf7 Mon Sep 17 00:00:00 2001
From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Sun, 11 May 2014 21:27:06 +0800
Subject: [PATCH 2/2] add user new js
---
templates/admin/users/new.tmpl | 1 -
1 file changed, 1 deletion(-)
diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
index 0e3fee8b2..4f4866c4b 100644
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/users/new.tmpl
@@ -79,7 +79,6 @@
$(function(){
$('#login-type').on("change",function(){
var v = $(this).val();
- alert(v.indexOf("0-")+1);
if(v.indexOf("0-")+1){
$('.auth-name').toggleHide();
$(".pwd").find("input").attr("required","required")