Merge branch 'main' into page-params

app/views/admin/form_answers/list_components/_table_body.html.slim

@@ -5,10 +5,10 @@
       td.govuk-table__cell = check_box_tag "check_#{obj.id}", obj.id, false, class: "form-answer-check", aria: { label: "Select nomination #{obj.id} for bulk action" }
     td.td-title.govuk-table__cell
       - if obj.company_or_nominee_name.present?
-        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: "View submitted nomination for #{obj.company_or_nominee_name}" }, class: 'govuk-link' do
+        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: "View submitted nomination for #{obj.company_or_nominee_name}" }, class: 'govuk-link', target: :_blank do
           = obj.company_or_nominee_name
       - else
-        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: "View submitted nomination, nominee name not yet specified" }, class: 'govuk-link' do
+        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: "View submitted nomination, nominee name not yet specified" }, class: 'govuk-link', target: :_blank do
           em
             ' Not yet specified
     td.govuk-table__cell = obj.dashboard_status
@@ -35,5 +35,5 @@
           = obj.last_updated_by
     td.govuk-table__cell
       - aria_label = obj.company_or_nominee_name.present? ? "View submitted nomination, for #{obj.company_or_nominee_name}" : "View submitted nomination, nominee name not yet specified"
-      = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: aria_label }, class: 'govuk-link' do
+      = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: aria_label }, class: 'govuk-link', target: :_blank do
         | View

app/views/assessor/dashboard/index.html.slim

@@ -15,6 +15,14 @@
 
       hr.govuk-section-break.govuk-section-break--m
 
+      p.govuk-body You can download the local assessment guide, which provides helpful tips on approaching the assessment and completing your report.
+      .govuk-body
+        = link_to "Download KAVS local assessment guide (PDF)",
+                  "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%20Guidance%20for%20LLs%202024.pdf",
+                  class: "download-link govuk-link govuk-link--no-visited-state",
+                  rel: "noreferrer noopener",
+                  target: :_blank
+
       / details.govuk-details data-module="govuk-details"
       /   summary.govuk-details__summary
       /     span.govuk-details__summary-text
@@ -32,4 +40,38 @@
       .button
         = link_to "Start reviewing nominations", assessor_form_answers_url, class: "govuk-button govuk-button--start"
 
-      hr.govuk-section-break.govuk-section-break--m
+      hr.govuk-section-break.govuk-section-break--m.govuk-section-break--visible
+
+      .govuk-grid-row
+    .govuk-grid-column-two-thirds
+      h2.govuk-heading-m
+        | Other useful resources
+      p.govuk-body
+        | You can also download promotional materials to help raise awareness of the award.
+      .govuk-body
+        = link_to "Download the KAVS leaflet and other promotional materials",
+                  "https://storage.googleapis.com/lord-lieutenant-guidance/KAVS%202%20page%20flyer.pdf",
+                  class: "download-link govuk-link govuk-link--no-visited-state",
+                  rel: "noreferrer noopener",
+                  target: :_blank
+      br
+      p.govuk-body
+        | We will share information with the successful groups directly. However, you can also find the materials to download below.
+      .govuk-body
+        = link_to "Download the KAVS logos and Guidelines",
+                  "https://kavs.dcms.gov.uk/the-kings-award-for-voluntary-service-emblem-guidelines",
+                  class: "download-link govuk-link govuk-link--no-visited-state",
+                  rel: "noreferrer noopener",
+                  target: :_blank
+
+      details.govuk-details data-module="govuk-details"
+        summary.govuk-details__summary
+          span.govuk-details__summary-text
+            | Get accessible format of the logo guidelines
+        .govuk-details__text
+          p.govuk-body If you use assistive technology, such as a screen reader, you can use an accessible PDF version of the logo guidelines.
+          = link_to "Download KAVS emblem guidelines 2024 (PDF)",
+                    "https://storage.googleapis.com/lord-lieutenant-guidance/Accessible%20-%20KAVS%20Emblem%20Guidelines%202023.pdf",
+                    class: "download-link govuk-link govuk-link--no-visited-state",
+                    rel: "noreferrer noopener",
+                    target: :_blank

app/views/assessor/form_answers/_list_body.html.slim

@@ -2,7 +2,7 @@ tbody.govuk-table__body
   - FormAnswerDecorator.decorate_collection(@form_answers).each do |obj|
     tr.govuk-table__row
       th.govuk-table__header scope="row"
-        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), class: 'govuk-link' do
+        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), class: 'govuk-link', target: :_blank do
           - unless obj.nominee_name.nil?
             span
               = obj.nominee_name
@@ -33,5 +33,5 @@ tbody.govuk-table__body
 
       td.govuk-table__cell
         - aria_label = obj.company_or_nominee_name.present? ? "View submitted nomination, for #{obj.company_or_nominee_name}" : "View submitted nomination, nominee name not yet specified"
-        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: aria_label }, class: 'govuk-link' do
+        = link_to polymorphic_url([namespace_name, obj], search_id: params[:search_id], year: params[:year], page: params[:page]), aria: { label: aria_label }, class: 'govuk-link', target: :_blank do
           | View