Redesign search filters

1 files changed, 10 insertions, 18 deletions

diff --git a/app/views/search/_filter.html.haml b/app/views/search/_filter.html.haml
index 3fe17dce857..a523fa254df 100644
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
@@ -1,24 +1,16 @@
 %fieldset
   %legend Groups:
-  %ul.nav.nav-pills.nav-stacked
-    %li{class: ("active" if params[:group_id].blank?)}
-      = link_to search_path(group_id: nil, search: params[:search]) do
-        Any
-    - current_user.authorized_groups.each do |group|
-      %li{class: ("active" if params[:group_id] == group.id.to_s)}
-        = link_to search_path(group_id: group.id, search: params[:search]) do
-          = group.name
+  .clearfix
+    = select_tag 'group_id', options_from_collection_for_select(current_user.authorized_groups, :id, :name, params[:group_id]), prompt: 'All', include_blank: true, class: 'trigger-submit chosen'
+
+
+%fieldset
+  %legend Teams:
+  .clearfix
+    = select_tag 'team_id', options_from_collection_for_select(current_user.authorized_teams, :id, :name, params[:team_id]), prompt: 'All', include_blank: true, class: 'trigger-submit chosen'
 
 %fieldset
   %legend Projects:
-  %ul.nav.nav-pills.nav-stacked
-    %li{class: ("active" if params[:project_id].blank?)}
-      = link_to search_path(project_id: nil, search: params[:search]) do
-        Any
-    - current_user.authorized_projects.each do |project|
-      %li{class: ("active" if params[:project_id] == project.id.to_s)}
-        = link_to search_path(project_id: project.id, search: params[:search]) do
-          = project.name_with_namespace
+  .clearfix
+    = select_tag 'project_id', options_from_collection_for_select(current_user.authorized_projects, :id, :name_with_namespace, params[:project_id]), prompt: 'All', include_blank: true, class: 'trigger-submit chosen'
 
-= hidden_field_tag :group_id, params[:group_id]
-= hidden_field_tag :project_id, params[:project_id]