Merge branch 'dev' of github.com:gogits/gogs into dev

This commit is contained in:
Unknown 2014-05-11 10:37:36 -04:00
commit d122aa6d88

View File

@ -16,7 +16,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">Auth Source: </label> <label class="col-md-3 control-label">Auth Source: </label>
<div class="col-md-7"> <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> <option value="0-0">Local</option>
{{range $key, $val := .LoginSources}} {{range $key, $val := .LoginSources}}
<option value="{{$val.Type}}-{{$val.Id}}">{{$val.Name}}</option> <option value="{{$val.Type}}-{{$val.Id}}">{{$val.Name}}</option>
@ -25,12 +25,14 @@
</div> </div>
</div> </div>
<div class="auth-name hidden">
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label">Auth Login Name: </label> <label class="col-md-3 control-label">Auth Login Name: </label>
<div class="col-md-7"> <div class="col-md-7">
<input name="loginname" class="form-control" placeholder="Type auth login's username" value="{{.loginname}}"> <input name="loginname" class="form-control" placeholder="Type auth login's username" value="{{.loginname}}">
</div> </div>
</div> </div>
</div>
<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}"> <div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
<label class="col-md-3 control-label">Username: </label> <label class="col-md-3 control-label">Username: </label>
@ -46,6 +48,7 @@
</div> </div>
</div> </div>
<div class="pwd">
<div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}"> <div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
<label class="col-md-3 control-label">Password: </label> <label class="col-md-3 control-label">Password: </label>
<div class="col-md-7"> <div class="col-md-7">
@ -57,6 +60,7 @@
<label class="col-md-3 control-label">Re-type: </label> <label class="col-md-3 control-label">Re-type: </label>
<div class="col-md-7"> <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"> <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>
</div> </div>
<hr/> <hr/>
@ -71,4 +75,20 @@
</div> </div>
</div> </div>
<script>
$(function(){
$('#login-type').on("change",function(){
var v = $(this).val();
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" .}} {{template "base/footer" .}}