diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-04 15:45:11 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-05 10:47:59 +0100 |
| commit | 023fa0383b6f12823b5d4e300c6f111a4bf54a2e (patch) | |
| tree | abaccfff3f5d32cd1449e4bbb4c006b3f72ad4cd | |
| parent | b1ee06e3f974153efb8f617cec2b12e688ea0040 (diff) | |
| download | gitlab-ce-new-breadcrumbs-alerts-below.tar.gz | |
move some flash messages above the breadcrumbsnew-breadcrumbs-alerts-below
this includes the broadcast message & no ssh key. Other flash messages
go below the breadcrumbs
| -rw-r--r-- | app/views/layouts/_page.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/empty.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 3 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index d1ad1a8e790..cc9219cb6fe 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -11,9 +11,11 @@ = yield :sub_nav .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/broadcast" = render "layouts/flash" = yield :flash_message %div{ class: "#{(container_class unless @no_container)} #{@content_class}" } 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 152e50a79bb..4160afd8b91 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, namespace_project_path(@project.namespace, @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' |