From 74a935754f4aeffba9144af62607ee8c82c03501 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Jul 2023 10:23:31 +0800 Subject: [PATCH 1/7] categorize admin settings --- options/locale/locale_en-US.ini | 3 ++ templates/admin/navbar.tmpl | 76 ++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 26 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5f671676b585..fa515c013549 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2627,10 +2627,13 @@ teams.invite.description = Please click the button below to join the team. [admin] dashboard = Dashboard +organization_structure = Organization Structure users = User Accounts organizations = Organizations +assets = Code Assets repositories = Repositories hooks = Webhooks +integrations = Integrations authentication = Authentication Sources emails = User Emails config = Configuration diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 641d3fad81f8..0474f108044e 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -4,35 +4,59 @@ {{.locale.Tr "admin.dashboard"}} - - {{.locale.Tr "admin.users"}} - - - {{.locale.Tr "admin.organizations"}} - - - {{.locale.Tr "admin.repositories"}} - - {{if .EnablePackages}} - - {{.locale.Tr "packages.title"}} - - {{end}} - {{if not DisableWebhooks}} +
+ {{.locale.Tr "admin.organization_structure"}} +
+ + {{.locale.Tr "admin.users"}} + + + {{.locale.Tr "admin.emails"}} + + + {{.locale.Tr "admin.organizations"}} + + + {{.locale.Tr "admin.authentication"}} + +
+
+
+ {{.locale.Tr "admin.assets"}} +
+ + {{.locale.Tr "admin.repositories"}} + + {{if .EnablePackages}} + + {{.locale.Tr "packages.title"}} + + {{end}} +
+
+ {{if and (not DisableWebhooks) .EnableOAuth2}} +
+ {{.locale.Tr "admin.integrations"}} +
+ + {{.locale.Tr "admin.hooks"}} + + + {{.locale.Tr "settings.applications"}} + +
+
+ {{else}} + {{if not DisableWebhooks}} {{.locale.Tr "admin.hooks"}} - {{end}} - - {{.locale.Tr "admin.authentication"}} - - - {{.locale.Tr "admin.emails"}} - - {{if .EnableOAuth2}} - - {{.locale.Tr "settings.applications"}} - + {{end}} + {{if .EnableOAuth2}} + + {{.locale.Tr "settings.applications"}} + + {{end}} {{end}} {{if .EnableActions}}
From 5e7c5cbbecaa81409a890347012f54f5ad0fa6ab Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Jul 2023 10:58:35 +0800 Subject: [PATCH 2/7] comment --- templates/admin/navbar.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 0474f108044e..65dccebae3ba 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -34,6 +34,7 @@ {{end}}
+ {{if and (not DisableWebhooks) .EnableOAuth2}}
{{.locale.Tr "admin.integrations"}} From 89682903212a8ed052b2c0e41f209b79b0890897 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Jul 2023 11:38:47 +0800 Subject: [PATCH 3/7] lint --- templates/admin/navbar.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 9176f93534cc..1ad4c4377e75 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -57,7 +57,7 @@ {{.locale.Tr "settings.applications"}} - {{end}} + {{end}} {{end}} {{if .EnableActions}}
From b6b002a3f83d4ea6b820f3c0f270a7b6874fc422 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Jul 2023 16:02:47 +0800 Subject: [PATCH 4/7] updaye --- options/locale/locale_en-US.ini | 2 +- templates/admin/navbar.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index fa515c013549..052f2d8c60d6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2627,7 +2627,7 @@ teams.invite.description = Please click the button below to join the team. [admin] dashboard = Dashboard -organization_structure = Organization Structure +indetity_access = Identity & Access users = User Accounts organizations = Organizations assets = Code Assets diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 1ad4c4377e75..a72ee4d91d5c 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -5,7 +5,7 @@ {{.locale.Tr "admin.dashboard"}}
- {{.locale.Tr "admin.organization_structure"}} + {{.locale.Tr "admin.indetity_access"}}
{{.locale.Tr "admin.users"}} From 9e8680f5a9b61d0cca20f7ca1019189280af0f84 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Jul 2023 16:23:52 +0800 Subject: [PATCH 5/7] Update options/locale/locale_en-US.ini Co-authored-by: delvh --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 052f2d8c60d6..286d34564980 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2627,7 +2627,7 @@ teams.invite.description = Please click the button below to join the team. [admin] dashboard = Dashboard -indetity_access = Identity & Access +identity_access = Identity & Access users = User Accounts organizations = Organizations assets = Code Assets From 7b54d7990371bd4e245e48adf76d64440e09de8e Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 21 Jul 2023 16:23:59 +0800 Subject: [PATCH 6/7] Update templates/admin/navbar.tmpl Co-authored-by: delvh --- templates/admin/navbar.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index a72ee4d91d5c..7cac0615fc6a 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -5,7 +5,7 @@ {{.locale.Tr "admin.dashboard"}}
- {{.locale.Tr "admin.indetity_access"}} + {{.locale.Tr "admin.identity_access"}}
{{.locale.Tr "admin.users"}} From c561d3c8eee11711510659354dbd5fdcee6aa31c Mon Sep 17 00:00:00 2001 From: HesterG Date: Sat, 22 Jul 2023 14:07:16 +0800 Subject: [PATCH 7/7] reorder --- templates/admin/navbar.tmpl | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 7cac0615fc6a..4cfdbac73f38 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -7,31 +7,31 @@
{{.locale.Tr "admin.identity_access"}}
+ + {{.locale.Tr "admin.authentication"}} + + + {{.locale.Tr "admin.organizations"}} + {{.locale.Tr "admin.users"}} {{.locale.Tr "admin.emails"}} - - {{.locale.Tr "admin.organizations"}} - - - {{.locale.Tr "admin.authentication"}} -
{{.locale.Tr "admin.assets"}}
- - {{.locale.Tr "admin.repositories"}} - {{if .EnablePackages}} {{.locale.Tr "packages.title"}} {{end}} + + {{.locale.Tr "admin.repositories"}} +
@@ -39,12 +39,12 @@
{{.locale.Tr "admin.integrations"}}
- - {{.locale.Tr "admin.hooks"}} - {{.locale.Tr "settings.applications"}} + + {{.locale.Tr "admin.hooks"}} +
{{else}}