Browse Source

dry headings logic

pull/645/head
JG 3 years ago
parent
commit
e5fd5914e3
  1. 6
      app/views/case_logs/index.html.erb
  2. 8
      app/views/organisations/index.html.erb
  3. 3
      app/views/organisations/show.html.erb
  4. 6
      app/views/users/index.html.erb

6
app/views/case_logs/index.html.erb

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

8
app/views/organisations/index.html.erb

@ -3,13 +3,7 @@
<% content_for :title, title %> <% content_for :title, title %>
<% if request.path == "/organisations" %> <%= render partial: "organisations/headings", locals: request.path == "/organisations" ? { main: "Organisations", sub: nil } : { main: @organisation.name, sub: "Organisations" } %>
<%= render partial: "headings", locals: { main: "Organisations", sub: nil } %>
<% else %>
<%= render partial: "headings", locals: { main: @organisation.name, sub: "Organisations" } %>
<% end %>
<% items = tab_items(current_user) %>
<h2 class="govuk-visually-hidden">Organisations</h2> <h2 class="govuk-visually-hidden">Organisations</h2>

3
app/views/organisations/show.html.erb

@ -2,8 +2,7 @@
<% title = format_title(nil, current_user.support? ? "About this organisation" : "About your organisation", current_user, nil, nil, @organisation.name) %> <% title = format_title(nil, current_user.support? ? "About this organisation" : "About your organisation", current_user, nil, nil, @organisation.name) %>
<% content_for :title, title %> <% content_for :title, title %>
<% locals = current_user.support? ? { main: @organisation.name, sub: nil } : { main: "About your organisation", sub: current_user.organisation.name }%> <%= render partial: "organisations/headings", locals: current_user.support? ? { main: @organisation.name, sub: nil } : { main: "About your organisation", sub: current_user.organisation.name } %>
<%= render partial: "organisations/headings", locals: locals %>
<% if current_user.support? %> <% if current_user.support? %>
<%= render SubNavigationComponent.new( <%= render SubNavigationComponent.new(

6
app/views/users/index.html.erb

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

Loading…
Cancel
Save