Commit 6c777ff8237e6c0f8628a2997848cd868974560c
1 parent
676a9a7e
Exists in
master
and in
4 other branches
Improve milestone show page
Showing
3 changed files
with
26 additions
and
30 deletions
Show diff stats
app/assets/javascripts/milestones.js.coffee
| 1 | $ -> | 1 | $ -> |
| 2 | - $('.milestone-issue-filter tr[data-closed]').addClass('hide') | 2 | + $('.milestone-issue-filter li[data-closed]').addClass('hide') |
| 3 | 3 | ||
| 4 | $('.milestone-issue-filter ul.nav li a').click -> | 4 | $('.milestone-issue-filter ul.nav li a').click -> |
| 5 | $('.milestone-issue-filter li').toggleClass('active') | 5 | $('.milestone-issue-filter li').toggleClass('active') |
| 6 | - $('.milestone-issue-filter tr[data-closed]').toggleClass('hide') | 6 | + $('.milestone-issue-filter li[data-closed]').toggleClass('hide') |
| 7 | false | 7 | false |
| 8 | 8 | ||
| 9 | - $('.milestone-merge-requests-filter tr[data-closed]').addClass('hide') | 9 | + $('.milestone-merge-requests-filter li[data-closed]').addClass('hide') |
| 10 | 10 | ||
| 11 | $('.milestone-merge-requests-filter ul.nav li a').click -> | 11 | $('.milestone-merge-requests-filter ul.nav li a').click -> |
| 12 | $('.milestone-merge-requests-filter li').toggleClass('active') | 12 | $('.milestone-merge-requests-filter li').toggleClass('active') |
| 13 | - $('.milestone-merge-requests-filter tr[data-closed]').toggleClass('hide') | 13 | + $('.milestone-merge-requests-filter li[data-closed]').toggleClass('hide') |
| 14 | false | 14 | false |
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/views/milestones/show.html.haml
| @@ -38,51 +38,46 @@ | @@ -38,51 +38,46 @@ | ||
| 38 | = gfm escape_once(@milestone.title) | 38 | = gfm escape_once(@milestone.title) |
| 39 | 39 | ||
| 40 | .ui-box-body | 40 | .ui-box-body |
| 41 | - %h5 | 41 | + %p |
| 42 | Progress: | 42 | Progress: |
| 43 | - %small | ||
| 44 | - #{@milestone.closed_items_count} closed | ||
| 45 | - – | ||
| 46 | - #{@milestone.open_items_count} open | 43 | + #{@milestone.closed_items_count} closed |
| 44 | + – | ||
| 45 | + #{@milestone.open_items_count} open | ||
| 47 | %span.right= @milestone.expires_at | 46 | %span.right= @milestone.expires_at |
| 48 | .progress.progress-info | 47 | .progress.progress-info |
| 49 | .bar{style: "width: #{@milestone.percent_complete}%;"} | 48 | .bar{style: "width: #{@milestone.percent_complete}%;"} |
| 50 | 49 | ||
| 51 | 50 | ||
| 52 | - if @milestone.description.present? | 51 | - if @milestone.description.present? |
| 53 | - .bottom_box_content | 52 | + .ui-box-bottom |
| 54 | = preserve do | 53 | = preserve do |
| 55 | = markdown @milestone.description | 54 | = markdown @milestone.description |
| 56 | 55 | ||
| 57 | 56 | ||
| 58 | .row | 57 | .row |
| 59 | .span6 | 58 | .span6 |
| 60 | - %table.milestone-issue-filter | ||
| 61 | - %thead | ||
| 62 | - %tr | ||
| 63 | - %th | ||
| 64 | - %ul.nav.nav-pills | ||
| 65 | - %li.active= link_to('Open Issues', '#') | ||
| 66 | - %li=link_to('All Issues', '#') | ||
| 67 | - - @issues.each do |issue| | ||
| 68 | - %tr{data: {closed: issue.closed}} | ||
| 69 | - %td | 59 | + .ui-box.milestone-issue-filter |
| 60 | + .title | ||
| 61 | + %ul.nav.nav-pills | ||
| 62 | + %li.active= link_to('Open Issues', '#') | ||
| 63 | + %li=link_to('All Issues', '#') | ||
| 64 | + %ul.well-list | ||
| 65 | + - @issues.each do |issue| | ||
| 66 | + %li{data: {closed: issue.closed}} | ||
| 70 | = link_to [@project, issue] do | 67 | = link_to [@project, issue] do |
| 71 | %span.badge.badge-info ##{issue.id} | 68 | %span.badge.badge-info ##{issue.id} |
| 72 | – | 69 | – |
| 73 | = link_to_gfm truncate(issue.title, length: 60), [@project, issue] | 70 | = link_to_gfm truncate(issue.title, length: 60), [@project, issue] |
| 74 | 71 | ||
| 75 | .span6 | 72 | .span6 |
| 76 | - %table.milestone-merge-requests-filter | ||
| 77 | - %thead | ||
| 78 | - %tr | ||
| 79 | - %th | ||
| 80 | - %ul.nav.nav-pills | ||
| 81 | - %li.active= link_to('Open Merge Requests', '#') | ||
| 82 | - %li=link_to('All Merge Requests', '#') | ||
| 83 | - - @merge_requests.each do |merge_request| | ||
| 84 | - %tr{data: {closed: merge_request.closed}} | ||
| 85 | - %td | 73 | + .ui-box.milestone-merge-requests-filter |
| 74 | + .title | ||
| 75 | + %ul.nav.nav-pills | ||
| 76 | + %li.active= link_to('Open Merge Requests', '#') | ||
| 77 | + %li=link_to('All Merge Requests', '#') | ||
| 78 | + %ul.well-list | ||
| 79 | + - @merge_requests.each do |merge_request| | ||
| 80 | + %li{data: {closed: merge_request.closed}} | ||
| 86 | = link_to [@project, merge_request] do | 81 | = link_to [@project, merge_request] do |
| 87 | %span.badge.badge-info ##{merge_request.id} | 82 | %span.badge.badge-info ##{merge_request.id} |
| 88 | – | 83 | – |