UI fix

diff --git a/gogs.go b/gogs.go
index 3d6b4807a68859cc42e96a053bd1fbacd81a3253..8d5b021c349a0952c440ba30f772d74a21c37286 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/base"
 )
 
-const APP_VER = "0.3.3.0508 Alpha"
+const APP_VER = "0.3.3.0511 Alpha"
 
 func init() {
        base.AppVer = APP_VER

diff --git a/modules/auth/authentication.go b/modules/auth/authentication.go
index 89ccc560f9f31132d91252d31d13e64faca07b97..4456d2a5f7b1099ec5938ca1c702ee2ef71fa7e6 100644 (file)
--- a/modules/auth/authentication.go
+++ b/modules/auth/authentication.go
@@ -27,9 +27,7 @@ type AuthenticationForm struct {
        MsAdSA            string `form:"ms_ad_sa"`
        IsActived         bool   `form:"is_actived"`
        SmtpAuth          string `form:"smtpauth"`
-       SmtpHost          string `form:"smtphost"`
-       SmtpPort          int    `form:"smtpport"`
-       SmtpTls           bool   `form:"smtptls"`
+       Tls               bool   `form:"tls"`
        AllowAutoRegister bool   `form:"allowautoregister"`
 }
 

diff --git a/routers/admin/auths.go b/routers/admin/auths.go
index c45bbaaba00bac045dad2b2ed01f65e441de9ea8..68fef21e8aaec61ecb1b3f5785512d699059d836 100644 (file)
--- a/routers/admin/auths.go
+++ b/routers/admin/auths.go
@@ -5,7 +5,6 @@
 package admin
 
 import (
-       "errors"
        "strings"
 
        "github.com/go-martini/martini"
@@ -38,7 +37,8 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
        }
 
        var u core.Conversion
-       if form.Type == models.LT_LDAP {
+       switch form.Type {
+       case models.LT_LDAP:
                u = &models.LDAPConfig{
                        Ldapsource: ldap.Ldapsource{
                                Host:         form.Host,
@@ -51,15 +51,16 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
                                Name:         form.AuthName,
                        },
                }
-       } else if form.Type == models.LT_SMTP {
+       case models.LT_SMTP:
                u = &models.SMTPConfig{
                        Auth: form.SmtpAuth,
-                       Host: form.SmtpHost,
-                       Port: form.SmtpPort,
-                       TLS:  form.SmtpTls,
+                       Host: form.Host,
+                       Port: form.Port,
+                       TLS:  form.Tls,
                }
-       } else {
-               panic(errors.New("not allow type"))
+       default:
+               ctx.Error(400)
+               return
        }
 
        var source = &models.LoginSource{
@@ -71,10 +72,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
        }
 
        if err := models.AddSource(source); err != nil {
-               switch err {
-               default:
-                       ctx.Handle(500, "admin.auths.NewAuth", err)
-               }
+               ctx.Handle(500, "admin.auths.NewAuth", err)
                return
        }
 
@@ -132,9 +130,9 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
        } else if form.Type == models.LT_SMTP {
                config = &models.SMTPConfig{
                        Auth: form.SmtpAuth,
-                       Host: form.SmtpHost,
-                       Port: form.SmtpPort,
-                       TLS:  form.SmtpTls,
+                       Host: form.Host,
+                       Port: form.Port,
+                       TLS:  form.Tls,
                }
        }
 

diff --git a/templates/admin/auths/new.tmpl b/templates/admin/auths/new.tmpl
index 287c996c7f1a1c4028c741e4f638b7305563959b..e5dcb4339b94bb38f33deca3b08157476bf472dd 100644 (file)
--- a/templates/admin/auths/new.tmpl
+++ b/templates/admin/auths/new.tmpl
@@ -82,14 +82,13 @@
                     </div>
 
                     <div class="smtp hidden">
-                        <div class="form-group {{if .Err_TLS}}has-error has-feedback{{end}}">
+                        <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>
@@ -97,31 +96,42 @@
                         <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="smtphost" class="form-control" placeholder="Type host address" value="{{.host}}">
+                                <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="smtpport" class="form-control" placeholder="Type port number" value="{{.port}}">
+                                <input name="port" class="form-control" placeholder="Type port number" value="{{.port}}">
                             </div>
                         </div>
 
-                        <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" value="">
+                        <!-- <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 Register Confirmation</strong>
+                                    </label>
+                                </div>
                             </div>
-                        </div>
+                        </div> -->
                     </div>
-                    <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" value="">
+
+                    <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 Registeration</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>