Merge pull request #947 from alphagov/no-double-breadcrumbs

Avoid double breadcrumbs on service sign in pages

Author: tijmenb

app/views/content_items/service_sign_in/_choose_sign_in.html.erb

@@ -1,5 +1,3 @@
-<%= render "govuk_publishing_components/components/back_link", href: @content_item.back_link %>
-
 <% if @error %>
   <div class="grid-row">
     <div class="column-two-thirds">

app/views/content_items/service_sign_in/_create_new_account.html.erb

@@ -1,5 +1,3 @@
-<%= render "govuk_publishing_components/components/back_link", href: @content_item.back_link %>
-
 <div class="grid-row">
   <div class="column-two-thirds">
     <%= render 'govuk_publishing_components/components/title', title: @content_item.title %>

app/views/layouts/application.html.erb

@@ -34,7 +34,13 @@
 
   <div id="wrapper" class="<%= wrapper_class %>">
     <%= render_phase_label @content_item, content_for(:phase_message) %>
-    <%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_item.content_item.parsed_content %>
+
+    <% if @content_item.try(:back_link) %>
+      <%= render 'govuk_publishing_components/components/back_link', href: @content_item.back_link %>
+    <% else %>
+      <%= render 'govuk_publishing_components/components/contextual_breadcrumbs', content_item: @content_item.content_item.parsed_content %>
+    <% end %>
+
     <main role="main" id="content" class="<%= @content_item.schema_name.dasherize %>" lang="<%= I18n.locale %>">
       <%= yield %>
     </main>