diff --git a/src/registrar/assets/sass/_theme/_register-form.scss b/src/registrar/assets/sass/_theme/_register-form.scss
index 6d268d155..8332d17ae 100644
--- a/src/registrar/assets/sass/_theme/_register-form.scss
+++ b/src/registrar/assets/sass/_theme/_register-form.scss
@@ -12,7 +12,7 @@
margin-top: units(1);
}
-.register-form-step h3 {
+.register-form-step h3:not(.text-base-darker) {
color: color('primary-dark');
letter-spacing: $letter-space--xs;
margin-top: units(3);
diff --git a/src/registrar/templates/application_review.html b/src/registrar/templates/application_review.html
index 057df6380..8efd9967d 100644
--- a/src/registrar/templates/application_review.html
+++ b/src/registrar/templates/application_review.html
@@ -20,113 +20,158 @@
{% block form_fields %}
{% for step in steps.all|slice:":-1" %}
-
-
-
-
-
{{ form_titles|get_item:step }}
-
- {% if step == Step.ORGANIZATION_TYPE %}
- {% if application.organization_type is not None %}
- {% with long_org_type=application.organization_type|get_organization_long_name %}
-
{{ long_org_type }}
- {% endwith %}
- {% else %}
-
Incomplete
- {% endif %}
+
+
+ {% if step == Step.ORGANIZATION_TYPE %}
+ {% namespaced_url 'application' step as application_url %}
+ {% if application.organization_type is not None %}
+ {% with title=form_titles|get_item:step value=application.organization_type|get_organization_long_name|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% else %}
+ {% with title=form_titles|get_item:step value="Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
{% endif %}
- {% if step == Step.TRIBAL_GOVERNMENT %}
- {{ application.tribe_name|default:"Incomplete" }}
- {% if application.federally_recognized_tribe %}Federally-recognized tribe
{% endif %}
- {% if application.state_recognized_tribe %}State-recognized tribe
{% endif %}
+ {% endif %}
+
+ {% if step == Step.TRIBAL_GOVERNMENT %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.tribe_name|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% if application.federally_recognized_tribe %}Federally-recognized tribe
{% endif %}
+ {% if application.state_recognized_tribe %}State-recognized tribe
{% endif %}
+ {% endif %}
+
+
+ {% if step == Step.ORGANIZATION_FEDERAL %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.get_federal_type_display|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% endif %}
+
+ {% if step == Step.ORGANIZATION_ELECTION %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.is_election_board|yesno:"Yes,No,Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% endif %}
+
+ {% if step == Step.ORGANIZATION_CONTACT %}
+ {% namespaced_url 'application' step as application_url %}
+ {% if application.organization_name %}
+ {% with title=form_titles|get_item:step value=application %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url address='true' %}
+ {% endwith %}
+ {% else %}
+ {% with title=form_titles|get_item:step value='Incomplete' %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
{% endif %}
- {% if step == Step.ORGANIZATION_FEDERAL %}
- {{ application.get_federal_type_display|default:"Incomplete" }}
+ {% endif %}
+
+ {% if step == Step.ABOUT_YOUR_ORGANIZATION %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.about_your_organization|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% endif %}
+
+ {% if step == Step.AUTHORIZING_OFFICIAL %}
+ {% namespaced_url 'application' step as application_url %}
+ {% if application.authorizing_official is not None %}
+ {% with title=form_titles|get_item:step value=application.authorizing_official %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url contact='true' %}
+ {% endwith %}
+ {% else %}
+ {% with title=form_titles|get_item:step value="Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
{% endif %}
- {% if step == Step.ORGANIZATION_ELECTION %}
- {{ application.is_election_board|yesno:"Yes,No,Incomplete" }}
+ {% endif %}
+
+ {% if step == Step.CURRENT_SITES %}
+ {% namespaced_url 'application' step as application_url %}
+ {% if application.alternative_domains.all %}
+ {% with title=form_titles|get_item:step value=application.current_websites.all %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url list='true' %}
+ {% endwith %}
+ {% else %}
+ {% with title=form_titles|get_item:step value='None' %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
{% endif %}
- {% if step == Step.ORGANIZATION_CONTACT %}
- {% if application.organization_name %}
- {% include "includes/organization_address.html" with organization=application %}
- {% else %}
- Incomplete
- {% endif %}
- {% endif %}
- {% if step == Step.ABOUT_YOUR_ORGANIZATION %}
- {{ application.about_your_organization|default:"Incomplete" }}
- {% endif %}
- {% if step == Step.AUTHORIZING_OFFICIAL %}
- {% if application.authorizing_official %}
-
- {% include "includes/contact.html" with contact=application.authorizing_official %}
-
- {% else %}
- Incomplete
- {% endif %}
- {% endif %}
- {% if step == Step.CURRENT_SITES %}
-
- {% for site in application.current_websites.all %}
+ {% endif %}
+
+ {% if step == Step.DOTGOV_DOMAIN %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.requested_domain.name|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+
+ {% if application.alternative_domains.all %}
+ Alternative domains
+
+ {% for site in application.alternative_domains.all %}
- {{ site.website }}
- {% empty %}
- - None
{% endfor %}
{% endif %}
- {% if step == Step.DOTGOV_DOMAIN %}
-
- - {{ application.requested_domain.name|default:"Incomplete" }}
-
- {% if application.alternative_domains.all %}
-
-
Alternative domains
-
- {% for site in application.alternative_domains.all %}
- - {{ site.website }}
- {% endfor %}
-
-
- {% endif %}
+ {% endif %}
+
+ {% if step == Step.PURPOSE %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.purpose|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% endif %}
+
+ {% if step == Step.YOUR_CONTACT %}
+ {% namespaced_url 'application' step as application_url %}
+ {% if application.submitter is not None %}
+ {% with title=form_titles|get_item:step value=application.submitter %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url contact='true' %}
+ {% endwith %}
+ {% else %}
+ {% with title=form_titles|get_item:step value="Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
{% endif %}
- {% if step == Step.PURPOSE %}
- {{ application.purpose|default:"Incomplete" }}
+ {% endif %}
+
+ {% if step == Step.OTHER_CONTACTS %}
+ {% namespaced_url 'application' step as application_url %}
+ {% if application.other_contacts.all %}
+ {% with title=form_titles|get_item:step value=application.other_contacts.all %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url contact='true' list='true' %}
+ {% endwith %}
+ {% else %}
+ {% with title=form_titles|get_item:step value=application.no_other_contacts_rationale|default:"Incomplete" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
{% endif %}
- {% if step == Step.YOUR_CONTACT %}
- {% if application.submitter %}
-
- {% include "includes/contact.html" with contact=application.submitter %}
-
- {% else %}
- Incomplete
- {% endif %}
- {% endif %}
- {% if step == Step.OTHER_CONTACTS %}
- {% for other in application.other_contacts.all %}
-
-
Contact {{ forloop.counter }}
- {% include "includes/contact.html" with contact=other %}
-
- {% empty %}
-
-
No other employees from your organization?
-
{{ application.no_other_contacts_rationale|default:"Incomplete" }}
-
- {% endfor %}
- {% endif %}
- {% if step == Step.ANYTHING_ELSE %}
- {{ application.anything_else|default:"No" }}
- {% endif %}
- {% if step == Step.REQUIREMENTS %}
- {{ application.is_policy_acknowledged|yesno:"I agree.,I do not agree.,I do not agree." }}
- {% endif %}
-
-
-
Edit {{ form_titles|get_item:step }}
-
+ {% endif %}
+
+
+ {% if step == Step.ANYTHING_ELSE %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.anything_else|default:"No" %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% endif %}
+
+
+ {% if step == Step.REQUIREMENTS %}
+ {% namespaced_url 'application' step as application_url %}
+ {% with title=form_titles|get_item:step value=application.is_policy_acknowledged|yesno:"I agree.,I do not agree.,I do not agree." %}
+ {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=True edit_link=application_url %}
+ {% endwith %}
+ {% endif %}
+
+
+
{% endfor %}
{% endblock %}
diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index 53364d1b2..657f3c29b 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -31,8 +31,10 @@