Browse Source

Update styling and lint

CLDC-3465-update-setup-question-link
Kat 9 months ago
parent
commit
258b133286
  1. 8
      app/frontend/styles/_button.scss
  2. 8
      app/frontend/styles/application.scss
  3. 2
      app/views/check_errors/confirm_clear_answer.html.erb
  4. 89
      app/views/form/check_errors.html.erb
  5. 2
      app/views/form/page.html.erb

8
app/frontend/styles/_button.scss

@ -29,3 +29,11 @@ $app-button-inverse-hover-background-colour: govuk-tint($app-button-inverse-fore
background-color: $app-button-inverse-hover-background-colour; background-color: $app-button-inverse-hover-background-colour;
box-shadow: inset 0 0 0 2px $govuk-focus-colour; box-shadow: inset 0 0 0 2px $govuk-focus-colour;
} }
.submit-button-link {
background: none;
border: none;
color: #1d70b8;
text-decoration: underline;
cursor: pointer;
}

8
app/frontend/styles/application.scss

@ -81,11 +81,3 @@ $govuk-breakpoints: (
.govuk-footer { .govuk-footer {
border-top: govuk-spacing(2) solid $govuk-brand-colour; border-top: govuk-spacing(2) solid $govuk-brand-colour;
} }
.submit-button-link {
background: none;
border: none;
color: #1d70b8;
text-decoration: underline;
cursor: pointer;
}

2
app/views/check_errors/confirm_clear_answer.html.erb

@ -17,7 +17,7 @@
<%= f.hidden_field :clear_question_id, value: @question.id %> <%= f.hidden_field :clear_question_id, value: @question.id %>
<%= f.hidden_field :page, value: @page.id %> <%= f.hidden_field :page, value: @page.id %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<%= f.govuk_submit "Confirm and continue", name: "check_errors" %> <%= f.govuk_submit "Confirm and continue", name: "check_errors" %>
<%= govuk_button_link_to( <%= govuk_button_link_to(

89
app/views/form/check_errors.html.erb

@ -1,63 +1,66 @@
<div class="govuk-grid-row"> <div class="govuk-grid-row">
<div class="govuk-grid-column-three-quarters-from-desktop"> <div class="govuk-grid-column-three-quarters-from-desktop">
<%= form_with model: @log, url: lettings_log_confirm_clear_answer_path(@log), method: "post", local: true do |f| %> <%= form_with model: @log, url: lettings_log_confirm_clear_answer_path(@log), method: "post", local: true do |f| %>
<%= f.govuk_error_summary %> <%= f.govuk_error_summary %>
<%= f.hidden_field :page_id, value: @page.id %> <%= f.hidden_field :page_id, value: @page.id %>
<h1 class="govuk-heading-m govuk-!-margin-bottom-6"> <h1 class="govuk-heading-m">
<span class="govuk-grid-column-two-thirds"> <div class="govuk-grid-row">
Make sure these answers are correct: <span class="govuk-grid-column-two-thirds">
</span> Make sure these answers are correct:
<span class="govuk-body govuk-!-text-align-right govuk-grid-column-one-third"> </span>
<%= govuk_link_to "Clear all", lettings_log_confirm_clear_all_answers_path(@log) %> <span class="govuk-body govuk-!-text-align-right govuk-grid-column-one-third">
</span> <%= govuk_link_to "Clear all", lettings_log_confirm_clear_all_answers_path(@log) %>
</span>
</div>
</h1> </h1>
<div class="govuk-summary-card__content"> <div class="govuk-summary-card">
<% applicable_questions = @questions.reject { |q| q.hidden_in_check_answers?(@log, current_user) }%> <div class="govuk-summary-card__content">
<% applicable_questions.each do |question| %> <% applicable_questions = @questions.reject { |q| q.hidden_in_check_answers?(@log, current_user) } %>
<%= f.hidden_field question.id, value: @log[question.id] %>
<dl class="govuk-summary-list"> <dl class="govuk-summary-list">
<div class="govuk-summary-list__row"> <% applicable_questions.each do |question| %>
<dt class="govuk-summary-list__key"> <%= f.hidden_field question.id, value: @log[question.id] %>
<%= get_question_label(question) %> <div class="govuk-summary-list__row">
</dt> <dt class="govuk-summary-list__key">
<dd class="govuk-summary-list__value"> <%= get_question_label(question) %>
<%= simple_format( </dt>
get_answer_label(question, @log), <dd class="govuk-summary-list__value">
wrapper_tag: "span", <%= simple_format(
class: "govuk-!-margin-right-4", get_answer_label(question, @log),
) %>
<% extra_value = question.get_extra_check_answer_value(@log) %>
<% if extra_value && question.answer_label(@log).present? %>
<%= simple_format(
extra_value,
wrapper_tag: "span", wrapper_tag: "span",
class: "govuk-!-font-weight-regular app-!-colour-muted", class: "govuk-!-margin-right-4",
) %> ) %>
<% end %>
<% question.get_inferred_answers(@log).each do |inferred_answer| %> <% extra_value = question.get_extra_check_answer_value(@log) %>
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
<% if extra_value && question.answer_label(@log).present? %>
<%= simple_format(
extra_value,
wrapper_tag: "span",
class: "govuk-!-font-weight-regular app-!-colour-muted",
) %>
<% end %>
<% question.get_inferred_answers(@log).each do |inferred_answer| %>
<span class="govuk-!-font-weight-regular app-!-colour-muted"><%= inferred_answer %></span>
<% end %>
</dd>
<dd class="govuk-summary-list__actions">
<% if question.displayed_as_answered?(@log) %>
<input type="submit" value="Clear" name=<%= question.id %> class="govuk-body govuk-link submit-button-link" >
<% else %>
<%= govuk_link_to "Answer", send("#{@log.model_name.param_key}_#{question.page.id}_path", @log, referrer: "check_errors", original_page_id: @page.id, related_question_ids: applicable_questions.map(&:id)) %>
<% end %> <% end %>
</dd> </dd>
<dd class="govuk-summary-list__actions"> </div>
<% if question.displayed_as_answered?(@log) %> <% end %>
<input type="submit" value="Clear" name=<%= question.id %> class="govuk-body govuk-link submit-button-link" >
<% else %>
<%= govuk_link_to "Answer", send("#{@log.model_name.param_key}_#{question.page.id}_path", @log, referrer: "check_errors", original_page_id: @page.id, related_question_ids: applicable_questions.map(&:id)) %>
<% end %>
</dd>
</div>
</dl> </dl>
<% end %> </div>
</div> </div>
<% end %> <% end %>
<%= govuk_button_link_to "Confirm and continue", "/" %> <%= govuk_button_link_to "Confirm and continue", "/" %>
</div> </div>
</div> </div>

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

@ -78,7 +78,7 @@
<% if all_questions_with_errors.count > 1 %> <% if all_questions_with_errors.count > 1 %>
<div class="govuk-button-group"> <div class="govuk-button-group">
<%= f.govuk_submit "See all related answers", :name => "check_errors", secondary: true %> <%= f.govuk_submit "See all related answers", name: "check_errors", secondary: true, class: "govuk-body govuk-link submit-button-link" %>
</div> </div>
<% end %> <% end %>

Loading…
Cancel
Save