Browse Source

Run Rubocop on ERB templates

pull/482/head
Paul Robert Lloyd 3 years ago
parent
commit
716dc59acc
  1. 4
      app/components/tab_navigation_component.html.erb
  2. 10
      app/views/case_logs/_log_list.html.erb
  3. 2
      app/views/case_logs/edit.html.erb
  4. 2
      app/views/case_logs/index.html.erb
  5. 2
      app/views/devise/passwords/edit.html.erb
  6. 2
      app/views/devise/passwords/new.html.erb
  7. 2
      app/views/devise/passwords/reset_password.html.erb
  8. 4
      app/views/devise/two_factor_authentication/resend.html.erb
  9. 2
      app/views/devise/two_factor_authentication/show.html.erb
  10. 4
      app/views/filters/_checkbox_filter.html.erb
  11. 2
      app/views/form/_check_answers_table.html.erb
  12. 4
      app/views/form/_checkbox_question.html.erb
  13. 8
      app/views/form/_interruption_screen_question.html.erb
  14. 2
      app/views/form/_numeric_output_question.html.erb
  15. 3
      app/views/form/_numeric_question.html.erb
  16. 16
      app/views/form/_radio_question.html.erb
  17. 6
      app/views/form/_select_question.html.erb
  18. 2
      app/views/form/_text_question.html.erb
  19. 2
      app/views/form/_textarea_question.html.erb
  20. 12
      app/views/form/check_answers.html.erb
  21. 2
      app/views/form/guidance/_what_counts_as_income.html.erb
  22. 10
      app/views/form/page.html.erb
  23. 21
      app/views/layouts/_collection_resources.html.erb
  24. 53
      app/views/layouts/application.html.erb
  25. 2
      app/views/layouts/organisations.html.erb
  26. 2
      app/views/organisations/edit.html.erb
  27. 24
      app/views/organisations/show.html.erb
  28. 20
      app/views/organisations/users.html.erb
  29. 6
      app/views/start/index.html.erb
  30. 10
      app/views/users/edit.html.erb
  31. 11
      app/views/users/new.html.erb
  32. 122
      app/views/users/show.html.erb
  33. 2
      spec/features/reset_password.html.erb

4
app/components/tab_navigation_component.html.erb

@ -3,11 +3,11 @@
<% items.each do |item| %> <% items.each do |item| %>
<% if item.fetch(:current, false) || current_page?(strip_query(item.fetch(:url))) %> <% if item.fetch(:current, false) || current_page?(strip_query(item.fetch(:url))) %>
<li class="app-tab-navigation__item app-tab-navigation__item--current"> <li class="app-tab-navigation__item app-tab-navigation__item--current">
<%= govuk_link_to item[:name], item[:url], class: 'app-tab-navigation__link', aria: { current: 'page' } %> <%= govuk_link_to item[:name], item[:url], class: "app-tab-navigation__link", aria: { current: "page" } %>
</li> </li>
<% else %> <% else %>
<li class="app-tab-navigation__item"> <li class="app-tab-navigation__item">
<%= govuk_link_to item[:name], item[:url], class: 'app-tab-navigation__link' %> <%= govuk_link_to item[:name], item[:url], class: "app-tab-navigation__link" %>
</li> </li>
<% end %> <% end %>
<% end %> <% end %>

10
app/views/case_logs/_log_list.html.erb

