Merge branch 'refactor-milestones' into 'master'

Better looking milestone lists

### Before

![milestone-before](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1366ade74d76b067fdc8707d31d2bffc/milestone-before.png)

### After

![milestone-after](https://gitlab.com/gitlab-org/gitlab-ce/uploads/80ae1c1f77eae5dff8ee61c4271bec17/milestone-after.png)

See merge request !484

app/assets/stylesheets/generic/common.scss

@@ -246,7 +246,7 @@ li.note {
 
 .milestone {
   &.milestone-closed {
-    background: #eee;
+    background: #f9f9f9;
   }
   .progress {
     margin-bottom: 0;

app/helpers/gitlab_routing_helper.rb

@@ -29,6 +29,10 @@ module GitlabRoutingHelper
     namespace_project_merge_request_path(entity.project.namespace, entity.project, entity, *args)
   end
 
+  def milestone_path(entity, *args)
+    namespace_project_milestone_path(entity.project.namespace, entity.project, entity, *args)
+  end
+
   def project_url(project, *args)
     namespace_project_url(project.namespace, project, *args)
   end

app/views/dashboard/milestones/_milestone.html.haml

+%li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone.milestones.first) }
+  %h4
+    = link_to_gfm truncate(milestone.title, length: 100), dashboard_milestone_path(milestone.safe_title, title: milestone.title)
+  .row
+    .col-sm-6
+      = link_to dashboard_milestone_path(milestone.safe_title, title: milestone.title) do
+        = pluralize milestone.issue_count, 'Issue'
+       
+      = link_to dashboard_milestone_path(milestone.safe_title, title: milestone.title) do
+        = pluralize milestone.merge_requests_count, 'Merge Request'
+       
+      %span.light #{milestone.percent_complete}% complete
+
+    .col-sm-6
+      = milestone_progress_bar(milestone)
+  %div
+    - milestone.milestones.each do |milestone|
+      = link_to milestone_path(milestone) do
+        %span.label.label-gray
+          = milestone.project.name_with_namespace

app/views/dashboard/milestones/index.html.haml

@@ -16,23 +16,5 @@
           .nothing-here-block No milestones to show
       - else
         - @dashboard_milestones.each do |milestone|
-          %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone.milestones.first) }
-            %h4
-              = link_to_gfm truncate(milestone.title, length: 100), dashboard_milestone_path(milestone.safe_title, title: milestone.title)
-            %div
-              %div
-                = link_to dashboard_milestone_path(milestone.safe_title, title: milestone.title) do
-                  = pluralize milestone.issue_count, 'Issue'
-                 
-                = link_to dashboard_milestone_path(milestone.safe_title, title: milestone.title) do
-                  = pluralize milestone.merge_requests_count, 'Merge Request'
-                 
-                %span.light #{milestone.percent_complete}% complete
-              = milestone_progress_bar(milestone)
-              %div
-                %br
-                - milestone.milestones.each do |milestone|
-                  = link_to namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone) do
-                    %span.label.label-default
-                      = milestone.project.name_with_namespace
+          = render 'milestone', milestone: milestone
   = paginate @dashboard_milestones, theme: "gitlab"

app/views/groups/milestones/_milestone.html.haml

+%li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone.milestones.first) }
+  .pull-right
+    - if can?(current_user, :manage_group, @group)
+      - if milestone.closed?
+        = link_to 'Reopen Milestone', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
+      - else
+        = link_to 'Close Milestone', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-sm btn-close"
+  %h4
+    = link_to_gfm truncate(milestone.title, length: 100), group_milestone_path(@group, milestone.safe_title, title: milestone.title)
+  .row
+    .col-sm-6
+      = link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
+        = pluralize milestone.issue_count, 'Issue'
+       
+      = link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
+        = pluralize milestone.merge_requests_count, 'Merge Request'
+       
+      %span.light #{milestone.percent_complete}% complete
+    .col-sm-6
+      = milestone_progress_bar(milestone)
+  %div
+    - milestone.milestones.each do |milestone|
+      = link_to milestone_path(milestone) do
+        %span.label.label-gray
+          = milestone.project.name

app/views/groups/milestones/index.html.haml

@@ -18,29 +18,5 @@
           .nothing-here-block No milestones to show
       - else
         - @group_milestones.each do |milestone|
-          %li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone.milestones.first) }
-            .pull-right
-              - if can?(current_user, :manage_group, @group)
-                - if milestone.closed?
-                  = link_to 'Reopen Milestone', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen"
-                - else
-                  = link_to 'Close Milestone', group_milestone_path(@group, milestone.safe_title, title: milestone.title, milestone: {state_event: :close }), method: :put, class: "btn btn-sm btn-close"
-            %h4
-              = link_to_gfm truncate(milestone.title, length: 100), group_milestone_path(@group, milestone.safe_title, title: milestone.title)
-            %div
-              %div
-                = link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
-                  = pluralize milestone.issue_count, 'Issue'
-                 
-                = link_to group_milestone_path(@group, milestone.safe_title, title: milestone.title) do
-                  = pluralize milestone.merge_requests_count, 'Merge Request'
-                 
-                %span.light #{milestone.percent_complete}% complete
-              = milestone_progress_bar(milestone)
-              %div
-                %br
-                - milestone.milestones.each do |milestone|
-                  = link_to namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone) do
-                    %span.label.label-default
-                      = milestone.project.name
+          = render 'milestone', milestone: milestone
   = paginate @group_milestones, theme: "gitlab"

app/views/projects/milestones/_milestone.html.haml

@@ -11,11 +11,8 @@
       %span.cred (Expired)
     %small
       = milestone.expires_at
-  - if milestone.is_empty?
-    %span.muted Empty
-  - else
-    %div
-      %div
+  .row
+    .col-sm-6
       = link_to namespace_project_issues_path(milestone.project.namespace, milestone.project, milestone_id: milestone.id) do
         = pluralize milestone.issues.count, 'Issue'
        
@@ -23,4 +20,5 @@
         = pluralize milestone.merge_requests.count, 'Merge Request'
        
       %span.light #{milestone.percent_complete}% complete
+    .col-sm-6
       = milestone_progress_bar(milestone)