summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorJames Anderson <james@jamesanderson.me>2014-04-23 15:30:18 -0400
committerJames Anderson <james@jamesanderson.me>2014-04-23 15:30:18 -0400
commit4b58c016038be87fa8d50c73cc064da216f10ec2 (patch)
tree7979ed37bb782374b008a7b1bb27e6c32e20fb26 /templates
parentff690840d42fa069dcda7a55cda602bf11b40b06 (diff)
downloadgitea-4b58c016038be87fa8d50c73cc064da216f10ec2.tar.gz
gitea-4b58c016038be87fa8d50c73cc064da216f10ec2.zip
Changed setting url to settings
Diffstat (limited to 'templates')
-rw-r--r--templates/base/navbar.tmpl2
-rw-r--r--templates/user/setting.tmpl2
-rw-r--r--templates/user/setting_nav.tmpl10
3 files changed, 7 insertions, 7 deletions
diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index e5b22192f5..932cae36d4 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 59357d7c93..a81f8bf61f 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 9c7ae5208f..387fe950b5 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>