@ -28,21 +28,21 @@
<%= govuk_link_to log.id, case_log_path(log) %> <%= govuk_link_to log.id, case_log_path(log) %>
</th> </th>
<td class="govuk-table__cell app-!-font-tabular"> <td class="govuk-table__cell app-!-font-tabular">
<%= log.tenant_code? ? log.tenant_code : '–' %> <%= log.tenant_code? ? log.tenant_code : "–" %>
</td> </td>
<td class="govuk-table__cell app-!-font-tabular"> <td class="govuk-table__cell app-!-font-tabular">
<%= log.propcode? ? log.propcode : '–' %> <%= log.propcode? ? log.propcode : "–" %>
</td> </td>
<td class="govuk-table__cell"> <td class="govuk-table__cell">
<%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : '–' %> <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : "–" %>
</td> </td>
<td class="govuk-table__cell"> <td class="govuk-table__cell">
<%= log.created_at.to_formatted_s(:govuk_date) %> <%= log.created_at.to_formatted_s(:govuk_date) %>
</td> </td>
<td class="govuk-table__cell"> <td class="govuk-table__cell">
<%= govuk_tag( <%= govuk_tag(
colour: log.status == 'completed' ? 'blue' : 'grey', colour: log.status == "completed" ? "blue" : "grey",
text: log.status.humanize text: log.status.humanize,
) %> ) %>
</td> </td>
<% if current_user.support? %> <% if current_user.support? %>

2
app/views/case_logs/edit.html.erb

@ -1,7 +1,7 @@
<% content_for :title, "Log #{@case_log.id}" %> <% content_for :title, "Log #{@case_log.id}" %>
<% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
"Logs" => "/logs", "Logs" => "/logs",
content_for(:title) => "" content_for(:title) => "",
}) %> }) %>
<div class="govuk-grid-row"> <div class="govuk-grid-row">

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

@ -13,7 +13,7 @@
<% if @case_logs.present? %> <% if @case_logs.present? %>
<div class="app-filter-layout__content"> <div class="app-filter-layout__content">
<%= render partial: "log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy } %> <%= render partial: "log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy } %>
<%== render partial: 'pagy/nav', locals: { pagy: @pagy, item_name: "logs" } %> <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
</div> </div>
<% end %> <% end %>
</div> </div>

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

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>

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

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>

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

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>

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

@ -2,8 +2,8 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: 'javascript:history.back()', href: "javascript:history.back()",
) %> ) %>
<% end %> <% end %>

2
app/views/devise/two_factor_authentication/show.html.erb

@ -15,7 +15,7 @@
<%= f.govuk_number_field :code, <%= f.govuk_number_field :code,
label: { text: "Security code", size: "m" }, label: { text: "Security code", size: "m" },
width: 5, width: 5,
autocomplete: 'one-time-code', autocomplete: "one-time-code",
autofocus: true %> autofocus: true %>
<%= f.govuk_submit "Submit" %> <%= f.govuk_submit "Submit" %>

4
app/views/filters/_checkbox_filter.html.erb

@ -1,6 +1,6 @@
<%= f.govuk_check_boxes_fieldset category.to_sym, legend: { text: label, size: "s"}, small: true, form_group: { classes: "app-filter__group" } do %> <%= f.govuk_check_boxes_fieldset category.to_sym, legend: { text: label, size: "s" }, small: true, form_group: { classes: "app-filter__group" } do %>
<% options.map do |key, option| %> <% options.map do |key, option| %>
<%= f.govuk_check_box category, "#{key}", <%= f.govuk_check_box category, key.to_s,
label: { text: option }, label: { text: option },
checked: filter_selected?(category, key), checked: filter_selected?(category, key),
size: "s" %> size: "s" %>

2
app/views/form/_check_answers_table.html.erb

@ -1,6 +1,6 @@
<div class="govuk-summary-list__row"> <div class="govuk-summary-list__row">
<dt class="govuk-summary-list__key"> <dt class="govuk-summary-list__key">
<%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %> <%= question.check_answer_label.to_s.presence || question.header.to_s %>
</dt> </dt>
<dd class="govuk-summary-list__value"> <dd class="govuk-summary-list__value">
<%= get_answer_label(question, @case_log) %><br> <%= get_answer_label(question, @case_log) %><br>

4
app/views/form/_checkbox_question.html.erb

@ -12,8 +12,8 @@
<%= f.govuk_check_box_divider %> <%= f.govuk_check_box_divider %>
<% else %> <% else %>
<%= f.govuk_check_box question.id, key, <%= f.govuk_check_box question.id, key,
label: { text: options['value'] }, label: { text: options["value"] },
hint: { text: options['hint'] }, hint: { text: options["hint"] },
checked: @case_log[key] == 1, checked: @case_log[key] == 1,
exclusive: after_divider, exclusive: after_divider,
**stimulus_html_attributes(question) %> **stimulus_html_attributes(question) %>

