From 0b67dcc25e7aaebbed197de66cc057534243028d Mon Sep 17 00:00:00 2001 From: igorkorenfeld Date: Tue, 8 Nov 2022 14:38:46 -0500 Subject: [PATCH] Move form id to base template, remove backnav block --- .../application_authorizing_official.html | 8 +------- .../templates/application_current_sites.html | 8 +------- .../templates/application_dotgov_domain.html | 8 +------- src/registrar/templates/application_form.html | 16 +++++++--------- .../templates/application_org_contact.html | 8 +------- .../templates/application_organization.html | 8 +------- src/registrar/templates/application_purpose.html | 4 +--- .../templates/application_your_contact.html | 8 +------- 8 files changed, 14 insertions(+), 54 deletions(-) diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index a72de94f2..2f1ff6869 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -3,12 +3,6 @@ {% load widget_tweaks %} {% load static %} -{% block backnav %} - {% with form_name="step__ao" %} - {{ block.super }} - {% endwith %} -{% endblock %} - {% block form_content %}

Who is the authorizing official for your organization

@@ -18,7 +12,7 @@

All fields are required unless they are marked optional.

-
+ {{ wizard.management_form }} {% csrf_token %} diff --git a/src/registrar/templates/application_current_sites.html b/src/registrar/templates/application_current_sites.html index c7d344462..535a8f5dc 100644 --- a/src/registrar/templates/application_current_sites.html +++ b/src/registrar/templates/application_current_sites.html @@ -3,15 +3,9 @@ {% load widget_tweaks %} {% load static %} -{% block backnav %} - {% with form_name="step__current-site" %} - {{ block.super }} - {% endwith %} -{% endblock %} - {% block form_content %} - + {{ wizard.management_form }} {% csrf_token %} diff --git a/src/registrar/templates/application_dotgov_domain.html b/src/registrar/templates/application_dotgov_domain.html index 06c517756..306a2ec0e 100644 --- a/src/registrar/templates/application_dotgov_domain.html +++ b/src/registrar/templates/application_dotgov_domain.html @@ -2,12 +2,6 @@ {% extends 'application_form.html' %} {% load widget_tweaks static%} -{% block backnav %} - {% with form_name="step__dotgov-domain" %} - {{ block.super }} - {% endwith %} -{% endblock %} - {% block form_content %}

Before requesting a .gov domain, please make sure it meets our naming requirements. Your domain name must:

- +

What .gov domain do you want?

After you enter your domain, we’ll make sure it’s available and that it meets some of our naming requirements. If your domain passes these initial checks, we’ll verify that it meets all of our requirements once you complete and submit the rest of the domain request form.

diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html index 3112b65d8..f49b288c7 100644 --- a/src/registrar/templates/application_form.html +++ b/src/registrar/templates/application_form.html @@ -8,15 +8,13 @@ {% include 'application_sidebar.html' %}
- {% block backnav %} - {% if wizard.steps.prev %} - - {% endif %} - {% endblock %} + {% if wizard.steps.prev %} + + {% endif %}

{{form_titles|get_item:wizard.steps.current}}

{% block form_content %} diff --git a/src/registrar/templates/application_org_contact.html b/src/registrar/templates/application_org_contact.html index a7d9c51b8..cc9c80fcf 100644 --- a/src/registrar/templates/application_org_contact.html +++ b/src/registrar/templates/application_org_contact.html @@ -2,12 +2,6 @@ {% extends 'application_form.html' %} {% load widget_tweaks %} -{% block backnav %} - {% with form_name="step__org-contact" %} - {{ block.super }} - {% endwith %} -{% endblock %} - {% block form_content %}

What is the name and mailing address of your organization?

@@ -17,7 +11,7 @@ of a larger entity. If so, enter information about your part of the larger entit

All fields are required unless they are marked optional.

- + {{ wizard.management_form }} {% csrf_token %} diff --git a/src/registrar/templates/application_organization.html b/src/registrar/templates/application_organization.html index 5bc9840bb..4c562d96c 100644 --- a/src/registrar/templates/application_organization.html +++ b/src/registrar/templates/application_organization.html @@ -3,15 +3,9 @@ {% load widget_tweaks %} {% load dynamic_question_tags %} -{% block backnav %} - {% with form_name="step__about-org" %} - {{ block.super }} - {% endwith %} -{% endblock %} - {% block form_content %} - + {{ wizard.management_form }} {% csrf_token %} diff --git a/src/registrar/templates/application_purpose.html b/src/registrar/templates/application_purpose.html index 6a7682b63..6b98d06f5 100644 --- a/src/registrar/templates/application_purpose.html +++ b/src/registrar/templates/application_purpose.html @@ -2,15 +2,13 @@ {% extends 'application_form.html' %} {% load widget_tweaks %} -{% block title %}Apply for a .gov domain - Puprose{% endblock %} - {% block form_content %}

Explain how you plan to use this domain. Will you use it for a website and/or email? Are you moving your website from another top-level domain (like .com or .org)?Read about activities that are prohibited on .gov domains.

All fields are required unless they are marked optional.

- +
{{ wizard.management_form }} {% csrf_token %} diff --git a/src/registrar/templates/application_your_contact.html b/src/registrar/templates/application_your_contact.html index 490f334b5..8e8b340d3 100644 --- a/src/registrar/templates/application_your_contact.html +++ b/src/registrar/templates/application_your_contact.html @@ -3,12 +3,6 @@ {% load widget_tweaks %} {% load static %} -{% block backnav %} - {% with form_name="step__ao" %} - {{ block.super }} - {% endwith %} -{% endblock %} - {% block form_content %}
@@ -21,7 +15,7 @@

All fields are required unless they are marked optional.

- + {{ wizard.management_form }} {% csrf_token %}