From d4e7db40829a9ece62ead4d98380b36c2707c556 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Wed, 9 Jul 2014 12:52:58 +0200 Subject: Add milestone descriptions on the group show page. --- app/views/groups/milestones/show.html.haml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'app') diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 4b6c00a3247..3daf5d986d5 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -26,6 +26,20 @@ %h4.title = gfm escape_once(@group_milestone.title) + .description + - @group_milestone.milestones.each do |milestone| + %hr + %strong + = link_to "#{milestone.project.name} - #{milestone.title}", project_milestone_path(milestone.project, milestone) + %span.pull-right= milestone.expires_at + %br + %br + = preserve do + - if milestone.description.present? + = milestone.description + - else + %em Project milestone has no description + .context %p Progress: -- cgit v1.2.3 From 0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99 Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Thu, 10 Jul 2014 08:37:51 +0200 Subject: Use heading instead of strong and line breaks in description. --- app/views/groups/milestones/show.html.haml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'app') diff --git a/app/views/groups/milestones/show.html.haml b/app/views/groups/milestones/show.html.haml index 3daf5d986d5..29b274af5a5 100644 --- a/app/views/groups/milestones/show.html.haml +++ b/app/views/groups/milestones/show.html.haml @@ -29,11 +29,9 @@ .description - @group_milestone.milestones.each do |milestone| %hr - %strong + %h4 = link_to "#{milestone.project.name} - #{milestone.title}", project_milestone_path(milestone.project, milestone) %span.pull-right= milestone.expires_at - %br - %br = preserve do - if milestone.description.present? = milestone.description -- cgit v1.2.3