8
app/views/form/_interruption_screen_question.html.erb

@ -1,6 +1,6 @@
<%= govuk_panel( <%= govuk_panel(
title_text: title_text, title_text:,
classes: 'app-panel--interruption', classes: "app-panel--interruption",
) do %> ) do %>
<%= display_informative_text(informative_text, case_log) %> <%= display_informative_text(informative_text, case_log) %>
<%= f.govuk_radio_buttons_fieldset question.id.to_sym, <%= f.govuk_radio_buttons_fieldset question.id.to_sym,
@ -12,8 +12,8 @@
<% else %> <% else %>
<%= f.govuk_radio_button question.id, <%= f.govuk_radio_button question.id,
key, key,
label: { text: options['value'] }, label: { text: options["value"] },
hint: { text: options['hint'] }, hint: { text: options["hint"] },
**stimulus_html_attributes(question) %> **stimulus_html_attributes(question) %>
<% end %> <% end %>
<% end %> <% end %>

2
app/views/form/_numeric_output_question.html.erb

@ -15,7 +15,7 @@
step="<%= question.step %>" step="<%= question.step %>"
type="number" type="number"
name="case_log[tcharge]" name="case_log[tcharge]"
for="<%= question.fields_added.present? ? question.fields_added.map { |x| "case-log-#{x}-field"}.join(" ") : "" %>"> for="<%= question.fields_added.present? ? question.fields_added.map { |x| "case-log-#{x}-field" }.join(" ") : "" %>">
<%= case_log[question.id] %></output> <%= case_log[question.id] %></output>
<span class="govuk-input__suffix"><%= question.suffix %></span> <span class="govuk-input__suffix"><%= question.suffix %></span>
</div> </div>

3
app/views/form/_numeric_question.html.erb

@ -5,7 +5,8 @@
label: legend(question, page_header, conditional), label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe }, hint: { text: question.hint_text&.html_safe },
min: question.min, max: question.max, step: question.step, min: question.min, max: question.max, step: question.step,
width: question.width, :readonly => question.read_only?, width: question.width,
readonly: question.read_only?,
prefix_text: question.prefix.to_s, prefix_text: question.prefix.to_s,
suffix_text: question.suffix.is_a?(String) ? question.suffix : nil, suffix_text: question.suffix.is_a?(String) ? question.suffix : nil,
**stimulus_html_attributes(question) %> **stimulus_html_attributes(question) %>

16
app/views/form/_radio_question.html.erb

@ -13,21 +13,21 @@
<% if conditional_question.nil? %> <% if conditional_question.nil? %>
<%= f.govuk_radio_button question.id, <%= f.govuk_radio_button question.id,
key, key,
label: { text: options['value'] }, label: { text: options["value"] },
hint: { text: options['hint'] }, hint: { text: options["hint"] },
**stimulus_html_attributes(question) %> **stimulus_html_attributes(question) %>
<% else %> <% else %>
<%= f.govuk_radio_button question.id, <%= f.govuk_radio_button question.id,
key, key,
label: { text: options['value'] }, label: { text: options["value"] },
hint: { text: options['hint'] }, hint: { text: options["hint"] },
**stimulus_html_attributes(question) do %> **stimulus_html_attributes(question) do %>
<%= render partial: "#{conditional_question.type}_question", locals: { <%= render partial: "#{conditional_question.type}_question", locals: {
question: conditional_question, question: conditional_question,
caption_text: caption_text, caption_text:,
page_header: page_header, page_header:,
f: f, f:,
conditional: true conditional: true,
} %> } %>
<% end %> <% end %>
<% end %> <% end %>

6
app/views/form/_select_question.html.erb

