From fb45bf231e1376ee70e4d4f1a0291f99e665a5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felipe=20Leopoldo=20Sologuren=20Guti=C3=A9rrez?= Date: Wed, 1 Feb 2023 19:56:10 -0300 Subject: [PATCH] Add main landmark to templates and adjust titles (#22670) * Add main aria landmark to templates * Adjust some titles to improve understanding of location in navigation Contributed by @Forgejo (cherry picked from commit e6a557cae3ad2db1bbb9a5ee7b90531b3bbc5c3f) --- routers/web/admin/hooks.go | 1 + routers/web/repo/setting.go | 6 +++--- routers/web/repo/setting_protected_branch.go | 4 ++-- routers/web/repo/tag.go | 2 +- routers/web/user/setting/account.go | 2 +- routers/web/user/setting/adopt.go | 2 +- routers/web/user/setting/applications.go | 2 +- routers/web/user/setting/keys.go | 2 +- routers/web/user/setting/profile.go | 8 ++++---- routers/web/user/setting/security/security.go | 2 +- templates/admin/applications/list.tmpl | 2 +- templates/admin/applications/oauth2_edit.tmpl | 2 +- templates/admin/auth/edit.tmpl | 2 +- templates/admin/auth/list.tmpl | 2 +- templates/admin/auth/new.tmpl | 2 +- templates/admin/config.tmpl | 2 +- templates/admin/dashboard.tmpl | 2 +- templates/admin/emails/list.tmpl | 2 +- templates/admin/hook_new.tmpl | 2 +- templates/admin/hooks.tmpl | 2 +- templates/admin/monitor.tmpl | 2 +- templates/admin/notice.tmpl | 2 +- templates/admin/org/list.tmpl | 2 +- templates/admin/packages/list.tmpl | 2 +- templates/admin/queue.tmpl | 2 +- templates/admin/repo/list.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 2 +- templates/admin/stacktrace.tmpl | 2 +- templates/admin/user/edit.tmpl | 2 +- templates/admin/user/list.tmpl | 2 +- templates/admin/user/new.tmpl | 2 +- templates/explore/code.tmpl | 2 +- templates/explore/organizations.tmpl | 2 +- templates/explore/repos.tmpl | 2 +- templates/explore/users.tmpl | 2 +- templates/home.tmpl | 2 +- templates/install.tmpl | 2 +- templates/org/create.tmpl | 2 +- templates/org/home.tmpl | 2 +- templates/org/member/members.tmpl | 2 +- templates/org/settings/applications.tmpl | 2 +- templates/org/settings/applications_oauth2_edit.tmpl | 2 +- templates/org/settings/delete.tmpl | 2 +- templates/org/settings/hook_new.tmpl | 2 +- templates/org/settings/hooks.tmpl | 2 +- templates/org/settings/labels.tmpl | 2 +- templates/org/settings/options.tmpl | 2 +- templates/org/team/invite.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/new.tmpl | 2 +- templates/org/team/repositories.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- templates/package/settings.tmpl | 2 +- templates/package/view.tmpl | 2 +- templates/post-install.tmpl | 2 +- templates/repo/activity.tmpl | 2 +- templates/repo/branch/list.tmpl | 2 +- templates/repo/commit_page.tmpl | 2 +- templates/repo/commits.tmpl | 2 +- templates/repo/create.tmpl | 2 +- templates/repo/diff/compare.tmpl | 2 +- templates/repo/editor/cherry_pick.tmpl | 2 +- templates/repo/editor/delete.tmpl | 2 +- templates/repo/editor/edit.tmpl | 2 +- templates/repo/editor/patch.tmpl | 2 +- templates/repo/editor/upload.tmpl | 2 +- templates/repo/empty.tmpl | 2 +- templates/repo/find/files.tmpl | 2 +- templates/repo/forks.tmpl | 2 +- templates/repo/graph.tmpl | 2 +- templates/repo/home.tmpl | 2 +- templates/repo/issue/choose.tmpl | 2 +- templates/repo/issue/labels.tmpl | 2 +- templates/repo/issue/list.tmpl | 2 +- templates/repo/issue/milestone_issues.tmpl | 2 +- templates/repo/issue/milestone_new.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/new.tmpl | 2 +- templates/repo/issue/view.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/migrate.tmpl | 2 +- templates/repo/migrate/migrating.tmpl | 2 +- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/packages.tmpl | 2 +- templates/repo/projects/list.tmpl | 2 +- templates/repo/projects/new.tmpl | 2 +- templates/repo/projects/view.tmpl | 2 +- templates/repo/pulls/commits.tmpl | 2 +- templates/repo/pulls/files.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 2 +- templates/repo/release/list.tmpl | 2 +- templates/repo/release/new.tmpl | 2 +- templates/repo/search.tmpl | 2 +- templates/repo/settings/branches.tmpl | 2 +- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/repo/settings/githook_edit.tmpl | 2 +- templates/repo/settings/githooks.tmpl | 2 +- templates/repo/settings/lfs.tmpl | 2 +- templates/repo/settings/lfs_file.tmpl | 2 +- templates/repo/settings/lfs_file_find.tmpl | 2 +- templates/repo/settings/lfs_locks.tmpl | 2 +- templates/repo/settings/lfs_pointers.tmpl | 2 +- templates/repo/settings/options.tmpl | 2 +- templates/repo/settings/protected_branch.tmpl | 2 +- templates/repo/settings/tags.tmpl | 2 +- templates/repo/settings/webhook/base.tmpl | 2 +- templates/repo/settings/webhook/new.tmpl | 2 +- templates/repo/watchers.tmpl | 2 +- templates/repo/wiki/new.tmpl | 2 +- templates/repo/wiki/pages.tmpl | 2 +- templates/repo/wiki/revision.tmpl | 2 +- templates/repo/wiki/start.tmpl | 2 +- templates/repo/wiki/view.tmpl | 2 +- templates/status/404.tmpl | 2 +- templates/status/500.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/change_passwd.tmpl | 2 +- templates/user/auth/finalize_openid.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/grant.tmpl | 2 +- templates/user/auth/grant_error.tmpl | 2 +- templates/user/auth/link_account.tmpl | 2 +- templates/user/auth/prohibit_login.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/auth/signin.tmpl | 2 +- templates/user/auth/signin_openid.tmpl | 2 +- templates/user/auth/signup.tmpl | 2 +- templates/user/auth/signup_openid_connect.tmpl | 2 +- templates/user/auth/signup_openid_register.tmpl | 2 +- templates/user/auth/twofa.tmpl | 2 +- templates/user/auth/twofa_scratch.tmpl | 2 +- templates/user/code.tmpl | 2 +- templates/user/dashboard/dashboard.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/notification/notification_div.tmpl | 2 +- .../user/notification/notification_subscriptions.tmpl | 2 +- templates/user/overview/package_versions.tmpl | 2 +- templates/user/overview/packages.tmpl | 2 +- templates/user/profile.tmpl | 2 +- templates/user/project.tmpl | 2 +- templates/user/settings/account.tmpl | 2 +- templates/user/settings/appearance.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/applications_oauth2_edit.tmpl | 2 +- templates/user/settings/keys.tmpl | 2 +- templates/user/settings/organization.tmpl | 2 +- templates/user/settings/profile.tmpl | 2 +- templates/user/settings/repos.tmpl | 2 +- templates/user/settings/security/security.tmpl | 2 +- templates/user/settings/security/twofa_enroll.tmpl | 2 +- 158 files changed, 164 insertions(+), 163 deletions(-) diff --git a/routers/web/admin/hooks.go b/routers/web/admin/hooks.go index bf71cb5595..c966396def 100644 --- a/routers/web/admin/hooks.go +++ b/routers/web/admin/hooks.go @@ -23,6 +23,7 @@ const ( func DefaultOrSystemWebhooks(ctx *context.Context) { var err error + ctx.Data["Title"] = ctx.Tr("admin.hooks") ctx.Data["PageIsAdminSystemHooks"] = true ctx.Data["PageIsAdminDefaultHooks"] = true diff --git a/routers/web/repo/setting.go b/routers/web/repo/setting.go index 2b5691ce88..3cf4c31db7 100644 --- a/routers/web/repo/setting.go +++ b/routers/web/repo/setting.go @@ -62,7 +62,7 @@ const ( // SettingsCtxData is a middleware that sets all the general context data for the // settings template. func SettingsCtxData(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["Title"] = ctx.Tr("repo.settings.options") ctx.Data["PageIsSettingsOptions"] = true ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled @@ -854,7 +854,7 @@ func handleSettingRemoteAddrError(ctx *context.Context, err error, form *forms.R // Collaboration render a repository's collaboration page func Collaboration(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["Title"] = ctx.Tr("repo.settings.collaboration") ctx.Data["PageIsSettingsCollaboration"] = true users, err := repo_model.GetCollaborators(ctx, ctx.Repo.Repository.ID, db.ListOptions{}) @@ -1093,7 +1093,7 @@ func GitHooksEditPost(ctx *context.Context) { // DeployKeys render the deploy keys list of a repository page func DeployKeys(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys") + ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys") + " / " + ctx.Tr("secrets.secrets") ctx.Data["PageIsSettingsKeys"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled diff --git a/routers/web/repo/setting_protected_branch.go b/routers/web/repo/setting_protected_branch.go index c4cd3486aa..55dcd12f73 100644 --- a/routers/web/repo/setting_protected_branch.go +++ b/routers/web/repo/setting_protected_branch.go @@ -29,7 +29,7 @@ import ( // ProtectedBranch render the page to protect the repository func ProtectedBranch(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["Title"] = ctx.Tr("repo.settings.branches") ctx.Data["PageIsSettingsBranches"] = true protectedBranches, err := git_model.GetProtectedBranches(ctx.Repo.Repository.ID) @@ -61,7 +61,7 @@ func ProtectedBranch(ctx *context.Context) { // ProtectedBranchPost response for protect for a branch of a repository func ProtectedBranchPost(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["Title"] = ctx.Tr("repo.settings.protected_branch") ctx.Data["PageIsSettingsBranches"] = true repo := ctx.Repo.Repository diff --git a/routers/web/repo/tag.go b/routers/web/repo/tag.go index f63a50782b..2c24d3fdf1 100644 --- a/routers/web/repo/tag.go +++ b/routers/web/repo/tag.go @@ -134,7 +134,7 @@ func DeleteProtectedTagPost(ctx *context.Context) { } func setTagsContext(ctx *context.Context) error { - ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["Title"] = ctx.Tr("repo.settings.tags") ctx.Data["PageIsSettingsTags"] = true protectedTags, err := git_model.GetProtectedTags(ctx.Repo.Repository.ID) diff --git a/routers/web/user/setting/account.go b/routers/web/user/setting/account.go index 552b1119bd..30da9d11d5 100644 --- a/routers/web/user/setting/account.go +++ b/routers/web/user/setting/account.go @@ -31,7 +31,7 @@ const ( // Account renders change user's password, user's email and user suicide page func Account(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.account") ctx.Data["PageIsSettingsAccount"] = true ctx.Data["Email"] = ctx.Doer.Email ctx.Data["EnableNotifyMail"] = setting.Service.EnableNotifyMail diff --git a/routers/web/user/setting/adopt.go b/routers/web/user/setting/adopt.go index a92aa6e989..0df9317870 100644 --- a/routers/web/user/setting/adopt.go +++ b/routers/web/user/setting/adopt.go @@ -18,7 +18,7 @@ import ( // AdoptOrDeleteRepository adopts or deletes a repository func AdoptOrDeleteRepository(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.adopt") ctx.Data["PageIsSettingsRepos"] = true allowAdopt := ctx.IsUserSiteAdmin() || setting.Repository.AllowAdoptionOfUnadoptedRepositories ctx.Data["allowAdopt"] = allowAdopt diff --git a/routers/web/user/setting/applications.go b/routers/web/user/setting/applications.go index e9572a07a6..2649669bb2 100644 --- a/routers/web/user/setting/applications.go +++ b/routers/web/user/setting/applications.go @@ -22,7 +22,7 @@ const ( // Applications render manage access token page func Applications(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.applications") ctx.Data["PageIsSettingsApplications"] = true loadApplicationsData(ctx) diff --git a/routers/web/user/setting/keys.go b/routers/web/user/setting/keys.go index 4c43e0524f..5d69eb7b86 100644 --- a/routers/web/user/setting/keys.go +++ b/routers/web/user/setting/keys.go @@ -24,7 +24,7 @@ const ( // Keys render user's SSH/GPG public keys page func Keys(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.ssh_gpg_keys") ctx.Data["PageIsSettingsKeys"] = true ctx.Data["DisableSSH"] = setting.SSH.Disabled ctx.Data["BuiltinSSH"] = setting.SSH.StartBuiltinServer diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index ba3f5b5080..a710773f38 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -43,7 +43,7 @@ const ( // Profile render user's profile page func Profile(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.profile") ctx.Data["PageIsSettingsProfile"] = true ctx.Data["AllowedUserVisibilityModes"] = setting.Service.AllowedUserVisibilityModesSlice.ToVisibleTypeSlice() @@ -220,7 +220,7 @@ func DeleteAvatar(ctx *context.Context) { // Organization render all the organization of the user func Organization(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.organization") ctx.Data["PageIsSettingsOrganization"] = true opts := organization.FindOrgOptions{ @@ -255,7 +255,7 @@ func Organization(ctx *context.Context) { // Repos display a list of all repositories of the user func Repos(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.repos") ctx.Data["PageIsSettingsRepos"] = true ctx.Data["allowAdopt"] = ctx.IsUserSiteAdmin() || setting.Repository.AllowAdoptionOfUnadoptedRepositories ctx.Data["allowDelete"] = ctx.IsUserSiteAdmin() || setting.Repository.AllowDeleteOfUnadoptedRepositories @@ -361,7 +361,7 @@ func Repos(ctx *context.Context) { // Appearance render user's appearance settings func Appearance(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.appearance") ctx.Data["PageIsSettingsAppearance"] = true var hiddenCommentTypes *big.Int diff --git a/routers/web/user/setting/security/security.go b/routers/web/user/setting/security/security.go index 57ea24eeb1..9cb4427a1b 100644 --- a/routers/web/user/setting/security/security.go +++ b/routers/web/user/setting/security/security.go @@ -23,7 +23,7 @@ const ( // Security render change user's password page and 2FA func Security(ctx *context.Context) { - ctx.Data["Title"] = ctx.Tr("settings") + ctx.Data["Title"] = ctx.Tr("settings.security") ctx.Data["PageIsSettingsSecurity"] = true if ctx.FormString("openid.return_to") != "" { diff --git a/templates/admin/applications/list.tmpl b/templates/admin/applications/list.tmpl index 6d627129df..4da6cb0446 100644 --- a/templates/admin/applications/list.tmpl +++ b/templates/admin/applications/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
diff --git a/templates/admin/applications/oauth2_edit.tmpl b/templates/admin/applications/oauth2_edit.tmpl index 84d821ecca..20231c4b1c 100644 --- a/templates/admin/applications/oauth2_edit.tmpl +++ b/templates/admin/applications/oauth2_edit.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}} {{template "user/settings/applications_oauth2_edit_form" .}} diff --git a/templates/admin/auth/edit.tmpl b/templates/admin/auth/edit.tmpl index bf9d53152c..91e4b1df52 100644 --- a/templates/admin/auth/edit.tmpl +++ b/templates/admin/auth/edit.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/auth/list.tmpl b/templates/admin/auth/list.tmpl index c43287ee1a..afe814cc6c 100644 --- a/templates/admin/auth/list.tmpl +++ b/templates/admin/auth/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/auth/new.tmpl b/templates/admin/auth/new.tmpl index 213c621b42..ab84dfccaf 100644 --- a/templates/admin/auth/new.tmpl +++ b/templates/admin/auth/new.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index c2ab31862d..8f572c8396 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 80eea91210..40f28068d7 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/emails/list.tmpl b/templates/admin/emails/list.tmpl index adf5b9bef7..b26d26b524 100644 --- a/templates/admin/emails/list.tmpl +++ b/templates/admin/emails/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/hook_new.tmpl b/templates/admin/hook_new.tmpl index c5196fce4e..327bf7788e 100644 --- a/templates/admin/hook_new.tmpl +++ b/templates/admin/hook_new.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/hooks.tmpl b/templates/admin/hooks.tmpl index a23cff4342..26f92c7064 100644 --- a/templates/admin/hooks.tmpl +++ b/templates/admin/hooks.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/monitor.tmpl b/templates/admin/monitor.tmpl index f11d071ea4..d53e9e18dc 100644 --- a/templates/admin/monitor.tmpl +++ b/templates/admin/monitor.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 2777741efb..058f8c0d30 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/org/list.tmpl b/templates/admin/org/list.tmpl index 11dc23c60e..9bf7a6268e 100644 --- a/templates/admin/org/list.tmpl +++ b/templates/admin/org/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 3aab2873c6..37fa64d189 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/queue.tmpl b/templates/admin/queue.tmpl index cd50798f80..1905f7adb3 100644 --- a/templates/admin/queue.tmpl +++ b/templates/admin/queue.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 837802f0d0..11216b8c86 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 0c27c80e93..ca0b4c3bb9 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/stacktrace.tmpl b/templates/admin/stacktrace.tmpl index 91929deaa8..4e16036ae3 100644 --- a/templates/admin/stacktrace.tmpl +++ b/templates/admin/stacktrace.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index 9e0f1d89fd..ef436c718a 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl index 67a726eb3f..88af2172b7 100644 --- a/templates/admin/user/list.tmpl +++ b/templates/admin/user/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/admin/user/new.tmpl b/templates/admin/user/new.tmpl index 9fdf0dce93..e5ca864cb7 100644 --- a/templates/admin/user/new.tmpl +++ b/templates/admin/user/new.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "admin/navbar" .}}
{{template "base/alert" .}} diff --git a/templates/explore/code.tmpl b/templates/explore/code.tmpl index f4e46d1198..924a3e6274 100644 --- a/templates/explore/code.tmpl +++ b/templates/explore/code.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "explore/navbar" .}}
{{template "code/searchform" .}} diff --git a/templates/explore/organizations.tmpl b/templates/explore/organizations.tmpl index 36267baf33..56c6ee56a0 100644 --- a/templates/explore/organizations.tmpl +++ b/templates/explore/organizations.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "explore/navbar" .}}
{{template "explore/search" .}} diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl index 457ad74115..dfede2ffcc 100644 --- a/templates/explore/repos.tmpl +++ b/templates/explore/repos.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "explore/navbar" .}}
{{template "explore/repo_search" .}} diff --git a/templates/explore/users.tmpl b/templates/explore/users.tmpl index 5fb79c0dd0..336daea7c8 100644 --- a/templates/explore/users.tmpl +++ b/templates/explore/users.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "explore/navbar" .}}
{{template "explore/search" .}} diff --git a/templates/home.tmpl b/templates/home.tmpl index 7667db27a1..70b47eba29 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
diff --git a/templates/install.tmpl b/templates/install.tmpl index 36f58218d4..2d3a81b6ce 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+

diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 999f5246a3..53ed1ab3a6 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 448639975f..ba52ad223f 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{avatar .Org 140 "org-avatar"}}
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index fceb080134..b4f788e523 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
{{template "base/alert" .}} diff --git a/templates/org/settings/applications.tmpl b/templates/org/settings/applications.tmpl index 8bdd99deb8..35736df591 100644 --- a/templates/org/settings/applications.tmpl +++ b/templates/org/settings/applications.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/settings/applications_oauth2_edit.tmpl b/templates/org/settings/applications_oauth2_edit.tmpl index 2c7fa842b3..861651a15e 100644 --- a/templates/org/settings/applications_oauth2_edit.tmpl +++ b/templates/org/settings/applications_oauth2_edit.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}} {{template "user/settings/applications_oauth2_edit_form" .}} diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl index 8a38dcafe3..669e393e1d 100644 --- a/templates/org/settings/delete.tmpl +++ b/templates/org/settings/delete.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl index 7308cafa20..1df56c374c 100644 --- a/templates/org/settings/hook_new.tmpl +++ b/templates/org/settings/hook_new.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl index cb0243bb1e..3abbc62ecf 100644 --- a/templates/org/settings/hooks.tmpl +++ b/templates/org/settings/hooks.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index a6b5405a42..5436bcba05 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl index 1b12c1221b..b52639fb19 100644 --- a/templates/org/settings/options.tmpl +++ b/templates/org/settings/options.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index a696d99498..ef365dee3a 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "base/alert" .}}
diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index 1a58dc5339..13bd6c5b5d 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
{{template "base/alert" .}} diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl index b4ecbed2c9..94d3b1a6b3 100644 --- a/templates/org/team/new.tmpl +++ b/templates/org/team/new.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 80bdf7b3db..0391a762fa 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
{{template "base/alert" .}} diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 5399f3a594..66ac4a4211 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "org/header" .}}
{{template "base/alert" .}} diff --git a/templates/package/settings.tmpl b/templates/package/settings.tmpl index d1475be593..a2c4bd4c28 100644 --- a/templates/package/settings.tmpl +++ b/templates/package/settings.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "user/overview/header" .}}
{{template "base/alert" .}} diff --git a/templates/package/view.tmpl b/templates/package/view.tmpl index a5b2a2ef68..be0a740bbb 100644 --- a/templates/package/view.tmpl +++ b/templates/package/view.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "user/overview/header" .}}
diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index 4abfe171dd..e098f43fda 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index cc6ca95edb..255951824d 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}

- diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 3702410df5..3d3e4b2d88 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 4270ce302c..5bd64efe02 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{$class := ""}} diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 9282e1d387..0188a39281 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "repo/sub_menu" .}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 6272b19bc6..a6399fc27a 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 029e7717a4..1010863b79 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/templates/repo/editor/cherry_pick.tmpl b/templates/repo/editor/cherry_pick.tmpl index 7f016f4649..55c6252991 100644 --- a/templates/repo/editor/cherry_pick.tmpl +++ b/templates/repo/editor/cherry_pick.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/editor/delete.tmpl b/templates/repo/editor/delete.tmpl index 08493944bf..2c0c2fc792 100644 --- a/templates/repo/editor/delete.tmpl +++ b/templates/repo/editor/delete.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index ebe56ec477..3bc9da99b0 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/editor/patch.tmpl b/templates/repo/editor/patch.tmpl index ad72a256e7..892adf957b 100644 --- a/templates/repo/editor/patch.tmpl +++ b/templates/repo/editor/patch.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/editor/upload.tmpl b/templates/repo/editor/upload.tmpl index f8496d5911..211859113f 100644 --- a/templates/repo/editor/upload.tmpl +++ b/templates/repo/editor/upload.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/empty.tmpl b/templates/repo/empty.tmpl index 24547758a7..cb883e8df5 100644 --- a/templates/repo/empty.tmpl +++ b/templates/repo/empty.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/templates/repo/find/files.tmpl b/templates/repo/find/files.tmpl index 00fa6dc8ff..ab6f03f4ad 100644 --- a/templates/repo/find/files.tmpl +++ b/templates/repo/find/files.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/templates/repo/forks.tmpl b/templates/repo/forks.tmpl index 56e60d4229..b328dc0c19 100644 --- a/templates/repo/forks.tmpl +++ b/templates/repo/forks.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}

diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 7efd6ec023..52c013a5d1 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 69eaf17429..fb091927de 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/issue/choose.tmpl b/templates/repo/issue/choose.tmpl index 609cd48436..192754f5f7 100644 --- a/templates/repo/issue/choose.tmpl +++ b/templates/repo/issue/choose.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}
{{template "base/alert" .}} diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 88cfd124a7..82cfcd0712 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -1,5 +1,5 @@ {{template "base/head" .}} -
+
{{template "repo/header" .}}