Commit bb5a7ef0 authored by Dan Rowden's avatar Dan Rowden Committed by Alfredo Sumaran

Show badges in Milestone tabs and padding in Milestone list (both to match Issues page)

parent 13a91b56
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
max-width: 90%; max-width: 90%;
} }
li.milestone { .milestones {
.milestone {
padding: 10px 16px;
h4 { h4 {
font-weight: bold; font-weight: bold;
} }
...@@ -10,6 +13,7 @@ li.milestone { ...@@ -10,6 +13,7 @@ li.milestone {
.progress { .progress {
height: 6px; height: 6px;
} }
}
} }
.milestone-content { .milestone-content {
......
...@@ -35,6 +35,19 @@ module MilestonesHelper ...@@ -35,6 +35,19 @@ module MilestonesHelper
milestone.issues.with_label(label.title).send(state).size milestone.issues.with_label(label.title).send(state).size
end end
def milestone_count_by_state(project, state)
if project.nil?
nil
else
case state
when 'all' then @project.milestones.size
when 'closed' then @project.milestones.closed.size
when 'opened' then @project.milestones.active.size
else nil
end
end
end
def milestone_progress_bar(milestone) def milestone_progress_bar(milestone)
options = { options = {
class: 'progress-bar progress-bar-success', class: 'progress-bar progress-bar-success',
......
...@@ -2,9 +2,12 @@ ...@@ -2,9 +2,12 @@
%li{class: ("active" if params[:state].blank? || params[:state] == 'opened')} %li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}
= link_to milestones_filter_path(state: 'opened') do = link_to milestones_filter_path(state: 'opened') do
Open Open
%span.badge #{milestone_count_by_state(@project, 'opened')}
%li{class: ("active" if params[:state] == 'closed')} %li{class: ("active" if params[:state] == 'closed')}
= link_to milestones_filter_path(state: 'closed') do = link_to milestones_filter_path(state: 'closed') do
Closed Closed
%span.badge #{milestone_count_by_state(@project, 'closed')}
%li{class: ("active" if params[:state] == 'all')} %li{class: ("active" if params[:state] == 'all')}
= link_to milestones_filter_path(state: 'all') do = link_to milestones_filter_path(state: 'all') do
All All
%span.badge #{milestone_count_by_state(@project, 'all')}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment