Better looking milestone lists

7 files changed, 62 insertions, 57 deletions

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index db393e08819..7c3021989a8 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -246,7 +246,7 @@ li.note {
 
 .milestone {
   &.milestone-closed {
-    background: #eee;
+    background: #f9f9f9;
   }
   .progress {
     margin-bottom: 0;
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 3386fac8657..9703c8d9e9c 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/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
diff --git a/app/views/dashboard/milestones/_milestone.html.haml b/app/views/dashboard/milestones/_milestone.html.haml
new file mode 100644
index 00000000000..21e730bb7ff
--- /dev/null
+++ b/app/views/dashboard/milestones/_milestone.html.haml
@@ -0,0 +1,20 @@
+%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
diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml
index caf3b685864..9944c0df815 100644
--- a/app/views/dashboard/milestones/index.html.haml
+++ b/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"
diff --git a/app/views/groups/milestones/_milestone.html.haml b/app/views/groups/milestones/_milestone.html.haml
new file mode 100644
index 00000000000..94fc43a581e
--- /dev/null
+++ b/app/views/groups/milestones/_milestone.html.haml
@@ -0,0 +1,25 @@
+%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
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index 57dc235f5bb..008d5a6bd22 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/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"
diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml
index 7039c85bb2c..62360158ff9 100644
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
@@ -11,16 +11,14 @@
       %span.cred (Expired)
     %small
       = milestone.expires_at
-  - if milestone.is_empty?
-    %span.muted Empty
-  - else
-    %div
-      %div
-        = link_to namespace_project_issues_path(milestone.project.namespace, milestone.project, milestone_id: milestone.id) do
-          = pluralize milestone.issues.count, 'Issue'
-         
-        = link_to namespace_project_merge_requests_path(milestone.project.namespace, milestone.project, milestone_id: milestone.id) do
-          = pluralize milestone.merge_requests.count, 'Merge Request'
-         
-        %span.light #{milestone.percent_complete}% complete
+  .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'
+       
+      = link_to namespace_project_merge_requests_path(milestone.project.namespace, milestone.project, milestone_id: milestone.id) do
+        = pluralize milestone.merge_requests.count, 'Merge Request'
+       
+      %span.light #{milestone.percent_complete}% complete
+    .col-sm-6
       = milestone_progress_bar(milestone)