mopped headings

app/views/case_logs/index.html.erb

@@ -3,12 +3,11 @@
 
 <% content_for :title, title %>
 
-<h1 class="govuk-heading-l">
+<% if current_user.support? %>
-  <% unless current_user.support? %>
+  <%= render partial: "organisations/headings", locals: { main: "Logs", sub: nil } %>
-    <span class="govuk-caption-l"><%= current_user.organisation.name %></span>
+<% else %>
-  <% end %>
+  <%= render partial: "organisations/headings", locals: { main: "Logs", sub: current_user.organisation.name } %>
-  Logs
+<% end %>
-</h1>
 
 <div class="app-filter-layout" data-controller="filter-layout">
   <div class="govuk-button-group app-filter-toggle">

app/views/organisations/_headings.html.erb

@@ -0,0 +1,4 @@
+<h1 class="govuk-heading-l">
+  <span class="govuk-caption-l"><%= sub %></span>
+  <%= main %>
+</h1>

app/views/organisations/index.html.erb

@@ -3,15 +3,11 @@
 
 <% content_for :title, title %>
 
-<h1 class="govuk-heading-l">
+<% if request.path == "/organisations" %>
-  <% if current_user.support? && request.path == "/organisations" %>
+  <%= render partial: "headings", locals: { main: "Organisations", sub: nil } %>
-    Organisations
+<% else %>
-  <% end %>
+  <%= render partial: "headings", locals: { main: @organisation.name, sub: "Organisations" } %>
-  <% if current_user.support? && request.path != "/organisations" %>
+<% end %>
-    <span class="govuk-caption-l"><%= @organisation.name %></span>
-    <h1 class="govuk-heading-l">Organisations</h1>
-  <% end %>
-</h1>
 
 <% items = tab_items(current_user) %>
 

app/views/organisations/logs.html.erb

@@ -3,9 +3,7 @@
 
 <% content_for :title, title %>
 
-<h1 class="govuk-heading-l">
+<%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
-  <%= @organisation.name %>
-</h1>
 
 <%= render SubNavigationComponent.new(
   items: secondary_items(request.path, @organisation.id),

app/views/organisations/show.html.erb

@@ -2,14 +2,11 @@
 <% title = format_title(nil, current_user.support? ? "About this organisation" : "About your organisation", current_user, nil, nil, @organisation.name) %>
 <% content_for :title, title %>
 
-<h1 class="govuk-heading-l">
+<% if !current_user.support? %>
-  <% if !current_user.support? %>
+  <%= render partial: "organisations/headings", locals: { main: current_user.organisation.name, sub: "About your organisation" } %>
-    <span class="govuk-caption-l"><%= current_user.organisation.name %></span>
+<% else %>
-    About your organisation
+  <%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
-  <% else %>
+<% end %>
-    <%= @organisation.name %>
-  <% end %>
-</h1>
 
 <% if current_user.support? %>
   <%= render SubNavigationComponent.new(

app/views/organisations/users.html.erb

@@ -3,9 +3,7 @@
 
 <% content_for :title, title %>
 
-<h1 class="govuk-heading-l">
+<%= render partial: "organisations/headings", locals: { main: @organisation.name, sub: nil } %>
-  <%= @organisation.name %>
-</h1>
 
 <%= render SubNavigationComponent.new(
   items: secondary_items(request.path, @organisation.id),

app/views/users/index.html.erb

@@ -3,12 +3,11 @@
 
 <% content_for :title, title %>
 
-<h1 class="govuk-heading-l">
+<% if current_user.support? %>
-  <% unless current_user.support? %>
+  <%= render partial: "organisations/headings", locals: { main: "Users", sub: nil } %>
-    <span class="govuk-caption-l"><%= current_user.organisation.name %></span>
+<% else %>
-  <% end %>
+  <%= render partial: "organisations/headings", locals: { main: "User", sub: current_user.organisation.name } %>
-  Users
+<% end %>
-</h1>
 
 <h2 class="govuk-visually-hidden">Users</h2>