@ -1,13 +1,13 @@
<%= render partial: "form/guidance/#{question.guidance_partial}" if question.guidance_partial %> <%= render partial: "form/guidance/#{question.guidance_partial}" if question.guidance_partial %>
<% selected = @case_log.public_send(question.id) || "" %> <% selected = @case_log.public_send(question.id) || "" %>
<%= answers = question.displayed_answer_options.map { |key, value| OpenStruct.new(id: key, name: value) } <%= answers = question.displayed_answer_options.map { |key, value| OpenStruct.new(id: key, name: value) } %>
f.govuk_collection_select question.id.to_sym, <%= f.govuk_collection_select question.id.to_sym,
answers, answers,
:id, :id,
:name, :name,
caption: caption(caption_text, page_header, conditional), caption: caption(caption_text, page_header, conditional),
label: legend(question, page_header, conditional), label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe }, hint: { text: question.hint_text&.html_safe },
options: { disabled: [""], selected: selected }, options: { disabled: [""], selected: },
"data-controller": "accessible-autocomplete" %> "data-controller": "accessible-autocomplete" %>

2
app/views/form/_text_question.html.erb

@ -4,5 +4,5 @@
caption: caption(caption_text, page_header, conditional), caption: caption(caption_text, page_header, conditional),
label: legend(question, page_header, conditional), label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe }, hint: { text: question.hint_text&.html_safe },
width: question.width ? question.width : nil, width: question.width || nil,
**stimulus_html_attributes(question) %> **stimulus_html_attributes(question) %>

2
app/views/form/_textarea_question.html.erb

@ -4,5 +4,5 @@
caption: caption(caption_text, page_header, conditional), caption: caption(caption_text, page_header, conditional),
label: legend(question, page_header, conditional), label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe }, hint: { text: question.hint_text&.html_safe },
width: question.width ? question.width : nil, width: question.width || nil,
**stimulus_html_attributes(question) %> **stimulus_html_attributes(question) %>

12
app/views/form/check_answers.html.erb

@ -1,8 +1,8 @@
<% content_for :title, "#{subsection.id.humanize} - Check your answers" %> <% content_for :title, "#{subsection.id.humanize} - Check your answers" %>
<% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: { <% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
"Logs" => "/logs", "Logs" => "/logs",
"Log #{@case_log.id.to_s}" => "/logs/" + @case_log.id.to_s, "Log #{@case_log.id}" => "/logs/#{@case_log.id}",
subsection.label => "" subsection.label => "",
}) %> }) %>
<div class="govuk-grid-row"> <div class="govuk-grid-row">
@ -16,16 +16,16 @@
<dl class="govuk-summary-list"> <dl class="govuk-summary-list">
<% subsection.applicable_questions(@case_log).each do |question| %> <% subsection.applicable_questions(@case_log).each do |question| %>
<%= render partial: 'form/check_answers_table', locals: { question: question, case_log: @case_log } %> <%= render partial: "form/check_answers_table", locals: { question:, case_log: @case_log } %>
<% end %> <% end %>
</dl> </dl>
<%= form_with model: @case_log, method: "get" do |f| %> <%= form_with model: @case_log, method: "get" do |f| %>
<%= f.govuk_submit 'Save and return to log' do %> <%= f.govuk_submit "Save and return to log" do %>
<% if @case_log.status == "in_progress" && @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) == false %> <% if @case_log.status == "in_progress" && @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) == false %>
<%= govuk_button_link_to 'Save and go to next incomplete section', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %> <%= govuk_button_link_to "Save and go to next incomplete section", "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
<% elsif @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) %> <% elsif @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) %>
<%= govuk_button_link_to 'Save and go to submit', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %> <%= govuk_button_link_to "Save and go to submit", "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

2
app/views/form/guidance/_what_counts_as_income.html.erb

@ -1,4 +1,4 @@
<%= govuk_details(summary_text: 'What counts as income?') do %> <%= govuk_details(summary_text: "What counts as income?") do %>
<p class="govuk-body">You should include any income after tax from:</p> <p class="govuk-body">You should include any income after tax from:</p>
<ul class="govuk-list govuk-list--bullet"> <ul class="govuk-list govuk-list--bullet">
<li>employment</li> <li>employment</li>

