From 9924e65ca11770f247723b10fcbdb81dc9534b32 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Sun, 22 Jun 2014 13:14:03 -0400
Subject: In progress of name template name constant

---
 templates/admin/auth/edit.tmpl  | 165 +++++++++++++++++++++++++++++++++++++
 templates/admin/auth/new.tmpl   | 178 ++++++++++++++++++++++++++++++++++++++++
 templates/admin/auths/edit.tmpl | 165 -------------------------------------
 templates/admin/auths/new.tmpl  | 178 ----------------------------------------
 templates/admin/user/edit.tmpl  | 103 +++++++++++++++++++++++
 templates/admin/user/new.tmpl   |  94 +++++++++++++++++++++
 templates/admin/users/edit.tmpl | 103 -----------------------
 templates/admin/users/new.tmpl  |  94 ---------------------
 8 files changed, 540 insertions(+), 540 deletions(-)
 create mode 100644 templates/admin/auth/edit.tmpl
 create mode 100644 templates/admin/auth/new.tmpl
 delete mode 100644 templates/admin/auths/edit.tmpl
 delete mode 100644 templates/admin/auths/new.tmpl
 create mode 100644 templates/admin/user/edit.tmpl
 create mode 100644 templates/admin/user/new.tmpl
 delete mode 100644 templates/admin/users/edit.tmpl
 delete mode 100644 templates/admin/users/new.tmpl

(limited to 'templates/admin')

diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl
new file mode 100644
index 0000000000..a2c2ddc698
--- /dev/null
+++ b/templates/admin/auth/edit.tmpl
@@ -0,0 +1,165 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container" data-page="admin">
+    {{template "admin/nav" .}}
+    <div id="admin-container" class="col-md-9">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                Edit Authentication
+            </div>
+
+            <div class="panel-body">
+                <br/>
+                <form action="/admin/auths/{{.Source.Id}}" method="post" class="form-horizontal">
+                    {{.CsrfTokenHtml}}
+                    {{template "base/alert" .}}
+                    <input type="hidden" value="{{.Source.Id}}" name="id"/>
+                    {{$type := .Source.Type}}
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">Auth Type: </label>
+                        <input type="hidden" name="type" value="{{.Source.Type}}"/>
+                        <label class="control-label">
+                            {{range $key, $val := .LoginTypes}}
+                                {{if eq $key $type}}{{$val}}{{end}}
+                            {{end}}
+                        </label>
+                    </div>
+                    <div class="form-group {{if .Err_AuthName}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Name: </label>
+                        <div class="col-md-7">
+                            <input name="name" class="form-control" placeholder="Type authentication's name" value="{{.Source.Name}}" required="required">
+                        </div>
+                    </div>
+
+                    {{if eq $type 2}}
+                    <div class="form-group {{if .Err_Domain}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Domain: </label>
+                        <div class="col-md-7">
+                            <input name="domain" class="form-control" placeholder="Type domain name" value="{{.Source.LDAP.Name}}" required="required">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Host: </label>
+                        <div class="col-md-7">
+                            <input name="host" class="form-control" placeholder="Type host address" value="{{.Source.LDAP.Host}}" required="required">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Port: </label>
+                        <div class="col-md-7">
+                            <input name="port" class="form-control" placeholder="Type port number" value="{{.Source.LDAP.Port}}" required="required">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_UseSSL}}has-error has-feedback{{end}}">
+                         <label class="col-md-3 control-label">Use SSL: </label>
+                         <div class="col-md-7">
+                              <input name="usessl" class="form-control" type="checkbox" {{if .Source.LDAP.UseSSL}}checked{{end}}>
+                         </div>
+                    </div>
+
+
+                    <div class="form-group {{if .Err_BaseDN}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Base DN: </label>
+                        <div class="col-md-7">
+                            <input name="base_dn" class="form-control" placeholder="Type base DN" value="{{.Source.LDAP.BaseDN}}" required="required">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_Attributes}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Search Attributes: </label>
+                        <div class="col-md-7">
+                            <input name="attributes" class="form-control" placeholder="Type search attributes" value="{{.Source.LDAP.Attributes}}">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_Filter}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Search Filter: </label>
+                        <div class="col-md-7">
+                            <input name="filter" class="form-control" placeholder="Type search filter" value="{{.Source.LDAP.Filter}}">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_MsAdSA}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Ms Ad SA: </label>
+                        <div class="col-md-7">
+                            <input name="ms_ad_sa" class="form-control" placeholder="Type Ms Ad SA" value="{{.Source.LDAP.MsAdSAFormat}}">
+                        </div>
+                    </div>
+                    {{else if eq $type 3}}
+                    <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">SMTP Auth: </label>
+                        <div class="col-md-7">
+                            <select name="smtpauth" class="form-control">
+                                {{$auth := .Source.SMTP.Auth}}
+                                {{range .SMTPAuths}}
+                                <option value="{{.}}"
+                                {{if eq . $auth}} selected{{end}}>{{.}}</option>
+                                {{end}}
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_SmtpHost}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Host: </label>
+                        <div class="col-md-7">
+                            <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.Source.SMTP.Host}}">
+                        </div>
+                    </div>
+
+                    <div class="form-group {{if .Err_SmtpPort}}has-error has-feedback{{end}}">
+                        <label class="col-md-3 control-label">Port: </label>
+                        <div class="col-md-7">
+                            <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.Source.SMTP.Port}}">
+                        </div>
+                    </div>
+                    {{end}}
+
+                    <div class="form-group">
+                        {{if eq $type 3}}
+                        <div class="col-md-offset-3 col-md-7">
+                            <div class="checkbox">
+                                <label>
+                                <input name="tls" type="checkbox" class="form-control" {{if .Source.SMTP.TLS}}checked{{end}}>
+                                    <strong>Enable TLS Encryption</strong>
+                                </label>
+                            </div>
+                        </div>
+                        {{end}}
+
+                        <div class="col-md-offset-3 col-md-7">
+                            <div class="checkbox">
+                                <label>
+                                    <input name="allowautoregister" type="checkbox" {{if .Source.AllowAutoRegister}}checked{{end}}>
+                                    <strong>Enable Auto Registration</strong>
+                                </label>
+                            </div>
+                        </div>
+
+                        <div class="col-md-7 col-md-offset-3">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="is_actived" {{if .Source.IsActived}}checked{{end}}>
+                                    <strong>This authentication has activated.</strong>
+                                </label>
+                            </div>
+                        </div>
+                    </div>
+
+                    <hr/>
+
+                    <div class="form-group">
+                        <div class="col-md-offset-3 col-md-6">
+                            <button type="submit" class="btn btn-lg btn-primary btn-block">Update authentication config</button>
+                            <a type="button" href="/admin/auths/{{.Source.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this authentication</a>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+
+    </div>
+</div>
+{{template "base/footer" .}}
diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl
new file mode 100644
index 0000000000..abb88043ee
--- /dev/null
+++ b/templates/admin/auth/new.tmpl
@@ -0,0 +1,178 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container" data-page="admin">
+    {{template "admin/nav" .}}
+    <div id="admin-container" class="col-md-9">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                New Authentication
+            </div>
+
+            <div class="panel-body">
+            	<br/>
+				<form action="/admin/auths/new" method="post" class="form-horizontal">
+					{{.CsrfTokenHtml}}
+				    {{template "base/alert" .}}
+				    <div class="form-group">
+					    <label class="col-md-3 control-label">Auth Type: </label>
+					    <div class="col-md-7">
+						    <select name="type" class="form-control" id="auth-type">
+						    {{range $key, $val := .LoginTypes}}
+		  					<option value="{{$key}}">{{$val}}</option>
+		  					{{end}}
+							</select>
+						</div>
+					</div>
+                    <div class="form-group {{if .Err_AuthName}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Name: </label>
+                            <div class="col-md-7">
+                                <input name="name" class="form-control" placeholder="Type authentication's name" value="{{.name}}">
+                            </div>
+                        </div>
+                    <div class="ldap">
+                        <div class="form-group {{if .Err_Domain}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Domain: </label>
+                            <div class="col-md-7">
+                                <input name="domain" class="form-control" placeholder="Type domain name" value="{{.domain}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Host: </label>
+                            <div class="col-md-7">
+                                <input name="host" class="form-control" placeholder="Type host address" value="{{.host}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Port: </label>
+                            <div class="col-md-7">
+                                <input name="port" class="form-control" placeholder="Type port number" value="{{.port}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_UseSSL}}has-error has-feedback{{end}}">
+                             <label class="col-md-3 control-label">Use SSL: </label>
+                             <div class="col-md-7">
+                                  <input name="usessl" class="form-control" type="checkbox" {{if .usessl}}checked{{end}}>
+                             </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_BaseDN}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Base DN: </label>
+                            <div class="col-md-7">
+                                <input name="base_dn" class="form-control" placeholder="Type base DN" value="{{.base_dn}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_Attributes}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Search Attributes: </label>
+                            <div class="col-md-7">
+                                <input name="attributes" class="form-control" placeholder="Type search attributes" value="{{.attributes}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_Filter}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Search Filter: </label>
+                            <div class="col-md-7">
+                                <input name="filter" class="form-control" placeholder="Type search filter" value="{{.filter}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_MsAdSA}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Ms Ad SA: </label>
+                            <div class="col-md-7">
+                                <input name="ms_ad_sa" class="form-control" placeholder="Type Ms Ad SA" value="{{.ms_ad_sa}}">
+                            </div>
+                        </div>
+
+                    </div>
+
+                    <div class="smtp hidden">
+                        <div class="form-group">
+                            <label class="col-md-3 control-label">SMTP Auth: </label>
+                            <div class="col-md-7">
+                                <select name="smtpauth" class="form-control">
+                                    {{range .SMTPAuths}}
+                                    <option value="{{.}}">{{.}}</option>
+                                    {{end}}
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_SmtpHost}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Host: </label>
+                            <div class="col-md-7">
+                                <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.smtphost}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group {{if .Err_SmtpPort}}has-error has-feedback{{end}}">
+                            <label class="col-md-3 control-label">Port: </label>
+                            <div class="col-md-7">
+                                <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.smtpport}}">
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <div class="col-md-offset-3 col-md-7">
+                                <div class="checkbox">
+                                    <label>
+                                        <input name="tls" type="checkbox" {{if .tls}}checked{{end}}>
+                                        <strong>Enable TLS Encryption</strong>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="col-md-offset-3 col-md-7">
+                            <div class="checkbox">
+                                <label>
+                                    <input name="allowautoregister" type="checkbox" {{if .allowautoregister}}checked{{end}}>
+                                    <strong>Enable Auto Registration</strong>
+                                </label>
+                            </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 authentication</button>
+					    </div>
+					</div>
+				</form>
+            </div>
+        </div>
+
+        <div class="panel panel-info">
+            <div class="panel-heading">
+                Tips
+            </div>
+
+            <div class="panel-body">
+                <h5>GMail Setting:</h5>
+                <p>Host: smtp.gmail.com, Post: 587, Enable TLS Encryption: true</p>
+            </div>
+        </div>
+	</div>
+</div>
+<script>
+    $(function () {
+        $('#auth-type').on("change", function () {
+            var v = $(this).val();
+            if (v == 2) {
+                $('.ldap').toggleShow();
+                $('.smtp').toggleHide();
+            }
+            if (v == 3) {
+                $('.smtp').toggleShow();
+                $('.ldap').toggleHide();
+            }
+        });
+    });
+</script>
+{{template "base/footer" .}}
diff --git a/templates/admin/auths/edit.tmpl b/templates/admin/auths/edit.tmpl
deleted file mode 100644
index a2c2ddc698..0000000000
--- a/templates/admin/auths/edit.tmpl
+++ /dev/null
@@ -1,165 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body" class="container" data-page="admin">
-    {{template "admin/nav" .}}
-    <div id="admin-container" class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                Edit Authentication
-            </div>
-
-            <div class="panel-body">
-                <br/>
-                <form action="/admin/auths/{{.Source.Id}}" method="post" class="form-horizontal">
-                    {{.CsrfTokenHtml}}
-                    {{template "base/alert" .}}
-                    <input type="hidden" value="{{.Source.Id}}" name="id"/>
-                    {{$type := .Source.Type}}
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">Auth Type: </label>
-                        <input type="hidden" name="type" value="{{.Source.Type}}"/>
-                        <label class="control-label">
-                            {{range $key, $val := .LoginTypes}}
-                                {{if eq $key $type}}{{$val}}{{end}}
-                            {{end}}
-                        </label>
-                    </div>
-                    <div class="form-group {{if .Err_AuthName}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Name: </label>
-                        <div class="col-md-7">
-                            <input name="name" class="form-control" placeholder="Type authentication's name" value="{{.Source.Name}}" required="required">
-                        </div>
-                    </div>
-
-                    {{if eq $type 2}}
-                    <div class="form-group {{if .Err_Domain}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Domain: </label>
-                        <div class="col-md-7">
-                            <input name="domain" class="form-control" placeholder="Type domain name" value="{{.Source.LDAP.Name}}" required="required">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Host: </label>
-                        <div class="col-md-7">
-                            <input name="host" class="form-control" placeholder="Type host address" value="{{.Source.LDAP.Host}}" required="required">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Port: </label>
-                        <div class="col-md-7">
-                            <input name="port" class="form-control" placeholder="Type port number" value="{{.Source.LDAP.Port}}" required="required">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_UseSSL}}has-error has-feedback{{end}}">
-                         <label class="col-md-3 control-label">Use SSL: </label>
-                         <div class="col-md-7">
-                              <input name="usessl" class="form-control" type="checkbox" {{if .Source.LDAP.UseSSL}}checked{{end}}>
-                         </div>
-                    </div>
-
-
-                    <div class="form-group {{if .Err_BaseDN}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Base DN: </label>
-                        <div class="col-md-7">
-                            <input name="base_dn" class="form-control" placeholder="Type base DN" value="{{.Source.LDAP.BaseDN}}" required="required">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_Attributes}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Search Attributes: </label>
-                        <div class="col-md-7">
-                            <input name="attributes" class="form-control" placeholder="Type search attributes" value="{{.Source.LDAP.Attributes}}">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_Filter}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Search Filter: </label>
-                        <div class="col-md-7">
-                            <input name="filter" class="form-control" placeholder="Type search filter" value="{{.Source.LDAP.Filter}}">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_MsAdSA}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Ms Ad SA: </label>
-                        <div class="col-md-7">
-                            <input name="ms_ad_sa" class="form-control" placeholder="Type Ms Ad SA" value="{{.Source.LDAP.MsAdSAFormat}}">
-                        </div>
-                    </div>
-                    {{else if eq $type 3}}
-                    <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">SMTP Auth: </label>
-                        <div class="col-md-7">
-                            <select name="smtpauth" class="form-control">
-                                {{$auth := .Source.SMTP.Auth}}
-                                {{range .SMTPAuths}}
-                                <option value="{{.}}"
-                                {{if eq . $auth}} selected{{end}}>{{.}}</option>
-                                {{end}}
-                            </select>
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_SmtpHost}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Host: </label>
-                        <div class="col-md-7">
-                            <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.Source.SMTP.Host}}">
-                        </div>
-                    </div>
-
-                    <div class="form-group {{if .Err_SmtpPort}}has-error has-feedback{{end}}">
-                        <label class="col-md-3 control-label">Port: </label>
-                        <div class="col-md-7">
-                            <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.Source.SMTP.Port}}">
-                        </div>
-                    </div>
-                    {{end}}
-
-                    <div class="form-group">
-                        {{if eq $type 3}}
-                        <div class="col-md-offset-3 col-md-7">
-                            <div class="checkbox">
-                                <label>
-                                <input name="tls" type="checkbox" class="form-control" {{if .Source.SMTP.TLS}}checked{{end}}>
-                                    <strong>Enable TLS Encryption</strong>
-                                </label>
-                            </div>
-                        </div>
-                        {{end}}
-
-                        <div class="col-md-offset-3 col-md-7">
-                            <div class="checkbox">
-                                <label>
-                                    <input name="allowautoregister" type="checkbox" {{if .Source.AllowAutoRegister}}checked{{end}}>
-                                    <strong>Enable Auto Registration</strong>
-                                </label>
-                            </div>
-                        </div>
-
-                        <div class="col-md-7 col-md-offset-3">
-                            <div class="checkbox">
-                                <label>
-                                    <input type="checkbox" name="is_actived" {{if .Source.IsActived}}checked{{end}}>
-                                    <strong>This authentication has activated.</strong>
-                                </label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <hr/>
-
-                    <div class="form-group">
-                        <div class="col-md-offset-3 col-md-6">
-                            <button type="submit" class="btn btn-lg btn-primary btn-block">Update authentication config</button>
-                            <a type="button" href="/admin/auths/{{.Source.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this authentication</a>
-                        </div>
-                    </div>
-                </form>
-            </div>
-        </div>
-
-    </div>
-</div>
-{{template "base/footer" .}}
diff --git a/templates/admin/auths/new.tmpl b/templates/admin/auths/new.tmpl
deleted file mode 100644
index abb88043ee..0000000000
--- a/templates/admin/auths/new.tmpl
+++ /dev/null
@@ -1,178 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body" class="container" data-page="admin">
-    {{template "admin/nav" .}}
-    <div id="admin-container" class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                New Authentication
-            </div>
-
-            <div class="panel-body">
-            	<br/>
-				<form action="/admin/auths/new" method="post" class="form-horizontal">
-					{{.CsrfTokenHtml}}
-				    {{template "base/alert" .}}
-				    <div class="form-group">
-					    <label class="col-md-3 control-label">Auth Type: </label>
-					    <div class="col-md-7">
-						    <select name="type" class="form-control" id="auth-type">
-						    {{range $key, $val := .LoginTypes}}
-		  					<option value="{{$key}}">{{$val}}</option>
-		  					{{end}}
-							</select>
-						</div>
-					</div>
-                    <div class="form-group {{if .Err_AuthName}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Name: </label>
-                            <div class="col-md-7">
-                                <input name="name" class="form-control" placeholder="Type authentication's name" value="{{.name}}">
-                            </div>
-                        </div>
-                    <div class="ldap">
-                        <div class="form-group {{if .Err_Domain}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Domain: </label>
-                            <div class="col-md-7">
-                                <input name="domain" class="form-control" placeholder="Type domain name" value="{{.domain}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Host: </label>
-                            <div class="col-md-7">
-                                <input name="host" class="form-control" placeholder="Type host address" value="{{.host}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Port: </label>
-                            <div class="col-md-7">
-                                <input name="port" class="form-control" placeholder="Type port number" value="{{.port}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_UseSSL}}has-error has-feedback{{end}}">
-                             <label class="col-md-3 control-label">Use SSL: </label>
-                             <div class="col-md-7">
-                                  <input name="usessl" class="form-control" type="checkbox" {{if .usessl}}checked{{end}}>
-                             </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_BaseDN}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Base DN: </label>
-                            <div class="col-md-7">
-                                <input name="base_dn" class="form-control" placeholder="Type base DN" value="{{.base_dn}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_Attributes}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Search Attributes: </label>
-                            <div class="col-md-7">
-                                <input name="attributes" class="form-control" placeholder="Type search attributes" value="{{.attributes}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_Filter}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Search Filter: </label>
-                            <div class="col-md-7">
-                                <input name="filter" class="form-control" placeholder="Type search filter" value="{{.filter}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_MsAdSA}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Ms Ad SA: </label>
-                            <div class="col-md-7">
-                                <input name="ms_ad_sa" class="form-control" placeholder="Type Ms Ad SA" value="{{.ms_ad_sa}}">
-                            </div>
-                        </div>
-
-                    </div>
-
-                    <div class="smtp hidden">
-                        <div class="form-group">
-                            <label class="col-md-3 control-label">SMTP Auth: </label>
-                            <div class="col-md-7">
-                                <select name="smtpauth" class="form-control">
-                                    {{range .SMTPAuths}}
-                                    <option value="{{.}}">{{.}}</option>
-                                    {{end}}
-                                </select>
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_SmtpHost}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Host: </label>
-                            <div class="col-md-7">
-                                <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.smtphost}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group {{if .Err_SmtpPort}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Port: </label>
-                            <div class="col-md-7">
-                                <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.smtpport}}">
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <div class="col-md-offset-3 col-md-7">
-                                <div class="checkbox">
-                                    <label>
-                                        <input name="tls" type="checkbox" {{if .tls}}checked{{end}}>
-                                        <strong>Enable TLS Encryption</strong>
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <div class="col-md-offset-3 col-md-7">
-                            <div class="checkbox">
-                                <label>
-                                    <input name="allowautoregister" type="checkbox" {{if .allowautoregister}}checked{{end}}>
-                                    <strong>Enable Auto Registration</strong>
-                                </label>
-                            </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 authentication</button>
-					    </div>
-					</div>
-				</form>
-            </div>
-        </div>
-
-        <div class="panel panel-info">
-            <div class="panel-heading">
-                Tips
-            </div>
-
-            <div class="panel-body">
-                <h5>GMail Setting:</h5>
-                <p>Host: smtp.gmail.com, Post: 587, Enable TLS Encryption: true</p>
-            </div>
-        </div>
-	</div>
-</div>
-<script>
-    $(function () {
-        $('#auth-type').on("change", function () {
-            var v = $(this).val();
-            if (v == 2) {
-                $('.ldap').toggleShow();
-                $('.smtp').toggleHide();
-            }
-            if (v == 3) {
-                $('.smtp').toggleShow();
-                $('.ldap').toggleHide();
-            }
-        });
-    });
-</script>
-{{template "base/footer" .}}
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
new file mode 100644
index 0000000000..b1fffb69c3
--- /dev/null
+++ b/templates/admin/user/edit.tmpl
@@ -0,0 +1,103 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container" data-page="admin">
+    {{template "admin/nav" .}}
+    <div id="admin-container" class="col-md-9">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                Edit Account
+            </div>
+
+            <div class="panel-body">
+            	<br/>
+				<form action="/admin/users/{{.User.Id}}" method="post" class="form-horizontal">
+				    {{.CsrfTokenHtml}}
+				    {{template "base/alert" .}}
+					<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">
+							    <option value="0-0"{{if eq 0 .User.LoginSource}} selected{{end}}>Local</option>
+							    {{$tp := .User.LoginSource}}
+							    {{range $key, $val := .LoginSources}}
+			  					<option value="{{$val.Type}}-{{$val.Id}}"{{if eq $val.Id $tp}} selected{{end}}>{{$val.Name}}</option>
+			  					{{end}}
+							</select>
+						</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="{{.User.LoginName}}">
+						</div>
+					</div>
+
+					<div class="form-group">
+						<label class="col-md-3 control-label">Username: </label>
+						<label class="control-label">{{.User.Name}}</label>
+					</div>
+
+					<div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
+						<label class="col-md-3 control-label">Email<strong class="text-danger">*</strong></label>
+						<div class="col-md-7">
+							<input name="email" class="form-control" placeholder="Type account's e-mail address" value="{{.User.Email}}" required="required">
+						</div>
+					</div>
+
+	                <div class="form-group">
+	                    <label class="col-md-3 control-label">Website</label>
+	                    <div class="col-md-7">
+	                        <input name="website" class="form-control" placeholder="Type account's website URL" value="{{.User.Website}}">
+	                    </div>
+	                </div>
+
+	                <div class="form-group">
+	                    <label class="col-md-3 control-label">Location</label>
+	                    <div class="col-md-7">
+	                        <input name="location" class="form-control" placeholder="Type account's current location" value="{{.User.Location}}">
+	                    </div>
+	                </div>
+
+	                <div class="form-group {{if .Err_Avatar}}has-error has-feedback{{end}}">
+	                    <label class="col-md-3 control-label">Gravatar Email<strong class="text-danger">*</strong></label>
+	                    <div class="col-md-7">
+	                        <input name="avatar" class="form-control" placeholder="Type account's Gravatar e-mail address" required="required" value="{{.User.AvatarEmail}}">
+	                    </div>
+	                </div>
+
+	                <div class="form-group">
+			            <div class="col-md-7 col-md-offset-3">
+			                <div class="checkbox">
+			                    <label>
+			                        <input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}>
+			                        <strong>This account has activated</strong>
+			                    </label>
+			                </div>
+			            </div>
+	                </div>
+
+	                <div class="form-group">
+			            <div class="col-md-7 col-md-offset-3">
+			                <div class="checkbox">
+			                    <label>
+			                        <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}>
+			                        <strong>This account has administor permisson</strong>
+			                    </label>
+			                </div>
+			            </div>
+	                </div>
+					<hr/>
+					<div class="form-group">
+					    <div class="col-md-offset-3 col-md-6">
+					    	<button type="submit" class="btn btn-lg btn-primary btn-block">Update account profile</button>
+					    	<a type="button" href="/admin/users/{{.User.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this account</a>
+					    </div>
+					</div>
+				</form>
+            </div>
+        </div>
+
+	</div>
+</div>
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl
new file mode 100644
index 0000000000..4f4866c4b6
--- /dev/null
+++ b/templates/admin/user/new.tmpl
@@ -0,0 +1,94 @@
+{{template "base/head" .}}
+{{template "base/navbar" .}}
+<div id="body" class="container" data-page="admin">
+    {{template "admin/nav" .}}
+    <div id="admin-container" class="col-md-9">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                New Account
+            </div>
+
+            <div class="panel-body">
+            	<br/>
+				<form action="/admin/users/new" method="post" class="form-horizontal">
+					{{.CsrfTokenHtml}}
+				    {{template "base/alert" .}}
+				    <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" id="login-type">
+							    <option value="0-0">Local</option>
+							    {{range $key, $val := .LoginSources}}
+			  					<option value="{{$val.Type}}-{{$val.Id}}">{{$val.Name}}</option>
+			  					{{end}}
+							</select>
+						</div>
+					</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}}">
+						<label class="col-md-3 control-label">Username: </label>
+						<div class="col-md-7">
+							<input name="username" class="form-control" placeholder="Type account's username" value="{{.username}}" required="required">
+						</div>
+					</div>
+
+					<div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
+						<label class="col-md-3 control-label">Email: </label>
+						<div class="col-md-7">
+							<input name="email" class="form-control" placeholder="Type account's e-mail address" value="{{.email}}" required="required" title="Email is not valid">
+						</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>
+					</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" .}}
\ No newline at end of file
diff --git a/templates/admin/users/edit.tmpl b/templates/admin/users/edit.tmpl
deleted file mode 100644
index b1fffb69c3..0000000000
--- a/templates/admin/users/edit.tmpl
+++ /dev/null
@@ -1,103 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body" class="container" data-page="admin">
-    {{template "admin/nav" .}}
-    <div id="admin-container" class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                Edit Account
-            </div>
-
-            <div class="panel-body">
-            	<br/>
-				<form action="/admin/users/{{.User.Id}}" method="post" class="form-horizontal">
-				    {{.CsrfTokenHtml}}
-				    {{template "base/alert" .}}
-					<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">
-							    <option value="0-0"{{if eq 0 .User.LoginSource}} selected{{end}}>Local</option>
-							    {{$tp := .User.LoginSource}}
-							    {{range $key, $val := .LoginSources}}
-			  					<option value="{{$val.Type}}-{{$val.Id}}"{{if eq $val.Id $tp}} selected{{end}}>{{$val.Name}}</option>
-			  					{{end}}
-							</select>
-						</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="{{.User.LoginName}}">
-						</div>
-					</div>
-
-					<div class="form-group">
-						<label class="col-md-3 control-label">Username: </label>
-						<label class="control-label">{{.User.Name}}</label>
-					</div>
-
-					<div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
-						<label class="col-md-3 control-label">Email<strong class="text-danger">*</strong></label>
-						<div class="col-md-7">
-							<input name="email" class="form-control" placeholder="Type account's e-mail address" value="{{.User.Email}}" required="required">
-						</div>
-					</div>
-
-	                <div class="form-group">
-	                    <label class="col-md-3 control-label">Website</label>
-	                    <div class="col-md-7">
-	                        <input name="website" class="form-control" placeholder="Type account's website URL" value="{{.User.Website}}">
-	                    </div>
-	                </div>
-
-	                <div class="form-group">
-	                    <label class="col-md-3 control-label">Location</label>
-	                    <div class="col-md-7">
-	                        <input name="location" class="form-control" placeholder="Type account's current location" value="{{.User.Location}}">
-	                    </div>
-	                </div>
-
-	                <div class="form-group {{if .Err_Avatar}}has-error has-feedback{{end}}">
-	                    <label class="col-md-3 control-label">Gravatar Email<strong class="text-danger">*</strong></label>
-	                    <div class="col-md-7">
-	                        <input name="avatar" class="form-control" placeholder="Type account's Gravatar e-mail address" required="required" value="{{.User.AvatarEmail}}">
-	                    </div>
-	                </div>
-
-	                <div class="form-group">
-			            <div class="col-md-7 col-md-offset-3">
-			                <div class="checkbox">
-			                    <label>
-			                        <input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}>
-			                        <strong>This account has activated</strong>
-			                    </label>
-			                </div>
-			            </div>
-	                </div>
-
-	                <div class="form-group">
-			            <div class="col-md-7 col-md-offset-3">
-			                <div class="checkbox">
-			                    <label>
-			                        <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}>
-			                        <strong>This account has administor permisson</strong>
-			                    </label>
-			                </div>
-			            </div>
-	                </div>
-					<hr/>
-					<div class="form-group">
-					    <div class="col-md-offset-3 col-md-6">
-					    	<button type="submit" class="btn btn-lg btn-primary btn-block">Update account profile</button>
-					    	<a type="button" href="/admin/users/{{.User.Id}}/delete" class="btn btn-lg btn-danger btn-block">Delete this account</a>
-					    </div>
-					</div>
-				</form>
-            </div>
-        </div>
-
-	</div>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
deleted file mode 100644
index 4f4866c4b6..0000000000
--- a/templates/admin/users/new.tmpl
+++ /dev/null
@@ -1,94 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body" class="container" data-page="admin">
-    {{template "admin/nav" .}}
-    <div id="admin-container" class="col-md-9">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                New Account
-            </div>
-
-            <div class="panel-body">
-            	<br/>
-				<form action="/admin/users/new" method="post" class="form-horizontal">
-					{{.CsrfTokenHtml}}
-				    {{template "base/alert" .}}
-				    <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" id="login-type">
-							    <option value="0-0">Local</option>
-							    {{range $key, $val := .LoginSources}}
-			  					<option value="{{$val.Type}}-{{$val.Id}}">{{$val.Name}}</option>
-			  					{{end}}
-							</select>
-						</div>
-					</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}}">
-						<label class="col-md-3 control-label">Username: </label>
-						<div class="col-md-7">
-							<input name="username" class="form-control" placeholder="Type account's username" value="{{.username}}" required="required">
-						</div>
-					</div>
-
-					<div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
-						<label class="col-md-3 control-label">Email: </label>
-						<div class="col-md-7">
-							<input name="email" class="form-control" placeholder="Type account's e-mail address" value="{{.email}}" required="required" title="Email is not valid">
-						</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>
-					</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" .}}
\ No newline at end of file
-- 
cgit v1.2.3