From e7938c9c44384e044afba14d5a86b1ba32520dd3 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 8 Dec 2020 05:14:28 +0100 Subject: Repo avatar fixes (#13891) - Split up avatar rendering helpers for performance - Fix showing repo SVG icon when no avatar is set - Make repo SVG and avatar same size at 32px - Fix fork line by adding vertical flexbox on repo title Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: Lunny Xiao --- templates/explore/repo_list.tmpl | 65 ++++++++++++++++++++++------------------ templates/repo/header.tmpl | 57 +++++++++++++++++++---------------- templates/repo/header_icon.tmpl | 20 ------------- templates/repo/icon.tmpl | 20 +++++++++++++ 4 files changed, 87 insertions(+), 75 deletions(-) delete mode 100644 templates/repo/header_icon.tmpl create mode 100644 templates/repo/icon.tmpl (limited to 'templates') diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl index fe4b278e2c..bfec17ff29 100644 --- a/templates/explore/repo_list.tmpl +++ b/templates/explore/repo_list.tmpl @@ -1,37 +1,44 @@
{{range .Repos}}
-
- {{avatar .}} - - {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} - - {{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}} +
+
+ {{$avatar := (repoAvatar . 32 "mr-3")}} + {{if $avatar}} + {{$avatar}} {{end}} - {{else}} - {{if .IsPrivate}} - {{$.i18n.Tr "repo.desc.private"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{$.i18n.Tr "repo.desc.internal"}} + + {{if or $.PageIsExplore $.PageIsProfileStarList }}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}} + +
+ {{if .IsArchived}} + {{$.i18n.Tr "repo.desc.archived"}} {{end}} - {{end}} - {{end}} - {{if .IsFork}} - {{svg "octicon-repo-forked"}} - {{else if .IsMirror}} - {{svg "octicon-mirror"}} - {{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"}} + {{else if .IsMirror}} + {{svg "octicon-mirror"}} + {{end}} +
+
+
{{if .PrimaryLanguage }} {{ .PrimaryLanguage.Language }} {{end}} diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 348c6b1ffa..8799cda655 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -2,35 +2,40 @@ {{with .Repository}}
-
- {{if .Name}} - {{avatar .}} - {{else}} - {{template "repo/header_icon" .}} - {{end}} - {{.Owner.Name}} -
/
- {{.Name}} - {{if .IsTemplate}} - {{if .IsPrivate}} - {{$.i18n.Tr "repo.desc.private_template"}} +
+
+ {{$avatar := (repoAvatar . 32 "mr-3")}} + {{if $avatar}} + {{$avatar}} {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{$.i18n.Tr "repo.desc.internal_template"}} - {{end}} + {{template "repo/icon" .}} {{end}} - {{else}} - {{if .IsPrivate}} - {{$.i18n.Tr "repo.desc.private"}} - {{else}} - {{if .Owner.Visibility.IsPrivate}} - {{$.i18n.Tr "repo.desc.internal"}} + {{.Owner.Name}} +
/
+ {{.Name}} +
+ {{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}} - {{end}} - {{end}} - {{if .IsArchived}} - {{$.i18n.Tr "repo.desc.archived"}} - {{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}} diff --git a/templates/repo/header_icon.tmpl b/templates/repo/header_icon.tmpl deleted file mode 100644 index b9d49c209d..0000000000 --- a/templates/repo/header_icon.tmpl +++ /dev/null @@ -1,20 +0,0 @@ -
- {{if $.IsTemplate}} - {{svg "octicon-repo-template" 32}} - {{else}} - {{if $.IsPrivate}} - {{svg "octicon-lock" 32}} - {{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}} - {{svg "octicon-repo" 32}} - {{if $.Owner.Visibility.IsPrivate}} - {{avatar $.Owner}} - {{end}} - {{else if $.IsMirror}} - {{svg "octicon-mirror" 32}} - {{else if $.IsFork}} - {{svg "octicon-repo-forked" 32}} - {{else}} - {{svg "octicon-repo" 32}} - {{end}} - {{end}} -
diff --git a/templates/repo/icon.tmpl b/templates/repo/icon.tmpl new file mode 100644 index 0000000000..b4d8a24560 --- /dev/null +++ b/templates/repo/icon.tmpl @@ -0,0 +1,20 @@ +
+ {{if $.IsTemplate}} + {{svg "octicon-repo-template" 32}} + {{else}} + {{if $.IsPrivate}} + {{svg "octicon-lock" 32}} + {{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}} + {{svg "octicon-repo" 32}} + {{if $.Owner.Visibility.IsPrivate}} + {{avatar $.Owner}} + {{end}} + {{else if $.IsMirror}} + {{svg "octicon-mirror" 32}} + {{else if $.IsFork}} + {{svg "octicon-repo-forked" 32}} + {{else}} + {{svg "octicon-repo" 32}} + {{end}} + {{end}} +
-- cgit v1.2.3