finish new add auth UI

2026-10-14 01:35:55 +09:00 · 2015-09-10 17:11:41 -04:00
1 parent fa728d8dff
commit 0617448282
@@ -817,6 +817,7 @@ auths.host = Host
 auths.port = Port
 auths.bind_dn = Bind DN
 auths.bind_password = Bind Password
+auths.bind_password_helper = Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base = User Search Base
 auths.user_dn = User DN
 auths.attribute_name = First name attribute
@@ -834,7 +835,7 @@ auths.pam_service_name = PAM Service Name
 auths.enable_auto_register = Enable Auto Registration
 auths.tips = Tips
 auths.edit = Edit Authentication Setting
-auths.activated = This authentication has activated
+auths.activated = This authentication is activate
 auths.update_success = Authentication setting has been updated successfully.
 auths.update = Update Authentication Setting
 auths.delete = Delete This Authentication
@@ -39,7 +39,7 @@ var (
 	ErrAuthenticationUserUsed     = errors.New("Authentication has been used by some users")
 )

-var LoginTypes = map[LoginType]string{
+var LoginNames = map[LoginType]string{
 	LDAP:  "LDAP (via BindDN)",
 	DLDAP: "LDAP (simple auth)",
 	SMTP:  "SMTP",
@@ -118,8 +118,8 @@ func (source *LoginSource) BeforeSet(colName string, val xorm.Cell) {
 	}
 }

-func (source *LoginSource) TypeString() string {
-	return LoginTypes[source.Type]
+func (source *LoginSource) TypeName() string {
+	return LoginNames[source.Type]
 }

 func (source *LoginSource) LDAP() *LDAPConfig {
@@ -315,9 +315,7 @@ const (
 	SMTP_LOGIN = "LOGIN"
 )

-var (
-	SMTPAuths = []string{SMTP_PLAIN, SMTP_LOGIN}
-)
+var SMTPAuths = []string{SMTP_PLAIN, SMTP_LOGIN}

 func SMTPAuth(a smtp.Auth, cfg *SMTPConfig) error {
 	c, err := smtp.Dial(fmt.Sprintf("%s:%d", cfg.Host, cfg.Port))
@@ -10,13 +10,13 @@ import (
 )

 type AuthenticationForm struct {
-	ID                int64 `form:"id"`
-	Type              int
-	Name              string `binding:"Required;MaxSize(50)"`
+	ID                int64
+	Type              int    `binding:"Range(2,5)"`
+	Name              string `binding:"Required;MaxSize(30)"`
 	Host              string
 	Port              int
-	UseSSL            bool   `form:"use_ssl"`
-	BindDN            string `form:"bind_dn"`
+	UseSSL            bool
+	BindDN            string
 	BindPassword      string
 	UserBase          string
 	UserDN            string `form:"user_dn"`
@@ -25,14 +25,14 @@ type AuthenticationForm struct {
 	AttributeMail     string
 	Filter            string
 	AdminFilter       string
-	IsActived         bool
-	SMTPAuth          string `form:"smtp_auth"`
-	SMTPHost          string `form:"smtp_host"`
-	SMTPPort          int    `form:"smtp_port"`
-	TLS               bool   `form:"tls"`
+	IsActive          bool
+	SMTPAuth          string
+	SMTPHost          string
+	SMTPPort          int
+	TLS               bool
 	SkipVerify        bool
-	AllowAutoRegister bool `form:"allowautoregister"`
-	PAMServiceName    string
+	AllowAutoRegister bool
+	PAMServiceName    string `form:"pam_service_name"`
 }

 func (f *AuthenticationForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
@@ -4364,7 +4364,7 @@ func confLocaleLocale_deDeIni() (*asset, error) {
 	return a, nil
 }

-var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\xbd\xeb\x72\xdc\x48\xae\x27\xfe\x9d\x4f\xc1\xf6\x09\xff\xdd\x1d\x21\x97\xa3\xbb\xff\x7b\x89\x0e\xdb\xbd\xb2\xd4\xbe\xcc\xb1\x2c\x8d\xa5\x9e\xd9\x59\x87\xa3\x9a\x55\xa4\xaa\x38\xae\x22\xab\x49\x96\x65\xcd\x89\x13\xb1\xaf\xb1\xaf\xb7\x4f\xb2\xc0\x0f\x40\xde\xc8\x92\xed\x9e\x13\xbb\x5f\x24\x56\x26\xf2\x86\x44\x22\x01\x24\x12\x59\xec\x76\xf3\xb2\xea\x97\xf9\x93\xfc\x38\xdf\x15\x75\xb3\xa9\xfa\x3e\xef\xab\xcd\xf5\xc3\x75\xdb\x0f\x55\x99\xbf\xa8\x07\xfa\xdd\x7d\xac\x97\x55\x96\xad\xdb\x6d\x45\xa0\x2f\xe9\x5f\x56\x16\xfd\x7a\xd1\x16\x5d\x49\x09\xa7\xf6\x9d\x55\x9f\x76\x9b\xb6\x63\xa0\x5f\xe4\x2b\x5b\x57\x9b\x1d\x97\xa1\x7f\x59\x5f\xaf\x9a\x79\xdd\xd0\xcf\x4b\xfa\xca\x5f\x35\x59\xdf\x2e\xeb\x62\x33\x0f\x32\x90\x60\xf9\x3f\xe5\x3f\x34\x65\x7e\x39\x54\xbb\xfc\x71\xbf\x2d\x36\x9b\xa7\x45\x8f\x22\x43\x95\x17\xcb\x65\xbb\x6f\x86\xc7\x8f\x24\x43\x2a\x6f\xf7\x83\xd5\x7e\xbe\x1f\x24\x6d\xbf\xb3\xa4\x5f\x77\x59\x57\xad\x6a\x1a\x58\x47\x49\x6f\xf5\x33\xbb\xa9\x16\x7d\x3d\x70\xa7\xff\x2a\x5f\xd9\xc7\xaa\xeb\xeb\x96\xfb\xf3\x17\xf9\xca\x76\xc5\x8a\x01\x2e\xe8\x5f\x36\x54\xdb\xdd\xa6\x40\x81\x2b\xfd\xcc\x36\x45\xb3\xda\x0b\xcc\x6b\xfd\xcc\x96\x5d\x45\x59\xf3\xa6\xba\xa1\xd4\x13\xfc\x98\xcd\x66\xd9\x9e\xf0\x39\xdf\x75\xed\x75\xbd\xa9\xe6\x45\x53\xce\xb7\x82\xb1\x5f\x29\x3d\xd7\xf4\x9c\xd2\x73\x4e\xc7\x10\xaa\x92\x90\x33\x2f\x7a\x1d\x07\x4d\x0b\xe1\xaa\xe8\x33\x54\xd5\x14\x5b\x2b\xcd\x9f\x59\xb5\x2d\xea\x0d\x4f\xc0\x43\xfe\xa0\x8e\xf7\xfd\x4d\x8b\x69\xba\xd0\x4f\x42\xc2\x7c\xb8\xdd\x55\xc0\xc1\xc3\x2b\xfa\xca\x96\xc5\x6e\x58\xae\x0b\xee\xa7\x7c\x65\x04\xb4\x6b\x09\x19\x6d\x77\x0b\x38\xfb\x91\xb5\xdd\xaa\x68\xea\x7f\x14\x83\x20\xe8\x3c\xf8\x99\x6d\xeb\xae\x6b\x19\xb7\x67\xf8\xc8\x68\xe8\x73\xae\x87\x52\xde\x10\x16\x82\x5a\x38\x67\x5b\xaf\x3a\x41\x23\x67\x9e\xe1\x17\xd7\xc2\x79\xd7\x6d\xf7\x41\x33\x9e\xf3\x67\x52\x94\x3a\xa1\xb9\x71\xfb\x45\x43\x88\xd7\xdc\x33\xfc\x88\x00\xfa\xac\x28\xb7\x84\xca\x5d\xd1\x54\x8c\xa3\x63\xfe\x45\x78\xa1\x5f\x99\xd2\xd3\xbc\xaf\x86\xa1\x6e\x56\x8c\xec\x63\x49\xca\x2f\x35\x29\x0b\xf2\x5c\xda\x6d\xbb\x77\xd3\x49\xe9\x7f\xa3\x9f\xf9\x85\xfc\x94\xbc\xa0\x10\x32\x5d\x49\x1e\x49\x3f\xbf\xae\xaa\x52\xc6\xd2\xe7\xcf\xe9\x3b\xdb\xed\x37\x1b\xc2\xda\xef\xfb\xaa\x1f\xb8\xd0\x05\xfd\xa6\xf1\xcb\xef\xac\xee\x7b\xfa\xa0\xe4\x57\xf8\xc8\x68\xea\x9a\x25\x06\x73\x82\x8f\x2c\x7b\xd7\x57\x45\xb7\x5c\xbf\xcf\xe4\x3f\xfa\xca\x1f\x4c\x7b\x87\x26\x95\x09\x49\x89\x48\x5a\xb0\x06\xb2\x65\x5b\xf2\x8f\x13\xfa\x47\x55\xd7\x4d\x3f\xd0\x6a\x7b\x9f\xe9\x07\x83\xc9\x97\x4c\xc0\x50\x0f\xc0\x82\x26\x62\xe9\xf6\x3c\x83\xf9\xf3\xba\xeb\x87\x87\x43\x4d\xc4\xfa\x76\xdf\x64\x3c\x3e\x5a\x69\xf3\x72\x61\x0c\xe8\x45\x4b\x28\x42\x72\x47\xe3\x3b\xbb\xbd\xfc\xf3\xeb\xa3\xfc\x82\xb8\xd0\xaa\xab\xe8\x3b\xa7\x3a\xe8\x1f\x95\xf9\x71\x96\x51\x29\x6b\xe9\xb4\x18\x8a\x45\xd1\x57\x1e\xad\x9c\x29\xd4\xed\xf2\x40\xe3\xcc\xd1\xc0\xbd\xfa\x21\x1a\xef\xd4\x0a\xa1\x3a\x74\x5d\xb9\x3a\xde\xf0\xe2\xa2\x74\x66\x68\x28\x7c\xb1\xa9\x38\x9d\xaa\xca\x5f\xbd\x79\x73\x7e\xfa\x2c\xaf\x9a\x55\xdd\x54\xf9\x4d\x3d\xac\xf3\xfd\x70\xfd\x5f\xe7\xab\xaa\xa9\x3a\xe2\x6f\xcb\x3a\xa7\x35\xd5\x11\x25\xe4\x44\xd8\x32\xb8\x59\xd6\xf7\x1b\x5a\xfb\x40\xef\xe5\xe5\xeb\xfc\x8c\x51\xbc\x2b\x86\x35\x3a\x32\xac\xb3\xfe\xf7\x0d\xa3\xc8\x35\x78\xb5\xae\x72\x50\x19\x80\xda\x6b\xc3\x47\x5e\x6a\x1f\x67\x59\xd5\x75\x73\x62\x49\xc3\xed\x5c\x0b\x6b\x7d\x29\xa4\x54\x41\xa4\xd3\xb4\x43\xbe\xa8\x72\x94\x99\x65\x99\x75\xd8\xb0\x7b\xbc\xdb\x6d\xea\xa5\xac\xf5\x17\x92\xe7\x11\xcd\xbb\x87\x62\x29\x84\x03\xa2\x2c\x2f\x40\x17\xb1\x66\x5e\x0f\x79\xc4\x40\x50\x7e\x5d\x11\x03\x5c\xef\x57\xc2\xf6\x36\xed\xbe\xfc\x06\x94\x6a\xbd\xf7\x84\x9a\xbf\x6d\xa9\xc3\xc0\x8e\x03\xf0\x4d\x1c\x13\xc5\xf1\x86\xd5\x55\xdb\x96\xf8\x8a\x23\xf6\x9a\x08\xea\xa6\xa6\x4c\x1a\x69\x5f\x7c\xa4\xf5\x36\xb4\xf9\xb0\xae\xfb\xbc\x24\x62\x5b\x72\xc5\xb4\x34\xf6\xb4\x55\x08\x59\x10\x81\x0a\x69\x58\x5a\x3c\x07\x80\xda\xee\x89\x9a\xd6\x54\x19\x6f\x44\xbc\x6b\x52\x95\x53\xfd\xc4\x90\xa8\x1e\xd0\x37\x51\x6e\x4b\x5c\x99\xf9\xe6\x29\x3e\xf4\x77\x58\x3f\xf5\xaa\xb8\xbe\xa6\x5e\xf5\x44\x15\x2f\xf3\xe5\xa6\x25\x92\xfa\xf5\xed\xeb\x9e\x09\x66\x3d\xdf\xb5\x1d\xb6\x38\xca\xba\xa0\x4f\x97\x16\x20\x9a\x21\x9a\xfd\x76\x41\xbf\x6e\xd6\x35\x71\x00\xa0\x9d\x4b\xf0\x4e\x4e\xa9\xd4\xc4\xbe\xa7\x29\x3c\xca\x89\x84\x69\x04\x84\x32\x10\x00\x8f\xa1\xac\xfb\x62\x41\x73\xcf\xe0\xd7\xb4\x65\xed\x3b\x22\xab\xf5\x30\xec\xac\xe5\x97\x57\x57\x17\xd2\xb4\x4b\xbd\xab\xed\x22\xa0\x0c\xcc\xc1\x86\x37\xdd\x26\x6f\x9b\x19\x88\x64\xdf\x6d\x12\xfa\xa1\xb1\x5a\xce\x01\xbc\x70\x17\x1e\xf1\x9f\x4b\x8f\x1e\xe0\xb9\x27\xc9\xe4\x06\xd4\x44\x38\xae\xb0\x01\x12\x51\xb7\x3b\xae\x37\xa0\xea\x73\x4d\xf0\xa4\x8c\x4d\xd3\xe5\xcb\xd6\x49\xb9\x90\x7b\x02\xf6\xbf\xa5\x01\x2b\x1b\xb9\x3c\x23\x34\x80\x97\x20\xf5\xba\x6b\xb7\x94\xfa\x9c\xfe\xf9\x04\xdf\xfd\x33\xae\x0f\x30\x45\x59\x12\x7f\xeb\x8f\xf2\xb7\xcf\x4f\xf2\xff\xf4\xe3\x0f\x3f\xcc\xf2\x57\x03\xaf\x44\x26\xce\xbf\x33\x51\xd1\xa7\xec\xe1\x0e\x94\x58\xc6\x4Line truncated
+var _confLocaleLocale_enUsIni = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xc4\xbd\xeb\x72\xdc\x48\xae\x27\xfe\x9d\x4f\xc1\xf6\x09\xff\xdd\x1d\x21\x97\xa3\xbb\xff\x7b\x89\x0e\xdb\xbd\xb2\xd4\xbe\xcc\xb1\x2c\x8d\xa5\x9e\xd9\x59\x87\xa3\x9a\x55\xa4\xaa\x38\xae\x22\xab\x49\x96\x65\xcd\x89\x13\xb1\xaf\xb1\xaf\xb7\x4f\xb2\xc0\x0f\x40\xde\xc8\x92\xed\x9e\x13\xbb\x5f\x24\x56\x26\xf2\x86\x44\x22\x01\x24\x12\x59\xec\x76\xf3\xb2\xea\x97\xf9\x93\xfc\x38\xdf\x15\x75\xb3\xa9\xfa\x3e\xef\xab\xcd\xf5\xc3\x75\xdb\x0f\x55\x99\xbf\xa8\x07\xfa\xdd\x7d\xac\x97\x55\x96\xad\xdb\x6d\x45\xa0\x2f\xe9\x5f\x56\x16\xfd\x7a\xd1\x16\x5d\x49\x09\xa7\xf6\x9d\x55\x9f\x76\x9b\xb6\x63\xa0\x5f\xe4\x2b\x5b\x57\x9b\x1d\x97\xa1\x7f\x59\x5f\xaf\x9a\x79\xdd\xd0\xcf\x4b\xfa\xca\x5f\x35\x59\xdf\x2e\xeb\x62\x33\x0f\x32\x90\x60\xf9\x3f\xe5\x3f\x34\x65\x7e\x39\x54\xbb\xfc\x71\xbf\x2d\x36\x9b\xa7\x45\x8f\x22\x43\x95\x17\xcb\x65\xbb\x6f\x86\xc7\x8f\x24\x43\x2a\x6f\xf7\x83\xd5\x7e\xbe\x1f\x24\x6d\xbf\xb3\xa4\x5f\x77\x59\x57\xad\x6a\x1a\x58\x47\x49\x6f\xf5\x33\xbb\xa9\x16\x7d\x3d\x70\xa7\xff\x2a\x5f\xd9\xc7\xaa\xeb\xeb\x96\xfb\xf3\x17\xf9\xca\x76\xc5\x8a\x01\x2e\xe8\x5f\x36\x54\xdb\xdd\xa6\x40\x81\x2b\xfd\xcc\x36\x45\xb3\xda\x0b\xcc\x6b\xfd\xcc\x96\x5d\x45\x59\xf3\xa6\xba\xa1\xd4\x13\xfc\x98\xcd\x66\xd9\x9e\xf0\x39\xdf\x75\xed\x75\xbd\xa9\xe6\x45\x53\xce\xb7\x82\xb1\x5f\x29\x3d\xd7\xf4\x9c\xd2\x73\x4e\xc7\x10\xaa\x92\x90\x33\x2f\x7a\x1d\x07\x4d\x0b\xe1\xaa\xe8\x33\x54\xd5\x14\x5b\x2b\xcd\x9f\x59\xb5\x2d\xea\x0d\x4f\xc0\x43\xfe\xa0\x8e\xf7\xfd\x4d\x8b\x69\xba\xd0\x4f\x42\xc2\x7c\xb8\xdd\x55\xc0\xc1\xc3\x2b\xfa\xca\x96\xc5\x6e\x58\xae\x0b\xee\xa7\x7c\x65\x04\xb4\x6b\x09\x19\x6d\x77\x0b\x38\xfb\x91\xb5\xdd\xaa\x68\xea\x7f\x14\x83\x20\xe8\x3c\xf8\x99\x6d\xeb\xae\x6b\x19\xb7\x67\xf8\xc8\x68\xe8\x73\xae\x87\x52\xde\x10\x16\x82\x5a\x38\x67\x5b\xaf\x3a\x41\x23\x67\x9e\xe1\x17\xd7\xc2\x79\xd7\x6d\xf7\x41\x33\x9e\xf3\x67\x52\x94\x3a\xa1\xb9\x71\xfb\x45\x43\x88\xd7\xdc\x33\xfc\x88\x00\xfa\xac\x28\xb7\x84\xca\x5d\xd1\x54\x8c\xa3\x63\xfe\x45\x78\xa1\x5f\x99\xd2\xd3\xbc\xaf\x86\xa1\x6e\x56\x8c\xec\x63\x49\xca\x2f\x35\x29\x0b\xf2\x5c\xda\x6d\xbb\x77\xd3\x49\xe9\x7f\xa3\x9f\xf9\x85\xfc\x94\xbc\xa0\x10\x32\x5d\x49\x1e\x49\x3f\xbf\xae\xaa\x52\xc6\xd2\xe7\xcf\xe9\x3b\xdb\xed\x37\x1b\xc2\xda\xef\xfb\xaa\x1f\xb8\xd0\x05\xfd\xa6\xf1\xcb\xef\xac\xee\x7b\xfa\xa0\xe4\x57\xf8\xc8\x68\xea\x9a\x25\x06\x73\x82\x8f\x2c\x7b\xd7\x57\x45\xb7\x5c\xbf\xcf\xe4\x3f\xfa\xca\x1f\x4c\x7b\x87\x26\x95\x09\x49\x89\x48\x5a\xb0\x06\xb2\x65\x5b\xf2\x8f\x13\xfa\x47\x55\xd7\x4d\x3f\xd0\x6a\x7b\x9f\xe9\x07\x83\xc9\x97\x4c\xc0\x50\x0f\xc0\x82\x26\x62\xe9\xf6\x3c\x83\xf9\xf3\xba\xeb\x87\x87\x43\x4d\xc4\xfa\x76\xdf\x64\x3c\x3e\x5a\x69\xf3\x72\x61\x0c\xe8\x45\x4b\x28\x42\x72\x47\xe3\x3b\xbb\xbd\xfc\xf3\xeb\xa3\xfc\x82\xb8\xd0\xaa\xab\xe8\x3b\xa7\x3a\xe8\x1f\x95\xf9\x71\x96\x51\x29\x6b\xe9\xb4\x18\x8a\x45\xd1\x57\x1e\xad\x9c\x29\xd4\xed\xf2\x40\xe3\xcc\xd1\xc0\xbd\xfa\x21\x1a\xef\xd4\x0a\xa1\x3a\x74\x5d\xb9\x3a\xde\xf0\xe2\xa2\x74\x66\x68\x28\x7c\xb1\xa9\x38\x9d\xaa\xca\x5f\xbd\x79\x73\x7e\xfa\x2c\xaf\x9a\x55\xdd\x54\xf9\x4d\x3d\xac\xf3\xfd\x70\xfd\x5f\xe7\xab\xaa\xa9\x3a\xe2\x6f\xcb\x3a\xa7\x35\xd5\x11\x25\xe4\x44\xd8\x32\xb8\x59\xd6\xf7\x1b\x5a\xfb\x40\xef\xe5\xe5\xeb\xfc\x8c\x51\xbc\x2b\x86\x35\x3a\x32\xac\xb3\xfe\xf7\x0d\xa3\xc8\x35\x78\xb5\xae\x72\x50\x19\x80\xda\x6b\xc3\x47\x5e\x6a\x1f\x67\x59\xd5\x75\x73\x62\x49\xc3\xed\x5c\x0b\x6b\x7d\x29\xa4\x54\x41\xa4\xd3\xb4\x43\xbe\xa8\x72\x94\x99\x65\x99\x75\xd8\xb0\x7b\xbc\xdb\x6d\xea\xa5\xac\xf5\x17\x92\xe7\x11\xcd\xbb\x87\x62\x29\x84\x03\xa2\x2c\x2f\x40\x17\xb1\x66\x5e\x0f\x79\xc4\x40\x50\x7e\x5d\x11\x03\x5c\xef\x57\xc2\xf6\x36\xed\xbe\xfc\x06\x94\x6a\xbd\xf7\x84\x9a\xbf\x6d\xa9\xc3\xc0\x8e\x03\xf0\x4d\x1c\x13\xc5\xf1\x86\xd5\x55\xdb\x96\xf8\x8a\x23\xf6\x9a\x08\xea\xa6\xa6\x4c\x1a\x69\x5f\x7c\xa4\xf5\x36\xb4\xf9\xb0\xae\xfb\xbc\x24\x62\x5b\x72\xc5\xb4\x34\xf6\xb4\x55\x08\x59\x10\x81\x0a\x69\x58\x5a\x3c\x07\x80\xda\xee\x89\x9a\xd6\x54\x19\x6f\x44\xbc\x6b\x52\x95\x53\xfd\xc4\x90\xa8\x1e\xd0\x37\x51\x6e\x4b\x5c\x99\xf9\xe6\x29\x3e\xf4\x77\x58\x3f\xf5\xaa\xb8\xbe\xa6\x5e\xf5\x44\x15\x2f\xf3\xe5\xa6\x25\x92\xfa\xf5\xed\xeb\x9e\x09\x66\x3d\xdf\xb5\x1d\xb6\x38\xca\xba\xa0\x4f\x97\x16\x20\x9a\x21\x9a\xfd\x76\x41\xbf\x6e\xd6\x35\x71\x00\xa0\x9d\x4b\xf0\x4e\x4e\xa9\xd4\xc4\xbe\xa7\x29\x3c\xca\x89\x84\x69\x04\x84\x32\x10\x00\x8f\xa1\xac\xfb\x62\x41\x73\xcf\xe0\xd7\xb4\x65\xed\x3b\x22\xab\xf5\x30\xec\xac\xe5\x97\x57\x57\x17\xd2\xb4\x4b\xbd\xab\xed\x22\xa0\x0c\xcc\xc1\x86\x37\xdd\x26\x6f\x9b\x19\x88\x64\xdf\x6d\x12\xfa\xa1\xb1\x5a\xce\x01\xbc\x70\x17\x1e\xf1\x9f\x4b\x8f\x1e\xe0\xb9\x27\xc9\xe4\x06\xd4\x44\x38\xae\xb0\x01\x12\x51\xb7\x3b\xae\x37\xa0\xea\x73\x4d\xf0\xa4\x8c\x4d\xd3\xe5\xcb\xd6\x49\xb9\x90\x7b\x02\xf6\xbf\xa5\x01\x2b\x1b\xb9\x3c\x23\x34\x80\x97\x20\xf5\xba\x6b\xb7\x94\xfa\x9c\xfe\xf9\x04\xdf\xfd\x33\xae\x0f\x30\x45\x59\x12\x7f\xeb\x8f\xf2\xb7\xcf\x4f\xf2\xff\xf4\xe3\x0f\x3f\xcc\xf2\x57\x03\xaf\x44\x26\xce\xbf\x33\x51\xd1\xa7\xec\xe1\x0e\x94\x58\xc6\x4Line truncated

 func confLocaleLocale_enUsIniBytes() ([]byte, error) {
 	return bindataRead(
@@ -4379,7 +4379,7 @@ func confLocaleLocale_enUsIni() (*asset, error) {
 		return nil, err
 	}

-	info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42467, mode: os.FileMode(420), modTime: time.Unix(1441912678, 0)}
+	info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42580, mode: os.FileMode(420), modTime: time.Unix(1441919427, 0)}
 	a := &asset{bytes: bytes, info:  info}
 	return a, nil
 }
@@ -147,7 +147,7 @@ function initInstall() {

    // Database type change detection.
    $("#db_type").change(function () {
-        var db_type = $('#db_type').val();
+        var db_type = $(this).val();
        if (db_type === "SQLite3" || db_type === "TiDB") {
            $('#sql_settings').hide();
            $('#pgsql_settings').hide();
@@ -442,6 +442,44 @@ function initWebhook() {
    });
 }

+
+function initAdmin() {
+    if ($('.admin').length == 0) {
+        return;
+    }
+
+    // New authentication
+    if ($('.admin.new.authentication').length > 0) {
+        $('#auth_type').change(function () {
+            var auth_type = $(this).val();
+            switch (auth_type) {
+                case '2':     // LDAP
+                    $('.dldap').hide();
+                    $('.smtp').hide();
+                    $('.pam').hide();
+                    $('.ldap').show();
+                    break;
+                case '3':     // SMTP
+                    $('.ldap').hide();
+                    $('.pam').hide();
+                    $('.smtp').show();
+                    break;
+                case '4':     // PAM
+                    $('.ldap').hide();
+                    $('.smtp').hide();
+                    $('.pam').show();
+                    break;
+                case '5':     // LDAP
+                    $('.ldap').hide();
+                    $('.smtp').hide();
+                    $('.pam').hide();
+                    $('.dldap').show();
+                    break;
+            }
+        });
+    }
+}
+
 $(document).ready(function () {
    csrf = $('meta[name=_csrf]').attr("content");
    suburl = $('meta[name=_suburl]').attr("content");
@@ -563,4 +601,5 @@ $(document).ready(function () {
    initOrganization();
    initUser();
    initWebhook();
+    initAdmin();
 });
@@ -39,11 +39,28 @@ func Authentications(ctx *middleware.Context) {
 	ctx.HTML(200, AUTHS)
 }

+type AuthSource struct {
+	Name string
+	Type models.LoginType
+}
+
+var authSources = []AuthSource{
+	{models.LoginNames[models.LDAP], models.LDAP},
+	{models.LoginNames[models.DLDAP], models.DLDAP},
+	{models.LoginNames[models.SMTP], models.SMTP},
+	{models.LoginNames[models.PAM], models.PAM},
+}
+
 func NewAuthSource(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("admin.auths.new")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminAuthentications"] = true
-	ctx.Data["LoginTypes"] = models.LoginTypes
+
+	ctx.Data["type"] = models.LDAP
+	ctx.Data["CurTypeName"] = models.LoginNames[models.LDAP]
+	ctx.Data["smtp_auth"] = "PLAIN"
+	ctx.Data["is_active"] = true
+	ctx.Data["AuthSources"] = authSources
 	ctx.Data["SMTPAuths"] = models.SMTPAuths
 	ctx.HTML(200, AUTH_NEW)
 }
@@ -52,7 +69,9 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
 	ctx.Data["Title"] = ctx.Tr("admin.auths.new")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminAuthentications"] = true
-	ctx.Data["LoginTypes"] = models.LoginTypes
+
+	ctx.Data["CurTypeName"] = models.LoginNames[models.LoginType(form.Type)]
+	ctx.Data["AuthSources"] = authSources
 	ctx.Data["SMTPAuths"] = models.SMTPAuths

 	if ctx.HasError() {
@@ -62,9 +81,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {

 	var u core.Conversion
 	switch models.LoginType(form.Type) {
-	case models.LDAP:
-		fallthrough
-	case models.DLDAP:
+	case models.LDAP, models.DLDAP:
 		u = &models.LDAPConfig{
 			Ldapsource: ldap.Ldapsource{
 				Name:             form.Name,
@@ -103,7 +120,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
 	var source = &models.LoginSource{
 		Type:              models.LoginType(form.Type),
 		Name:              form.Name,
-		IsActived:         true,
+		IsActived:         form.IsActive,
 		AllowAutoRegister: form.AllowAutoRegister,
 		Cfg:               u,
 	}
@@ -121,7 +138,7 @@ func EditAuthSource(ctx *middleware.Context) {
 	ctx.Data["Title"] = ctx.Tr("admin.auths.edit")
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminAuthentications"] = true
-	ctx.Data["LoginTypes"] = models.LoginTypes
+	// ctx.Data["LoginTypes"] = models.LoginTypes
 	ctx.Data["SMTPAuths"] = models.SMTPAuths

 	id := com.StrTo(ctx.Params(":authid")).MustInt64()
@@ -143,7 +160,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
 	ctx.Data["PageIsAdmin"] = true
 	ctx.Data["PageIsAdminAuthentications"] = true
 	ctx.Data["PageIsAuths"] = true
-	ctx.Data["LoginTypes"] = models.LoginTypes
+	// ctx.Data["LoginTypes"] = models.LoginTypes
 	ctx.Data["SMTPAuths"] = models.SMTPAuths

 	if ctx.HasError() {
@@ -194,7 +211,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
 	u := models.LoginSource{
 		ID:                form.ID,
 		Name:              form.Name,
-		IsActived:         form.IsActived,
+		IsActived:         form.IsActive,
 		Type:              models.LoginType(form.Type),
 		AllowAutoRegister: form.AllowAutoRegister,
 		Cfg:               config,
@@ -29,7 +29,7 @@
              <tr>
                <td>{{.ID}}</td>
                <td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
-                <td>{{.TypeString}}</td>
+                <td>{{.TypeName}}</td>
                <td><i class="fa fa{{if .IsActived}}-check{{end}}-square-o"></i></td>
                <td><span class="poping up" data-content="{{DateFmtLong .Updated}}" data-variation="tiny">{{DateFmtShort .Updated}}</span></td>
                <td><span class="poping up" data-content="{{DateFmtLong .Created}}" data-variation="tiny">{{DateFmtShort .Created}}</span></td>
@@ -1,140 +1,156 @@
-{{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.auths.new"}}</strong>
-                            </div>
-                            <form class="form form-align panel-body" id="repo-setting-form" action="{{AppSubUrl}}/admin/auths/new" method="post">
-                                {{.CsrfTokenHtml}}
-                                <div class="field">
-                                    <label class="req">{{.i18n.Tr "admin.auths.auth_type"}}</label>
-                                    <select id="auth-type" name="type">
-                                        {{range $key, $val := .LoginTypes}}
-                                        <option value="{{$key}}">{{$val}}</option>
-                                        {{end}}
-                                    </select>
-                                </div>
-                                <div class="field">
-                                    <label class="req" for="name">{{.i18n.Tr "admin.auths.auth_name"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_AuthName}}ipt-error{{end}}" id="name" name="name" value="{{.name}}" required />
-                                </div>
-                                <div class="dldap ldap">
-                                    <div class="dldap ldap field">
-                                        <label class="req" for="host">{{.i18n.Tr "admin.auths.host"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_Host}}ipt-error{{end}}" id="host" name="host" value="{{.host}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label class="req" for="port">{{.i18n.Tr "admin.auths.port"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_Port}}ipt-error{{end}}" id="port" name="port" value="{{.port}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label for="use_ssl">{{.i18n.Tr "admin.auths.enable_tls"}}</label>
-                                        <input name="use_ssl" type="checkbox" {{if .use_ssl}}checked{{end}}>
-                                    </div>
-                                    <div class="ldap field">
-                                        <label class="req" for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_BindDN}}ipt-error{{end}}" id="bind_dn" name="bind_dn" value="{{.bind_dn}}" />
-                                    </div>
-                                    <div class="ldap field">
-                                        <label class="req" for="bind_password">{{.i18n.Tr "admin.auths.bind_password"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_BindPassword}}ipt-error{{end}}" id="bind_password" name="bind_password" type="password" value="{{.bind_password}}" />
-                                    </div>
-                                    <div class="ldap field">
-                                        <label class="req" for="user_base">{{.i18n.Tr "admin.auths.user_base"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_UserBase}}ipt-error{{end}}" id="user_base" name="user_base" value="{{.user_base}}" />
-                                    </div>
-                                    <div class="dldap field hidden">
-                                        <label class="req" for="user_dn">{{.i18n.Tr "admin.auths.user_dn"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_UserDN}}ipt-error{{end}}" id="user_dn" name="user_dn" value="{{.user_dn}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label class="req" for="filter">{{.i18n.Tr "admin.auths.filter"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_Filter}}ipt-error{{end}}" id="filter" name="filter" value="{{.filter}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label for="filter">{{.i18n.Tr "admin.auths.admin_filter"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_AdminFilter}}ipt-error{{end}}" id="admin_filter" name="admin_filter" value="{{.admin_filter}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_AttributeName}}ipt-error{{end}}" id="attribute_name" name="attribute_name" value="{{.attribute_name}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label for="attribute_surname">{{.i18n.Tr "admin.auths.attribute_surname"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_AttributeSurname}}ipt-error{{end}}" id="attribute_surname" name="attribute_surname" value="{{.attribute_surname}}" />
-                                    </div>
-                                    <div class="dldap ldap field">
-                                        <label class="req" for="attribute_mail">{{.i18n.Tr "admin.auths.attribute_mail"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_AttributeMail}}ipt-error{{end}}" id="attribute_mail" name="attribute_mail" value="{{.attribute_mail}}" />
-                                    </div>
-                                </div>
-                                <div class="smtp hidden">
-                                    <div class="field">
-                                        <label class="req">{{.i18n.Tr "admin.auths.smtp_auth"}}</label>
-                                        <select name="smtp_auth">
-                                            {{range .SMTPAuths}}
-                                            <option value="{{.}}">{{.}}</option>
-                                            {{end}}
-                                        </select>
-                                    </div>
-                                    <div class="field">
-                                        <label class="req" for="smtp_host">{{.i18n.Tr "admin.auths.smtphost"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_SmtpHost}}ipt-error{{end}}" id="smtp_host" name="smtp_host" value="{{.smtp_host}}" />
-                                    </div>
-                                    <div class="field">
-                                        <label class="req" for="smtp_port">{{.i18n.Tr "admin.auths.smtpport"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.smtp_port}}" />
-                                    </div>
-                                </div>
-                                <div class="pam hidden">
-                                    <div class="field">
-                                        <label class="req" for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label>
-                                        <input class="ipt ipt-large ipt-radius {{if .Err_PAMServiceName}}ipt-error{{end}}" id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}" />
-                                    </div>
-                                </div>
-                                <div class="field">
-                                    <div class="smtp hidden">
-                                        <label></label>
-                                        <input name="tls" type="checkbox" {{if .tls}}checked{{end}}>
-                                        <strong>{{.i18n.Tr "admin.auths.enable_tls"}}</strong>
-                                        <br>
-                                        <label></label>
-                                        <input name="skip_verify" type="checkbox" {{if .skip_verify}}checked{{end}}>
-                                        <strong>{{.i18n.Tr "admin.auths.skip_tls_verify"}}</strong>
-                                        <br>
-                                    </div>
-                                    <label></label>
-                                    <input name="allowautoregister" type="checkbox" {{if .allowautoregister}}checked{{end}}>
-                                    <strong>{{.i18n.Tr "admin.auths.enable_auto_register"}}</strong>
-                                </div>
-                                <div class="field">
-                                    <label></label>
-                                    <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "admin.auths.new"}}</button>
-                                </div>
-                            </form>
-                        </div>
-                        <br>
-                        <div class="panel panel-radius">
-                            <div class="panel-header">
-                                {{.i18n.Tr "admin.auths.tips"}}
-                            </div>
-                            <div class="panel-body admin-panel">
-                                <h5>GMail Setting:</h5>
-                                <p>Host: smtp.gmail.com, Post: 587, Enable TLS Encryption: true</p>
-                            </div>
-                        </div>
-                    </div>
+{{template "base/head" .}}
+<div class="admin new authentication">
+  <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.auths.new"}}
+        </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_Type}}error{{end}}">
+              <label>{{.i18n.Tr "admin.auths.auth_type"}}</label>
+              <div class="ui selection type dropdown">
+                <input type="hidden" id="auth_type" name="type" value="{{.type}}">
+                <div class="text">{{.CurTypeName}}</div>
+                <i class="dropdown icon"></i>
+                <div class="menu">
+                  {{range .AuthSources}}
+                  <div class="item" data-value="{{.Type}}">{{.Name}}</div>
+                  {{end}}
+                </div>
+              </div>
+            </div>
+            <div class="required inline field {{if .Err_Name}}error{{end}}">
+              <label for="name">{{.i18n.Tr "admin.auths.auth_name"}}</label>
+              <input id="name" name="name" value="{{.name}}" autofocus required>
+            </div>
+
+            <!-- LDAP and DLDAP -->
+            <div class="ldap dldap field {{if not (or (eq .type 2) (eq .type 5))}}hide{{end}}">
+                <div class="required field">
+                    <label for="host">{{.i18n.Tr "admin.auths.host"}}</label>
+                    <input id="host" name="host" value="{{.host}}" placeholder="e.g. mydomain.com">
+                </div>
+                <div class="required field">
+                    <label for="port">{{.i18n.Tr "admin.auths.port"}}</label>
+                    <input id="port" name="port" value="{{.port}}"  placeholder="e.g. 636">
+                </div>
+                <div class="ldap required field {{if not (eq .type 2)}}hide{{end}}">
+                    <label for="bind_dn">{{.i18n.Tr "admin.auths.bind_dn"}}</label>
+                    <input id="bind_dn" name="bind_dn" value="{{.bind_dn}}" placeholder="e.g. cn=Search,dc=mydomain,dc=com">
+                </div>
+                <input class="fake" type="password">
+                <div class="ldap required field {{if not (eq .type 2)}}hide{{end}}">
+                    <label for="bind_password">{{.i18n.Tr "admin.auths.bind_password"}}</label>
+                    <input id="bind_password" name="bind_password" type="password" value="{{.bind_password}}">
+                    <p class="help text red">{{.i18n.Tr "admin.auths.bind_password_helper"}}</p>
+                </div>
+                <div class="ldap required field {{if not (eq .type 2)}}hide{{end}}">
+                    <label for="user_base">{{.i18n.Tr "admin.auths.user_base"}}</label>
+                    <input id="user_base" name="user_base" value="{{.user_base}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com">
+                </div>
+                <div class="dldap required field {{if not (eq .type 5)}}hide{{end}}">
+                    <label for="user_dn">{{.i18n.Tr "admin.auths.user_dn"}}</label>
+                    <input id="user_dn" name="user_dn" value="{{.user_dn}}" placeholder="e.g. ou=Users,dc=mydomain,dc=com">
+                </div>
+                <div class="required field">
+                    <label for="filter">{{.i18n.Tr "admin.auths.filter"}}</label>
+                    <input id="filter" name="filter" value="{{.filter}}" placeholder="e.g. (&(objectClass=posixAccount)(uid=%s))">
+                </div>
+                <div class="field">
+                    <label for="admin_filter">{{.i18n.Tr "admin.auths.admin_filter"}}</label>
+                    <input id="admin_filter" name="admin_filter" value="{{.admin_filter}}">
+                </div>
+                <div class="field">
+                    <label for="attribute_name">{{.i18n.Tr "admin.auths.attribute_name"}}</label>
+                    <input id="attribute_name" name="attribute_name" value="{{.attribute_name}}">
+                </div>
+                <div class="field">
+                    <label for="attribute_surname">{{.i18n.Tr "admin.auths.attribute_surname"}}</label>
+                    <input id="attribute_surname" name="attribute_surname" value="{{.attribute_surname}}">
+                </div>
+                <div class="required field">
+                    <label for="attribute_mail">{{.i18n.Tr "admin.auths.attribute_mail"}}</label>
+                    <input id="attribute_mail" name="attribute_mail" value="{{.attribute_mail}}" placeholder="e.g. mail">
                </div>
            </div>
+
+            <!-- SMTP -->
+            <div class="smtp field {{if not (eq .type 3)}}hide{{end}}">
+              <div class="inline required field">
+                <label>{{.i18n.Tr "admin.auths.smtp_auth"}}</label>
+                <div class="ui selection type dropdown">
+                  <input type="hidden" id="smtp_auth" name="smtp_auth" value="{{.smtp_auth}}">
+                  <div class="text">{{.smtp_auth}}</div>
+                  <i class="dropdown icon"></i>
+                  <div class="menu">
+                    {{range .SMTPAuths}}
+                    <div class="item" data-value="{{.}}">{{.}}</div>
+                    {{end}}
+                  </div>
+                </div>
+              </div>
+              <div class="required field">
+                  <label for="smtp_host">{{.i18n.Tr "admin.auths.smtphost"}}</label>
+                  <input id="smtp_host" name="smtp_host" value="{{.smtp_host}}" />
+              </div>
+              <div class="required field">
+                  <label for="smtp_port">{{.i18n.Tr "admin.auths.smtpport"}}</label>
+                  <input id="smtp_port" name="smtp_port" value="{{.smtp_port}}" />
+              </div>
+            </div>
+
+            <!-- PAM -->
+            <div class="pam required field {{if not (eq .type 4)}}hide{{end}}">
+              <label for="pam_service_name">{{.i18n.Tr "admin.auths.pam_service_name"}}</label>
+              <input id="pam_service_name" name="pam_service_name" value="{{.pam_service_name}}" />
+            </div>
+
+            <div class="ldap dldap smtp inline field {{if not (or (or (eq .type 2) (eq .type 5)) (eq .type 3))}}hide{{end}}">
+              <div class="ui checkbox">
+                <label><strong>{{.i18n.Tr "admin.auths.enable_tls"}}</strong></label>
+                <input name="tls" type="checkbox" {{if .tls}}checked{{end}}>
+              </div>
+            </div>
+            <div class="smtp inline field {{if not (eq .type 3)}}hide{{end}}">
+              <div class="ui checkbox">
+                <label><strong>{{.i18n.Tr "admin.auths.skip_tls_verify"}}</strong></label>
+                <input name="skip_verify" type="checkbox" {{if .skip_verify}}checked{{end}}>
+              </div>
+            </div>
+            <div class="inline field">
+              <div class="ui checkbox">
+                <label><strong>{{.i18n.Tr "admin.auths.enable_auto_register"}}</strong></label>
+                <input name="allow_auto_register" type="checkbox" {{if .allow_auto_register}}checked{{end}}>
+              </div>
+            </div>
+            <div class="inline field">
+              <div class="ui checkbox">
+                <label><strong>{{.i18n.Tr "admin.auths.activated"}}</strong></label>
+                <input name="is_active" type="checkbox" {{if .is_active}}checked{{end}}>
+              </div>
+            </div>
+
+            <div class="field">
+               <button class="ui green button">{{.i18n.Tr "admin.auths.new"}}</button>
+            </div>
+          </form>
        </div>
+
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "admin.auths.tips"}}
+        </h4>
+        <div class="ui attached segment">
+          <h5>GMail Setting:</h5>
+          <p>Host: smtp.gmail.com, Post: 587, Enable TLS Encryption: true</p>
+          </div>
+      </div>
+    </div>
 	</div>
 </div>
-{{template "ng/base/footer" .}}
+{{template "base/footer" .}}