diff options
author | David Schneiderbauer <daviian@users.noreply.github.com> | 2018-05-15 12:07:32 +0200 |
---|---|---|
committer | Lauris BH <lauris@nix.lv> | 2018-05-15 13:07:32 +0300 |
commit | 099372d76c411c598285d637bd85c9b2dbc40948 (patch) | |
tree | bce801f16b8534e2ca0dadcbc24455de95f0501c /templates/user/settings/navbar.tmpl | |
parent | 1546458f7df4a4f0e77b7ae5cb65baed6feae394 (diff) | |
download | gitea-099372d76c411c598285d637bd85c9b2dbc40948.tar.gz gitea-099372d76c411c598285d637bd85c9b2dbc40948.zip |
Refactor User Settings (#3900)
* moved avatar to profile page
* combined password change, email and account deletion into account settings page
* combined totp, access tokens, linked accounts and openid into security settings page
* move access tokens to applications settings page
* small change to restart drone build
* fix change avatar url on profile page
* redirect old settings urls to new ones
* enforce only one autofocus attribute on settings pages
* set correct redirect status code
* fmt fix
Diffstat (limited to 'templates/user/settings/navbar.tmpl')
-rw-r--r-- | templates/user/settings/navbar.tmpl | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 4e0c7048ee..18bd9a4f8d 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -2,28 +2,17 @@ <a class="{{if .PageIsSettingsProfile}}active{{end}} item" href="{{AppSubUrl}}/user/settings"> {{.i18n.Tr "settings.profile"}} </a> - <a class="{{if .PageIsSettingsAvatar}}active{{end}} item" href="{{AppSubUrl}}/user/settings/avatar"> - {{.i18n.Tr "settings.avatar"}} + <a class="{{if .PageIsSettingsAccount}}active{{end}} item" href="{{AppSubUrl}}/user/settings/account"> + {{.i18n.Tr "settings.account"}} </a> <a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security"> {{.i18n.Tr "settings.security"}} </a> - <a class="{{if .PageIsSettingsEmails}}active{{end}} item" href="{{AppSubUrl}}/user/settings/email"> - {{.i18n.Tr "settings.emails"}} - </a> - {{if .EnableOpenIDSignIn}} - <a class="{{if .PageIsSettingsOpenID}}active{{end}} item" href="{{AppSubUrl}}/user/settings/openid"> - OpenID - </a> - {{end}} - <a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys"> - {{.i18n.Tr "settings.ssh_gpg_keys"}} - </a> <a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications"> {{.i18n.Tr "settings.applications"}} </a> - <a class="{{if .PageIsSettingsAccountLink}}active{{end}} item" href="{{AppSubUrl}}/user/settings/account_link"> - {{.i18n.Tr "settings.account_link"}} + <a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{AppSubUrl}}/user/settings/keys"> + {{.i18n.Tr "settings.ssh_gpg_keys"}} </a> <a class="{{if .PageIsSettingsOrganization}}active{{end}} item" href="{{AppSubUrl}}/user/settings/organization"> {{.i18n.Tr "settings.organization"}} @@ -31,7 +20,4 @@ <a class="{{if .PageIsSettingsRepos}}active{{end}} item" href="{{AppSubUrl}}/user/settings/repos"> {{.i18n.Tr "settings.repos"}} </a> - <a class="{{if .PageIsSettingsDelete}}active{{end}} item" href="{{AppSubUrl}}/user/settings/delete"> - {{.i18n.Tr "settings.delete"}} - </a> </div> |