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

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,47 @@
 						</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();
+            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" .}}