10
app/views/form/page.html.erb

@ -1,9 +1,9 @@
<% content_for :title, @page.header.present? ? @page.header : @page.questions.first().header.html_safe %> <% content_for :title, @page.header.presence || @page.questions.first.header.html_safe %>
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: 'javascript:history.back()', href: "javascript:history.back()",
) %> ) %>
<% end %> <% end %>
@ -34,9 +34,9 @@
<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m"> <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
<% end %> <% end %>
<% if question.type == "interruption_screen" %> <% if question.type == "interruption_screen" %>
<%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f: f, conditional: false } %> <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f:, conditional: false } %>
<% else %> <% else %>
<%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f: f, conditional: false } %> <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f:, conditional: false } %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>

21
app/views/layouts/_collection_resources.html.erb

@ -1,13 +1,16 @@
<div class="app-card"> <div class="app-card">
<h2 class="govuk-heading-s">Collection resources</h2> <h2 class="govuk-heading-s">Collection resources</h2>
<%= render DocumentListComponent.new(items: [{ <%= render DocumentListComponent.new(items: [
name: "Lettings log for tenants (2022/23)", {
href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2022-23%20Lettings%20paper%20form.pdf?download-format=pdf", name: "Lettings log for tenants (2022/23)",
metadata: "PDF, 654 KB, 4 pages" href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2022-23%20Lettings%20paper%20form.pdf?download-format=pdf",
}, { metadata: "PDF, 654 KB, 4 pages",
name: "Lettings log for tenants (2021/22)", },
href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2021_22%20Lettings%20Log.pdf?download-format=pdf", {
metadata: "PDF, 302 KB, 3 pages" name: "Lettings log for tenants (2021/22)",
}]) %> href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2021_22%20Lettings%20Log.pdf?download-format=pdf",
metadata: "PDF, 302 KB, 3 pages",
},
]) %>
</div> </div>

53
app/views/layouts/application.html.erb

