sascha
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup repo details icons/labels (#27644) (#27654) 

Backport #27644 by @denyskon

Fix #27596 

Change confusing behavior when showing information about a repo via labels and icons.
Implement changes proposed by @lng2020 in
https://github.com/go-gitea/gitea/pull/27627#pullrequestreview-1678787673.

Co-authored-by: Denys Konovalov <kontakt@denyskon.de>
pull/27702/head v1.21.0-rc2
Giteabot 2023-10-20 04:04:24 +07:00 committed by GitHub
parent 6befca1695
commit 6cef7a767b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
options/locale/locale_en-US.ini
Unescape Escape View File

@ -1026,10 +1026,8 @@ transfer.no_permission_to_reject = You do not have permission to reject this tra
desc.private = Private desc.private = Private
desc.public = Public desc.public = Public
desc.private_template = Private template desc.template = Template
desc.public_template = Template
desc.internal = Internal desc.internal = Internal
desc.internal_template = Internal template
desc.archived = Archived desc.archived = Archived
template.items = Template Items template.items = Template Items

29
templates/admin/repo/list.tmpl
Unescape Escape View File

@ -55,29 +55,22 @@
<td> <td>
<a href="{{.Link}}">{{.Name}}</a> <a href="{{.Link}}">{{.Name}}</a>
{{if .IsArchived}} {{if .IsArchived}}
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.archived"}}</span> <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
{{end}} {{end}}
{{if .IsTemplate}} {{if .IsPrivate}}
{{if .IsPrivate}} <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
{{else}}
{{if .Owner.Visibility.IsPrivate}}
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
{{end}}
{{end}}
{{else}} {{else}}
{{if .IsPrivate}} {{if .Owner.Visibility.IsPrivate}}
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.private"}}</span> <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{else}}
{{if .Owner.Visibility.IsPrivate}}
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{end}}
{{end}} {{end}}
{{end}} {{end}}
{{if .IsFork}} {{if .IsTemplate}}
{{svg "octicon-repo-forked"}} <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
{{else if .IsMirror}} {{end}}
{{if .IsMirror}}
{{svg "octicon-mirror"}} {{svg "octicon-mirror"}}
{{else if .IsFork}}
{{svg "octicon-repo-forked"}}
{{end}} {{end}}
</td> </td>
<td>{{.NumWatches}}</td> <td>{{.NumWatches}}</td>

26
templates/explore/repo_list.tmpl
Unescape Escape View File

@ -14,29 +14,17 @@
{{if .IsArchived}} {{if .IsArchived}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span> <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
{{end}} {{end}}
{{if .IsTemplate}} {{if .IsPrivate}}
{{if .IsPrivate}} <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
{{else}}
{{if .Owner.Visibility.IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
{{end}}
{{end}}
{{else}} {{else}}
{{if .IsPrivate}} {{if .Owner.Visibility.IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span> <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{else}}
{{if .Owner.Visibility.IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{end}}
{{end}} {{end}}
{{end}} {{end}}
{{if .IsTemplate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
{{end}}
</span> </span>
{{if .IsFork}}
<span data-tooltip-content="{{ctx.Locale.Tr "repo.fork"}}">{{svg "octicon-repo-forked"}}</span>
{{else if .IsMirror}}
<span data-tooltip-content="{{ctx.Locale.Tr "mirror"}}">{{svg "octicon-mirror"}}</span>
{{end}}
</div> </div>
<div class="flex-item-trailing"> <div class="flex-item-trailing">
{{if .PrimaryLanguage}} {{if .PrimaryLanguage}}

25
templates/repo/header.tmpl
Unescape Escape View File

@ -11,25 +11,18 @@
<div class="gt-mx-2">/</div> <div class="gt-mx-2">/</div>
<a href="{{$.RepoLink}}">{{.Name}}</a> <a href="{{$.RepoLink}}">{{.Name}}</a>
<div class="labels gt-df gt-ac gt-fw"> <div class="labels gt-df gt-ac gt-fw">
{{if .IsTemplate}} {{if .IsArchived}}
{{if .IsPrivate}} <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span> {{end}}
{{else}} {{if .IsPrivate}}
{{if .Owner.Visibility.IsPrivate}} <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
{{end}}
{{end}}
{{else}} {{else}}
{{if .IsPrivate}} {{if .Owner.Visibility.IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span> <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{else}}
{{if .Owner.Visibility.IsPrivate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
{{end}}
{{end}} {{end}}
{{end}} {{end}}
{{if .IsArchived}} {{if .IsTemplate}}
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span> <span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
{{end}} {{end}}
</div> </div>
{{if $.EnableFeed}} {{if $.EnableFeed}}

4
templates/repo/icon.tmpl
Unescape Escape View File

@ -1,10 +1,6 @@
{{$avatarLink := .RelAvatarLink}} {{$avatarLink := .RelAvatarLink}}
{{if $avatarLink}} {{if $avatarLink}}
<img class="ui avatar gt-vm" src="{{$avatarLink}}" width="32" height="32" alt="{{.FullName}}"> <img class="ui avatar gt-vm" src="{{$avatarLink}}" width="32" height="32" alt="{{.FullName}}">
{{else if $.IsTemplate}}
{{svg "octicon-repo-template" 32}}
{{else if $.IsPrivate}}
{{svg "octicon-lock" 32}}
{{else if $.IsMirror}} {{else if $.IsMirror}}
{{svg "octicon-mirror" 32}} {{svg "octicon-mirror" 32}}
{{else if $.IsFork}} {{else if $.IsFork}}