Add flash containers and broadcast messages below subnavcreate-mr-banner

2 files changed, 31 insertions, 29 deletions

diff --git a/app/views/projects/issues/_head.html.haml b/app/views/projects/issues/_head.html.haml
index f88b33018d0..509b01c548a 100644
--- a/app/views/projects/issues/_head.html.haml
+++ b/app/views/projects/issues/_head.html.haml
@@ -1,32 +1,33 @@
-.scrolling-tabs-container.sub-nav-scroll
-  = render 'shared/nav_scroll'
-  .nav-links.sub-nav.scrolling-tabs
-    %ul{ class: (container_class) }
-      - if project_nav_tab?(:issues) && !current_controller?(:merge_requests)
-        = nav_link(controller: :issues) do
-          = link_to namespace_project_issues_path(@project.namespace, @project), title: 'Issues' do
-            %span
-              Issues
+= content_for :sub_nav do
+  .scrolling-tabs-container.sub-nav-scroll
+    = render 'shared/nav_scroll'
+    .nav-links.sub-nav.scrolling-tabs
+      %ul{ class: (container_class) }
+        - if project_nav_tab?(:issues) && !current_controller?(:merge_requests)
+          = nav_link(controller: :issues) do
+            = link_to namespace_project_issues_path(@project.namespace, @project), title: 'Issues' do
+              %span
+                Issues
 
-        = nav_link(controller: :boards) do
-          = link_to namespace_project_board_path(@project.namespace, @project), title: 'Board' do
-            %span
-              Board
+          = nav_link(controller: :boards) do
+            = link_to namespace_project_board_path(@project.namespace, @project), title: 'Board' do
+              %span
+                Board
 
-      - if project_nav_tab?(:merge_requests) && current_controller?(:merge_requests)
-        = nav_link(controller: :merge_requests) do
-          = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do
-            %span
-              Merge Requests
+        - if project_nav_tab?(:merge_requests) && current_controller?(:merge_requests)
+          = nav_link(controller: :merge_requests) do
+            = link_to namespace_project_merge_requests_path(@project.namespace, @project), title: 'Merge Requests' do
+              %span
+                Merge Requests
 
-      - if project_nav_tab? :labels
-        = nav_link(controller: :labels) do
-          = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
-            %span
-              Labels
+        - if project_nav_tab? :labels
+          = nav_link(controller: :labels) do
+            = link_to namespace_project_labels_path(@project.namespace, @project), title: 'Labels' do
+              %span
+                Labels
 
-      - if project_nav_tab? :milestones
-        = nav_link(controller: :milestones) do
-          = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
-            %span
-              Milestones
\ No newline at end of file
+        - if project_nav_tab? :milestones
+          = nav_link(controller: :milestones) do
+            = link_to namespace_project_milestones_path(@project.namespace, @project), title: 'Milestones' do
+              %span
+                Milestones
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index 8da9f2100e9..cc57cfdb342 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -3,7 +3,8 @@
 
 - page_title "Issues"
 - new_issue_email = @project.new_issue_address(current_user)
-= render "projects/issues/head"
+= content_for :sub_nav do
+  = render "projects/issues/head"
 
 = content_for :meta_tags do
   - if current_user