Skip to content

Commit e6abe77

Browse files
richmahnrichmahn
committed
Merge branch 'root-v1.21-and-main'
2 parents 3c6d4d3 + e9048d2 commit e6abe77

File tree

2 files changed

+21
-31
lines changed

2 files changed

+21
-31
lines changed

‎templates/catalog/catalog_list.tmpl‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
<div class="item">
44
<div class="ui header gt-df gt-ac">
55
<div class="repo-title">
6-
{{$avatar := (repoAvatar .Repo 32 "gt-mr-3")}}
7-
{{if $avatar}}
8-
{{$avatar}}
9-
{{end}}
6+
{{template "repo/icon" .Repo}}
107
{{if .Release}}
118
<a class="name" href="{{.Repo.Link}}/releases/tag/{{.Ref | PathEscapeSegments}}">
129
{{else}}
@@ -52,18 +49,18 @@
5249
<div class="description">
5350
<table>
5451
<tr>
55-
<td><strong>{{if .Release}}{{$ctx.Locale.Tr "repo.metadata.publisher"}}{{else}}{{$ctx.Locale.Tr "repo.metadata.provider"}}{{end}}:</strong></td>
52+
<td><strong>{{if .Release}}{{$.locale.Tr "repo.metadata.publisher"}}{{else}}{{$.locale.Tr "repo.metadata.provider"}}{{end}}:</strong></td>
5653
<td><a href="?sort={{$.SortType}}&q=owner%3A{{.Repo.OwnerName}}">{{.Repo.OwnerName}}</a></td>
5754
<tr>
58-
<td><strong>{{$ctx.Locale.Tr "repo.metadata.subject"}}:</strong></td>
55+
<td><strong>{{$.locale.Tr "repo.metadata.subject"}}:</strong></td>
5956
<td><a href="?sort={{$.SortType}}&q=subject%3A{{.Subject}}">{{.Subject}}</a></td>
6057
</tr>
6158
<tr>
62-
<td><strong>{{$ctx.Locale.Tr "repo.metadata.resource"}}:</strong></td>
59+
<td><strong>{{$.locale.Tr "repo.metadata.resource"}}:</strong></td>
6360
<td><a href="?sort={{$.SortType}}&q=resource%3A{{.Resource}}">{{.Resource}}</a></td>
6461
</tr>
6562
<tr>
66-
<td><strong>{{$ctx.Locale.Tr "repo.metadata.metadata_type"}}:</strong></td>
63+
<td><strong>{{$.locale.Tr "repo.metadata.metadata_type"}}:</strong></td>
6764
<td>
6865
<img src="{{AssetUrlPrefix}}/img/dcs/{{.GetMetadataTypeIcon}}" style="height:16px;vertical-align:middle" />
6966
<a href="?sort={{$.SortType}}&q=metadata_type%3A{{.MetadataType}}">
@@ -72,31 +69,31 @@
7269
</td>
7370
</tr>
7471
<tr>
75-
<td><strong>{{$ctx.Locale.Tr "repo.metadata.language"}}:</strong></td>
72+
<td><strong>{{$.locale.Tr "repo.metadata.language"}}:</strong></td>
7673
<td><a href="?sort={{$.SortType}}&q=lang%3A{{.Language}}">{{.LanguageTitle}} ({{.Language}}, {{.LanguageDirection}})</a></td>
7774
</tr>
7875
<tr>
79-
<td><strong>{{ctx.Locale.Tr "repo.metadata.stage"}}:</strong></td>
76+
<td><strong>{{$.locale.Tr "repo.metadata.stage"}}:</strong></td>
8077
<td>{{.StageStr}}</td>
8178
</tr>
8279
<tr>
83-
<td><strong>{{ctx.Locale.Tr "repo.metadata.ingredients"}}:</strong></td>
80+
<td><strong>{{$.locale.Tr "repo.metadata.ingredients"}}:</strong></td>
8481
<td>
8582
{{range .Ingredients}}
8683
<a href="?sort={{$.SortType}}&q=book%3A{{.Identifier}}">{{.Identifier}}</a>
8784
{{end}}
8885
</td>
8986
</tr>
9087
<tr>
91-
<td><strong>{{if .Release}}{{ctx.Locale.Tr "repo.metadata.release_date"}}{{else}}{{ctx.Locale.Tr "repo.metadata.last_updated"}}{{end}}:</strong></td>
88+
<td><strong>{{if .Release}}{{$.locale.Tr "repo.metadata.release_date"}}{{else}}{{$.locale.Tr "repo.metadata.last_updated"}}{{end}}:</strong></td>
9289
<td>{{DateTime "full" .ReleaseDateUnix.AsTime}}</td>
9390
</tr>
9491
</table>
9592
</div>
9693
</div>
9794
{{else}}
9895
<div>
99-
{{ctx.Locale.Tr "explore.repo_no_results"}}
96+
{{$.locale.Tr "explore.repo_no_results"}}
10097
</div>
10198
{{end}}
10299
</div>

