diff options
| -rw-r--r-- | cmd/serve.go | 2 | ||||
| -rw-r--r-- | models/login.go | 2 | ||||
| -rw-r--r-- | models/user.go | 4 | ||||
| -rw-r--r-- | public/ng/less/gogs/sign.less | 7 | ||||
| -rw-r--r-- | routers/api/v1/repo.go | 2 | ||||
| -rw-r--r-- | scripts/init/centos/gogs | 2 | ||||
| -rw-r--r-- | templates/user/auth/signin.tmpl | 7 |
7 files changed, 16 insertions, 10 deletions
diff --git a/cmd/serve.go b/cmd/serve.go index 484060c4..c291c5e3 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -102,7 +102,7 @@ func runServ(c *cli.Context) { cmd := os.Getenv("SSH_ORIGINAL_COMMAND") if cmd == "" { - println("Hi", user.Name, "! You've successfully authenticated, but Gogs does not provide shell access.") + fmt.Printf("Hi, %s! You've successfully authenticated, but Gogs does not provide shell access.\n", user.Name) if user.IsAdmin { println("If this is unexpected, please log in with password and setup Gogs under another user.") } diff --git a/models/login.go b/models/login.go index 8b773c13..10f782be 100644 --- a/models/login.go +++ b/models/login.go @@ -191,7 +191,7 @@ func UserSignIn(uname, passwd string) (*User, error) { // For plain login, user must exist to reach this line. // Now verify password. if u.LoginType == PLAIN { - if !u.ValidtePassword(passwd) { + if !u.ValidatePassword(passwd) { return nil, ErrUserNotExist } return u, nil diff --git a/models/user.go b/models/user.go index bf69f97a..e239ea17 100644 --- a/models/user.go +++ b/models/user.go @@ -143,8 +143,8 @@ func (u *User) EncodePasswd() { u.Passwd = fmt.Sprintf("%x", newPasswd) } -// ValidtePassword checks if given password matches the one belongs to the user. -func (u *User) ValidtePassword(passwd string) bool { +// ValidatePassword checks if given password matches the one belongs to the user. +func (u *User) ValidatePassword(passwd string) bool { newUser := &User{Passwd: passwd, Salt: u.Salt} newUser.EncodePasswd() return u.Passwd == newUser.Passwd diff --git a/public/ng/less/gogs/sign.less b/public/ng/less/gogs/sign.less index 55a9ffbb..3950be03 100644 --- a/public/ng/less/gogs/sign.less +++ b/public/ng/less/gogs/sign.less @@ -25,6 +25,11 @@ The register and sign-in page style .form-label { width: 160px; } + .chk-label { + width: auto; + text-align: left; + margin-left: 176px; + } .alert{ margin:0 30px 24px 30px; } @@ -60,4 +65,4 @@ The register and sign-in page style background-color: #FFF; margin-left: -15px; } -}
\ No newline at end of file +} diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go index 170c2e90..7da5f817 100644 --- a/routers/api/v1/repo.go +++ b/routers/api/v1/repo.go @@ -164,7 +164,7 @@ func MigrateRepo(ctx *middleware.Context, form auth.MigrateRepoForm) { } return } - if !u.ValidtePassword(ctx.Query("password")) { + if !u.ValidatePassword(ctx.Query("password")) { ctx.HandleAPI(422, "Username or password is not correct.") return } diff --git a/scripts/init/centos/gogs b/scripts/init/centos/gogs index 1a92ff20..5ff6de53 100644 --- a/scripts/init/centos/gogs +++ b/scripts/init/centos/gogs @@ -33,7 +33,7 @@ LOGFILE=${GOGS_HOME}/log/gogs.log RETVAL=0 # Read configuration from /etc/sysconfig/gogs to override defaults -[ -r /etc/sysconfig/$NAME ] && ./etc/sysconfig/$NAME +[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME # Don't do anything if nothing is installed [ -x ${GOGS_PATH} ] || exit 0 diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl index 455df63a..bc0b0f2d 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/signin.tmpl @@ -17,8 +17,9 @@ </div> {{if not .IsSocialLogin}} <div class="field"> - <span class="form-label"></span> - <input class="ipt-chk" id="remember" name="remember" type="checkbox"/> <strong>{{.i18n.Tr "auth.remember_me"}}</strong> + <label class="chk-label"> + <input class="ipt-chk" id="remember" name="remember" type="checkbox"/> <strong>{{.i18n.Tr "auth.remember_me"}}</strong> + </label> </div> {{end}} <div class="field"> @@ -41,4 +42,4 @@ </div> </form> </div> -{{template "ng/base/footer" .}}
\ No newline at end of file +{{template "ng/base/footer" .}} |