From 4b58c016038be87fa8d50c73cc064da216f10ec2 Mon Sep 17 00:00:00 2001 From: James Anderson Date: Wed, 23 Apr 2014 15:30:18 -0400 Subject: [PATCH 1/2] Changed setting url to settings --- templates/base/navbar.tmpl | 2 +- templates/user/setting.tmpl | 2 +- templates/user/setting_nav.tmpl | 10 +++++----- web.go | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index e5b22192f580..932cae36d41c 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -21,7 +21,7 @@ user-avatar - + {{if .IsAdmin}}{{end}} diff --git a/templates/user/setting_nav.tmpl b/templates/user/setting_nav.tmpl index 9c7ae5208ff8..387fe950b5e2 100644 --- a/templates/user/setting_nav.tmpl +++ b/templates/user/setting_nav.tmpl @@ -1,11 +1,11 @@
-

Account Setting

+

Account Settings

diff --git a/web.go b/web.go index d8d5aba10d5d..23fa10796c21 100644 --- a/web.go +++ b/web.go @@ -94,8 +94,8 @@ func runWeb(*cli.Context) { m.Group("/user", func(r martini.Router) { r.Get("/delete", user.Delete) r.Post("/delete", user.DeletePost) - r.Get("/setting", user.Setting) - r.Post("/setting", bindIgnErr(auth.UpdateProfileForm{}), user.SettingPost) + r.Get("/settings", user.Setting) + r.Post("/settings", bindIgnErr(auth.UpdateProfileForm{}), user.SettingPost) }, reqSignIn) m.Group("/user", func(r martini.Router) { r.Get("/feeds", middleware.Bind(auth.FeedsForm{}), user.Feeds) @@ -105,7 +105,7 @@ func runWeb(*cli.Context) { r.Post("/forget_password", user.ForgotPasswdPost) r.Get("/logout", user.SignOut) }) - m.Group("/user/setting", func(r martini.Router) { + m.Group("/user/settings", func(r martini.Router) { r.Get("/social", user.SettingSocial) r.Get("/password", user.SettingPassword) r.Post("/password", bindIgnErr(auth.UpdatePasswdForm{}), user.SettingPasswordPost) From 32ae6896fa77f31f5626b41260743ef84c132b1e Mon Sep 17 00:00:00 2001 From: James Anderson Date: Wed, 23 Apr 2014 15:39:37 -0400 Subject: [PATCH 2/2] Close to Closed --- templates/issue/user.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/issue/user.tmpl b/templates/issue/user.tmpl index 1d49395cb979..812d9d8e2441 100644 --- a/templates/issue/user.tmpl +++ b/templates/issue/user.tmpl @@ -29,7 +29,7 @@
{{.OpenIssueCount}} Open - {{.ClosedIssueCount}} Close + {{.ClosedIssueCount}} Closed