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 <techknowlogick@gitea.io>
go-gitea · Jun 22, 2020 · d9aa007 · d9aa007
1 parent daf6284
commit d9aa007
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 9 deletions.
diff --git 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
@@ -7,13 +7,26 @@
 				{{end}}
 				<a class="name" href="{{.Link}}">
 					{{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
-					{{if .IsArchived}}<i class="archive icon archived-icon"></i>{{end}}
 				</a>
-				{{if .IsPrivate}}
-					<span class="middle text gold">{{svg "octicon-lock" 16}}</span>
-				{{else if and (not .IsMirror) (not .IsFork) (.Owner.Visibility.IsPrivate) }}
-					<span class="text gold">{{svg "octicon-internal-repo" 16}}</span>
-				{{else if .IsFork}}
+				{{if .IsArchived}}<span class="ui compact label">{{$.i18n.Tr "repo.desc.archived"}}</span>{{end}}
+				{{if .IsTemplate}}
+					{{if .IsPrivate}}
+						<span class="ui basic label">{{$.i18n.Tr "repo.desc.private_template"}}</span>
+					{{else}}
+						{{if .Owner.Visibility.IsPrivate}}
+							<span class="ui basic label">{{$.i18n.Tr "repo.desc.internal_template"}}</span>
+						{{end}}
+					{{end}}
+				{{else}}
+					{{if .IsPrivate}}
+						<span class="ui basic label">{{$.i18n.Tr "repo.desc.private"}}</span>
+					{{else}}
+						{{if .Owner.Visibility.IsPrivate}}
+							<span class="ui basic label">{{$.i18n.Tr "repo.desc.internal"}}</span>
+						{{end}}
+					{{end}}
+				{{end}}
+				{{if .IsFork}}
 					<span class="middle">{{svg "octicon-repo-forked" 16}}</span>
 				{{else if .IsMirror}}
 					<span class="middle">{{svg "octicon-repo-clone" 16}}</span>

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
@@ -11,10 +11,24 @@
 				<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 				<div class="divider"> / </div>
 				<a href="{{$.RepoLink}}">{{.Name}}</a>
-				{{if .RelAvatarLink}}
-					{{template "repo/header_icon" .}}
+				{{if .IsTemplate}}
+					{{if .IsPrivate}}
+						<span class="ui basic label">{{$.i18n.Tr "repo.desc.private_template"}}</span>
+					{{else}}
+						{{if .Owner.Visibility.IsPrivate}}
+							<span class="ui basic label">{{$.i18n.Tr "repo.desc.internal_template"}}</span>
+						{{end}}
+					{{end}}
+				{{else}}
+					{{if .IsPrivate}}
+						<span class="ui basic label">{{$.i18n.Tr "repo.desc.private"}}</span>
+					{{else}}
+						{{if .Owner.Visibility.IsPrivate}}
+							<span class="ui basic label">{{$.i18n.Tr "repo.desc.internal"}}</span>
+						{{end}}
+					{{end}}
 				{{end}}
-				{{if .IsArchived}}<i class="archive icon archived-icon"></i>{{end}}
+				{{if .IsArchived}}<span class="ui compact label">{{$.i18n.Tr "repo.desc.archived"}}</span>{{end}}
 				{{if .IsMirror}}<div class="fork-flag">{{$.i18n.Tr "repo.mirror_from"}} <a target="_blank" rel="noopener noreferrer" href="{{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}">{{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}</a></div>{{end}}
 				{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.Link}}">{{SubStr .BaseRepo.RelLink 1 -1}}</a></div>{{end}}
 				{{if .IsGenerated}}<div class="fork-flag">{{$.i18n.Tr "repo.generated_from"}} <a href="{{.TemplateRepo.Link}}">{{SubStr .TemplateRepo.RelLink 1 -1}}</a></div>{{end}}