diff --git a/.vscode/settings.json b/.vscode/settings.json
index 650e65b0f..b3ff8e30d 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,12 +1,10 @@
{
- "djlint.guessProfile": false,
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
- "[html]": {
- "editor.defaultFormatter": "monosans.djlint"
- },
- "[django-html]": {
- "editor.defaultFormatter": "monosans.djlint"
+ "[django-html][html]": {
+ "editor.defaultFormatter": "monosans.djlint",
+ "djlint.enableLinting": true,
+ "djlint.profile": "django"
},
"files.encoding": "utf8",
"files.eol": "\n",
diff --git a/benefits/core/migrations/0001_initial.py b/benefits/core/migrations/0001_initial.py
index ccbf07160..ee5978058 100644
--- a/benefits/core/migrations/0001_initial.py
+++ b/benefits/core/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.3 on 2023-07-08 02:54
+# Generated by Django 4.2.3 on 2023-07-11 17:22
from django.db import migrations, models
import django.db.models.deletion
@@ -109,7 +109,7 @@ class Migration(migrations.Migration):
("phone", models.TextField()),
("active", models.BooleanField(default=False)),
("jws_signing_alg", models.TextField()),
- ("eligibility_index_intro", models.TextField()),
+ ("eligibility_index_template", models.TextField()),
("transit_type", models.TextField()),
("eligibility_types", models.ManyToManyField(to="core.eligibilitytype")),
("eligibility_verifiers", models.ManyToManyField(to="core.eligibilityverifier")),
diff --git a/benefits/core/migrations/0002_data.py b/benefits/core/migrations/0002_data.py
index 49a6e66cb..0c883978d 100644
--- a/benefits/core/migrations/0002_data.py
+++ b/benefits/core/migrations/0002_data.py
@@ -263,7 +263,7 @@ def load_data(app, *args, **kwargs):
public_key=client_public_key,
jws_signing_alg=os.environ.get("MST_AGENCY_JWS_SIGNING_ALG", "RS256"),
payment_processor=mst_payment_processor,
- eligibility_index_intro=_("eligibility.pages.index.p[0].mst"),
+ eligibility_index_template="eligibility/index--mst.html",
transit_type=_("agency.variables.mst.transit_type"),
)
mst_agency.eligibility_types.set([mst_senior_type, mst_veteran_type, mst_courtesy_card_type])
@@ -282,7 +282,7 @@ def load_data(app, *args, **kwargs):
public_key=client_public_key,
jws_signing_alg=os.environ.get("SACRT_AGENCY_JWS_SIGNING_ALG", "RS256"),
payment_processor=sacrt_payment_processor,
- eligibility_index_intro=_("eligibility.pages.index.p[0].sacrt"),
+ eligibility_index_template="eligibility/index--sacrt.html",
transit_type=_("agency.variables.sacrt.transit_type"),
)
sacrt_agency.eligibility_types.set([sacrt_senior_type])
diff --git a/benefits/core/models.py b/benefits/core/models.py
index ded6b80f3..eee1962af 100644
--- a/benefits/core/models.py
+++ b/benefits/core/models.py
@@ -198,7 +198,7 @@ class TransitAgency(models.Model):
public_key = models.ForeignKey(PemData, related_name="+", on_delete=models.PROTECT)
# The JWS-compatible signing algorithm
jws_signing_alg = models.TextField()
- eligibility_index_intro = models.TextField()
+ eligibility_index_template = models.TextField()
transit_type = models.TextField()
def __str__(self):
diff --git a/benefits/core/templates/core/includes/button__previous_page.html b/benefits/core/templates/core/includes/button--previous-page.html
similarity index 100%
rename from benefits/core/templates/core/includes/button__previous_page.html
rename to benefits/core/templates/core/includes/button--previous-page.html
diff --git a/benefits/eligibility/templates/eligibility/index--mst.html b/benefits/eligibility/templates/eligibility/index--mst.html
new file mode 100644
index 000000000..c8100345b
--- /dev/null
+++ b/benefits/eligibility/templates/eligibility/index--mst.html
@@ -0,0 +1,7 @@
+{% extends "eligibility/index.html" %}
+
+{% load i18n %}
+
+{% block explanatory-text %}
+ {% translate "eligibility.pages.index.intro.mst" %}
+{% endblock explanatory-text %}
diff --git a/benefits/eligibility/templates/eligibility/index--sacrt.html b/benefits/eligibility/templates/eligibility/index--sacrt.html
new file mode 100644
index 000000000..fb75a577c
--- /dev/null
+++ b/benefits/eligibility/templates/eligibility/index--sacrt.html
@@ -0,0 +1,7 @@
+{% extends "eligibility/index.html" %}
+
+{% load i18n %}
+
+{% block explanatory-text %}
+ {% translate "eligibility.pages.index.intro.sacrt" %}
+{% endblock explanatory-text %}
diff --git a/benefits/eligibility/templates/eligibility/index.html b/benefits/eligibility/templates/eligibility/index.html
index a6330e9dc..835c114d2 100644
--- a/benefits/eligibility/templates/eligibility/index.html
+++ b/benefits/eligibility/templates/eligibility/index.html
@@ -1,25 +1,30 @@
{% extends "core/base.html" %}
+{% load i18n %}
{% block classes %}
{{ block.super | add:" eligibility-index" }}
{% endblock classes %}
+{% block page_title %}
+ {% translate "eligibility.pages.index.title" %} |
+{% endblock page_title %}
+
{% block nav-buttons %}
- {% include "core/includes/previous-page-link.html" %}
+ {% url "core:index" as url %}
+ {% include "core/includes/button--previous-page.html" with url=url %}
{% endblock nav-buttons %}
+{% block headline %}
+
+
{% translate "eligibility.pages.index.headline" %}
+
+{% endblock headline %}
+
{% block explanatory-text %}
- {% for p in page.paragraphs %}{{ p }}
{% endfor %}
{% endblock explanatory-text %}
{% block inner-content %}
-
- {% block forms %}
- {% for f in page.forms %}
- {% include "core/includes/form.html" with form=f %}
- {% endfor %}
- {% endblock forms %}
-
+
{% include "core/includes/form.html" with form=form %}