Merge branch 'improve-search-ux' into 'master'

Improve search ux When I use search from merge requests page I usually want to see merge requests results. If I do search from wiki pages -> I want to see wiki results first. With this patch search scope is set to issues if you are on issues controller and same for merge requests and wikis See merge request !1290

Merge branch 'improve-search-ux' into 'master'
300311f3 · Dmitriy Zaporozhets · 1242e039 · 5f15ed04 · 300311f3 · 300311f3
Commit 300311f3 authored Dec 02, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

_search.html.haml app/views/layouts/_search.html.haml +10 -1

_project_filter.html.haml app/views/search/_project_filter.html.haml +1 -0

No files found.
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -4,7 +4,16 @@
    = hidden_field_tag :group_id, @group.try(:id)
    - if @project && @project.persisted?
      = hidden_field_tag :project_id, @project.id
-      = hidden_field_tag :search_code, true
+
+      - if current_controller?(:issues)
+        = hidden_field_tag :scope, 'issues'
+      - elsif current_controller?(:merge_requests)
+        = hidden_field_tag :scope, 'merge_requests'
+      - elsif current_controller?(:wikis)
+        = hidden_field_tag :scope, 'wiki_blobs'
+      - else
+        = hidden_field_tag :search_code, true
+
    - if @snippet || @snippets
      = hidden_field_tag :snippets, true
    = hidden_field_tag :repository_ref, @ref

--- a/app/views/search/_project_filter.html.haml
+++ b/app/views/search/_project_filter.html.haml
@@ -25,6 +25,7 @@
        = @search_results.notes_count
  %li{class: ("active" if @scope == 'wiki_blobs')}
    = link_to search_filter_path(scope: 'wiki_blobs') do
+      %i.fa.fa-book
      Wiki
      .pull-right
        = @search_results.wiki_blobs_count