@ -4,19 +4,19 @@
<title><%= browser_title(yield(:title), @pagy, @admin_user, @user, @organisation, @case_log, @resource) %></title> <title><%= browser_title(yield(:title), @pagy, @admin_user, @user, @organisation, @case_log, @resource) %></title>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<%= csp_meta_tag %> <%= csp_meta_tag %>
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %> <%= tag.meta name: "viewport", content: "width=device-width, initial-scale=1" %>
<%= tag :meta, property: 'og:image', content: asset_path('images/govuk-opengraph-image.png') %> <%= tag.meta property: "og:image", content: asset_path("images/govuk-opengraph-image.png") %>
<%= tag :meta, name: 'theme-color', content: '#0b0c0c' %> <%= tag.meta name: "theme-color", content: "#0b0c0c" %>
<%= favicon_link_tag asset_path('images/favicon.ico') %> <%= favicon_link_tag asset_path("images/favicon.ico") %>
<%= favicon_link_tag asset_path('images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %> <%= favicon_link_tag asset_path("images/govuk-mask-icon.svg"), rel: "mask-icon", type: "image/svg", color: "#0b0c0c" %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %> <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon.png"), rel: "apple-touch-icon", type: "image/png" %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %> <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-152x152.png"), rel: "apple-touch-icon", type: "image/png", size: "152x152" %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %> <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-167x167.png"), rel: "apple-touch-icon", type: "image/png", size: "167x167" %>
<%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %> <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-180x180.png"), rel: "apple-touch-icon", type: "image/png", size: "180x180" %>
<%= stylesheet_link_tag "application" %> <%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/html5shiv.min.js" %> <%= javascript_include_tag "vendor/html5shiv.min.js" %>
<script> <script>
window.html5.elements = 'output'; window.html5.elements = "output";
html5.shivDocument(document); html5.shivDocument(document);
</script> </script>
<%= javascript_include_tag "vendor/polyfill-output-value.js" %> <%= javascript_include_tag "vendor/polyfill-output-value.js" %>
@ -37,43 +37,44 @@
<body class="govuk-template__body app-template--wide"> <body class="govuk-template__body app-template--wide">
<script> <script>
document.body.className = ((document.body.className) ? document.body.className + ' js-enabled' : 'js-enabled'); document.body.className = ((document.body.className) ? document.body.className + " js-enabled" : "js-enabled");
</script> </script>
<%= govuk_skip_link %> <%= govuk_skip_link %>
<%= govuk_header( <%= govuk_header(
logotype: 'GOV.UK', logotype: "GOV.UK",
service_name: t('service_name'), service_name: t("service_name"),
service_url: current_user.nil? ? "/" : '/logs' service_url: current_user.nil? ? "/" : "/logs",
) do |component| ) do |component|
if current_user.nil? if current_user.nil?
component.navigation_item(text: 'Sign in', href: user_session_path) component.navigation_item(text: "Sign in", href: user_session_path)
elsif else
component.navigation_item(text: 'Logs', href: case_logs_path) component.navigation_item(text: "Logs", href: case_logs_path)
component.navigation_item(text: 'Your organisation', href: "/organisations/#{current_user.organisation.id}") component.navigation_item(text: "Your organisation", href: "/organisations/#{current_user.organisation.id}")
component.navigation_item(text: 'Your account', href: account_path) component.navigation_item(text: "Your account", href: account_path)
component.navigation_item(text: 'Sign out', href: destroy_user_session_path) component.navigation_item(text: "Sign out", href: destroy_user_session_path)
end end
end %> end %>
<div class="govuk-width-container"> <div class="govuk-width-container">
<aside> <aside>
<%= govuk_phase_banner( <%= govuk_phase_banner(
tag: { text: 'Beta' }, tag: { text: "Beta" },
text: "This is a new service – help us improve it by <a class=\"govuk-link\" href=\"#{t('feedback_form')}\" rel=\"noreferrer noopener\" target=\"_blank\">giving us your feedback (opens in a new tab)</a>".html_safe text: "This is a new service – help us improve it by <a class=\"govuk-link\" href=\"#{t('feedback_form')}\" rel=\"noreferrer noopener\" target=\"_blank\">giving us your feedback (opens in a new tab)</a>".html_safe,
) %> ) %>
<%= content_for(:breadcrumbs) %> <%= content_for(:breadcrumbs) %>
<%= content_for(:before_content) %> <%= content_for(:before_content) %>
</aside> </aside>
<main class="govuk-main-wrapper" id="main-content" role="main"> <main class="govuk-main-wrapper" id="main-content" role="main">
<% if flash.notice && !flash.notice.include?('translation missing') %> <% if flash.notice && !flash.notice.include?("translation missing") %>
<%= govuk_notification_banner( <%= govuk_notification_banner(
title_text: 'Success', title_text: "Success",
success: true, title_heading_level: 3, success: true, title_heading_level: 3,
title_id: "swanky-notifications") do |notification_banner| title_id: "swanky-notifications"
notification_banner.heading(text: flash.notice) ) do |notification_banner|
notification_banner.heading(text: flash.notice)
end %> end %>
<% end %> <% end %>
<%= content_for?(:content) ? yield(:content) : yield %> <%= content_for?(:content) ? yield(:content) : yield %>

2
app/views/layouts/organisations.html.erb

@ -5,7 +5,7 @@
<% items = tab_items(current_user) %> <% items = tab_items(current_user) %>
<%= render TabNavigationComponent.new(items: items) %> <%= render TabNavigationComponent.new(items:) %>
<h2 class="govuk-visually-hidden"><%= content_for(:tab_title) %></h2> <h2 class="govuk-visually-hidden"><%= content_for(:tab_title) %></h2>

2
app/views/organisations/edit.html.erb

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>

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

@ -10,17 +10,21 @@
<% @organisation.display_attributes.each do |attr| %> <% @organisation.display_attributes.each do |attr| %>
<% if current_user.data_coordinator? && attr[:editable] %> <% if current_user.data_coordinator? && attr[:editable] %>
<%= summary_list.row do |row| <%= summary_list.row do |row| %>
row.key { attr[:name].to_s.humanize } <% row.key { attr[:name].to_s.humanize } %>
row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } <% row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } %>
row.action(visually_hidden_text: 'name', href: edit_organisation_path, html_attributes: { 'data-qa': "change-#{attr[:name]}" }) <% row.action(
end %> visually_hidden_text: "name",
href: edit_organisation_path,
html_attributes: { "data-qa": "change-#{attr[:name]}" },
) %>
<% end %>
<% else %> <% else %>
<%= summary_list.row do |row| <%= summary_list.row do |row| %>
row.key { attr[:name].to_s.humanize } <% row.key { attr[:name].to_s.humanize } %>
row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } <% row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } %>
row.action() <% row.action %>
end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

