diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2012-09-04 04:13:56 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2012-10-10 12:43:59 -0400 |
| commit | ace816354fb098118539640b5d9af392da349396 (patch) | |
| tree | 4b31fc40d300f7a3a28ca59ad917e8bc19d0df83 | |
| parent | 2b7fd29b1abb3ab6ca5ece7fe2b093f6672796d6 (diff) | |
| download | gitlab-ce-ace816354fb098118539640b5d9af392da349396.tar.gz | |
Add toggle to show closed issues on Milestones#show
Progress on #1167
| -rw-r--r-- | app/assets/javascripts/milestones.js.coffee | 7 | ||||
| -rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/tables.scss | 5 | ||||
| -rw-r--r-- | app/controllers/milestones_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/milestones/show.html.haml | 10 |
4 files changed, 19 insertions, 5 deletions
diff --git a/app/assets/javascripts/milestones.js.coffee b/app/assets/javascripts/milestones.js.coffee new file mode 100644 index 00000000000..f24682bff9b --- /dev/null +++ b/app/assets/javascripts/milestones.js.coffee @@ -0,0 +1,7 @@ +$ -> + $('.milestone-issue-filter td[data-closed]').addClass('hide') + + $('.milestone-issue-filter ul.nav li a').click -> + $('.milestone-issue-filter li').toggleClass('active') + $('.milestone-issue-filter td[data-closed]').toggleClass('hide') + false diff --git a/app/assets/stylesheets/gitlab_bootstrap/tables.scss b/app/assets/stylesheets/gitlab_bootstrap/tables.scss index 29293867ef7..b9220792b36 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/tables.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/tables.scss @@ -11,6 +11,11 @@ table { border-bottom: 1px solid #bbb; text-shadow: 0 1px 1px #fff; @include bg-dark-gray-gradient; + + ul.nav { + text-shadow: none; + margin: 0; + } } th, td { diff --git a/app/controllers/milestones_controller.rb b/app/controllers/milestones_controller.rb index f8fe987c437..fa202cf4677 100644 --- a/app/controllers/milestones_controller.rb +++ b/app/controllers/milestones_controller.rb @@ -30,7 +30,7 @@ class MilestonesController < ProjectResourceController end def show - @issues = @milestone.issues.opened.page(params[:page]).per(40) + @issues = @milestone.issues @users = @milestone.participants respond_to do |format| diff --git a/app/views/milestones/show.html.haml b/app/views/milestones/show.html.haml index d3b1c092192..e2555610b52 100644 --- a/app/views/milestones/show.html.haml +++ b/app/views/milestones/show.html.haml @@ -45,18 +45,20 @@ .row .span6 - %table + %table.milestone-issue-filter %thead - %th Open Issues + %th + %ul.nav.nav-pills + %li.active.open= link_to('Open Issues', '#') + %li.all=link_to('All Issues', '#') - @issues.each do |issue| %tr - %td + %td{data: {closed: issue.closed}} = link_to [@project, issue] do %span.badge.badge-info ##{issue.id} – = link_to_gfm truncate(issue.title, length: 60), [@project, issue] %br - = paginate @issues, theme: "gitlab" .span6 %table |