diff --git a/src/registrar/templates/application_status.html b/src/registrar/templates/application_status.html index 054e04460..3d0f44a9f 100644 --- a/src/registrar/templates/application_status.html +++ b/src/registrar/templates/application_status.html @@ -4,11 +4,11 @@ {% load static url_helpers %} {% block content %} -
+

Domain request for {{ domainapplication.requested_domain.name }}

@@ -38,11 +38,11 @@

Summary of your domain request

- - {% include "includes/summary_item.html" with title='Type of organization' value=domainapplication.get_organization_type_display %} + {% with heading_level='h3' %} + {% include "includes/summary_item.html" with title='Type of organization' value=domainapplication.get_organization_type_display heading_level=heading_level %} {% if domainapplication.tribe_name %} - {% include "includes/summary_item.html" with title='Tribal government' value=domainapplication.tribe_name %} + {% include "includes/summary_item.html" with title='Tribal government' value=domainapplication.tribe_name heading_level=heading_level %} {% if domainapplication.federally_recognized_tribe %}

Federally-recognized tribe

@@ -55,44 +55,46 @@ {% endif %} {% if domainapplication.get_federal_type_display %} - {% include "includes/summary_item.html" with title='Federal government branch' value=domainapplication.get_federal_type_display %} + {% include "includes/summary_item.html" with title='Federal government branch' value=domainapplication.get_federal_type_display heading_level=heading_level %} {% endif %} {% if domainapplication.is_election_board %} - {% include "includes/summary_item.html" with title='Election office' value=domainapplication.is_election_board %} + {% include "includes/summary_item.html" with title='Election office' value=domainapplication.is_election_board heading_level=heading_level %} {% endif %} {% if domainapplication.organization_name %} - {% include "includes/summary_item.html" with title='Organization name and mailing address' value=domainapplication address='true' %} + {% include "includes/summary_item.html" with title='Organization name and mailing address' value=domainapplication address='true' heading_level=heading_level %} {% endif %} {% if domainapplication.type_of_work %} - {% include "includes/summary_item.html" with title='Type of work' value=domainapplication.type_of_work %} + {% include "includes/summary_item.html" with title='Type of work' value=domainapplication.type_of_work heading_level=heading_level %} {% endif %} {% if domainapplication.more_organization_information %} - {% include "includes/summary_item.html" with title='More information about your organization' value=domainapplication.more_organization_information %} + {% include "includes/summary_item.html" with title='More information about your organization' value=domainapplication.more_organization_information heading_level=heading_level %} {% endif %} {% if domainapplication.authorizing_official %} - {% include "includes/summary_item.html" with title='Authorizing official' value=domainapplication.authorizing_official contact='true' %} + {% include "includes/summary_item.html" with title='Authorizing official' value=domainapplication.authorizing_official contact='true' heading_level=heading_level %} {% endif %} {% if domainapplication.current_websites.all %} - {% include "includes/summary_item.html" with title='Current website for your organization' value=domainapplication.current_websites.all list='true' %} + {% include "includes/summary_item.html" with title='Current website for your organization' value=domainapplication.current_websites.all list='true' heading_level=heading_level %} {% endif %} {% if domainapplication.purpose %} - {% include "includes/summary_item.html" with title='Purpose of your domain' value=domainapplication.purpose %} + {% include "includes/summary_item.html" with title='Purpose of your domain' value=domainapplication.purpose heading_level=heading_level %} {% endif %} {% if domainapplication.submitter %} - {% include "includes/summary_item.html" with title='Your contact information' value=domainapplication.submitter contact='true'%} + {% include "includes/summary_item.html" with title='Your contact information' value=domainapplication.submitter contact='true' heading_level=heading_level %} {% endif %} - {% include "includes/summary_item.html" with title='Other employees from your organization' value=domainapplication.other_contacts.all contact='true' list='true' %} - {% include "includes/summary_item.html" with title='Anything else we should know' value=domainapplication.anything_else|default:"No" %} + {% include "includes/summary_item.html" with title='Other employees from your organization' value=domainapplication.other_contacts.all contact='true' list='true' heading_level=heading_level %} + {% include "includes/summary_item.html" with title='Anything else we should know' value=domainapplication.anything_else|default:"No" heading_level=heading_level %} + + {% endwith %}
diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html index 9efa0e2a4..a2035b227 100644 --- a/src/registrar/templates/includes/summary_item.html +++ b/src/registrar/templates/includes/summary_item.html @@ -2,66 +2,87 @@
-

- {{ title }} -

- {% if address %} - {% include "includes/organization_address.html" with organization=value %} - {% elif contact %} - {% if list %} - {% if value|length == 1 %} - {% include "includes/contact.html" with contact=value|first %} +
+
+ {% if heading_level %} + <{{ heading_level }} + {% else %} +

+ {{ title }} + {% if heading_level %} + + {% else %} +

+ {% endif %} + {% if address %} + {% include "includes/organization_address.html" with organization=value %} + {% elif contact %} + {% if list %} + {% if value|length == 1 %} + {% include "includes/contact.html" with contact=value|first %} + {% else %} +
    + {% for item in value %} +
  • +

    + Contact {{forloop.counter}} +

    + {% include "includes/contact.html" with contact=item %}
  • + {% empty %} +
  • None
  • + {% endfor %} +
+ {% endif %} + {% else %} + {% include "includes/contact.html" with contact=value %} + {% endif %} + {% elif list %} + {% if value|length == 1 %} + {% if users %} +

{{ value.0.user.email }}

+ {% else %} +

{{ value | first }}

+ {% endif %} + {% else %} +
    + {% for item in value %} + {% if users %} +
  • {{ item.user.email }}
  • + {% else %} +
  • {{ item }}
  • + {% endif %} + {% empty %} +
  • None
  • + {% endfor %} +
+ {% endif %} {% else %} -
    - {% for item in value %} -
  • -

    - Contact {{forloop.counter}} -

    - {% include "includes/contact.html" with contact=item %}
  • - {% empty %} -
  • None
  • - {% endfor %}

- +

+ {% if value %} + {{ value }} + {% else %} + None + {% endif %} +

{% endif %} - {% else %} - {% include "includes/contact.html" with contact=value %} - {% endif %} - {% elif list %} - {% if value|length == 1 %} - {% if users %} -

{{ value.0.user.email }}

- {% else %} -

{{ value | first }}

- {% endif %} - {% else %} -
    - {% for item in value %} - {% if users %} -
  • {{ item.user.email }}
  • - {% else %} -
  • {{ item }}
  • - {% endif %} - {% empty %} -
  • None
  • - {% endfor %}

- - {% endif %} - {% else %} -

- {{ value }} -

- {% endif %} +
{% if edit_link %} - - Edit {{ title }} - + {% endif %} - +