baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

correct headings

pull/641/head
JG 3 years ago
parent
139a7c0558
commit
e3e2807f01
7 changed files with 57 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      app/views/case_logs/index.html.erb
  2. 23
      app/views/layouts/organisations.html.erb
  3. 14
      app/views/organisations/index.html.erb
  4. 8
      app/views/organisations/logs.html.erb
  5. 13
      app/views/organisations/show.html.erb
  6. 10
      app/views/organisations/users.html.erb
  7. 11
      app/views/users/index.html.erb

11
app/views/case_logs/index.html.erb
Unescape View File

@ -6,11 +6,12 @@
<% title = "Your organisation (Logs)" %> <% title = "Your organisation (Logs)" %>
<% end %> <% end %>
<% content_for :title, title %> <h1 class="govuk-heading-l">
<% if !current_user.support? %>
<% content_for :tab_title do %> <span class="govuk-caption-l"><%= current_user.organisation.name %></span>
<%= "Logs" %> <% end %>
<% end %> Logs
</h1>
<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">

23
app/views/layouts/organisations.html.erb
Unescape View File

@ -1,16 +1,17 @@
<% content_for :content do %> <%# <% content_for :content do %1> %>
<h1 class="govuk-heading-l"> <%# <h1 class="govuk-heading-l"> %>
<% if current_user.support? && request.path != "/organisations" %> <%# <% if current_user.support? && request.path != "/organisations" %1> %>
<span class="govuk-caption-l"><%= @organisation.name %></span> <%# <span class="govuk-caption-l"><%= @organisation.name %1></span> %>
<% end %> <%# <% end %1> %>
<%= content_for(:title) %> <%# <%= content_for(:title) %1> %>
</h1> <%# </h1> %>
<% items = tab_items(current_user) %> <%# <% items = tab_items(current_user) %1> %>
<h2 class="govuk-visually-hidden"><%= content_for(:tab_title) %></h2> <%# <h2 class="govuk-visually-hidden"><%= content_for(:tab_title) %1></h2> %>
<%= content_for?(:organisations_content) ? yield(:organisations_content) : yield %> <%# <%= content_for?(:organisations_content) ? yield(:organisations_content) : yield %1> %>
<% end %> <%# <% end %1> %>
<%# <%= content_for?(:organisations_content) ? yield(:organisations_content) : yield %1> %>
<%= render template: "layouts/application" %> <%= render template: "layouts/application" %>

14
app/views/organisations/index.html.erb
Unescape View File

@ -5,7 +5,19 @@
<% title = "Organisations" %> <% title = "Organisations" %>
<% end %> <% end %>
<% content_for :title, title %> <h1 class="govuk-heading-l">
<% if current_user.support? && request.path == "/organisations" %>
Organisations
<% end %>
<% if current_user.support? && request.path != "/organisations" %>
<span class="govuk-caption-l"><%= @organisation.name %></span>
<h1 class="govuk-heading-l">Organisations</h1>
<% end %>
</h1>
<% items = tab_items(current_user) %>
<h2 class="govuk-visually-hidden">Organisations</h2>
<%= render SearchComponent.new(current_user:, search_label: "Search by organisation name", value: @searched) %> <%= render SearchComponent.new(current_user:, search_label: "Search by organisation name", value: @searched) %>

8
app/views/organisations/logs.html.erb
Unescape View File

@ -5,11 +5,11 @@
<% title = "Your organisation (Logs)" %> <% title = "Your organisation (Logs)" %>
<% end %> <% end %>
<% content_for :title, title %> <h1 class="govuk-heading-l">
<h1 class="govuk-heading-l"><%= @organisation.name %></h1>
</h1>
<% content_for :tab_title do %> <h2 class="govuk-visually-hidden">Logs</h2>
<%= "Logs" %>
<% end %>
<%= render SubNavigationComponent.new( <%= render SubNavigationComponent.new(
items: secondary_items(request.path, @organisation.id), items: secondary_items(request.path, @organisation.id),

13
app/views/organisations/show.html.erb
Unescape View File

@ -1,8 +1,13 @@
<% content_for :title, current_user.support? ? "Details" : "Your organisation" %> <h1 class="govuk-heading-l">
<% if !current_user.support? %>
<span class="govuk-caption-l"><%= current_user.organisation.name %></span>
About your organisation
<% else %>
<h1 class="govuk-heading-l"><%= @organisation.name %></h1>
<% end %>
</h1>
<% content_for :tab_title do %> <h2 class="govuk-visually-hidden">About this organisation</h2>
<%= "Details" %>
<% end %>
<% if current_user.support? %> <% if current_user.support? %>
<%= render SubNavigationComponent.new( <%= render SubNavigationComponent.new(

10
app/views/organisations/users.html.erb
Unescape View File

@ -5,11 +5,13 @@
<% title = "Your organisation (User)" %> <% title = "Your organisation (User)" %>
<% end %> <% end %>
<% content_for :title, title %> <h1 class="govuk-heading-l">
<% if current_user.support? %>
<h1 class="govuk-heading-l"><%= @organisation.name %></h1>
<% end %>
</h1>
<% content_for :tab_title do %> <h2 class="govuk-visually-hidden">Users</h2>
<%= "Users" %>
<% end %>
<%= render SubNavigationComponent.new( <%= render SubNavigationComponent.new(
items: secondary_items(request.path, @organisation.id), items: secondary_items(request.path, @organisation.id),

11
app/views/users/index.html.erb
Unescape View File

@ -5,11 +5,14 @@
<% title = "Your organisation (Users)" %> <% title = "Your organisation (Users)" %>
<% end %> <% end %>
<% content_for :title, title %> <h1 class="govuk-heading-l">
<% unless current_user.support? %>
<span class="govuk-caption-l"><%= current_user.organisation.name %></span>
<% end %>
Users
</h1>
<% content_for :tab_title do %> <h2 class="govuk-visually-hidden">Users</h2>
<%= "Users" %>
<% end %>
<% if current_user.data_coordinator? || current_user.support? %> <% if current_user.data_coordinator? || current_user.support? %>
<%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %> <%= govuk_button_link_to "Invite user", new_user_path, html: { method: :get } %>

Write Preview
Loading…
Cancel
Save