Restlye issueable filters to be more compact

1 files changed, 17 insertions, 8 deletions

diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 669ba224177..0d0e3e3c82f 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,12 +1,11 @@
-%h3.page-title
-  Issues
-  - if current_user
-    .hidden-xs.inline
-      = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }) do
-        %small
-          %i.fa.fa-rss
+.append-bottom-10
   .pull-right
     .pull-left
+      - if current_user
+        .hidden-xs.pull-left
+          = link_to project_issues_path(@project, :atom, { private_token: current_user.private_token }), class: 'btn append-right-10' do
+            %i.fa.fa-rss
+
       = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form'  do
         .append-right-10.hidden-xs.hidden-sm
           = search_field_tag :issue_search, params[:issue_search], { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' }
@@ -21,7 +20,17 @@
         %i.fa.fa-plus
         New Issue
 
+  = render 'shared/issuable_filter'
+
+  .clearfix
+    .issues_bulk_update.hide
+      = form_tag bulk_update_project_issues_path(@project), method: :post  do
+        = select_tag('update[status]', options_for_select([['Open', 'open'], ['Closed', 'closed']]), prompt: "Status")
+        = project_users_select_tag('update[assignee_id]', placeholder: 'Assignee')
+        = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
+        = hidden_field_tag 'update[issues_ids]', []
+        = hidden_field_tag :status, params[:status]
+        = button_tag "Update issues", class: "btn update_selected_issues btn-save"
 
-%hr
 .issues-holder
   = render "issues"