Move form id to base template, remove backnav block

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 %}
 
 <h2>Who is the authorizing official for your organization</h2>
@@ -18,7 +12,7 @@
 
 <p>All fields are required unless they are marked optional.</p>
 
-<form class="usa-form usa-form--large" id="step__ao" method="post">
+<form class="usa-form usa-form--large" id="step__{{wizard.steps.current}}" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}
 

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 %}
 
-<form class="usa-form usa-form--large" id="step__current-site" method="post">
+<form class="usa-form usa-form--large" id="step__{{wizard.steps.current}}" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}
 

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 %}
   <p> Before requesting a .gov domain, <a href="#">please make sure it meets our naming requirements.</a> Your domain name must:
   <ul class="usa-list">
@@ -40,7 +34,7 @@
   </ul>
   </p>
 
-<form id="step__dotgov-domain" class="usa-form usa-form--large" method="post">
+<form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   <h2> What .gov domain do you want? </h2>
   <p class="domain_instructions"> 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. </p>
 

src/registrar/templates/application_form.html

@@ -8,15 +8,13 @@
     {% include 'application_sidebar.html' %}
   </div>
   <div class="grid-col-9">
-    {% block backnav %}
-      {% if wizard.steps.prev %}
-      <button form="step__{{wizard.steps.current}}" name="wizard_goto_step" type="submit" class="usa-button usa-button--unstyled" value="{{ wizard.steps.prev }}">
-        <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-          <use xlink:href="{%static '/img/sprite.svg'%}#arrow_back"></use>
-        </svg><span class="margin-left-05">Previous step </span>
-      </button>
-      {% endif %}
-    {% endblock %}
+    {% if wizard.steps.prev %}
+    <button form="step__{{wizard.steps.current}}" name="wizard_goto_step" type="submit" class="usa-button usa-button--unstyled" value="{{ wizard.steps.prev }}">
+      <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+        <use xlink:href="{%static '/img/sprite.svg'%}#arrow_back"></use>
+      </svg><span class="margin-left-05">Previous step </span>
+    </button>
+    {% endif %}
     <h1> {{form_titles|get_item:wizard.steps.current}} </h1>
     {% block form_content %}
      <button type="submit" class="usa-button">Next</button>

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 %}
 
 <h2>What is the name and mailing address of your organization?</h2>
@@ -17,7 +11,7 @@ of a larger entity. If so, enter information about your part of the larger entit
 
 <p>All fields are required unless they are marked optional.</p>
 
-<form id="step__org-contact" class="usa-form usa-form--large" method="post">
+<form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}
 

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 %}
 
-<form id="step__about-org" class="usa-form usa-form--large" method="post">
+<form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}
 

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 %}
 
 <p id="instructions">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 <a href="#">activities that are prohibited on .gov domains.</a></p>
 
 <p>All fields are required unless they are marked optional.</p>
 
-<form class="usa-form usa-form--large" method="post">
+<form id="step__{{wizard.steps.current}}" class="usa-form usa-form--large" method="post">
   <div class="usa-form-group">
     {{ wizard.management_form }}
     {% csrf_token %}

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 %}
 
 <div id="instructions">
@@ -21,7 +15,7 @@
 
 <p>All fields are required unless they are marked optional.</p>
 
-<form class="usa-form usa-form--large" id="step__ao" method="post">
+<form class="usa-form usa-form--large" id="step__{{wizard.steps.current}}" method="post">
   {{ wizard.management_form }}
   {% csrf_token %}