From e52c0b77711823319f921a8930443389c737b175 Mon Sep 17 00:00:00 2001 From: JakobDev Date: Fri, 2 Jun 2023 09:45:09 +0200 Subject: [PATCH 1/4] Add Progressbar to Milestone Page --- templates/repo/issue/milestone_issues.tmpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 82d2cac94348c..d526322db9a0f 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -39,7 +39,10 @@ {{end}} {{end}}   - {{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness}} +
+ {{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness}} + +
From bce22c639b2aa811c4d9ef95352bf50e2255958a Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 2 Jun 2023 20:16:18 +0200 Subject: [PATCH 2/4] Update templates/repo/issue/milestone_issues.tmpl Co-authored-by: delvh --- templates/repo/issue/milestone_issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index d526322db9a0f..3c22aab7254f7 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -40,7 +40,7 @@ {{end}}  
- {{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness}} + {{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness}}
From e7680f7c3b43e77255f54b1b81da283289d1af09 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 2 Jun 2023 20:29:41 +0200 Subject: [PATCH 3/4] style tweaks --- options/locale/locale_en-US.ini | 2 +- templates/repo/issue/milestone_issues.tmpl | 37 +++++++++++----------- web_src/css/repo.css | 5 +++ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index bf6e4b75247f3..fa478042bd0dd 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1755,7 +1755,7 @@ milestones.no_due_date = No due date milestones.open = Open milestones.close = Close milestones.new_subheader = Milestones organize issues and track progress. -milestones.completeness = %d%% Completed +milestones.completeness = %d%% Completed milestones.create = Create Milestone milestones.title = Title milestones.desc = Description diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 3c22aab7254f7..34558ac09e257 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -20,29 +20,28 @@ {{end}} -
-
- {{.Milestone.RenderedContent|Str2html}} -
+ {{if .Milestone.RenderedContent}} +
+ {{.Milestone.RenderedContent|Str2html}}
-
-
- {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}} - {{if .IsClosed}} - {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} - {{else}} - {{svg "octicon-calendar"}} - {{if .Milestone.DeadlineString}} - {{DateTime "short" .Milestone.DeadlineString}} + {{end}} +
+ +
+
+ {{$closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.locale}} + {{if .IsClosed}} + {{svg "octicon-clock"}} {{$.locale.Tr "repo.milestones.closed" $closedDate | Safe}} {{else}} - {{$.locale.Tr "repo.milestones.no_due_date"}} + {{svg "octicon-calendar"}} + {{if .Milestone.DeadlineString}} + {{DateTime "short" .Milestone.DeadlineString}} + {{else}} + {{$.locale.Tr "repo.milestones.no_due_date"}} + {{end}} {{end}} - {{end}} -   -
- {{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness}} -
+
{{.locale.Tr "repo.milestones.completeness" .Milestone.Completeness | Safe}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 71cd7a28468d0..b2b544a7ea1a9 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1225,6 +1225,11 @@ height: 200px; } +.milestone-progress-big { + width: min(420px, 96vw); + height: 10px; +} + .repository.compare.pull .show-form-container { text-align: left; } From a36826fc15db5b5be2e3a7cd0d46a03fbff32026 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 2 Jun 2023 20:32:30 +0200 Subject: [PATCH 4/4] tweak margin --- templates/repo/issue/milestone_issues.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index 34558ac09e257..3a103bd5e0c72 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}}
-

{{.Milestone.Name}}

+

{{.Milestone.Name}}

{{if not .Repository.IsArchived}}
{{if or .CanWriteIssues .CanWritePulls}}