Skip to content
Snippets Groups Projects
Commit bb5a7ef0 authored by Dan Rowden's avatar Dan Rowden Committed by Alfredo Sumaran
Browse files

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

parent 13a91b56
No related branches found
No related tags found
1 merge request!5946Milestone tab badges
Loading
Loading
@@ -2,7 +2,10 @@
max-width: 90%;
}
 
li.milestone {
.milestones {
.milestone {
padding: 10px 16px;
h4 {
font-weight: bold;
}
Loading
Loading
@@ -11,6 +14,7 @@ li.milestone {
height: 6px;
}
}
}
 
.milestone-content {
.issues-count {
Loading
Loading
Loading
Loading
@@ -35,6 +35,19 @@ module MilestonesHelper
milestone.issues.with_label(label.title).send(state).size
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)
options = {
class: 'progress-bar progress-bar-success',
Loading
Loading
Loading
Loading
@@ -2,9 +2,12 @@
%li{class: ("active" if params[:state].blank? || params[:state] == 'opened')}
= link_to milestones_filter_path(state: 'opened') do
Open
%span.badge #{milestone_count_by_state(@project, 'opened')}
%li{class: ("active" if params[:state] == 'closed')}
= link_to milestones_filter_path(state: 'closed') do
Closed
%span.badge #{milestone_count_by_state(@project, 'closed')}
%li{class: ("active" if params[:state] == 'all')}
= link_to milestones_filter_path(state: 'all') do
All
%span.badge #{milestone_count_by_state(@project, 'all')}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment