summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-02-23 23:02:32 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-03-04 22:37:03 -0500
commit96058605c39ed2a7f6fdbdbbc3da05fdbe170681 (patch)
tree62cf2a3733346bb5a29ecd42ae08c8e86dedc0d2
parent3c157b6bf7fa97cba769ecacd11cdcdba43adf4a (diff)
downloadgitlab-ce-96058605c39ed2a7f6fdbdbbc3da05fdbe170681.tar.gz
Show some stats about Milestone according to the new UI.
-rw-r--r--app/views/dashboard/milestones/show.html.haml18
-rw-r--r--app/views/groups/milestones/show.html.haml18
2 files changed, 26 insertions, 10 deletions
diff --git a/app/views/dashboard/milestones/show.html.haml b/app/views/dashboard/milestones/show.html.haml
index 18cf6fcbfd3..88edc025c62 100644
--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
@@ -41,11 +41,19 @@
= milestone.expires_at
.context
- %p.lead
- Progress:
- #{@milestone.closed_items_count} closed
- &ndash;
- #{@milestone.open_items_count} open
+ .milestone-summary
+ %h4 Progress
+ %strong= @milestone.issues.size
+ issues:
+ %span.milestone-stat
+ %strong= @milestone.opened_issues.size
+ open and
+ %strong= @milestone.closed_issues.size
+ closed
+ %span.milestone-stat
+ %strong== #{@milestone.percent_complete}%
+ complete
+
= milestone_progress_bar(@milestone)
%ul.nav-links.no-top.no-bottom
diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml
index 021425cad4f..bd61e50a5bd 100644
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -47,11 +47,19 @@
= milestone.expires_at
.context
- %p.lead
- Progress:
- #{@milestone.closed_items_count} closed
- &ndash;
- #{@milestone.open_items_count} open
+ .milestone-summary
+ %h4 Progress
+ %strong= @milestone.issues.size
+ issues:
+ %span.milestone-stat
+ %strong= @milestone.opened_issues.size
+ open and
+ %strong= @milestone.closed_issues.size
+ closed
+ %span.milestone-stat
+ %strong== #{@milestone.percent_complete}%
+ complete
+
= milestone_progress_bar(@milestone)
%ul.nav-links.no-top.no-bottom