Continue refactoring and restyle of search layout

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 32 insertions, 31 deletions

diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml
index fc4656be079..a7ec19cb692 100644
--- a/app/views/layouts/_head_panel.html.haml
+++ b/app/views/layouts/_head_panel.html.haml
@@ -13,8 +13,9 @@
 
       .navbar-collapse.collapse
         %ul.nav.navbar-nav
-          %li.hidden-sm.hidden-xs
-            = render 'layouts/search'
+          - unless current_controller?(:search)
+            %li.hidden-sm.hidden-xs
+              = render 'layouts/search'
           %li.visible-sm.visible-xs
             = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('search')
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index 58e6bd3158f..04f79846858 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -1,6 +1,6 @@
 .search
   = form_tag search_path, method: :get, class: 'navbar-form pull-left' do |f|
-    = search_field_tag "search", @search_term, placeholder: search_placeholder, class: "search-input"
+    = search_field_tag "search", nil, placeholder: search_placeholder, class: "search-input"
     = hidden_field_tag :group_id, @group.try(:id)
     - if @project && @project.persisted?
       = hidden_field_tag :project_id, @project.id
diff --git a/app/views/layouts/nav/_search.html.haml b/app/views/layouts/nav/_search.html.haml
index 35806c2d0fb..f95f6acb28d 100644
--- a/app/views/layouts/nav/_search.html.haml
+++ b/app/views/layouts/nav/_search.html.haml
@@ -1,30 +1,30 @@
-%ul.nav.nav-sidebar.search-filter
-  - if @project
-    = render 'layouts/nav/search/project'
+- if @search_term
+  %ul.nav.nav-sidebar.search-filter
+    - if @project
+      = render 'layouts/nav/search/project'
 
-  - elsif @show_snippets
-    = render 'layouts/nav/search/snippet'
-
-  - else
-    %li{class: ("active" if @scope == 'projects')}
-      = link_to search_filter_path(scope: 'projects') do
-        = icon('bookmark fw')
-        %span
-          Projects
-          %span.count
-            = @search_results.projects_count
-    %li{class: ("active" if @scope == 'issues')}
-      = link_to search_filter_path(scope: 'issues') do
-        = icon('exclamation-circle fw')
-        %span
-          Issues
-          %span.count
-            = @search_results.issues_count
-    %li{class: ("active" if @scope == 'merge_requests')}
-      = link_to search_filter_path(scope: 'merge_requests') do
-        = icon('tasks fw')
-        %span
-          Merge requests
-          %span.count
-            = @search_results.merge_requests_count
+    - elsif @show_snippets
+      = render 'layouts/nav/search/snippet'
 
+    - else
+      %li{class: ("active" if @scope == 'projects')}
+        = link_to search_filter_path(scope: 'projects') do
+          = icon('bookmark fw')
+          %span
+            Projects
+            %span.count
+              = @search_results.projects_count
+      %li{class: ("active" if @scope == 'issues')}
+        = link_to search_filter_path(scope: 'issues') do
+          = icon('exclamation-circle fw')
+          %span
+            Issues
+            %span.count
+              = @search_results.issues_count
+      %li{class: ("active" if @scope == 'merge_requests')}
+        = link_to search_filter_path(scope: 'merge_requests') do
+          = icon('tasks fw')
+          %span
+            Merge requests
+            %span.count
+              = @search_results.merge_requests_count