From 4c710b6b12f321dd0f38f639375372f96a93d9ec Mon Sep 17 00:00:00 2001
From: Jonathan Bobel <jonathan.bobel@gsa.gov>
Date: Tue, 10 Dec 2024 12:21:01 -0500
Subject: [PATCH] 2133 - small a11y updates

---
 app/main/views/send.py                        | 91 +++++++++++++------
 .../components/back-link/template.njk         |  4 +-
 app/templates/views/send.html                 | 10 +-
 3 files changed, 71 insertions(+), 34 deletions(-)

diff --git a/app/main/views/send.py b/app/main/views/send.py
index a6601840da..436f2bec1a 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -174,12 +174,25 @@ def send_messages(service_id, template_id):
         flash(error_message)
     column_headings = get_spreadsheet_column_headings_from_template(template)
 
+    params = {
+        "href": {
+            "url": url_for(
+                "main.send_one_off",
+                service_id=current_service.id,
+                template_id=template.id,
+            ),
+            "text": "Back to Select recipients",
+        },
+        "classes": "usa-link usa-back-link",
+    }
+
     return render_template(
         "views/send.html",
         template=template,
         column_headings=list(ascii_uppercase[: len(column_headings)]),
         example=[column_headings, get_example_csv_rows(template)],
         form=form,
+        params=params,
         allowed_file_extensions=Spreadsheet.ALLOWED_FILE_EXTENSIONS,
         remaining_messages=remaining_messages,
     )
@@ -466,6 +479,14 @@ def send_one_off_step(service_id, template_id, step_index):
 
     back_link = get_back_link(service_id, template, step_index, placeholders)
 
+    # # Construct params for the template
+    # params = {
+    #     "href": back_link["url"],  # Use the URL from get_back_link
+    #     "text": back_link["text"],  # Use the text from get_back_link
+    #     "classes": "usa-link usa-back-link display-inline-flex",
+    #     "attributes": {},  # Add any additional attributes if needed
+    # }
+
     template.values = template_values
     template.values[current_placeholder] = None
 
@@ -743,39 +764,46 @@ def get_send_test_page_title(template_type, entering_recipient, name=None):
     return "Personalize this message"
 
 
-def get_back_link(
-    service_id,
-    template,
-    step_index,
-    placeholders=None,
-    preview=False,
-):
+def get_back_link(service_id, template, step_index, placeholders=None, preview=False):
     if preview:
-        return url_for(
-            "main.check_notification",
-            service_id=service_id,
-            template_id=template.id,
-        )
+        return {
+            "url": url_for(
+                "main.check_notification",
+                service_id=service_id,
+                template_id=template.id,
+            ),
+            "text": "Back to Select delivery time",
+        }
 
     if step_index == 0:
         if should_skip_template_page(template._template):
-            return url_for(
-                ".choose_template",
-                service_id=service_id,
-            )
+            return {
+                "url": url_for(
+                    "main.view_template",
+                    service_id=service_id,
+                    template_id=template.id,
+                ),
+                "text": "Back to View Template",  # Dummy text for skipping template page
+            }
         else:
-            return url_for(
-                ".view_template",
-                service_id=service_id,
-                template_id=template.id,
-            )
+            return {
+                "url": url_for(
+                    ".choose_template",
+                    service_id=service_id,
+                ),
+                "text": "Back to Select or create a template",  # Dummy text for choosing template
+            }
 
-    return url_for(
-        "main.send_one_off_step",
-        service_id=service_id,
-        template_id=template.id,
-        step_index=step_index - 1,
-    )
+    # For all other steps
+    return {
+        "url": url_for(
+            "main.send_one_off_step",
+            service_id=service_id,
+            template_id=template.id,
+            step_index=step_index - 1,
+        ),
+        "text": "Back to Personalize this message",  # Dummy text for previous steps
+    }
 
 
 def get_skip_link(step_index, template):
@@ -1104,3 +1132,12 @@ def get_recipient():
     return session["recipient"] or InsensitiveDict(session["placeholders"]).get(
         "address line 1"
     )
+
+params = {
+    "href": {
+        "url": url_for("main.some_view", service_id=service_id),
+        "text": "Back to some view",
+    }
+}
+print(json.dumps(params, indent=2))  # Add this for debugging
+return render_template("views/template.html", params=params)
diff --git a/app/templates/components/components/back-link/template.njk b/app/templates/components/components/back-link/template.njk
index aba4e4d956..396e46ef1c 100644
--- a/app/templates/components/components/back-link/template.njk
+++ b/app/templates/components/components/back-link/template.njk
@@ -1,4 +1,4 @@
 <nav class="usa-breadcrumb" aria-label="Breadcrumb">
-  <a href="{{ params.href or '#' }}" class="usa-link usa-back-link display-inline-flex {{ params.classes or '' }}"
-  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}" {% endfor %}>{{ params.html | safe or params.text or 'Back' }}</a>
+  <a href="{{ params.href.url or '#' }}" class="usa-link usa-back-link display-inline-flex {{ params.classes or '' }}"
+  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}" {% endfor %}>{{ params.html | safe or params.href.text or 'Back' }}</a>
 </nav>
diff --git a/app/templates/views/send.html b/app/templates/views/send.html
index b8a0c65610..afc97935ae 100644
--- a/app/templates/views/send.html
+++ b/app/templates/views/send.html
@@ -12,7 +12,7 @@
 
 
 {% block backLink %}
-  {{ usaBackLink({ "href": url_for('main.send_one_off', service_id=current_service.id, template_id=template.id) }) }}
+  {{ usaBackLink(params) }}
 {% endblock %}
 
 {% block maincolumn_content %}
@@ -31,10 +31,10 @@
   <h2 class="font-body-lg">Your file needs to look like this example</h2>
   <p class="hint">
     Save your file as a
-    <acronym title="Comma Separated Values">CSV</acronym>,
-    <acronym title="Tab Separated Values">TSV</acronym>,
-    <acronym title="Open Document Spreadsheet">ODS</acronym>,
-    or Microsoft Excel spreadsheet
+    <abbr title="Comma Separated Values">CSV</abbr><span aria-hidden="true">, </span>
+    <abbr title="Tab Separated Values">TSV</abbr><span aria-hidden="true">, </span>
+    <abbr title="Open Document Spreadsheet">ODS</abbr>
+    or Microsoft Excel spreadsheet.
   </p>
 
   <div class="spreadsheet" data-module="fullscreen-table">