diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-10-30 00:40:00 +0400 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-10-30 00:40:00 +0400 |
| commit | d4e070cfadcccfe503402dd5d0524ca102d372d4 (patch) | |
| tree | 0782081eff38e53624daf6e1099ac47f9bb344c5 /app/views/milestones | |
| parent | ecdf778e80d3804a076061989b5abb2d6e1e5c19 (diff) | |
Improve styles. Add merge request completness to milestone percentage
Diffstat (limited to 'app/views/milestones')
| -rw-r--r-- | app/views/milestones/_milestone.html.haml | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/app/views/milestones/_milestone.html.haml b/app/views/milestones/_milestone.html.haml index 3ccd93608a1..2bb78975baa 100644 --- a/app/views/milestones/_milestone.html.haml +++ b/app/views/milestones/_milestone.html.haml @@ -1,22 +1,21 @@ %li{class: "milestone", id: dom_id(milestone) } .right - - if milestone.issues.any? - %span.btn.small.disabled.grouped= pluralize milestone.issues.count, 'issues' - - if milestone.issues.count > 0 - = link_to 'Browse Issues', project_issues_path(milestone.project, milestone_id: milestone.id), class: "btn small grouped" - - if milestone.merge_requests.any? - %span.btn.small.disabled.grouped= pluralize milestone.issues.count, 'Merge Requests' - - if milestone.merge_requests.count > 0 - = link_to 'Browse Merge Requests', project_merge_requests_path(milestone.project, milestone_id: milestone.id), class: "btn small grouped" - if can? current_user, :admin_milestone, milestone.project - = link_to 'Edit', edit_project_milestone_path(milestone.project, milestone), class: "btn small edit-milestone-link grouped" + = link_to edit_project_milestone_path(milestone.project, milestone), class: "btn small edit-milestone-link grouped" do + %i.icon-edit + Edit %h4 - = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone), class: "row_title" + = link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone) %small = milestone.expires_at - %br - .progress.progress-success.span3 + .row + .progress.progress-success.span4 .bar{style: "width: #{milestone.percent_complete}%;"} + .span6 + - if milestone.issues.any? + = link_to project_issues_path(milestone.project, milestone_id: milestone.id), class: "padded" do + %strong= pluralize milestone.issues.count, 'Issue' - - + - if milestone.merge_requests.any? + = link_to project_merge_requests_path(milestone.project, milestone_id: milestone.id), class: "padded" do + %strong= pluralize milestone.issues.count, 'Merge Request' |