Moves alert boxes to below the breadcrumbs
This commit is contained in:
parent
1dab640357
commit
17ff1f8393
|
@ -12,10 +12,12 @@
|
||||||
.content-wrapper{ class: "#{(layout_nav_class unless show_new_nav?)}" }
|
.content-wrapper{ class: "#{(layout_nav_class unless show_new_nav?)}" }
|
||||||
.alert-wrapper
|
.alert-wrapper
|
||||||
= render "layouts/broadcast"
|
= render "layouts/broadcast"
|
||||||
|
- if show_new_nav?
|
||||||
|
- if content_for?(:new_global_flash)
|
||||||
|
= yield :new_global_flash
|
||||||
|
= render "layouts/nav/breadcrumbs"
|
||||||
= render "layouts/flash"
|
= render "layouts/flash"
|
||||||
= yield :flash_message
|
= yield :flash_message
|
||||||
- if show_new_nav?
|
|
||||||
= render "layouts/nav/breadcrumbs"
|
|
||||||
%div{ class: "#{(container_class unless @no_container)} #{@content_class}" }
|
%div{ class: "#{(container_class unless @no_container)} #{@content_class}" }
|
||||||
.content{ id: "content-body" }
|
.content{ id: "content-body" }
|
||||||
= yield
|
= yield
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
- @no_container = true
|
- @no_container = true
|
||||||
|
- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
|
||||||
|
|
||||||
= content_for :flash_message do
|
= content_for flash_message_container do
|
||||||
- if current_user && can?(current_user, :download_code, @project)
|
- if current_user && can?(current_user, :download_code, @project)
|
||||||
= render 'shared/no_ssh'
|
= render 'shared/no_ssh'
|
||||||
= render 'shared/no_password'
|
= render 'shared/no_password'
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
- @no_container = true
|
- @no_container = true
|
||||||
|
- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message
|
||||||
|
|
||||||
= content_for :meta_tags do
|
= content_for :meta_tags do
|
||||||
= auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
|
= auto_discovery_link_tag(:atom, project_path(@project, rss_url_options), title: "#{@project.name} activity")
|
||||||
|
|
||||||
= content_for :flash_message do
|
= content_for flash_message_container do
|
||||||
- if current_user && can?(current_user, :download_code, @project)
|
- if current_user && can?(current_user, :download_code, @project)
|
||||||
= render 'shared/no_ssh'
|
= render 'shared/no_ssh'
|
||||||
= render 'shared/no_password'
|
= render 'shared/no_password'
|
||||||
|
|
Loading…
Reference in New Issue