20
app/views/organisations/users.html.erb

@ -9,19 +9,19 @@
<% end %> <% end %>
<%= govuk_table do |table| %> <%= govuk_table do |table| %>
<%= table.head do |head| %> <%= table.head do |head| %>
<%= head.row do |row| <%= head.row do |row| %>
row.cell(header: true, text: "Name and email adress") <% row.cell(header: true, text: "Name and email adress") %>
row.cell(header: true, text: "Organisation and role") <% row.cell(header: true, text: "Organisation and role") %>
row.cell(header: true, text: "Last logged in") <% row.cell(header: true, text: "Last logged in") %>
end %> <% end %>
<% end %> <% end %>
<% @organisation.users.each do |user| %> <% @organisation.users.each do |user| %>
<%= table.body do |body| %> <%= table.body do |body| %>
<%= body.row do |row| <%= body.row do |row| %>
row.cell(text: simple_format(user_cell(user), {}, wrapper_tag: "div")) <% row.cell(text: simple_format(user_cell(user), {}, wrapper_tag: "div")) %>
row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) <% row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %>
row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date) ) <% row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date)) %>
end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>
<% end %> <% end %>

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

@ -10,10 +10,10 @@
<p class="govuk-body">The data will be used to update the national record for social housing. It will also help to inform policy about the cost of social housing and what type of housing needs to be built.</p> <p class="govuk-body">The data will be used to update the national record for social housing. It will also help to inform policy about the cost of social housing and what type of housing needs to be built.</p>
<p class="govuk-body">This service is only for social housing in England.</p> <p class="govuk-body">This service is only for social housing in England.</p>
<% start_path = current_user ? case_logs_path : (user_session_path + "?start=true") %> <% start_path = current_user ? case_logs_path : "#{user_session_path}?start=true" %>
<%= govuk_start_button( <%= govuk_start_button(
text: 'Start now', text: "Start now",
href: start_path href: start_path,
) %> ) %>
<h2 class="govuk-heading-m">Before you start</h2> <h2 class="govuk-heading-m">Before you start</h2>

