Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Categorize admin settings sidebar panel #26030

Merged
merged 22 commits into from
Jul 24, 2023
Merged

Categorize admin settings sidebar panel #26030

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
74a9357
categorize admin settings
HesterG Jul 21, 2023
5e7c5cb
comment
HesterG Jul 21, 2023
544c410
Merge branch 'main' into organize-admin-setting
HesterG Jul 21, 2023
fab03c8
Merge branch 'main' into organize-admin-setting
HesterG Jul 21, 2023
8968290
lint
HesterG Jul 21, 2023
02980a0
Merge branch 'main' into organize-admin-setting
HesterG Jul 21, 2023
67592b1
Merge branch 'main' into organize-admin-setting
HesterG Jul 21, 2023
b6b002a
updaye
HesterG Jul 21, 2023
9e8680f
Update options/locale/locale_en-US.ini
HesterG Jul 21, 2023
7b54d79
Update templates/admin/navbar.tmpl
HesterG Jul 21, 2023
6430927
Merge branch 'main' into organize-admin-setting
HesterG Jul 21, 2023
4700e41
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 21, 2023
ea855f4
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 21, 2023
c561d3c
reorder
HesterG Jul 22, 2023
8fe0d03
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 22, 2023
d8e4a4e
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 22, 2023
6f7b834
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 22, 2023
e8da30b
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 22, 2023
b2afb86
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 22, 2023
40a2a55
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 22, 2023
fbb80d0
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 23, 2023
7ec0983
Merge branch 'main' into organize-admin-setting
GiteaBot Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2627,10 +2627,13 @@ teams.invite.description = Please click the button below to join the team.

[admin]
dashboard = Dashboard
identity_access = Identity & Access
users = User Accounts
organizations = Organizations
assets = Code Assets
repositories = Repositories
hooks = Webhooks
integrations = Integrations
authentication = Authentication Sources
emails = User Emails
config = Configuration
Expand Down
77 changes: 51 additions & 26 deletions templates/admin/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,60 @@
<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">
{{.locale.Tr "admin.dashboard"}}
</a>
<a class="{{if .PageIsAdminUsers}}active {{end}}item" href="{{AppSubUrl}}/admin/users">
{{.locale.Tr "admin.users"}}
</a>
<a class="{{if .PageIsAdminOrganizations}}active {{end}}item" href="{{AppSubUrl}}/admin/orgs">
{{.locale.Tr "admin.organizations"}}
</a>
<a class="{{if .PageIsAdminRepositories}}active {{end}}item" href="{{AppSubUrl}}/admin/repos">
{{.locale.Tr "admin.repositories"}}
</a>
{{if .EnablePackages}}
<a class="{{if .PageIsAdminPackages}}active {{end}}item" href="{{AppSubUrl}}/admin/packages">
{{.locale.Tr "packages.title"}}
</a>
{{end}}
{{if not DisableWebhooks}}
<details class="item toggleable-item" {{if or .PageIsAdminUsers .PageIsAdminEmails .PageIsAdminOrganizations .PageIsAdminAuthentications}}open{{end}}>
<summary>{{.locale.Tr "admin.identity_access"}}</summary>
<div class="menu">
<a class="{{if .PageIsAdminUsers}}active {{end}}item" href="{{AppSubUrl}}/admin/users">
{{.locale.Tr "admin.users"}}
</a>
<a class="{{if .PageIsAdminEmails}}active {{end}}item" href="{{AppSubUrl}}/admin/emails">
{{.locale.Tr "admin.emails"}}
</a>
<a class="{{if .PageIsAdminOrganizations}}active {{end}}item" href="{{AppSubUrl}}/admin/orgs">
{{.locale.Tr "admin.organizations"}}
</a>
<a class="{{if .PageIsAdminAuthentications}}active {{end}}item" href="{{AppSubUrl}}/admin/auths">
{{.locale.Tr "admin.authentication"}}
</a>
</div>
</details>
<details class="item toggleable-item" {{if or .PageIsAdminRepositories (and .EnablePackages .PageIsAdminPackages)}}open{{end}}>
<summary>{{.locale.Tr "admin.assets"}}</summary>
<div class="menu">
<a class="{{if .PageIsAdminRepositories}}active {{end}}item" href="{{AppSubUrl}}/admin/repos">
{{.locale.Tr "admin.repositories"}}
</a>
{{if .EnablePackages}}
<a class="{{if .PageIsAdminPackages}}active {{end}}item" href="{{AppSubUrl}}/admin/packages">
{{.locale.Tr "packages.title"}}
</a>
{{end}}
</div>
</details>
<!-- Webhooks and OAuth can be both disabled here, so add this if statement to display different ui -->
{{if and (not DisableWebhooks) .EnableOAuth2}}
<details class="item toggleable-item" {{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks .PageIsAdminApplications}}open{{end}}>
<summary>{{.locale.Tr "admin.integrations"}}</summary>
<div class="menu">
<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active {{end}}item" href="{{AppSubUrl}}/admin/hooks">
{{.locale.Tr "admin.hooks"}}
</a>
<a class="{{if .PageIsAdminApplications}}active {{end}}item" href="{{AppSubUrl}}/admin/applications">
{{.locale.Tr "settings.applications"}}
</a>
</div>
</details>
{{else}}
{{if not DisableWebhooks}}
<a class="{{if or .PageIsAdminDefaultHooks .PageIsAdminSystemHooks}}active {{end}}item" href="{{AppSubUrl}}/admin/hooks">
{{.locale.Tr "admin.hooks"}}
</a>
{{end}}
<a class="{{if .PageIsAdminAuthentications}}active {{end}}item" href="{{AppSubUrl}}/admin/auths">
{{.locale.Tr "admin.authentication"}}
</a>
<a class="{{if .PageIsAdminEmails}}active {{end}}item" href="{{AppSubUrl}}/admin/emails">
{{.locale.Tr "admin.emails"}}
</a>
{{if .EnableOAuth2}}
<a class="{{if .PageIsAdminApplications}}active {{end}}item" href="{{AppSubUrl}}/admin/applications">
{{.locale.Tr "settings.applications"}}
</a>
{{end}}
{{if .EnableOAuth2}}
<a class="{{if .PageIsAdminApplications}}active {{end}}item" href="{{AppSubUrl}}/admin/applications">
{{.locale.Tr "settings.applications"}}
</a>
{{end}}
{{end}}
{{if .EnableActions}}
<details class="item toggleable-item" {{if .PageIsSharedSettingsRunners}}open{{end}}>
Expand Down