Merge pull request #238 from alphagov/consistent-breadcrumbs

Show breadcrumbs consistently
alphagov · Jan 25, 2017 · 3f2ed53 · 3f2ed53
2 parents 3e544ea + 311a219
commit 3f2ed53
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 8 deletions.
diff --git a/app/views/content_items/case_study.html.erb b/app/views/content_items/case_study.html.erb
@@ -1,6 +1,5 @@
 <%= content_for :title, "#{@content_item.page_title} - #{t("content_item.format.#{@content_item.document_type}", count: 1)}" %>
 
-<%= render "shared/breadcrumbs" %>
 <%= render 'shared/title_and_translations', content_item: @content_item %>
 <%= render 'shared/withdrawal_notice', content_item: @content_item %>
 <%= render 'shared/metadata', content_item: @content_item %>

diff --git a/app/views/content_items/detailed_guide.html.erb b/app/views/content_items/detailed_guide.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :title, @content_item.page_title %>
 
-<%= render "shared/breadcrumbs" %>
-
 <div class="grid-row">
   <div class="column-two-thirds">
     <%= render 'govuk_component/title', @content_item.title_and_context %>

diff --git a/app/views/content_items/document_collection.html.erb b/app/views/content_items/document_collection.html.erb
@@ -1,6 +1,5 @@
 <%= content_for :title, @content_item.page_title %>
 
-<%= render "shared/breadcrumbs" %>
 <%= render 'shared/title_and_translations', content_item: @content_item %>
 <%= render 'shared/withdrawal_notice', content_item: @content_item %>
 <%= render 'shared/metadata', content_item: @content_item %>

diff --git a/app/views/content_items/publication.html.erb b/app/views/content_items/publication.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :title, @content_item.page_title %>
 
-<%= render "shared/breadcrumbs" %>
-
 <div class="grid-row">
   <div class="column-two-thirds">
     <%= render 'govuk_component/title',

diff --git a/app/views/content_items/topical_event_about_page.html.erb b/app/views/content_items/topical_event_about_page.html.erb
@@ -1,7 +1,5 @@
 <%= content_for :title, @content_item.title %>
 
-<%= render "shared/breadcrumbs" %>
-
 <%= render 'shared/title_and_translations', content_item: @content_item %>
 <%= render 'shared/description', description: @content_item.description %>
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -22,6 +22,7 @@
   <div id="wrapper" class="<%= wrapper_class %>">
     <main role="main" id="content" class="<%= @content_item.format.dasherize %>" lang="<%= I18n.locale %>">
       <%= render_phase_label @content_item, content_for(:phase_message) %>
+      <%= render 'shared/breadcrumbs' %>
       <%= yield %>
     </main>
   </div>