Skip to content

Commit 6ed4626

Browse files
earl-warrenLouis9902GiteaBot
authored
Merge templates/projects/list.tmpl and templates/repo/projects/list.tmpl together (#26265)
(cherry picked from commit 473862a1d599382ca022482e2e044025872d240b) Refs: https://codeberg.org/forgejo/forgejo/pulls/1126 Co-authored-by: Louis Seubert <louis.seubert.ls@gmail.com> Co-authored-by: Giteabot <teabot@gitea.io>
1 parent ab388de commit 6ed4626

File tree

3 files changed

+3
-100
lines changed

3 files changed

+3
-100
lines changed

templates/projects/list.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{if .CanWriteProjects}}
1+
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
22
<div class="gt-text-right">
33
<a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a>
44
</div>
@@ -72,7 +72,7 @@
7272
{{template "base/paginate" .}}
7373
</div>
7474

75-
{{if $.CanWriteProjects}}
75+
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
7676
<div class="ui g-modal-confirm delete modal">
7777
<div class="header">
7878
{{svg "octicon-trash"}}

templates/repo/projects/list.tmpl

+1-86
Original file line numberDiff line numberDiff line change
@@ -2,92 +2,7 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository projects milestones">
33
{{template "repo/header" .}}
44
<div class="ui container">
5-
<div class="navbar projects-header">
6-
<div>
7-
<div class="small-menu-items ui compact tiny menu">
8-
<a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=open">
9-
{{svg "octicon-project" 16 "gt-mr-3"}}
10-
{{.locale.PrettyNumber .OpenCount}}&nbsp;{{.locale.Tr "repo.issues.open_title"}}
11-
</a>
12-
<a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=closed">
13-
{{svg "octicon-check" 16 "gt-mr-3"}}
14-
{{.locale.PrettyNumber .ClosedCount}}&nbsp;{{.locale.Tr "repo.issues.closed_title"}}
15-
</a>
16-
</div>
17-
</div>
18-
<div class="projects-toolbar">
19-
<!-- Sort -->
20-
<div class="ui small dropdown type jump item">
21-
<span class="text">
22-
{{.locale.Tr "repo.issues.filter_sort"}}
23-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
24-
</span>
25-
<div class="menu">
26-
<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a>
27-
<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
28-
<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=leastupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
29-
</div>
30-
</div>
31-
{{if and .CanWriteProjects (not .Repository.IsArchived)}}
32-
<a class="ui small green button gt-ml-4" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a>
33-
{{end}}
34-
</div>
35-
</div>
36-
{{template "base/alert" .}}
37-
38-
<div class="milestone-list">
39-
{{range .Projects}}
40-
<li class="milestone-card">
41-
<h3 class="flex-text-block gt-m-0">
42-
{{svg .IconName 16}}
43-
<a class="muted" href="{{.Link}}">{{.Title}}</a>
44-
</h3>
45-
<div class="milestone-toolbar">
46-
<div class="group">
47-
<div class="flex-text-block">
48-
{{svg "octicon-issue-opened" 14}}
49-
{{$.locale.PrettyNumber .NumOpenIssues}}&nbsp;{{$.locale.Tr "repo.issues.open_title"}}
50-
</div>
51-
<div class="flex-text-block">
52-
{{svg "octicon-check" 14}}
53-
{{$.locale.PrettyNumber .NumClosedIssues}}&nbsp;{{$.locale.Tr "repo.issues.closed_title"}}
54-
</div>
55-
</div>
56-
{{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
57-
<div class="group">
58-
<a class="flex-text-inline" href="{{.Link}}/edit">{{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}}</a>
59-
{{if .IsClosed}}
60-
<a class="link-action flex-text-inline" href data-url="{{.Link}}/open">{{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}}</a>
61-
{{else}}
62-
<a class="link-action flex-text-inline" href data-url="{{.Link}}/close">{{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}}</a>
63-
{{end}}
64-
<a class="delete-button flex-text-inline" href="#" data-url="{{.Link}}/delete">{{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}</a>
65-
</div>
66-
{{end}}
67-
</div>
68-
{{if .Description}}
69-
<div class="content">
70-
{{.RenderedContent|Str2html}}
71-
</div>
72-
{{end}}
73-
</li>
74-
{{end}}
75-
76-
{{template "base/paginate" .}}
77-
</div>
5+
{{template "projects/list" .}}
786
</div>
797
</div>
80-
81-
{{if .CanWriteProjects}}
82-
<div class="ui g-modal-confirm delete modal">
83-
<div class="header">
84-
{{svg "octicon-trash"}}
85-
{{.locale.Tr "repo.projects.deletion"}}
86-
</div>
87-
<div class="content">
88-
<p>{{.locale.Tr "repo.projects.deletion_desc"}}</p>
89-
</div>
90-
{{template "base/modal_actions_confirm" .}}
91-
</div>
92-
{{end}}
938
{{template "base/footer" .}}

web_src/css/repo.css

-12
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,6 @@
8787
}
8888
}
8989

90-
.projects-header {
91-
margin-bottom: 1rem;
92-
flex-direction: column;
93-
gap: 8px;
94-
}
95-
96-
.projects-toolbar {
97-
display: flex;
98-
justify-content: space-between;
99-
padding-left: 4px;
100-
}
101-
10290
.repository .issue-content-right .menu {
10391
overflow-x: auto;
10492
max-height: 500px;

0 commit comments

Comments
 (0)