From 6cef7a767b649aa250ea902042c719d1c87d678d Mon Sep 17 00:00:00 2001 From: Giteabot Date: Fri, 20 Oct 2023 04:04:24 +0800 Subject: [PATCH] cleanup repo details icons/labels (#27644) (#27654) Backport #27644 by @denyskon Fix #27596 Change confusing behavior when showing information about a repo via labels and icons. Implement changes proposed by @lng2020 in https://github.com/go-gitea/gitea/pull/27627#pullrequestreview-1678787673. Co-authored-by: Denys Konovalov --- options/locale/locale_en-US.ini | 4 +--- templates/admin/repo/list.tmpl | 29 +++++++++++------------------ templates/explore/repo_list.tmpl | 26 +++++++------------------- templates/repo/header.tmpl | 25 +++++++++---------------- templates/repo/icon.tmpl | 4 ---- 5 files changed, 28 insertions(+), 60 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index eb8d074e37969..5939ac8ff09e2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1026,10 +1026,8 @@ transfer.no_permission_to_reject = You do not have permission to reject this tra desc.private = Private desc.public = Public -desc.private_template = Private template -desc.public_template = Template +desc.template = Template desc.internal = Internal -desc.internal_template = Internal template desc.archived = Archived template.items = Template Items diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index c23b6a1b6301e..2581864547b28 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -55,29 +55,22 @@ {{.Name}} {{if .IsArchived}} - {{ctx.Locale.Tr "repo.desc.archived"}} + {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} - {{if .IsTemplate}} - {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private_template"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal_template"}} - {{end}} - {{end}} + {{if .IsPrivate}} + {{ctx.Locale.Tr "repo.desc.private"}} {{else}} - {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal"}} - {{end}} + {{if .Owner.Visibility.IsPrivate}} + {{ctx.Locale.Tr "repo.desc.internal"}} {{end}} {{end}} - {{if .IsFork}} - {{svg "octicon-repo-forked"}} - {{else if .IsMirror}} + {{if .IsTemplate}} + {{ctx.Locale.Tr "repo.desc.template"}} + {{end}} + {{if .IsMirror}} {{svg "octicon-mirror"}} + {{else if .IsFork}} + {{svg "octicon-repo-forked"}} {{end}} {{.NumWatches}} diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 35839087433ff..1976ed5a15977 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -14,29 +14,17 @@ {{if .IsArchived}} {{ctx.Locale.Tr "repo.desc.archived"}} {{end}} - {{if .IsTemplate}} - {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private_template"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal_template"}} - {{end}} - {{end}} + {{if .IsPrivate}} + {{ctx.Locale.Tr "repo.desc.private"}} {{else}} - {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal"}} - {{end}} + {{if .Owner.Visibility.IsPrivate}} + {{ctx.Locale.Tr "repo.desc.internal"}} {{end}} {{end}} + {{if .IsTemplate}} + {{ctx.Locale.Tr "repo.desc.template"}} + {{end}} - {{if .IsFork}} - {{svg "octicon-repo-forked"}} - {{else if .IsMirror}} - {{svg "octicon-mirror"}} - {{end}}
{{if .PrimaryLanguage}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 5d4bc64734147..814128fc9900f 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -11,25 +11,18 @@
/
{{.Name}}
- {{if .IsTemplate}} - {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private_template"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal_template"}} - {{end}} - {{end}} + {{if .IsArchived}} + {{ctx.Locale.Tr "repo.desc.archived"}} + {{end}} + {{if .IsPrivate}} + {{ctx.Locale.Tr "repo.desc.private"}} {{else}} - {{if .IsPrivate}} - {{ctx.Locale.Tr "repo.desc.private"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{ctx.Locale.Tr "repo.desc.internal"}} - {{end}} + {{if .Owner.Visibility.IsPrivate}} + {{ctx.Locale.Tr "repo.desc.internal"}} {{end}} {{end}} - {{if .IsArchived}} - {{ctx.Locale.Tr "repo.desc.archived"}} + {{if .IsTemplate}} + {{ctx.Locale.Tr "repo.desc.template"}} {{end}}
{{if $.EnableFeed}} diff --git a/templates/repo/icon.tmpl b/templates/repo/icon.tmpl index 0568b74f63080..3575e48683b0f 100644 --- a/templates/repo/icon.tmpl +++ b/templates/repo/icon.tmpl @@ -1,10 +1,6 @@ {{$avatarLink := .RelAvatarLink}} {{if $avatarLink}} {{.FullName}} -{{else if $.IsTemplate}} - {{svg "octicon-repo-template" 32}} -{{else if $.IsPrivate}} - {{svg "octicon-lock" 32}} {{else if $.IsMirror}} {{svg "octicon-mirror" 32}} {{else if $.IsFork}}