Fix broadcast message to show up properly with new UI

With the new UI, the broadcast message is the first level child element
of the body tag and then render full width without respecting the width
of the left sidebar. This makes the message goes under the left sidebar
in smaller screen.

This commit fixes the issue by moving the message element into the
"page-with-sidebar" div so it will always render together with the main
content area with same look as before. The rendering for the search,
login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable
Fixes: #1019

10 files changed, 1 insertions, 9 deletions

diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 621365fa6aa..1263f44eca9 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,5 +1,6 @@
 - if defined?(sidebar)
   .page-with-sidebar
+    = render "layouts/broadcast"
     .sidebar-wrapper
       = render(sidebar)
     .content-wrapper
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index fb62d5fea0a..dc8652cb145 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: "Admin area"
   %body{class: "#{app_theme} #{theme_type} admin", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Admin area"
     = render 'layouts/page', sidebar: 'layouts/nav/admin'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index d40c9753b10..e5420a13605 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: "Dashboard"
   %body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page }
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Dashboard"
     = render 'layouts/page', sidebar: 'layouts/nav/dashboard'
diff --git a/app/views/layouts/group.html.haml b/app/views/layouts/group.html.haml
index 72b0d03908d..98edcf3a140 100644
--- a/app/views/layouts/group.html.haml
+++ b/app/views/layouts/group.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: group_head_title
   %body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: @group.name
     = render 'layouts/page', sidebar: 'layouts/nav/group'
diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml
index 941084cc4ad..89d816061e2 100644
--- a/app/views/layouts/profile.html.haml
+++ b/app/views/layouts/profile.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: "Profile"
   %body{class: "#{app_theme} #{theme_type} profile", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: "Profile"
     = render 'layouts/page', sidebar: 'layouts/nav/profile'
diff --git a/app/views/layouts/project_settings.html.haml b/app/views/layouts/project_settings.html.haml
index 0f20bf38bfd..d2c9c2a991c 100644
--- a/app/views/layouts/project_settings.html.haml
+++ b/app/views/layouts/project_settings.html.haml
@@ -2,7 +2,6 @@
 %html{ lang: "en"}
   = render "layouts/head", title: @project.name_with_namespace
   %body{class: "#{app_theme} #{theme_type} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: project_title(@project)
     = render "layouts/init_auto_complete"
     - @project_settings_nav = true
diff --git a/app/views/layouts/projects.html.haml b/app/views/layouts/projects.html.haml
index d4ee53db55c..c44a40c9c12 100644
--- a/app/views/layouts/projects.html.haml
+++ b/app/views/layouts/projects.html.haml
@@ -2,7 +2,6 @@
 %html{ lang: "en"}
   = render "layouts/head", title: project_head_title
   %body{class: "#{app_theme} #{theme_type} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
-    = render "layouts/broadcast"
     = render "layouts/head_panel", title: project_title(@project)
     = render "layouts/init_auto_complete"
     = render 'layouts/page', sidebar: 'layouts/nav/project'
diff --git a/app/views/layouts/public_group.html.haml b/app/views/layouts/public_group.html.haml
index 64794104ac5..ae3d2bd8a89 100644
--- a/app/views/layouts/public_group.html.haml
+++ b/app/views/layouts/public_group.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: group_head_title
   %body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: "group: #{@group.name}"
     = render 'layouts/page', sidebar: 'layouts/nav/group'
diff --git a/app/views/layouts/public_projects.html.haml b/app/views/layouts/public_projects.html.haml
index 5964a29d522..027e9a53139 100644
--- a/app/views/layouts/public_projects.html.haml
+++ b/app/views/layouts/public_projects.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: @project.name_with_namespace
   %body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: project_title(@project)
     = render 'layouts/page', sidebar: 'layouts/nav/project'
diff --git a/app/views/layouts/public_users.html.haml b/app/views/layouts/public_users.html.haml
index 0510ce34a7f..37767df33d2 100644
--- a/app/views/layouts/public_users.html.haml
+++ b/app/views/layouts/public_users.html.haml
@@ -2,6 +2,5 @@
 %html{ lang: "en"}
   = render "layouts/head", title: @title
   %body{class: "#{app_theme} #{theme_type} application", :'data-page' => body_data_page}
-    = render "layouts/broadcast"
     = render "layouts/public_head_panel", title: @title
     = render 'layouts/page'