Move search to separate layout

Dmitriy Zaporozhets
1 parent 68d146b4
Showing 5 changed files with 14 additions and 11 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/search.html.haml
features/dashboard/active_tab.feature
features/steps/dashboard/dashboard_active_tab.rb
@@ -418,3 +418,7 @@ img.emoji {
   overflow: hidden;
   height: 220px;
 }
+
+.search-container {
+  margin-top: 30px;
+}
@@ -13,8 +13,6 @@
     = link_to merge_requests_dashboard_path do
       Merge Requests
       %span.count= current_user.cared_merge_requests.opened.count
-  = nav_link(path: 'search#show') do
-    = link_to "Search", search_path
   = nav_link(controller: :help) do
     = link_to "Help", help_path
  
@@ -0,0 +1,10 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: "Search"
+  %body{class: "#{app_theme} application"}
+    = render "layouts/head_panel", title: "Search"
+    = render "layouts/flash"
+
+    .container.search-container
+      .content
+        = yield
@@ -17,11 +17,6 @@ Feature: Dashboard active tab
     Then the active main tab should be Merge Requests
     And no other main tabs should be active
  
-  Scenario: On Dashboard Search
-    Given I visit dashboard search page
-    Then the active main tab should be Search
-    And no other main tabs should be active
-
   Scenario: On Dashboard Help
     Given I visit dashboard help page
     Then the active main tab should be Help
@@ -15,10 +15,6 @@ class DashboardActiveTab &lt; Spinach::FeatureSteps
     ensure_active_main_tab('Merge Requests')
   end
  
-  Then 'the active main tab should be Search' do
-    ensure_active_main_tab('Search')
-  end
-
   Then 'the active main tab should be Help' do
     ensure_active_main_tab('Help')
   end
...	...	@@ -418,3 +418,7 @@ img.emoji {
418	418	overflow: hidden;
419	419	height: 220px;
420	420	}
	421	+
	422	+.search-container {
	423	+ margin-top: 30px;
	424	+}
...	...
...	...	@@ -13,8 +13,6 @@
13	13	= link_to merge_requests_dashboard_path do
14	14	Merge Requests
15	15	%span.count= current_user.cared_merge_requests.opened.count
16		- = nav_link(path: 'search#show') do
17		- = link_to "Search", search_path
18	16	= nav_link(controller: :help) do
19	17	= link_to "Help", help_path
20	18
...	...
...	...	@@ -0,0 +1,10 @@
	1	+!!! 5
	2	+%html{ lang: "en"}
	3	+ = render "layouts/head", title: "Search"
	4	+ %body{class: "#{app_theme} application"}
	5	+ = render "layouts/head_panel", title: "Search"
	6	+ = render "layouts/flash"
	7	+
	8	+ .container.search-container
	9	+ .content
	10	+ = yield
...	...
...	...	@@ -17,11 +17,6 @@ Feature: Dashboard active tab
17	17	Then the active main tab should be Merge Requests
18	18	And no other main tabs should be active
19	19
20		- Scenario: On Dashboard Search
21		- Given I visit dashboard search page
22		- Then the active main tab should be Search
23		- And no other main tabs should be active
24		-
25	20	Scenario: On Dashboard Help
26	21	Given I visit dashboard help page
27	22	Then the active main tab should be Help
...	...
...	...	@@ -15,10 +15,6 @@ class DashboardActiveTab < Spinach::FeatureSteps
15	15	ensure_active_main_tab('Merge Requests')
16	16	end
17	17
18		- Then 'the active main tab should be Search' do
19		- ensure_active_main_tab('Search')
20		- end
21		-
22	18	Then 'the active main tab should be Help' do
23	19	ensure_active_main_tab('Help')
24	20	end
...	...