feat: add 24/25 forms, shrink tab header font size and tidy up routes.rb

app/frontend/styles/_document-list.scss

@@ -11,6 +11,10 @@
   }
 }
 
+.app-document-list__tab {
+  @include govuk-font($size: 16);
+}
+
 .app-document-list__item-title {
   @include govuk-font($size: 16);
   margin: 0 0 govuk-spacing(1);

app/views/layouts/_collection_resources.html.erb

@@ -5,7 +5,47 @@
   <h2 class="govuk-heading-m">Collection resources</h2>
 <% end %>
 <p class="govuk-body">Use the 2023 to 2024 forms for lettings that start and sales that complete between 1 April 2023 and 31 March 2024.</p>
-<%= govuk_tabs(title: "Collection resources") do |c| %>
+<%= govuk_tabs(title: "Collection resources", classes: ["app-document-list__tab"]) do |c| %>
+  <% if FormHandler.instance.lettings_form_for_start_year(2024) && FormHandler.instance.lettings_form_for_start_year(2024).edit_end_date > Time.zone.today %>
+    <% c.with_tab(label: "Lettings 2024/25") do %>
+      <%= render DocumentListComponent.new(items: [
+        {
+          name: "Download the lettings log for tenants (2024 to 2025)",
+          href: download_24_25_lettings_form_path,
+          metadata: file_type_size_and_pages("2024_25_lettings_paper_form.pdf", number_of_pages: 8),
+        },
+        {
+          name: "Download the lettings bulk upload template (2024 to 2025) – New question ordering",
+          href: download_24_25_lettings_bulk_upload_template_path,
+          metadata: file_type_size_and_pages("bulk-upload-lettings-template-2024-25.xlsx"),
+        },
+        {
+          name: "Download the lettings bulk upload specification (2024 to 2025)",
+          href: download_24_25_lettings_bulk_upload_specification_path,
+          metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2024-25.xlsx"),
+        },
+      ]) %>
+    <% end %>
+    <% c.with_tab(label: "Sales 2024/25") do %>
+      <%= render DocumentListComponent.new(items: [
+        {
+          name: "Download the sales log for buyers (2024 to 2025)",
+          href: download_24_25_sales_form_path,
+          metadata: file_type_size_and_pages("2024_25_sales_paper_form.pdf", number_of_pages: 8),
+        },
+        {
+          name: "Download the sales bulk upload template (2024 to 2025) – New question ordering",
+          href: download_24_25_sales_bulk_upload_template_path,
+          metadata: file_type_size_and_pages("bulk-upload-sales-template-2024-25.xlsx"),
+        },
+        {
+          name: "Download the sales bulk upload specification (2024 to 2025)",
+          href: download_24_25_sales_bulk_upload_specification_path,
+          metadata: file_type_size_and_pages("bulk-upload-sales-specification-2024-25.xlsx"),
+        },
+      ]) %>
+    <% end %>
+  <% end %>
   <% if FormHandler.instance.lettings_form_for_start_year(2023) && FormHandler.instance.lettings_form_for_start_year(2023).edit_end_date > Time.zone.today %>
     <% c.with_tab(label: "Lettings 2023/24") do %>
       <%= render DocumentListComponent.new(items: [

config/routes.rb

@@ -39,23 +39,32 @@ Rails.application.routes.draw do
   get "/service-moved", to: "maintenance#service_moved"
   get "/service-unavailable", to: "maintenance#service_unavailable"
 
-  get "/download-23-24-lettings-form", to: "start#download_23_24_lettings_form"
   get "/download-22-23-lettings-form", to: "start#download_22_23_lettings_form"
+  get "/download-22-23-lettings-bulk-upload-template", to: "start#download_22_23_lettings_bulk_upload_template"
+  get "/download-22-23-lettings-bulk-upload-specification", to: "start#download_22_23_lettings_bulk_upload_specification"
+
+  get "/download-22-23-sales-form", to: "start#download_22_23_sales_form"
+  get "/download-22-23-sales-bulk-upload-template", to: "start#download_22_23_sales_bulk_upload_template"
+  get "/download-22-23-sales-bulk-upload-specification", to: "start#download_22_23_sales_bulk_upload_specification"
+
+  get "/download-23-24-lettings-form", to: "start#download_23_24_lettings_form"
   get "/download-23-24-lettings-bulk-upload-template", to: "start#download_23_24_lettings_bulk_upload_template"
   get "/download-23-24-lettings-bulk-upload-legacy-template", to: "start#download_23_24_lettings_bulk_upload_legacy_template"
   get "/download-23-24-lettings-bulk-upload-specification", to: "start#download_23_24_lettings_bulk_upload_specification"
 
-  get "/download-22-23-lettings-bulk-upload-template", to: "start#download_22_23_lettings_bulk_upload_template"
-  get "/download-22-23-lettings-bulk-upload-specification", to: "start#download_22_23_lettings_bulk_upload_specification"
-
   get "/download-23-24-sales-form", to: "start#download_23_24_sales_form"
-  get "/download-22-23-sales-form", to: "start#download_22_23_sales_form"
   get "/download-23-24-sales-bulk-upload-template", to: "start#download_23_24_sales_bulk_upload_template"
   get "/download-23-24-sales-bulk-upload-legacy-template", to: "start#download_23_24_sales_bulk_upload_legacy_template"
   get "/download-23-24-sales-bulk-upload-specification", to: "start#download_23_24_sales_bulk_upload_specification"
 
-  get "/download-22-23-sales-bulk-upload-template", to: "start#download_22_23_sales_bulk_upload_template"
-  get "/download-22-23-sales-bulk-upload-specification", to: "start#download_22_23_sales_bulk_upload_specification"
+  get "/download-24-25-lettings-form", to: "start#download_24_25_lettings_form"
+  get "/download-24-25-lettings-bulk-upload-template", to: "start#download_24_25_lettings_bulk_upload_template"
+  get "/download-24-25-lettings-bulk-upload-specification", to: "start#download_24_25_lettings_bulk_upload_specification"
+
+  get "/download-24-25-sales-form", to: "start#download_24_25_sales_form"
+  get "/download-24-25-sales-bulk-upload-template", to: "start#download_24_25_sales_bulk_upload_template"
+  get "/download-24-25-sales-bulk-upload-specification", to: "start#download_24_25_sales_bulk_upload_specification"
+
 
   get "clear-filters", to: "sessions#clear_filters"