loading up the forgejo repo on tangled to test page performance
cleanup repo details icons/labels (#27644)
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.
authored by
Denys Konovalov
and committed by
GitHub
0271114e
6c501b14
+28
-60
+1
-3
options/locale/locale_en-US.ini
+1
-3
options/locale/locale_en-US.ini
···
1030
1030
1031
1031
desc.private = Private
1032
1032
desc.public = Public
1033
-
desc.private_template = Private template
1034
-
desc.public_template = Template
1033
+
desc.template = Template
1035
1034
desc.internal = Internal
1036
-
desc.internal_template = Internal template
1037
1035
desc.archived = Archived
1038
1036
1039
1037
template.items = Template Items
+11
-18
templates/admin/repo/list.tmpl
+11
-18
templates/admin/repo/list.tmpl
···
55
55
<td>
56
56
<a href="{{.Link}}">{{.Name}}</a>
57
57
{{if .IsArchived}}
58
-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
58
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
59
59
{{end}}
60
-
{{if .IsTemplate}}
61
-
{{if .IsPrivate}}
62
-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
63
-
{{else}}
64
-
{{if .Owner.Visibility.IsPrivate}}
65
-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
66
-
{{end}}
67
-
{{end}}
60
+
{{if .IsPrivate}}
61
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
68
62
{{else}}
69
-
{{if .IsPrivate}}
70
-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
71
-
{{else}}
72
-
{{if .Owner.Visibility.IsPrivate}}
73
-
<span class="ui basic mini label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
74
-
{{end}}
63
+
{{if .Owner.Visibility.IsPrivate}}
64
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
75
65
{{end}}
76
66
{{end}}
77
-
{{if .IsFork}}
78
-
{{svg "octicon-repo-forked"}}
79
-
{{else if .IsMirror}}
67
+
{{if .IsTemplate}}
68
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
69
+
{{end}}
70
+
{{if .IsMirror}}
80
71
{{svg "octicon-mirror"}}
72
+
{{else if .IsFork}}
73
+
{{svg "octicon-repo-forked"}}
81
74
{{end}}
82
75
</td>
83
76
<td>{{.NumWatches}}</td>
+7
-19
templates/explore/repo_list.tmpl
+7
-19
templates/explore/repo_list.tmpl
···
14
14
{{if .IsArchived}}
15
15
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
16
16
{{end}}
17
-
{{if .IsTemplate}}
18
-
{{if .IsPrivate}}
19
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
20
-
{{else}}
21
-
{{if .Owner.Visibility.IsPrivate}}
22
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
23
-
{{end}}
24
-
{{end}}
17
+
{{if .IsPrivate}}
18
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
25
19
{{else}}
26
-
{{if .IsPrivate}}
27
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
28
-
{{else}}
29
-
{{if .Owner.Visibility.IsPrivate}}
30
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
31
-
{{end}}
20
+
{{if .Owner.Visibility.IsPrivate}}
21
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
32
22
{{end}}
33
23
{{end}}
24
+
{{if .IsTemplate}}
25
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
26
+
{{end}}
34
27
</span>
35
-
{{if .IsFork}}
36
-
<span data-tooltip-content="{{ctx.Locale.Tr "repo.fork"}}">{{svg "octicon-repo-forked"}}</span>
37
-
{{else if .IsMirror}}
38
-
<span data-tooltip-content="{{ctx.Locale.Tr "mirror"}}">{{svg "octicon-mirror"}}</span>
39
-
{{end}}
40
28
</div>
41
29
<div class="flex-item-trailing">
42
30
{{if .PrimaryLanguage}}
+9
-16
templates/repo/header.tmpl
+9
-16
templates/repo/header.tmpl
···
11
11
<div class="gt-mx-2">/</div>
12
12
<a href="{{$.RepoLink}}">{{.Name}}</a>
13
13
<div class="labels gt-df gt-ac gt-fw">
14
-
{{if .IsTemplate}}
15
-
{{if .IsPrivate}}
16
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private_template"}}</span>
17
-
{{else}}
18
-
{{if .Owner.Visibility.IsPrivate}}
19
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal_template"}}</span>
20
-
{{end}}
21
-
{{end}}
14
+
{{if .IsArchived}}
15
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
16
+
{{end}}
17
+
{{if .IsPrivate}}
18
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
22
19
{{else}}
23
-
{{if .IsPrivate}}
24
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.private"}}</span>
25
-
{{else}}
26
-
{{if .Owner.Visibility.IsPrivate}}
27
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
28
-
{{end}}
20
+
{{if .Owner.Visibility.IsPrivate}}
21
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.internal"}}</span>
29
22
{{end}}
30
23
{{end}}
31
-
{{if .IsArchived}}
32
-
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.archived"}}</span>
24
+
{{if .IsTemplate}}
25
+
<span class="ui basic label">{{ctx.Locale.Tr "repo.desc.template"}}</span>
33
26
{{end}}
34
27
</div>
35
28
{{if $.EnableFeed}}
-4
templates/repo/icon.tmpl
-4
templates/repo/icon.tmpl
···
1
1
{{$avatarLink := (.RelAvatarLink ctx)}}
2
2
{{if $avatarLink}}
3
3
<img class="ui avatar gt-vm" src="{{$avatarLink}}" width="32" height="32" alt="{{.FullName}}">
4
-
{{else if $.IsTemplate}}
5
-
{{svg "octicon-repo-template" 32}}
6
-
{{else if $.IsPrivate}}
7
-
{{svg "octicon-lock" 32}}
8
4
{{else if $.IsMirror}}
9
5
{{svg "octicon-mirror" 32}}
10
6
{{else if $.IsFork}}