Skip to content

Commit 7d192cb

Browse files
JakobDevsilverwind
andauthored
Add Progressbar to Milestone Page (#25050)
This is adds the progress bar, which is already on the Milestone List, also to the Page of a Single Milestone. ![grafik](https://github.com/go-gitea/gitea/assets/15185051/24e0fa28-369b-4bb9-807a-ee823b46ba81) --------- Co-authored-by: silverwind <[email protected]>
1 parent d63d810 commit 7d192cb

File tree

3 files changed

+26
-19
lines changed

3 files changed

+26
-19
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1759,7 +1759,7 @@ milestones.no_due_date = No due date
17591759
milestones.open = Open
17601760
milestones.close = Close
17611761
milestones.new_subheader = Milestones organize issues and track progress.
1762-
milestones.completeness = %d%% Completed
1762+
milestones.completeness = <strong>%d%%</strong> Completed
17631763
milestones.create = Create Milestone
17641764
milestones.title = Title
17651765
milestones.desc = Description

templates/repo/issue/milestone_issues.tmpl

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{{template "repo/header" .}}
44
<div class="ui container">
55
<div class="gt-df">
6-
<h1>{{.Milestone.Name}}</h1>
6+
<h1 class="gt-mb-3">{{.Milestone.Name}}</h1>
77
{{if not .Repository.IsArchived}}
88
<div class="text right gt-f1">
99
{{if or .CanWriteIssues .CanWritePulls}}
@@ -20,26 +20,28 @@
2020
</div>
2121
{{end}}
2222
</div>
23-
<div class="ui one column stackable grid">
24-
<div class="column markup content">
25-
{{.Milestone.RenderedContent|Str2html}}
26-
</div>
23+
{{if .Milestone.RenderedContent}}
24+
<div class="markup content gt-mb-4">
25+
{{.Milestone.RenderedContent|Str2html}}
2726
</div>
28-
<div class="ui one column stackable grid">
29-
<div class="column">
30-
{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}}
31-
{{if .IsClosed}}
32-
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
33-
{{else}}
34-
{{svg "octicon-calendar"}}
35-
{{if .Milestone.DeadlineString}}
36-
<span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .Milestone.DeadlineString}}</span>
27+
{{end}}
28+
<div class="gt-df gt-fc gt-gap-3">
29+
<progress class="milestone-progress-big" value="{{.Milestone.Completeness}}" max="100"></progress>
30+
<div class="gt-df gt-gap-4">
31+
<div classs="gt-df gt-ac">
32+
{{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}}
33+
{{if .IsClosed}}
34+
{{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}}
3735
{{else}}
38-
{{$.locale.Tr "repo.milestones.no_due_date"}}
36+
{{svg "octicon-calendar"}}
37+
{{if .Milestone.DeadlineString}}
38+
<span {{if .IsOverdue}}class="overdue"{{end}}>{{DateTime "short" .Milestone.DeadlineString}}</span>
39+
{{else}}
40+
{{$.locale.Tr "repo.milestones.no_due_date"}}
41+
{{end}}
3942
{{end}}
40-
{{end}}
41-
&nbsp;
42-
<b>{{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness}}</b>
43+
</div>
44+
<div class="gt-mr-3">{{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness | Safe}}</div>
4345
</div>
4446
</div>
4547
<div class="ui divider"></div>

web_src/css/repo.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,6 +1225,11 @@
12251225
height: 200px;
12261226
}
12271227

1228+
.milestone-progress-big {
1229+
width: min(420px, 96vw);
1230+
height: 10px;
1231+
}
1232+
12281233
.repository.compare.pull .show-form-container {
12291234
text-align: left;
12301235
}

0 commit comments

Comments
 (0)