Fix placement of back links on scheme pages (#685)

app/views/devise/confirmations/new.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Resend invitation link" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>

app/views/devise/passwords/edit.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Change your password" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, html: { method: :patch }) do |f| %>

app/views/devise/passwords/new.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Reset password" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>

app/views/devise/passwords/reset_password.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, @confirmation ? I18n.t("user.create_password") : I18n.t("user.reset_password") %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>

app/views/devise/two_factor_authentication/resend.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Resend security code" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: "javascript:history.back()") %>
-    text: "Back",
-    href: "javascript:history.back()",
-  ) %>
 <% end %>
 
 <%= form_with(url: send("resend_code_#{resource_name}_two_factor_authentication_path"), html: { method: :get }) do |f| %>

app/views/form/page.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, @page.header.presence || @page.questions.first.header.html_safe %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: "javascript:history.back()") %>
-    text: "Back",
-    href: "javascript:history.back()",
-  ) %>
 <% end %>
 
 <div data-controller="govukfrontend"></div>

app/views/organisations/edit.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Change #{@organisation.name}’s details" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(@organisation, as: :organisation, html: { method: :patch }) do |f| %>

app/views/organisations/new.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Create a new organisation" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(@resource, as: :organisation, html: { method: :post }) do |f| %>

app/views/schemes/locations.html.erb

@@ -1,7 +1,9 @@
 <% title = @scheme.service_name %>
 <% content_for :title, title %>
 
-<%= govuk_back_link(href: request.referer.to_s) %>
+<% content_for :before_content do %>
+  <%= govuk_back_link(href: request.referer.to_s) %>
+<% end %>
 
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
 

app/views/schemes/show.html.erb

@@ -1,7 +1,9 @@
 <% title = @scheme.service_name %>
 <% content_for :title, title %>
 
-<%= govuk_back_link(href: request.referer.to_s) %>
+<% content_for :before_content do %>
+  <%= govuk_back_link(href: request.referer.to_s) %>
+<% end %>
 
 <%= render partial: "organisations/headings", locals: { main: @scheme.service_name, sub: nil } %>
 

app/views/users/edit.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, current_user == @user ? "Change your personal details" : "Change #{@user.name.presence || 'this user'}’s personal details" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(@user, as: :user, html: { method: :patch }) do |f| %>

app/views/users/new.html.erb

@@ -1,10 +1,7 @@
 <% content_for :title, "Invite somebody to submit CORE data" %>
 
 <% content_for :before_content do %>
-  <%= govuk_back_link(
+  <%= govuk_back_link(href: :back) %>
-    text: "Back",
-    href: :back,
-  ) %>
 <% end %>
 
 <%= form_for(@resource, as: :user, html: { method: :post }) do |f| %>