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

Fix broadcast message to show up properly with new UI
35d6d1ce · Visay Keo · 8cc111bd · 35d6d1ce · 35d6d1ce · 35d6d1ce
Commit 35d6d1ce authored Jan 26, 2015 by Visay Keo
11 changed files
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,7 +33,7 @@ v 7.8.0
  - 
  - 
  - 
-  - 
+  - Fix long broadcast message cut-off on left sidebar (Visay Keo)
  - Add Project Avatars (Steven Thonus and Hannes Rosenögger)
  - 
  - 

--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
 - if defined?(sidebar)
  .page-with-sidebar
+    = render "layouts/broadcast"
    .sidebar-wrapper
      = render(sidebar)
    .content-wrapper

--- 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'
--- 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'
--- 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'
--- 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'
--- 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

--- 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'
--- 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'
--- 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'
--- 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'