diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-07 16:18:57 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-07-07 16:18:57 +0000 |
| commit | 17ff1f83934cc6f09aab447fbf5230da596bddb1 (patch) | |
| tree | d00208d44c73113212b0c9579877ef230e710ae1 | |
| parent | 1dab640357fa1ba8992757499e4167fcd4ce6276 (diff) | |
| download | gitlab-ce-17ff1f83934cc6f09aab447fbf5230da596bddb1.tar.gz | |
Moves alert boxes to below the breadcrumbs
| -rw-r--r-- | app/views/layouts/_page.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/empty.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index 1a9f5401a78..cc9219cb6fe 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -12,10 +12,12 @@ .content-wrapper{ class: "#{(layout_nav_class unless show_new_nav?)}" } .alert-wrapper = render "layouts/broadcast" + - if show_new_nav? + - if content_for?(:new_global_flash) + = yield :new_global_flash + = render "layouts/nav/breadcrumbs" = render "layouts/flash" = yield :flash_message - - if show_new_nav? - = render "layouts/nav/breadcrumbs" %div{ class: "#{(container_class unless @no_container)} #{@content_class}" } .content{ id: "content-body" } = yield diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml index 50e0bad3ccf..0f132a68ce1 100644 --- a/app/views/projects/empty.html.haml +++ b/app/views/projects/empty.html.haml @@ -1,6 +1,7 @@ - @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) = render 'shared/no_ssh' = render 'shared/no_password' diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index ea780b1cb83..d413c4619be 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -1,9 +1,10 @@ - @no_container = true +- flash_message_container = show_new_nav? ? :new_global_flash : :flash_message = content_for :meta_tags do = 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) = render 'shared/no_ssh' = render 'shared/no_password' |