From 0ec626ed0183fd73bd3a46cafe13ff0dbfc72a61 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 29 Mar 2025 05:48:35 +0000 Subject: [PATCH 1/8] add --- options/locale/locale_en-US.ini | 3 +++ templates/repo/settings/public_access.tmpl | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 252044da16fbe..7755aff0abb43 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -927,8 +927,11 @@ permission_no_access = No Access permission_read = Read permission_write = Read and Write permission_anonymous_read = Anonymous Read +permission_anonymous_read_helper = Non-signed-in users can read permission_everyone_read = Everyone Read +permission_everyone_read_helper = Signed-in users can read permission_everyone_write = Everyone Write +permission_everyone_write_helper = Signed-in users can write (wiki-only) access_token_desc = Selected token permissions limit authorization only to the corresponding API routes. Read the documentation for more information. at_least_one_permission = You must select at least one permission to create a token permissions_list = Permissions: diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index 5c807969319d0..6c30892a3e110 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -10,9 +10,12 @@ {{ctx.Locale.Tr "settings.permission_not_set"}} - {{ctx.Locale.Tr "settings.permission_anonymous_read"}} - {{ctx.Locale.Tr "settings.permission_everyone_read"}} - {{ctx.Locale.Tr "settings.permission_everyone_write"}} + {{ctx.Locale.Tr "settings.permission_anonymous_read"}} + {{svg "octicon-question" 16 "tw-ml-1"}} + {{ctx.Locale.Tr "settings.permission_everyone_read"}} + {{svg "octicon-question" 16 "tw-ml-1"}} + {{ctx.Locale.Tr "settings.permission_everyone_write"}} + {{svg "octicon-question" 16 "tw-ml-1"}} {{range $ua := .RepoUnitPublicAccesses}} From 8a7614650f469dfa29ac7770d5618e3ba0b30f13 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 29 Mar 2025 05:57:05 +0000 Subject: [PATCH 2/8] improve --- options/locale/locale_en-US.ini | 1 + templates/repo/settings/public_access.tmpl | 74 ++++++++++++---------- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7755aff0abb43..699e47b3014c7 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2141,6 +2141,7 @@ settings = Settings settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository settings.public_access = Public Access +settings.public_access_desc = Configure public access permissions for each units. settings.collaboration = Collaborators settings.collaboration.admin = Administrator settings.collaboration.write = Write diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index 6c30892a3e110..cf81f43b16e9b 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -1,39 +1,47 @@ {{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings")}}
- {{$paNotSet := "not-set"}} - {{$paAnonymousRead := "anonymous-read"}} - {{$paEveryoneRead := "everyone-read"}} - {{$paEveryoneWrite := "everyone-write"}} -
- {{.CsrfTokenHtml}} - - - - - - - - - {{range $ua := .RepoUnitPublicAccesses}} +

+ {{ctx.Locale.Tr "repo.settings.public_access"}} +

+
+

+ {{ctx.Locale.Tr "repo.settings.public_access_desc"}} +

+ {{$paNotSet := "not-set"}} + {{$paAnonymousRead := "anonymous-read"}} + {{$paEveryoneRead := "everyone-read"}} + {{$paEveryoneWrite := "everyone-write"}} + + {{.CsrfTokenHtml}} +
{{ctx.Locale.Tr "settings.permission_not_set"}}{{ctx.Locale.Tr "settings.permission_anonymous_read"}} - {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_everyone_read"}} - {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_everyone_write"}} - {{svg "octicon-question" 16 "tw-ml-1"}}
- - - - - + + + + + - {{end}} -
{{$ua.DisplayName}} - {{if SliceUtils.Contains $ua.PublicAccessTypes $paEveryoneWrite}} - - {{else}} - - - {{end}} - {{ctx.Locale.Tr "settings.permission_not_set"}}{{ctx.Locale.Tr "settings.permission_anonymous_read"}} + {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_everyone_read"}} + {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_everyone_write"}} + {{svg "octicon-question" 16 "tw-ml-1"}}
- -
+ {{range $ua := .RepoUnitPublicAccesses}} + + {{$ua.DisplayName}} + + + + + {{if SliceUtils.Contains $ua.PublicAccessTypes $paEveryoneWrite}} + + {{else}} + - + {{end}} + + + {{end}} + + + +
{{template "repo/settings/layout_footer" .}} From 170b796a7a39c30c464e4c3ab2033f0149363ece Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 29 Mar 2025 06:20:58 +0000 Subject: [PATCH 3/8] add description to not set --- options/locale/locale_en-US.ini | 1 + templates/repo/settings/public_access.tmpl | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 699e47b3014c7..3894d7ac19ce5 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -923,6 +923,7 @@ repo_and_org_access = Repository and Organization Access permissions_public_only = Public only permissions_access_all = All (public, private, and limited) permission_not_set = Not set +permission_not_set_helper = No public access to this unit permission_no_access = No Access permission_read = Read permission_write = Read and Write diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index cf81f43b16e9b..3d087aec99600 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -16,7 +16,8 @@ - + {{end}}
{{ctx.Locale.Tr "settings.permission_not_set"}}{{ctx.Locale.Tr "settings.permission_not_set"}} + {{svg "octicon-question" 16 "tw-ml-1"}} {{ctx.Locale.Tr "settings.permission_anonymous_read"}} {{svg "octicon-question" 16 "tw-ml-1"}} {{ctx.Locale.Tr "settings.permission_everyone_read"}} From 56e4e4110aa262f71456754cca39f0d54bc68e2b Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 29 Mar 2025 09:00:59 +0000 Subject: [PATCH 4/8] follow the suggestion --- options/locale/locale_en-US.ini | 8 ++++---- templates/repo/settings/public_access.tmpl | 18 ++++++++++-------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3894d7ac19ce5..2829cfc9796af 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -923,16 +923,12 @@ repo_and_org_access = Repository and Organization Access permissions_public_only = Public only permissions_access_all = All (public, private, and limited) permission_not_set = Not set -permission_not_set_helper = No public access to this unit permission_no_access = No Access permission_read = Read permission_write = Read and Write permission_anonymous_read = Anonymous Read -permission_anonymous_read_helper = Non-signed-in users can read permission_everyone_read = Everyone Read -permission_everyone_read_helper = Signed-in users can read permission_everyone_write = Everyone Write -permission_everyone_write_helper = Signed-in users can write (wiki-only) access_token_desc = Selected token permissions limit authorization only to the corresponding API routes. Read the documentation for more information. at_least_one_permission = You must select at least one permission to create a token permissions_list = Permissions: @@ -2143,6 +2139,10 @@ settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository settings.public_access = Public Access settings.public_access_desc = Configure public access permissions for each units. +settings.public_access.docs.not_set = "Not set" means there is no extra public access rules for this repo, it follows its own visibility and member permissions. +settings.public_access.docs.anonymous_read = "Anonymous read" means non-signed-in users can access the unit. +settings.public_access.docs.everyone_read = "Everyone read" means all signed-in users can access the unit. Read permission also means being able to create new issues or PRs. +settings.public_access.docs.everyone_write = "Everyone write" means all signed-in users have write permission to the unit, this is only for Wiki unit. settings.collaboration = Collaborators settings.collaboration.admin = Administrator settings.collaboration.write = Write diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index 3d087aec99600..464fd2251deca 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -16,14 +16,10 @@ - - - - + + + + {{range $ua := .RepoUnitPublicAccesses}} @@ -41,6 +37,12 @@ {{end}}
{{ctx.Locale.Tr "settings.permission_not_set"}} - {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_anonymous_read"}} - {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_everyone_read"}} - {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_everyone_write"}} - {{svg "octicon-question" 16 "tw-ml-1"}}{{ctx.Locale.Tr "settings.permission_not_set"}}{{ctx.Locale.Tr "settings.permission_anonymous_read"}}{{ctx.Locale.Tr "settings.permission_everyone_read"}}{{ctx.Locale.Tr "settings.permission_everyone_write"}}
+
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.not_set"}}
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.anonymous_read"}}
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_read"}}
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_write"}}
+
From 4d48f0b3fb77cd69cbc0e79e08689762414777f2 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 29 Mar 2025 09:15:55 +0000 Subject: [PATCH 5/8] improve --- options/locale/locale_en-US.ini | 8 ++++---- templates/repo/settings/public_access.tmpl | 12 +++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2829cfc9796af..756adff3db325 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2139,10 +2139,10 @@ settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository settings.public_access = Public Access settings.public_access_desc = Configure public access permissions for each units. -settings.public_access.docs.not_set = "Not set" means there is no extra public access rules for this repo, it follows its own visibility and member permissions. -settings.public_access.docs.anonymous_read = "Anonymous read" means non-signed-in users can access the unit. -settings.public_access.docs.everyone_read = "Everyone read" means all signed-in users can access the unit. Read permission also means being able to create new issues or PRs. -settings.public_access.docs.everyone_write = "Everyone write" means all signed-in users have write permission to the unit, this is only for Wiki unit. +settings.public_access.docs.not_set = Not set means there is no extra public access rules for this repo, it follows its own visibility and member permissions. +settings.public_access.docs.anonymous_read = Anonymous read means non-signed-in users can access the unit. +settings.public_access.docs.everyone_read = Everyone read means all signed-in users can access the unit. Read permission also means being able to create new issues or PRs. +settings.public_access.docs.everyone_write = Everyone write means all signed-in users have write permission to the unit, this is only for Wiki unit. settings.collaboration = Collaborators settings.collaboration.admin = Administrator settings.collaboration.write = Write diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index 464fd2251deca..1e1e8b8c2f0c8 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -37,11 +37,13 @@
-
- {{ctx.Locale.Tr "repo.settings.public_access.docs.not_set"}}
- {{ctx.Locale.Tr "repo.settings.public_access.docs.anonymous_read"}}
- {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_read"}}
- {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_write"}}
+
+

+ {{ctx.Locale.Tr "repo.settings.public_access.docs.not_set"}}
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.anonymous_read"}}
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_read"}}
+ {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_write"}} +

From 2fccb6c3cd3292da881896ee908c155e1953101a Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 29 Mar 2025 17:38:28 +0800 Subject: [PATCH 6/8] fine tune --- options/locale/locale_en-US.ini | 10 +++++----- templates/repo/settings/public_access.tmpl | 14 ++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 756adff3db325..f20d4777483a4 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2138,11 +2138,11 @@ settings = Settings settings.desc = Settings is where you can manage the settings for the repository settings.options = Repository settings.public_access = Public Access -settings.public_access_desc = Configure public access permissions for each units. -settings.public_access.docs.not_set = Not set means there is no extra public access rules for this repo, it follows its own visibility and member permissions. -settings.public_access.docs.anonymous_read = Anonymous read means non-signed-in users can access the unit. -settings.public_access.docs.everyone_read = Everyone read means all signed-in users can access the unit. Read permission also means being able to create new issues or PRs. -settings.public_access.docs.everyone_write = Everyone write means all signed-in users have write permission to the unit, this is only for Wiki unit. +settings.public_access_desc = Configure public visitor's access permissions to override the defaults of this repository. +settings.public_access.docs.not_set = Not Set: no extra public access permission. The visitor's permission follows the repository's visibility and member permissions. +settings.public_access.docs.anonymous_read = Anonymous Read: users who are not logged in can access the unit with read permission. +settings.public_access.docs.everyone_read = Everyone Read: all logged-in users can access the unit with read permission. Read permission of issues/pull-requests units also means visitor can create new issues/pull-requests. +settings.public_access.docs.everyone_write = Everyone Write: all logged-in users have write permission to the unit. Only Wiki unit supports this permission. settings.collaboration = Collaborators settings.collaboration.admin = Administrator settings.collaboration.write = Write diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index 1e1e8b8c2f0c8..02167b954f340 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -37,14 +37,12 @@ {{end}} -
-

- {{ctx.Locale.Tr "repo.settings.public_access.docs.not_set"}}
- {{ctx.Locale.Tr "repo.settings.public_access.docs.anonymous_read"}}
- {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_read"}}
- {{ctx.Locale.Tr "repo.settings.public_access.docs.everyone_write"}} -

-
+
From 54babc7883bf37ca00d0e637905701347a7ccd80 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 29 Mar 2025 17:42:19 +0800 Subject: [PATCH 7/8] fine tune table --- templates/repo/settings/public_access.tmpl | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/public_access.tmpl index 02167b954f340..c1c198bcce5f2 100644 --- a/templates/repo/settings/public_access.tmpl +++ b/templates/repo/settings/public_access.tmpl @@ -14,13 +14,16 @@
{{.CsrfTokenHtml}} - - - - - - - + + + + + + + + + + {{range $ua := .RepoUnitPublicAccesses}} @@ -36,6 +39,7 @@ {{end}} +
{{ctx.Locale.Tr "settings.permission_not_set"}}{{ctx.Locale.Tr "settings.permission_anonymous_read"}}{{ctx.Locale.Tr "settings.permission_everyone_read"}}{{ctx.Locale.Tr "settings.permission_everyone_write"}}
{{ctx.Locale.Tr "units.unit"}}{{ctx.Locale.Tr "settings.permission_not_set"}}{{ctx.Locale.Tr "settings.permission_anonymous_read"}}{{ctx.Locale.Tr "settings.permission_everyone_read"}}{{ctx.Locale.Tr "settings.permission_everyone_write"}}
{{$ua.DisplayName}}