‎templates/explore/repo_list.tmpl‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,24 @@
4343
<!-- END DCS Customizations -->
4444
</div>
4545
<div class="flex-item-trailing">
46-
{{if .PrimaryLanguage}}
47-
<a class="muted" href="{{$.Link}}?q={{$.Keyword}}&sort={{$.SortType}}&language={{.PrimaryLanguage.Language}}">
48-
<span class="flex-text-inline"><i class="color-icon gt-mr-3" style="background-color: {{.PrimaryLanguage.Color}}"></i>{{.PrimaryLanguage.Language}}</span>
46+
<!-- DCS Customizations -->
47+
{{if .RepoDM.Language}}
48+
<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=lang%3A{{.RepoDM.Language}}" title="{{.RepoDM.LanguageTitle}}">
49+
<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .RepoDM.Language}}"></i>{{.RepoDM.Language}}</span>
50+
</a>
51+
{{end}}
52+
{{if .RepoDM.Subject}}
53+
<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=subject%3A{{.RepoDM.Subject}}" title="Resource: {{.RepoDM.Resource}}">
54+
<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .RepoDM.Subject}}"></i>{{.RepoDM.Subject}}</span>
4955
</a>
5056
{{end}}
57+
<!-- END DCS Customizations -->
5158
{{if not $.DisableStars}}
5259
<a class="text grey flex-text-inline" href="{{.Link}}/stars">{{svg "octicon-star" 16}}{{.NumStars}}</a>
5360
{{end}}
5461
<a class="text grey flex-text-inline" href="{{.Link}}/forks">{{svg "octicon-git-branch" 16}}{{.NumForks}}</a>
5562
</div>
5663
</div>
57-
<div class="gt-font-13 gt-df gt-ac text grey">
58-
{{if .RepoDM.Language}}
59-
<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=lang%3A{{.RepoDM.Language}}" title="{{.RepoDM.LanguageTitle}}">
60-
<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .RepoDM.Language}}"></i>{{.RepoDM.Language}}</span>
61-
</a>
62-
{{end}}
63-
{{if .RepoDM.Subject}}
64-
<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=subject%3A{{.RepoDM.Subject}}" title="Resource: {{.RepoDM.Resource}}">
65-
<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .RepoDM.Subject}}"></i>{{.RepoDM.Subject}}</span>
66-
</a>
67-
{{end}}
68-
</div>
69-
</div>
70-
<div class="description">
7164
{{$description := .DescriptionHTML $.Context}}
7265
{{if $description}}
7366
<div class="flex-item-body">{{$description}}</div>
@@ -87,4 +80,4 @@
8780
{{ctx.Locale.Tr "explore.repo_no_results"}}
8881
</div>
8982
{{end}}
90-
</div>
83+
</div>

0 commit comments

Comments
 (0)