Download as
Browse Code »

Commit 14fa0d5bd7c6bd4a7eb02de8c7e16f44583706d6

Authored by Dmitriy Zaporozhets
2 parents ade780a9 4d093f9f
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #6346 from jvanbaarsen/fix-5674-show-broadcast-everywhere 

Added broadcast message on every layout file
Showing 7 changed files with 7 additions and 0 deletions   Show diff stats
app/views/layouts/admin.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: "Admin area"
4 4 %body{class: "#{app_theme} admin", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 = render "layouts/head_panel", title: "Admin area"
6 7 = render "layouts/flash"
7 8 %nav.main-nav.navbar-collapse.collapse
... ...
app/views/layouts/navless.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: @title
4 4 %body{class: "#{app_theme} application", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 = render "layouts/head_panel", title: @title
6 7 = render "layouts/flash"
7 8  
... ...
app/views/layouts/public.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: "Public Projects"
4 4 %body{class: "#{app_theme} application", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 - if current_user
6 7 = render "layouts/head_panel", title: "Public Projects"
7 8 - else
... ...
app/views/layouts/public_projects.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: @project.name_with_namespace
4 4 %body{class: "#{app_theme} application", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 = render "layouts/public_head_panel", title: @project.name_with_namespace
6 7 %nav.main-nav
7 8 .container= render 'layouts/nav/project'
... ...
app/views/layouts/public_users.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: @title
4 4 %body{class: "#{app_theme} application", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 = render "layouts/public_head_panel", title: @title
6 7 .container.navless-container
7 8 .content= yield
... ...
app/views/layouts/search.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: "Search"
4 4 %body{class: "#{app_theme} application", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 = render "layouts/head_panel", title: "Search"
6 7 = render "layouts/flash"
7 8  
... ...
app/views/layouts/user_team.html.haml
  Diff comments   View file @14fa0d5
... ... @@ -2,6 +2,7 @@
2 2 %html{ lang: "en"}
3 3 = render "layouts/head", title: "#{@team.name}"
4 4 %body{class: "#{app_theme} application", :'data-page' => body_data_page}
  5 + = render "layouts/broadcast"
5 6 = render "layouts/head_panel", title: "team: #{@team.name}"
6 7 = render "layouts/flash"
7 8 %nav.main-nav.navbar-collapse.collapse
... ...