From b6adf80a803ee3953917c1bc897b69a90c41de0b Mon Sep 17 00:00:00 2001
From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com>
Date: Fri, 12 Jun 2020 23:24:41 +0200
Subject: [PATCH] Fix repo internal icon when avatar is present (#11873)

* Fix repo internal icon when avatar is present

* fix tabs

* move repo icons in header to separate template
---
 templates/repo/header.tmpl      | 40 ++-------------------------------
 templates/repo/header_icon.tmpl | 23 +++++++++++++++++++
 2 files changed, 25 insertions(+), 38 deletions(-)
 create mode 100644 templates/repo/header_icon.tmpl

diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 2faaafa442..76102529df 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -5,50 +5,14 @@
 			<div class="ui huge breadcrumb repo-title">
 				{{if .RelAvatarLink}}
 					<img class="ui avatar image" src="{{.RelAvatarLink}}">
-				{{else if .IsTemplate}}
-					{{if .IsPrivate}}
-						{{svg "octicon-repo-template-private" 32}}
-					{{else}}
-						{{svg "octicon-repo-template" 32}}
-					{{end}}
 				{{else}}
-					{{if .IsPrivate}}
-						{{svg "octicon-lock" 32}}
-					{{else if and (not .IsMirror) (not .IsFork) (.Owner)}}
-						{{if .Owner.Visibility.IsPrivate}}
-							{{svg "octicon-internal-repo" 32}}
-						{{else}}
-							{{svg "octicon-repo" 32}}
-						{{end}}
-					{{else if .IsMirror}}
-						{{svg "octicon-repo-clone" 32}}
-					{{else if .IsFork}}
-						{{svg "octicon-repo-forked" 32}}
-					{{else}}
-						{{svg "octicon-repo" 32}}
-					{{end}}
+					{{template "repo/header_icon" .}}
 				{{end}}
 				<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 				<div class="divider"> / </div>
 				<a href="{{$.RepoLink}}">{{.Name}}</a>
 				{{if .RelAvatarLink}}
-					{{if .IsTemplate}}
-						{{if .IsPrivate}}
-							{{svg "octicon-repo-template-private" 32}}
-						{{else}}
-							{{svg "octicon-repo-template" 32}}
-						{{end}}
-					{{else}}
-						{{if .IsPrivate}}
-							{{svg "octicon-lock" 32}}
-						{{else if .IsMirror}}
-							{{svg "octicon-repo-clone" 32}}
-						{{else if .IsFork}}
-							{{svg "octicon-repo-forked" 32}}
-						{{else}}
-							{{svg "octicon-repo" 32}}
-						{{end}}
-					{{end}}
+					{{template "repo/header_icon" .}}
 				{{end}}
 				{{if .IsArchived}}<i class="archive icon archived-icon"></i>{{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}}
diff --git a/templates/repo/header_icon.tmpl b/templates/repo/header_icon.tmpl
new file mode 100644
index 0000000000..7184734bbf
--- /dev/null
+++ b/templates/repo/header_icon.tmpl
@@ -0,0 +1,23 @@
+{{if $.IsTemplate}}
+	{{if $.IsPrivate}}
+		{{svg "octicon-repo-template-private" 32}}
+	{{else}}
+		{{svg "octicon-repo-template" 32}}
+	{{end}}
+{{else}}
+	{{if $.IsPrivate}}
+		{{svg "octicon-lock" 32}}
+	{{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}}
+		{{if $.Owner.Visibility.IsPrivate}}
+			{{svg "octicon-internal-repo" 32}}
+		{{else}}
+			{{svg "octicon-repo" 32}}
+		{{end}}
+	{{else if $.IsMirror}}
+		{{svg "octicon-repo-clone" 32}}
+	{{else if $.IsFork}}
+		{{svg "octicon-repo-forked" 32}}
+	{{else}}
+		{{svg "octicon-repo" 32}}
+	{{end}}
+{{end}}