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
This commit is contained in:
Cirno the Strongest 2020-06-12 23:24:41 +02:00 committed by GitHub
parent 83e9ac57a1
commit b6adf80a80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 38 deletions

View File

@ -5,50 +5,14 @@
<div class="ui huge breadcrumb repo-title"> <div class="ui huge breadcrumb repo-title">
{{if .RelAvatarLink}} {{if .RelAvatarLink}}
<img class="ui avatar image" src="{{.RelAvatarLink}}"> <img class="ui avatar image" src="{{.RelAvatarLink}}">
{{else if .IsTemplate}}
{{if .IsPrivate}}
{{svg "octicon-repo-template-private" 32}}
{{else}} {{else}}
{{svg "octicon-repo-template" 32}} {{template "repo/header_icon" .}}
{{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}} {{end}}
<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> <a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
<div class="divider"> / </div> <div class="divider"> / </div>
<a href="{{$.RepoLink}}">{{.Name}}</a> <a href="{{$.RepoLink}}">{{.Name}}</a>
{{if .RelAvatarLink}} {{if .RelAvatarLink}}
{{if .IsTemplate}} {{template "repo/header_icon" .}}
{{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}}
{{end}} {{end}}
{{if .IsArchived}}<i class="archive icon archived-icon"></i>{{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}} {{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}}

View File

@ -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}}