10
app/views/users/edit.html.erb

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>
@ -25,9 +25,13 @@
spellcheck: "false" %> spellcheck: "false" %>
<% if current_user.data_coordinator? || current_user.support? %> <% if current_user.data_coordinator? || current_user.support? %>
<%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" } %> <%= f.govuk_collection_radio_buttons :role,
roles,
:id,
:name,
legend: { text: "Role", size: "m" } %>
<%= f.govuk_collection_radio_buttons :is_dpo, <%= f.govuk_collection_radio_buttons :is_dpo,
[OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")], [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],

11
app/views/users/new.html.erb

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>
@ -25,8 +25,13 @@
spellcheck: "false", spellcheck: "false",
value: @resource.email %> value: @resource.email %>
<%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" } %>
<%= f.govuk_collection_radio_buttons :role,
roles,
:id,
:name,
legend: { text: "Role", size: "m" } %>
<%= f.govuk_collection_radio_buttons :is_dpo, <%= f.govuk_collection_radio_buttons :is_dpo,
[OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")], [OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],

122
app/views/users/show.html.erb

@ -12,70 +12,86 @@
<%= govuk_summary_list do |summary_list| %> <%= govuk_summary_list do |summary_list| %>
<%= summary_list.row do |row| <%= summary_list.row do |row|
row.key { "Name" } row.key { "Name" }
row.value { @user.name } row.value { @user.name }
if can_edit_names?(@user, current_user) if can_edit_names?(@user, current_user)
row.action(visually_hidden_text: "name", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-name" }) row.action(visually_hidden_text: "name", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-name" })
else else
row.action() row.action
end end
end %> end %>
<%= summary_list.row() do |row| <%= summary_list.row do |row|
row.key { "Email address" } row.key { "Email address" }
row.value { @user.email } row.value { @user.email }
if can_edit_emails?(@user, current_user) if can_edit_emails?(@user, current_user)
row.action(visually_hidden_text: "email address", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-email-address" }) row.action(visually_hidden_text: "email address", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-email-address" })
else else
row.action() row.action
end end
end %> end %>
<%= summary_list.row do |row| <%= summary_list.row do |row|
row.key { "Password" } row.key { "Password" }
row.value { "••••••••" } row.value { "••••••••" }
if can_edit_password?(@user, current_user) if can_edit_password?(@user, current_user)
row.action(visually_hidden_text: "password", href: edit_password_account_path, html_attributes: { "data-qa": "change-password" }) row.action(
else visually_hidden_text: "password",
row.action() href: edit_password_account_path,
end html_attributes: { "data-qa": "change-password" },
end %> )
else
row.action
end
end %>
<%= summary_list.row do |row| <%= summary_list.row do |row|
row.key { "Organisation" } row.key { "Organisation" }
row.value { @user.organisation.name } row.value { @user.organisation.name }
row.action() row.action
end %> end %>
<%= summary_list.row do |row| <%= summary_list.row do |row|
row.key { "Role" } row.key { "Role" }
row.value { @user.role.humanize } row.value { @user.role.humanize }
if can_edit_roles?(@user, current_user) if can_edit_roles?(@user, current_user)
row.action(visually_hidden_text: "role", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-role" }) row.action(
else visually_hidden_text: "role",
row.action() href: aliased_user_edit(@user, current_user),
end html_attributes: { "data-qa": "change-role" },
end %> )
else
row.action
end
end %>
<%= summary_list.row do |row| <%= summary_list.row do |row|
row.key { "Data protection officer" } row.key { "Data protection officer" }
row.value { @user.is_data_protection_officer? ? "Yes" : "No" } row.value { @user.is_data_protection_officer? ? "Yes" : "No" }
if can_edit_dpo?(@user, current_user) if can_edit_dpo?(@user, current_user)
row.action(visually_hidden_text: "are #{pronoun(@user, current_user)} a data protection officer?", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-data-protection-officer" }) row.action(
else visually_hidden_text: "are #{pronoun(@user, current_user)} a data protection officer?",
row.action() href: aliased_user_edit(@user, current_user),
end html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-data-protection-officer" },
end %> )
else
row.action
end
end %>
<%= summary_list.row do |row| <%= summary_list.row do |row|
row.key { "Key contact" } row.key { "Key contact" }
row.value { @user.is_key_contact? ? "Yes" : "No" } row.value { @user.is_key_contact? ? "Yes" : "No" }
if can_edit_key_contact?(@user, current_user) if can_edit_key_contact?(@user, current_user)
row.action(visually_hidden_text: "are #{pronoun(@user, current_user)} a key contact?", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-key-contact" }) row.action(
else visually_hidden_text: "are #{pronoun(@user, current_user)} a key contact?",
row.action() href: aliased_user_edit(@user, current_user),
end html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-key-contact" },
end %> )
else
row.action
end
end %>
<% end %> <% end %>
</div> </div>
</div> </div>

2
spec/features/reset_password.html.erb

@ -2,7 +2,7 @@
<% content_for :before_content do %> <% content_for :before_content do %>
<%= govuk_back_link( <%= govuk_back_link(
text: 'Back', text: "Back",
href: :back, href: :back,
) %> ) %>
<% end %> <% end %>

Loading…
Cancel
Save