From 4b58c016038be87fa8d50c73cc064da216f10ec2 Mon Sep 17 00:00:00 2001
From: James Anderson <james@jamesanderson.me>
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 e5b22192f..932cae36d 100644
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -21,7 +21,7 @@
<a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
<img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
</a>
- <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/setting" data-toggle="tooltip" data-placement="bottom" title="Setting"><i class="fa fa-cogs fa-lg"></i></a>
+ <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/settings" data-toggle="tooltip" data-placement="bottom" title="Settings"><i class="fa fa-cogs fa-lg"></i></a>
{{if .IsAdmin}}<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="/admin" data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a>{{end}}
<div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo">
<button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button>
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index 59357d7c9..a81f8bf61 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -13,7 +13,7 @@
<label class="col-md-2 control-label" for="user-setting-username">Username<strong class="text-danger">*</strong></label>
<div class="col-md-8">
<input name="username" class="form-control" placeholder="Type your user name" required="required" value="{{.SignedUser.Name}}" title="{{.SignedUser.Name}}" id="user-setting-username">
- <p class="help-block hidden"><span class="text-danger">Cautious : </span>your username is changing !</p>
+ <p class="help-block hidden"><span class="text-danger">Caution : </span>your username is changing !</p>
</div>
</div>
diff --git a/templates/user/setting_nav.tmpl b/templates/user/setting_nav.tmpl
index 9c7ae5208..387fe950b 100644
--- a/templates/user/setting_nav.tmpl
+++ b/templates/user/setting_nav.tmpl
@@ -1,11 +1,11 @@
<div id="user-setting-nav" class="col-md-3">
- <h4>Account Setting</h4>
+ <h4>Account Settings</h4>
<ul class="list-group">
- <li class="list-group-item{{if .IsUserPageSetting}} list-group-item-success{{end}}"><a href="/user/setting">Account Profile</a></li>
- <li class="list-group-item{{if .IsUserPageSettingSocial}} list-group-item-success{{end}}"><a href="/user/setting/social">Social Account</a></li>
- <li class="list-group-item{{if .IsUserPageSettingPasswd}} list-group-item-success{{end}}"><a href="/user/setting/password">Password</a></li>
+ <li class="list-group-item{{if .IsUserPageSetting}} list-group-item-success{{end}}"><a href="/user/settings">Account Profile</a></li>
+ <li class="list-group-item{{if .IsUserPageSettingSocial}} list-group-item-success{{end}}"><a href="/user/settings/social">Social Account</a></li>
+ <li class="list-group-item{{if .IsUserPageSettingPasswd}} list-group-item-success{{end}}"><a href="/user/settings/password">Password</a></li>
<!-- <li class="list-group-item{{if .IsUserPageSettingNotify}} list-group-item-success{{end}}"><a href="/user/setting/notification">Notifications</a></li> -->
- <li class="list-group-item{{if .IsUserPageSettingSSH}} list-group-item-success{{end}}"><a href="/user/setting/ssh/">SSH Keys</a></li>
+ <li class="list-group-item{{if .IsUserPageSettingSSH}} list-group-item-success{{end}}"><a href="/user/settings/ssh/">SSH Keys</a></li>
<!-- <li class="list-group-item{{if .IsUserPageSettingSecurity}} list-group-item-success{{end}}"><a href="/user/setting/security">Security</a></li> -->
<li class="list-group-item{{if .IsUserPageSettingDelete}} list-group-item-success{{end}}"><a href="/user/delete">Delete Account</a></li>
</ul>
diff --git a/web.go b/web.go
index d8d5aba10..23fa10796 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 <james@jamesanderson.me>
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 1d49395cb..812d9d8e2 100644
--- a/templates/issue/user.tmpl
+++ b/templates/issue/user.tmpl
@@ -29,7 +29,7 @@
<div class="filter-option">
<div class="btn-group">
<a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="/issues?type={{.ViewType}}&repoid={{.RepoId}}">{{.OpenIssueCount}} Open</a>
- <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="/issues?state=closed&type={{.ViewType}}&repoid={{.RepoId}}">{{.ClosedIssueCount}} Close</a>
+ <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="/issues?state=closed&type={{.ViewType}}&repoid={{.RepoId}}">{{.ClosedIssueCount}} Closed</a>
</div>
</div>
<div class="issues list-group">