more minor fix on 1581

This commit is contained in:
Unknwon committed 2015-09-10 15:45:03 -04:00
1 parent 26ac016b9f
commit fa728d8dff
9 files changed
+70 -70

No files matched your search

+3 -2
View File
@@ -14,7 +14,7 @@ version = Version
page = Page
template = Template
language = Language
create_new = Create new...
create_new = Create...
user_profile_and_more = User profile and more
signed_in_as = Signed in as
@@ -718,6 +718,7 @@ notices = System Notices
monitor = Monitoring
prev = Prev.
next = Next
total = Total: %d
dashboard.statistic = Statistic
dashboard.operations = Operations
@@ -804,7 +805,7 @@ repos.stars = Stars
repos.issues = Issues
auths.auth_manage_panel = Authentication Manage Panel
auths.new = Add New Authentication Source
auths.new = Add New Source
auths.name = Name
auths.type = Type
auths.enabled = Enabled
+6
View File
@@ -134,6 +134,12 @@ func (source *LoginSource) PAM() *PAMConfig {
return source.Cfg.(*PAMConfig)
}
// CountLoginSources returns number of login sources.
func CountLoginSources() int64 {
count, _ := x.Count(new(LoginSource))
return count
}
func CreateSource(source *LoginSource) error {
_, err := x.Insert(source)
return err
+1 -1
View File
@@ -237,7 +237,7 @@ func GetStatistic() (stats Statistic) {
stats.Counter.Follow, _ = x.Count(new(Follow))
stats.Counter.Mirror, _ = x.Count(new(Mirror))
stats.Counter.Release, _ = x.Count(new(Release))
stats.Counter.LoginSource, _ = x.Count(new(LoginSource))
stats.Counter.LoginSource = CountLoginSources()
stats.Counter.Webhook, _ = x.Count(new(Webhook))
stats.Counter.Milestone, _ = x.Count(new(Milestone))
stats.Counter.Label, _ = x.Count(new(Label))
+2 -2
View File
@@ -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\xc8\xe9\xc7\x6c\x36\xcb\xf6\x84\xd3\xf9\xae\x6b\xaf\xeb\x4d\x35\x2f\x9a\x72\xbe\x15\xac\xfd\x4a\xe9\xb9\xa6\xe7\x94\x9e\x73\x3a\x86\x51\x95\x84\xa0\x79\xd1\xeb\x58\x68\x6a\x08\x5f\x45\x9f\xa1\xaa\xa6\xd8\x5a\x69\xfe\xcc\xaa\x6d\x51\x6f\x78\x12\x1e\xf2\x07\x75\xbe\xef\x6f\x5a\x4c\xd5\x85\x7e\x12\x22\xe6\xc3\xed\xae\x02\x1e\x1e\x5e\xd1\x57\xb6\x2c\x76\xc3\x72\x5d\x70\x5f\xe5\x2b\x23\xa0\x5d\x4b\x08\x69\xbb\x5b\xc0\xd9\x8f\xac\xed\x56\x45\x53\xff\xa3\x18\x04\x49\xe7\xc1\xcf\x6c\x5b\x77\x5d\xcb\xf8\x3d\xc3\x47\x46\x23\x9e\x73\x3d\x94\xf2\x86\x30\x11\xd4\xc2\x39\xdb\x7a\xd5\x09\x2a\x39\xf3\x0c\xbf\xb8\x16\xce\xbb\x6e\xbb\x0f\x9a\xf1\x9c\x3f\x93\xa2\xd4\x09\xcd\x8d\xdb\x2f\x1a\x42\xbe\xe6\x9e\xe1\x47\x04\xd0\x67\x45\xb9\x25\x54\xee\x8a\xa6\x62\x1c\x1d\xf3\x2f\xc2\x0b\xfd\xca\x94\xa6\xe6\x7d\x35\x0c\x75\xb3\x62\x64\x1f\x4b\x52\x7e\xa9\x49\x59\x90\xe7\xd2\x6e\xdb\xbd\x9b\x4e\x4a\xff\x1b\xfd\xcc\x2f\xe4\xa7\xe4\x05\x85\x90\xe9\x4a\xf2\x48\xfa\xf9\x75\x55\x95\x32\x96\x3e\x7f\x4e\xdf\xd9\x6e\xbf\xd9\x10\xd6\x7e\xdf\x57\xfd\xc0\x85\x2e\xe8\x37\x8d\x5f\x7e\x67\x75\xdf\xd3\x07\x25\xbf\xc2\x47\x46\x53\xd7\x2c\x31\x98\x13\x7c\x64\xd9\xbb\xbe\x2a\xba\xe5\xfa\x7d\x26\xff\xd1\x57\xfe\x60\xda\x3b\x34\xa9\x4c\x48\x4a\x44\xd2\x82\x35\x90\x2d\xdb\x92\x7f\x9c\xd0\x3f\xaa\xba\x6e\xfa\x81\x56\xdc\xfb\x4c\x3f\x18\x4c\xbe\x64\x02\x86\x7a\x00\x16\x34\x11\xcb\xb7\xe7\x19\xcc\x9f\xd7\x5d\x3f\x3c\x1c\x6a\x22\xd6\xb7\xfb\x26\xe3\xf1\xd1\x6a\x9b\x97\x0b\x63\x42\x2f\x5a\x42\x11\x92\x3b\x1a\xdf\xd9\xed\xe5\x9f\x5f\x1f\xe5\x17\xc4\x89\x56\x5d\x45\xdf\x39\xd5\x41\xff\xa8\xcc\x8f\xb3\x8c\x4a\x59\x4b\xa7\xc5\x50\x2c\x8a\xbe\xf2\x68\xe5\x4c\xa1\x6e\x97\x07\x1a\x67\xae\x06\x0e\xd6\x0f\xd1\x78\xa7\x56\x08\xd5\xa1\xeb\xca\xd5\xf1\x86\x17\x17\xa5\x33\x53\x43\xe1\x8b\x4d\xc5\xe9\x54\x55\xfe\xea\xcd\x9b\xf3\xd3\x67\x79\xd5\xac\xea\xa6\xca\x6f\xea\x61\x9d\xef\x87\xeb\xff\x3a\x5f\x55\x4d\xd5\x11\x8f\x5b\xd6\x39\xad\xa9\x8e\x28\x21\x27\xc2\x96\xc1\xcd\xb2\xbe\xdf\xd0\xda\x07\x7a\x2f\x2f\x5f\xe7\x67\x8c\xe2\x5d\x31\xac\xd1\x91\x61\x9d\xf5\xbf\x6f\x18\x45\xae\xc1\xab\x75\x95\x83\xca\x00\xd4\x5e\x1b\x3e\xf2\x52\xfb\x38\xcb\xaa\xae\x9b\x13\x5b\x1a\x6e\xe7\x5a\x58\xeb\x4b\x21\xa5\x0a\x22\x9d\xa6\x1d\xf2\x45\x95\xa3\xcc\x2c\xcb\xac\xc3\x86\xdd\xe3\xdd\x6e\x53\x2f\x65\xad\xbf\x90\x3c\x8f\x68\xde\x41\x14\x4b\x21\x1c\x10\x65\x79\x01\xba\x88\x3d\xf3\x7a\xc8\x23\x06\x82\xf2\xeb\x8a\x18\xe0\x7a\xbf\x12\xb6\xb7\x69\xf7\xe5\x37\xa0\x54\xeb\xbd\x27\xd4\xfc\x6d\x4b\x1d\x06\x76\x1c\x80\x6f\xe2\x98\x28\x8e\x37\xad\xae\xda\xb6\xc4\x57\x1c\xb1\xd7\x44\x50\x37\x35\x65\xd2\x48\xfb\xe2\x23\xad\xb7\xa1\xcd\x87\x75\xdd\xe7\x25\x11\xdb\x92\x2b\xa6\xa5\xb1\xa7\xed\x42\xc8\x82\x08\x54\x48\xc3\xd2\xe2\x39\x00\xd4\x76\x4f\xd4\xb4\xa6\xca\x78\x33\xe2\x9d\x93\xaa\x9c\xea\x27\x86\x44\xf5\x80\xbe\x89\x72\x5b\xe2\xca\xcc\x37\x4f\xf1\xa1\xbf\xc3\xfa\xa9\x57\xc5\xf5\x35\xf5\xaa\x27\xaa\x78\x99\x2f\x37\x2d\x91\xd4\xaf\x6f\x5f\xf7\x4c\x30\xeb\xf9\xae\xed\xb0\xcd\x51\xd6\x05\x7d\xba\xb4\x00\xd1\x0c\xd1\xec\xb7\x0b\xfa\x75\xb3\xae\x89\x03\x00\xed\x5c\x82\x77\x73\x4a\xa5\x26\xf6\x3d\x4d\xe1\x51\x4e\x24\x4c\x23\x20\x94\x81\x00\x78\x0c\x65\xdd\x17\x0b\x9a\x7b\x06\xbf\xa6\x6d\x6b\xdf\x11\x59\xad\x87\x61\x67\x2d\xbf\xbc\xba\xba\x90\xa6\x5d\xea\x5d\x6d\x17\x01\x65\x60\x0e\x36\xbc\xf1\x36\x79\xdb\xcc\x40\x24\xfb\x6e\x93\xd0\x0f\x8d\xd5\x72\x0e\xe0\x85\xbb\xf0\x88\xff\x5c\x7a\xf4\x00\xcf\x3d\x49\x27\x37\xa0\x26\xc2\x71\x85\x0d\x90\x88\xba\xdd\x71\xbd\x01\x55\x9f\x6b\x82\x27\x65\x6c\x9a\x2e\x5f\xb6\x4e\xca\x85\xec\x13\xb0\xff\x2d\x0d\x58\xd9\xc8\xe5\x19\xa1\x01\xbc\x04\xa9\xd7\x5d\xbb\xa5\xd4\xe7\xf4\xcf\x27\xf8\xee\x9f\x71\x7d\x80\x29\xca\x92\xf8\x5b\x7f\x94\xbf\x7d\x7e\x92\xff\xa7\x1f\x7f\xf8\x61\x96\xbf\x1a\x78\x25\x32\x71\xfe\x9d\x89\x8a\x3e\x65\x0f\x77\xa0\xcLine 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: 42468, mode: os.FileMode(420), modTime: time.Unix(1441911357, 0)}
info := bindataFileInfo{name: "conf/locale/locale_en-US.ini", size: 42467, mode: os.FileMode(420), modTime: time.Unix(1441912678, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('embedded-opentype'),url(../fonts/octicons.woff?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('woff'),url(../fonts/octicons.ttf?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('truetype'),url(../fonts/octicons.svg?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d#octicons) format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beaker:before,.octicon-microscope:before{content:'\f0dd'}.octicon-bell:before{content:'\f0de'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-clone:before,.octicon-desktop-download:before{content:'\f0dc'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gLine truncated
@font-face{font-family:octicons;src:url(../fonts/octicons.eot?#iefix&v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('embedded-opentype'),url(../fonts/octicons.woff?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('woff'),url(../fonts/octicons.ttf?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d) format('truetype'),url(../fonts/octicons.svg?v=396334ee3da78f4302d25c758ae3e3ce5dc3c97d#octicons) format('svg');font-weight:400;font-style:normal}.mega-octicon,.octicon{font:normal normal normal 16px/1 octicons;display:inline-block;text-decoration:none;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.mega-octicon{font-size:32px}.octicon-alert:before{content:'\f02d'}.octicon-arrow-down:before{content:'\f03f'}.octicon-arrow-left:before{content:'\f040'}.octicon-arrow-right:before{content:'\f03e'}.octicon-arrow-small-down:before{content:'\f0a0'}.octicon-arrow-small-left:before{content:'\f0a1'}.octicon-arrow-small-right:before{content:'\f071'}.octicon-arrow-small-up:before{content:'\f09f'}.octicon-arrow-up:before{content:'\f03d'}.octicon-beaker:before,.octicon-microscope:before{content:'\f0dd'}.octicon-bell:before{content:'\f0de'}.octicon-book:before{content:'\f007'}.octicon-bookmark:before{content:'\f07b'}.octicon-briefcase:before{content:'\f0d3'}.octicon-broadcast:before{content:'\f048'}.octicon-browser:before{content:'\f0c5'}.octicon-bug:before{content:'\f091'}.octicon-calendar:before{content:'\f068'}.octicon-check:before{content:'\f03a'}.octicon-checklist:before{content:'\f076'}.octicon-chevron-down:before{content:'\f0a3'}.octicon-chevron-left:before{content:'\f0a4'}.octicon-chevron-right:before{content:'\f078'}.octicon-chevron-up:before{content:'\f0a2'}.octicon-circle-slash:before{content:'\f084'}.octicon-circuit-board:before{content:'\f0d6'}.octicon-clippy:before{content:'\f035'}.octicon-clock:before{content:'\f046'}.octicon-cloud-download:before{content:'\f00b'}.octicon-cloud-upload:before{content:'\f00c'}.octicon-code:before{content:'\f05f'}.octicon-color-mode:before{content:'\f065'}.octicon-comment-add:before,.octicon-comment:before{content:'\f02b'}.octicon-comment-discussion:before{content:'\f04f'}.octicon-credit-card:before{content:'\f045'}.octicon-dash:before{content:'\f0ca'}.octicon-dashboard:before{content:'\f07d'}.octicon-database:before{content:'\f096'}.octicon-clone:before,.octicon-desktop-download:before{content:'\f0dc'}.octicon-device-camera:before{content:'\f056'}.octicon-device-camera-video:before{content:'\f057'}.octicon-device-desktop:before{content:'\f27c'}.octicon-device-mobile:before{content:'\f038'}.octicon-diff:before{content:'\f04d'}.octicon-diff-added:before{content:'\f06b'}.octicon-diff-ignored:before{content:'\f099'}.octicon-diff-modified:before{content:'\f06d'}.octicon-diff-removed:before{content:'\f06c'}.octicon-diff-renamed:before{content:'\f06e'}.octicon-ellipsis:before{content:'\f09a'}.octicon-eye-unwatch:before,.octicon-eye-watch:before,.octicon-eye:before{content:'\f04e'}.octicon-file-binary:before{content:'\f094'}.octicon-file-code:before{content:'\f010'}.octicon-file-directory:before{content:'\f016'}.octicon-file-media:before{content:'\f012'}.octicon-file-pdf:before{content:'\f014'}.octicon-file-submodule:before{content:'\f017'}.octicon-file-symlink-directory:before{content:'\f0b1'}.octicon-file-symlink-file:before{content:'\f0b0'}.octicon-file-text:before{content:'\f011'}.octicon-file-zip:before{content:'\f013'}.octicon-flame:before{content:'\f0d2'}.octicon-fold:before{content:'\f0cc'}.octicon-gear:before{content:'\f02f'}.octicon-gift:before{content:'\f042'}.octicon-gist:before{content:'\f00e'}.octicon-gist-secret:before{content:'\f08c'}.octicon-git-branch-create:before,.octicon-git-branch-delete:before,.octicon-git-branch:before{content:'\f020'}.octicon-git-commit:before{content:'\f01f'}.octicon-git-compare:before{content:'\f0ac'}.octicon-git-merge:before{content:'\f023'}.octicon-git-pull-request-abandoned:before,.octicon-git-pull-request:before{content:'\f009'}.octicon-globe:before{content:'\f0b6'}.octicon-graph:before{content:'\f043'}.octicon-heart:before{content:'\2665'}.octicon-history:before{content:'\f07e'}.octicon-home:before{content:'\f08d'}.octicon-horizontal-rule:before{content:'\f070'}.octicon-hubot:before{content:'\f09d'}.octicon-inbox:before{content:'\f0cf'}.octicon-info:before{content:'\f059'}.octicon-issue-closed:before{content:'\f028'}.octicon-issue-opened:before{content:'\f026'}.octicon-issue-reopened:before{content:'\f027'}.octicon-jersey:before{content:'\f019'}.octicon-key:before{content:'\f049'}.octicon-keyboard:before{content:'\f00d'}.octicon-law:before{content:'\f0d8'}.octicon-light-bulb:before{content:'\f000'}.octicon-link:before{content:'\f05c'}.octicon-link-external:before{content:'\f07f'}.octicon-list-ordered:before{content:'\f062'}.octicon-list-unordered:before{content:'\f061'}.octicon-location:before{content:'\f060'}.octicon-gLine truncated
+4
View File
@@ -15,4 +15,8 @@
}
}
}
.ui.header,
.ui.segment {
box-shadow: 0 1px 2px 0 rgba(34,36,38,.15);
}
}
+4 -2
View File
@@ -34,6 +34,8 @@ func Authentications(ctx *middleware.Context) {
ctx.Handle(500, "GetAuths", err)
return
}
ctx.Data["Total"] = models.CountLoginSources()
ctx.HTML(200, AUTHS)
}
@@ -61,7 +63,7 @@ func NewAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
var u core.Conversion
switch models.LoginType(form.Type) {
case models.LDAP:
fallthrough
fallthrough
case models.DLDAP:
u = &models.LDAPConfig{
Ldapsource: ldap.Ldapsource{
@@ -152,7 +154,7 @@ func EditAuthSourcePost(ctx *middleware.Context, form auth.AuthenticationForm) {
var config core.Conversion
switch models.LoginType(form.Type) {
case models.LDAP:
fallthrough
fallthrough
case models.DLDAP:
config = &models.LDAPConfig{
Ldapsource: ldap.Ldapsource{
+5 -5
View File
@@ -30,7 +30,7 @@
<input class="ipt ipt-large ipt-radius {{if .Err_AuthName}}ipt-error{{end}}" id="name" name="name" value="{{.Source.Name}}" required />
</div>
{{if eq $type 2 3}}
{{if eq $type 2 5}}
<div class="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="{{.Source.LDAP.Host}}" required />
@@ -57,7 +57,7 @@
<input class="ipt ipt-large ipt-radius {{if .Err_UserBase}}ipt-error{{end}}" id="user_base" name="user_base" value="{{.Source.LDAP.UserBase}}" />
</div>
{{end}}
{{if eq $type 3}}
{{if eq $type 5}}
<div class="field">
<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="{{.Source.LDAP.UserDN}}" />
@@ -85,7 +85,7 @@
</div>
{{else if eq $type 4}}
{{else if eq $type 3}}
<div class="field">
<label class="req">{{.i18n.Tr "admin.auths.smtp_auth"}}</label>
<select name="smtp_auth">
@@ -105,7 +105,7 @@
<input class="ipt ipt-large ipt-radius {{if .Err_SmtpPort}}ipt-error{{end}}" id="smtp_port" name="smtp_port" value="{{.Source.SMTP.Port}}" />
</div>
{{else if eq $type 5}}
{{else if eq $type 4}}
<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="{{.Source.PAM.ServiceName}}" />
@@ -113,7 +113,7 @@
{{end}}
<div class="field">
{{if eq $type 4}}
{{if eq $type 3}}
<label></label>
<input name="tls" type="checkbox" {{if .Source.SMTP.TLS}}checked{{end}}>
<strong>{{.i18n.Tr "admin.auths.enable_tls"}}</strong>
+44 -57
View File
@@ -1,59 +1,46 @@
{{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.auth_manage_panel"}}</strong>
</div>
<div class="panel-body admin-panel">
<a class="btn-blue btn-medium btn-link btn-radius" href="{{AppSubUrl}}/admin/auths/new">{{.i18n.Tr "admin.auths.new"}}</a>
<div class="admin-table">
<table class="table table-striped">
<thead>
<tr>
<th>Id</th>
<th>{{.i18n.Tr "admin.auths.name"}}</th>
<th>{{.i18n.Tr "admin.auths.type"}}</th>
<th>{{.i18n.Tr "admin.auths.enabled"}}</th>
<th>{{.i18n.Tr "admin.auths.updated"}}</th>
<th>{{.i18n.Tr "admin.users.created"}}</th>
<th>{{.i18n.Tr "admin.users.edit"}}</th>
</tr>
</thead>
<tbody>
{{range .Sources}}
<tr>
<td>{{.ID}}</td>
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
<td>{{.TypeString}}</td>
<td><i class="fa fa{{if .IsActived}}-check{{end}}-square-o"></i></td>
<td><span title="{{DateFmtLong .Updated}}">{{DateFmtShort .Updated}}</span></td>
<td><span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span></td>
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}"><i class="fa fa-pencil-square-o"></i></a></td>
</tr>
{{end}}
</tbody>
</table>
{{if or .LastPageNum .NextPageNum}}
<ul class="pagination">
{{if .LastPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/auths?p={{.LastPageNum}}">&laquo; Prev.</a></li>{{end}}
{{if .NextPageNum}}<li><a class="btn btn-medium btn-gray btn-radius" href="{{AppSubUrl}}/admin/auths?p={{.NextPageNum}}">&raquo; Next</a></li>{{end}}
</ul>
{{end}}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{{template "base/head" .}}
<div class="admin 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.auth_manage_panel"}} ({{.i18n.Tr "admin.total" .Total}})
<div class="ui right">
<a class="ui blue tiny button" href="{{AppSubUrl}}/admin/auths/new">{{.i18n.Tr "admin.auths.new"}}</a>
</div>
</h4>
<div class="ui attached table segment">
<table class="ui very basic striped table">
<thead>
<tr>
<th>ID</th>
<th>{{.i18n.Tr "admin.auths.name"}}</th>
<th>{{.i18n.Tr "admin.auths.type"}}</th>
<th>{{.i18n.Tr "admin.auths.enabled"}}</th>
<th>{{.i18n.Tr "admin.auths.updated"}}</th>
<th>{{.i18n.Tr "admin.users.created"}}</th>
<th>{{.i18n.Tr "admin.users.edit"}}</th>
</tr>
</thead>
<tbody>
{{range .Sources}}
<tr>
<td>{{.ID}}</td>
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}">{{.Name}}</a></td>
<td>{{.TypeString}}</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>
<td><a href="{{AppSubUrl}}/admin/auths/{{.ID}}"><i class="fa fa-pencil-square-o"></i></a></td>
</tr>
{{end}}
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
{{template "ng/base/footer" .}}
{{template "base/footer" .}}