From d9aa007a9e84bd255b16bd02b9ab18719cb650a2 Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Mon, 22 Jun 2020 22:20:51 +0200 Subject: [PATCH] Use label to describe repository type (#11891) * Use label instead of icon to describe repository type when repo avatar is set * header_icon is not longer duplicated; move out of separate template * handle archived case too * use everywhere * public template -> template * bring back separate icon in better form * definitely was overthinking this * 32 Co-authored-by: techknowlogick --- options/locale/locale_en-US.ini | 8 ++++++++ templates/explore/repo_list.tmpl | 25 +++++++++++++++++++------ templates/repo/header.tmpl | 20 +++++++++++++++++--- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 662ea49aca..e444bfa7c0 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -673,6 +673,14 @@ reactions_more = and %d more unit_disabled = The site administrator has disabled this repository section. language_other = Other +desc.private = Private +desc.public = Public +desc.private_template = Private template +desc.public_template = Template +desc.internal = Internal +desc.internal_template = Internal template +desc.archived = Archived + template.items = Template Items template.git_content = Git Content (Default Branch) template.git_hooks = Git Hooks diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index 61ef056afc..97495e16b7 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -7,13 +7,26 @@ {{end}} {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} - {{if .IsArchived}}{{end}} - {{if .IsPrivate}} - {{svg "octicon-lock" 16}} - {{else if and (not .IsMirror) (not .IsFork) (.Owner.Visibility.IsPrivate) }} - {{svg "octicon-internal-repo" 16}} - {{else if .IsFork}} + {{if .IsArchived}}{{$.i18n.Tr "repo.desc.archived"}}{{end}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{$.i18n.Tr "repo.desc.private_template"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.i18n.Tr "repo.desc.internal_template"}} + {{end}} + {{end}} + {{else}} + {{if .IsPrivate}} + {{$.i18n.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.i18n.Tr "repo.desc.internal"}} + {{end}} + {{end}} + {{end}} + {{if .IsFork}} {{svg "octicon-repo-forked" 16}} {{else if .IsMirror}} {{svg "octicon-repo-clone" 16}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 713968dc21..c777d27fcd 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -11,10 +11,24 @@ {{.Owner.Name}}
/
{{.Name}} - {{if .RelAvatarLink}} - {{template "repo/header_icon" .}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{$.i18n.Tr "repo.desc.private_template"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.i18n.Tr "repo.desc.internal_template"}} + {{end}} + {{end}} + {{else}} + {{if .IsPrivate}} + {{$.i18n.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.i18n.Tr "repo.desc.internal"}} + {{end}} + {{end}} {{end}} - {{if .IsArchived}}{{end}} + {{if .IsArchived}}{{$.i18n.Tr "repo.desc.archived"}}{{end}} {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}
{{end}} {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}} {{if .IsGenerated}}
{{$.i18n.Tr "repo.generated_from"}} {{SubStr .TemplateRepo.RelLink 1 -1}}
{{end}}