Skip to content

Commit 6d5d402

Browse files
committed
move sub_menu_release_tag to release_tag_header and add a div for it
1 parent d74a638 commit 6d5d402

File tree

7 files changed

+42
-50
lines changed

7 files changed

+42
-50
lines changed

templates/repo/release/list.tmpl

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
{{template "base/head" .}}
22
<div role="main" aria-label="{{.Title}}" class="page-content repository releases">
33
{{template "repo/header" .}}
4-
<div class="ui container releases-page">
4+
<div class="ui container releases-container">
55
{{template "base/alert" .}}
6-
{{template "repo/sub_menu_release_tag" .}}
7-
8-
{{if .CanCreateRelease}}
9-
<a class="ui right small green button" href="{{$.RepoLink}}/releases/new">
10-
{{.locale.Tr "repo.release.new_release"}}
11-
</a>
12-
{{end}}
13-
6+
{{template "repo/release_tag_header" .}}
147
<ul id="release-list">
158
{{range $idx, $release := .Releases}}
169
<li class="ui grid">
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{{$canReadReleases := $.Permission.CanRead $.UnitTypeReleases}}
2+
{{$canReadCode := $.Permission.CanRead $.UnitTypeCode}}
3+
<div class="releases-tag-header gt-df gt-ac">
4+
<div class="releases-tag-header-left gt-df gt-ac gt-f1">
5+
{{if $canReadReleases}}
6+
<h2 class="ui compact small menu header small-menu-items">
7+
<a class="{{if .PageIsReleaseList}}active {{end}}item" href="{{.RepoLink}}/releases">{{.locale.Tr "repo.release.releases"}}</a>
8+
{{if $canReadCode}}
9+
<a class="{{if .PageIsTagList}}active {{end}}item" href="{{.RepoLink}}/tags">{{.locale.Tr "repo.release.tags"}}</a>
10+
{{end}}
11+
</h2>
12+
13+
{{if .EnableFeed}}
14+
<a class="rss-icon" href="{{.RepoLink}}/{{if .PageIsTagList}}tags{{else}}releases{{end}}.rss" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</a>
15+
{{end}}
16+
{{else if $canReadCode}}
17+
{{template "repo/sub_menu" .}}
18+
{{end}}
19+
</div>
20+
<div class="releases-tag-header-right">
21+
{{if and (not .PageIsTagList) .CanCreateRelease}}
22+
<a class="ui right small green button" href="{{$.RepoLink}}/releases/new">
23+
{{.locale.Tr "repo.release.new_release"}}
24+
</a>
25+
{{end}}
26+
</div>
27+
</div>

templates/repo/sub_menu_release_tag.tmpl

Lines changed: 0 additions & 17 deletions
This file was deleted.

templates/repo/tag/list.tmpl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
{{template "base/head" .}}
2-
32
<div role="main" aria-label="{{.Title}}" class="page-content repository tags">
43
{{template "repo/header" .}}
5-
<div class="ui container releases-page">
4+
<div class="ui container tags-container">
65
{{template "base/alert" .}}
7-
{{template "repo/sub_menu_release_tag" .}}
8-
9-
<div class="ui divider"></div>
10-
11-
<h4 class="ui top attached header">
6+
{{template "repo/release_tag_header" .}}
7+
<h4 class="ui top attached header gt-mt-4">
128
<div class="five wide column gt-df gt-ac">
139
{{svg "octicon-tag" 16 "gt-mr-2"}}{{.locale.Tr "repo.release.tags"}}
1410
</div>
1511
</h4>
16-
1712
{{$canReadReleases := $.Permission.CanRead $.UnitTypeReleases}}
18-
1913
<div class="ui attached table segment">
2014
<table class="ui very basic striped fixed table single line" id="tags-table">
2115
<tbody class="tag-list">

web_src/css/base.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2573,6 +2573,16 @@ a.ui.basic.label:hover {
25732573
line-height: .67em;
25742574
}
25752575

2576+
.rss-icon {
2577+
display: inline-flex;
2578+
margin-left: 8px;
2579+
color: var(--color-text-light-1);
2580+
}
2581+
2582+
.organization.profile .rss-icon {
2583+
margin-left: 0;
2584+
}
2585+
25762586
table th[data-sortt-asc]:hover,
25772587
table th[data-sortt-desc]:hover {
25782588
background: rgba(0, 0, 0, 0.1) !important;

web_src/css/features/rss.css

Lines changed: 0 additions & 14 deletions
This file was deleted.

web_src/css/index.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
@import "./features/imagediff.css";
1010
@import "./features/codeeditor.css";
1111
@import "./features/projects.css";
12-
@import "./features/rss.css";
1312

1413
@import "./modules/tippy.css";
1514
@import "./modules/modal.css";

0 commit comments

Comments
 (0)