#697 disable captcha and new admin create user UI

3 files changed, 101 insertions, 96 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index 4fab68fc04..203bac2818 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.11.0912 Beta
\ No newline at end of file
+0.6.11.0913 Beta
\ No newline at end of file
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
index 9b05eebf53..59f624ec7e 100644
--- a/templates/admin/user/new.tmpl
+++ b/templates/admin/user/new.tmpl
@@ -1,58 +1,56 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="admin-wrapper">
-    <div id="setting-wrapper" class="main-wrapper">
-        <div id="admin-setting" class="container clear">
-            {{template "admin/nav" .}}
-            <div class="grid-4-5 left">
-                <div class="setting-content">
-                    {{template "ng/base/alert" .}}
-                    <div id="setting-content">
-                        <div class="panel panel-radius">
-                            <div class="panel-header">
-                                <strong>{{.i18n.Tr "admin.users.new_account"}}</strong>
-                            </div>
-                            <form class="form form-align panel-body" id="repo-setting-form" action="{{AppSubUrl}}/admin/users/new" method="post">
-					            {{.CsrfTokenHtml}}
-                                <div class="field">
-                                    <label class="req">{{.i18n.Tr "admin.users.auth_source"}}</label>
-                                    <select id="login-type" name="logintype">
-                                        <option value="0-0">{{.i18n.Tr "admin.users.local"}}</option>
-                                        {{range $key, $val := .LoginSources}}
-                                        <option value="{{$val.Type}}-{{$val.ID}}">{{$val.Name}}</option>
-                                        {{end}}
-                                    </select>
-                                </div>
-                                <div class="field auth-name hidden">
-                                    <label class="req" for="loginname">{{.i18n.Tr "admin.users.auth_login_name"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_LoginName}}ipt-error{{end}}" id="loginname" name="loginname" value="{{.loginname}}" />
-                                </div>
-                                <div class="field">
-                                    <label class="req" for="username">{{.i18n.Tr "username"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.uname}}" required />
-                                </div>
-                                <div class="field">
-                                    <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}" required/>
-                                </div>
-                                <div class="field pwd">
-                                    <label class="req" for="password">{{.i18n.Tr "password"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/>
-                                </div>
-                                <div class="field">
-                                    <label class="req" for="re-type">{{.i18n.Tr "re_type"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="re-type" name="retype" type="password" required/>
-                                </div>
-                                <div class="field">
-                                    <label></label>
-                                    <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "admin.users.new_account"}}</button>
-                                </div>
-				            </form>
-                        </div>
-                    </div>
+{{template "base/head" .}}
+<div class="admin new user">
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "admin/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "admin.users.new_account"}}
+        </h4>
+        <div class="ui attached segment">
+          <form class="ui form" action="{{.Link}}" method="post">
+            {{.CsrfTokenHtml}}
+            <!-- Types and name -->
+            <div class="inline required field {{if .Err_LoginType}}error{{end}}">
+              <label>{{.i18n.Tr "admin.users.auth_source"}}</label>
+              <div class="ui selection type dropdown">
+                <input type="hidden" id="login_type" name="login_type" value="{{.login_type}}-{{.login_id}}" required>
+                <div class="text">{{.i18n.Tr "admin.users.local"}}</div>
+                <i class="dropdown icon"></i>
+                <div class="menu">
+                  <div class="item" data-value="0-0">{{.i18n.Tr "admin.users.local"}}</div>
+                  {{range .Sources}}
+                  <div class="item" data-value="{{.Type}}-{{.ID}}">{{.Name}}</div>
+                  {{end}}
                 </div>
+              </div>
             </div>
+            <div class="required non-local field {{if .Err_LoginName}}error{{end}} {{if not (eq .login_type "0-0")}}hide{{end}}">
+              <label for="login_name">{{.i18n.Tr "admin.users.auth_login_name"}}</label>
+              <input id="login_name" name="login_name" value="{{.login_name}}">
+            </div>
+            <div class="required field {{if .Err_UserName}}error{{end}}">
+              <label for="user_name">{{.i18n.Tr "username"}}</label>
+              <input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+            </div>
+            <div class="required field {{if .Err_Email}}error{{end}}">
+              <label for="email">{{.i18n.Tr "email"}}</label>
+              <input id="email" name="email" type="email" value="{{.email}}" required>
+            </div>
+            <input class="fake" type="password">
+            <div class="required local field {{if .Err_Password}}error{{end}} {{if eq .login_type "0-0"}}hide{{end}}">
+              <label for="password">{{.i18n.Tr "password"}}</label>
+              <input id="password" name="password" type="password" value="{{.password}}" required>
+            </div>
+
+            <div class="field">
+              <button class="ui green button">{{.i18n.Tr "admin.users.new_account"}}</button>
+            </div>
+          </form>
         </div>
+      </div>
     </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl
index b68c79632a..4a5b32b6a6 100644
--- a/templates/user/auth/signup.tmpl
+++ b/templates/user/auth/signup.tmpl
@@ -1,49 +1,56 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="sign-wrapper">
-    <form class="form-align form panel panel-radius sign-panel sign-form container" id="sign-up-form" action="{{AppSubUrl}}/user/sign_up" method="post">
-        <div class="panel-header">
-            <h2>{{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_up"}}{{end}}</h2>
-        </div>
-        <div class="panel-content">
-            {{template "ng/base/alert" .}}
+{{template "base/head" .}}
+<div class="signup">
+  <div class="ui middle very relaxed page grid">
+    <div class="column">
+      <form class="ui form" action="{{.Link}}" method="post">
+        {{.CsrfTokenHtml}}
+        <h3 class="ui top attached header">
+          {{if .IsSocialLogin}}{{.i18n.Tr "social_sign_in" | Str2html}}{{else}}{{.i18n.Tr "sign_up"}}{{end}}
+        </h3>
+        <div class="ui attached segment">
+          {{template "base/alert" .}}
 	        {{if .DisableRegistration}}
 	        <p>{{.i18n.Tr "auth.disable_register_prompt"}}</p>
 	        {{else}}
-            <div class="field">
-                <label class="req" for="username">{{.i18n.Tr "username"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.uname}}" required/>
-            </div>
-            <div class="field">
-                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}" required />
-            </div>
-            <div class="field">
-                <label class="req" for="password">{{.i18n.Tr "password"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="password" name="password" type="password" value="{{.password}}" required/>
-            </div>
-            <div class="field">
-                <label class="req" for="re-type">{{.i18n.Tr "re_type"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Password}}ipt-error{{end}}" id="re-type" name="retype" type="password" required/>
-            </div>
-            <div class="field">
-                <label></label>
-                {{.Captcha.CreateHtml}}
-            </div>
-            <div class="field">
-                <label class="req" for="captcha">{{.i18n.Tr "captcha"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Captcha}}ipt-error{{end}}" id="captcha" name="captcha" type="text" required/>
-            </div>
-            <div class="field">
-                <span class="form-label"></span>
-                <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "auth.create_new_account"}}</button>
-            </div>
-            <div class="field">
-                <span class="form-label"></span>
-                <a href="{{AppSubUrl}}/user/login">{{if .IsSocialLogin}}{{.i18n.Tr "auth.social_register_hepler_msg"}}{{else}}{{.i18n.Tr "auth.register_hepler_msg"}}{{end}}</a>
-            </div>
+          <div class="required inline field {{if .Err_UserName}}error{{end}}">
+            <label for="user_name">{{.i18n.Tr "username"}}</label>
+            <input id="user_name" name="user_name" value="{{.user_name}}" autofocus required>
+          </div>
+          <div class="required inline field {{if .Err_Email}}error{{end}}">
+            <label for="email">{{.i18n.Tr "email"}}</label>
+            <input id="email" name="email" type="email" value="{{.email}}" required>
+          </div>
+          <div class="required inline field {{if .Err_Password}}error{{end}}">
+            <label for="password">{{.i18n.Tr "password"}}</label>
+            <input id="password" name="password" type="password" value="{{.password}}" required>
+          </div>
+          <div class="required inline field {{if .Err_Password}}error{{end}}">
+            <label for="retype">{{.i18n.Tr "re_type"}}</label>
+            <input id="retype" name="retype" type="password" value="{{.retype}}" required>
+          </div>
+          {{if not .DisableCaptcha}}
+          <div class="inline field">
+            <label></label>
+            {{.Captcha.CreateHtml}}
+          </div>
+          <div class="required inline field {{if .Err_Captcha}}error{{end}}">
+            <label for="captcha">{{.i18n.Tr "captcha"}}</label>
+            <input id="captcha" name="captcha" value="{{.captcha}}" autocomplete="off">
+          </div>
+          {{end}}
+
+          <div class="inline field">
+            <label></label>
+            <button class="ui green button">{{.i18n.Tr "auth.create_new_account"}}</button>
+          </div>
+          <div class="inline field">
+            <label></label>
+            <a href="{{AppSubUrl}}/user/login">{{if .IsSocialLogin}}{{.i18n.Tr "auth.social_register_hepler_msg"}}{{else}}{{.i18n.Tr "auth.register_hepler_msg"}}{{end}}</a>
+          </div>
         	{{end}}
         </div>
     </form>
+    </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file