From f1130ce5e9fa63df5e472a9c5fbd3e875f1ba9f5 Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Mon, 12 May 2014 11:02:36 -0400
Subject: Fix edit auth page bug

---
 templates/admin/auths/edit.tmpl | 41 ++++++++++++++++++++++-------------------
 templates/admin/auths/new.tmpl  |  8 ++++----
 2 files changed, 26 insertions(+), 23 deletions(-)

(limited to 'templates/admin')

diff --git a/templates/admin/auths/edit.tmpl b/templates/admin/auths/edit.tmpl
index 2c7a5754bf..b3277242ce 100644
--- a/templates/admin/auths/edit.tmpl
+++ b/templates/admin/auths/edit.tmpl
@@ -18,11 +18,11 @@
                     <div class="form-group">
                         <label class="col-md-3 control-label">Auth Type: </label>
                         <input type="hidden" name="type" value="{{.Source.Type}}"/>
-                        <div class="col-md-7">
-                        {{range $key, $val := .LoginTypes}}
-                            {{if eq $key $type}}{{$val}}{{end}}
-                        {{end}}
-                        </div>
+                        <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>
@@ -85,46 +85,47 @@
                         <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}}
+                                {{$auth := .Source.SMTP.Auth}}
                                 {{range .SMTPAuths}}
                                 <option value="{{.}}"
                                 {{if eq . $auth}} selected{{end}}>{{.}}</option>
                                 {{end}}
-                                }
                             </select>
                         </div>
                     </div>
 
-                    <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
+                    <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_Port}}has-error has-feedback{{end}}">
+                    <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>
 
-                    <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
+                    <!-- <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
                         <label class="col-md-3 control-label">TLS: </label>
                         <div class="col-md-7">
-                            <input name="smtptls" type="checkbox" class="form-control" {{if .Source.SMTP.TLS}}checked{{end}}>
+                            <input name="tls" type="checkbox" class="form-control" {{if .Source.SMTP.TLS}}checked{{end}}>
                         </div>
-                    </div>
+                    </div> -->
                     {{end}}
-                    
-                    <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
-                            <label class="col-md-3 control-label">Auto Register: </label>
-                            <div class="col-md-7">
-                                <input name="allowautoregister" type="checkbox" class="form-control" {{if .Source.AllowAutoRegister}}checked{{end}}>
-                            </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 .Source.AllowAutoRegister}}checked{{end}}>
+                                    <strong>Enable Auto Registeration</strong>
+                                </label>
+                            </div>
+                        </div>
+
                         <div class="col-md-7 col-md-offset-3">
                             <div class="checkbox">
                                 <label>
@@ -134,7 +135,9 @@
                             </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>
diff --git a/templates/admin/auths/new.tmpl b/templates/admin/auths/new.tmpl
index e5dcb4339b..3741d9cc5f 100644
--- a/templates/admin/auths/new.tmpl
+++ b/templates/admin/auths/new.tmpl
@@ -93,17 +93,17 @@
                             </div>
                         </div>
 
-                        <div class="form-group {{if .Err_Host}}has-error has-feedback{{end}}">
+                        <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="host" class="form-control" placeholder="Type host address" value="{{.host}}">
+                                <input name="smtphost" class="form-control" placeholder="Type host address" value="{{.smtphost}}">
                             </div>
                         </div>
 
-                        <div class="form-group {{if .Err_Port}}has-error has-feedback{{end}}">
+                        <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="port" class="form-control" placeholder="Type port number" value="{{.port}}">
+                                <input name="smtpport" class="form-control" placeholder="Type port number" value="{{.smtpport}}">
                             </div>
                         </div>
 
-- 
cgit v1.2.3