From 4c3236450ec88fd58bd30ec5e281687a01286679 Mon Sep 17 00:00:00 2001
From: Ee Durbin <ewdurbin@gmail.com>
Date: Tue, 2 Jan 2024 08:43:06 -0500
Subject: [PATCH] Re-structure and re-order sponsor information form

---
 sponsors/forms.py                             |   2 +-
 .../new_sponsorship_application_form.html     | 129 ++++++++++--------
 2 files changed, 71 insertions(+), 60 deletions(-)

diff --git a/sponsors/forms.py b/sponsors/forms.py
index 6033a0b18..c6a3d0bde 100644
--- a/sponsors/forms.py
+++ b/sponsors/forms.py
@@ -252,7 +252,7 @@ class SponsorshipApplicationForm(forms.Form):
         label="State/Province/Region", max_length=64, required=False
     )
     state_of_incorporation = forms.CharField(
-        label="State of incorporation", help_text="US only, If different", max_length=64, required=False
+        label="State of incorporation", help_text="US only, If different than mailing address", max_length=64, required=False
     )
     postal_code = forms.CharField(
         label="Zip/Postal Code", max_length=64, required=False
diff --git a/templates/sponsors/new_sponsorship_application_form.html b/templates/sponsors/new_sponsorship_application_form.html
index 29181f80f..ddce38459 100644
--- a/templates/sponsors/new_sponsorship_application_form.html
+++ b/templates/sponsors/new_sponsorship_application_form.html
@@ -53,6 +53,8 @@ <h1>Submit Sponsorship Information</h1>
 
       <div id="new-appication-fields" {% if form.user_with_previous_sponsors and not form.errors %}style="display: none"{% endif %}>
 
+        <h2>Basics</h2>
+
         <p class="form_field">
           <label>{{ form.name.label }} <span class="error-message">{% if form.name.errors %}{{ form.name.errors.as_text }}</span>{% endif %}</label>
           {% render_field form.name %}
@@ -62,6 +64,33 @@ <h1>Submit Sponsorship Information</h1>
           {% endif %}
         </p>
 
+
+        <div class="inline_fields">
+          <div>
+            <p class="form_field">
+            <label>{{ form.country_of_incorporation.label }} <span class="error-message">{% if form.country_of_incorporation.errors %}
+              {{ form.country.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.country_of_incorporation %}
+            {% if form.country_of_incorporation.help_text %}
+              <br/>
+              <span class="helptext">{{ form.country_of_incorporation.help_text }}</span>
+            {% endif %}
+            </p>
+          </div>
+
+          <div>
+            <p class="form_field">
+            <label>{{ form.state_of_incorporation.label }} <span class="error-message">{% if form.state_of_incorporation.errors %}
+              {{ form.state_of_incorporation.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.state %}
+            {% if form.state_of_incorporation.help_text %}
+              <br/>
+              <span class="helptext">{{ form.state_of_incorporation.help_text }}</span>
+            {% endif %}
+            </p>
+          </div>
+        </div>
+
         <p class="form_field">
           <label>{{ form.description.label }} <span class="error-message">{% if form.description.errors %}{{ form.description.errors.as_text }}</span>{% endif %}</label>
           {% render_field form.description %}
@@ -94,29 +123,34 @@ <h1>Submit Sponsorship Information</h1>
             </p>
           </div>
         </div>
-            <div class="inline_fields">
-              <div>
-        <p class="form_field">
-          <label>{{ form.country.label }} <span class="error-message">{% if form.country.errors %}{{ form.country.errors.as_text }}</span>{% endif %}</label>
-          {% render_field form.country %}
-          {% if form.country.help_text %}
-          <br/>
-          <span class="helptext">{{ form.country.help_text }}</span>
-          {% endif %}
-        </p>
-              </div>
-         <div>
-                        <p class="form_field">
-        <label>{{ form.country_of_incorporation.label }} <span class="error-message">{% if form.country_of_incorporation.errors %}
-          {{ form.country.errors.as_text }}</span>{% endif %}</label>
-        {% render_field form.country_of_incorporation %}
-        {% if form.country_of_incorporation.help_text %}
-          <br/>
-          <span class="helptext">{{ form.country_of_incorporation.help_text }}</span>
-        {% endif %}
-        </p>
-                    </div>
-      </div>
+
+        <div class="inline_fields">
+          <div>
+          <p class="form_field">
+          <label>{{ form.web_logo.label }} <span class="error-message">{% if form.web_logo.errors %}{{ form.web_logo.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.web_logo %}
+            {% if form.web_logo.help_text %}
+            <br/>
+            <span class="helptext">{{ form.web_logo.help_text }}</span>
+            {% endif %}
+          </p>
+          </div>
+
+          <div>
+          <p class="form_field">
+            <label>{{ form.print_logo.label }} <span class="error-message">{% if form.print_logo.errors %}{{ form.print_logo.errors.as_text }}</span>{% endif %}</label>
+            {% render_field form.print_logo %}
+            {% if form.print_logo.help_text %}
+            <br/>
+            <span class="helptext">{{ form.print_logo.help_text }}</span>
+            {% endif %}
+          </p>
+          </div>
+        </div>
+
+        <hr>
+
+        <h2>Mailing and Contact</h2>
 
         <div class="inline_fields">
           <div>
@@ -163,19 +197,7 @@ <h1>Submit Sponsorship Information</h1>
               <span class="helptext">{{ form.state.help_text }}</span>
               {% endif %}
             </p>
-            </div>
-
-             <div>
-                    <p class="form_field">
-            <label>{{ form.state_of_incorporation.label }} <span class="error-message">{% if form.state_of_incorporation.errors %}
-              {{ form.state_of_incorporation.errors.as_text }}</span>{% endif %}</label>
-            {% render_field form.state %}
-            {% if form.state_of_incorporation.help_text %}
-              <br/>
-              <span class="helptext">{{ form.state_of_incorporation.help_text }}</span>
-            {% endif %}
-          </p>
-            </div>
+          </div>
         </div>
 
 
@@ -193,11 +215,11 @@ <h1>Submit Sponsorship Information</h1>
 
           <div>
             <p class="form_field">
-              <label>{{ form.primary_phone.label }} <span class="error-message">{% if form.primary_phone.errors %}{{ form.primary_phone.errors.as_text }}</span>{% endif %}</label>
-              {% render_field form.primary_phone %}
-              {% if form.primary_phone.help_text %}
+              <label>{{ form.country.label }} <span class="error-message">{% if form.country.errors %}{{ form.country.errors.as_text }}</span>{% endif %}</label>
+              {% render_field form.country %}
+              {% if form.country.help_text %}
               <br/>
-              <span class="helptext">{{ form.primary_phone.help_text }}</span>
+              <span class="helptext">{{ form.country.help_text }}</span>
               {% endif %}
             </p>
           </div>
@@ -205,25 +227,14 @@ <h1>Submit Sponsorship Information</h1>
 
         <div class="inline_fields">
           <div>
-          <p class="form_field">
-          <label>{{ form.web_logo.label }} <span class="error-message">{% if form.web_logo.errors %}{{ form.web_logo.errors.as_text }}</span>{% endif %}</label>
-            {% render_field form.web_logo %}
-            {% if form.web_logo.help_text %}
-            <br/>
-            <span class="helptext">{{ form.web_logo.help_text }}</span>
-            {% endif %}
-          </p>
-          </div>
-
-          <div>
-          <p class="form_field">
-            <label>{{ form.print_logo.label }} <span class="error-message">{% if form.print_logo.errors %}{{ form.print_logo.errors.as_text }}</span>{% endif %}</label>
-            {% render_field form.print_logo %}
-            {% if form.print_logo.help_text %}
-            <br/>
-            <span class="helptext">{{ form.print_logo.help_text }}</span>
-            {% endif %}
-          </p>
+            <p class="form_field">
+              <label>{{ form.primary_phone.label }} <span class="error-message">{% if form.primary_phone.errors %}{{ form.primary_phone.errors.as_text }}</span>{% endif %}</label>
+              {% render_field form.primary_phone %}
+              {% if form.primary_phone.help_text %}
+              <br/>
+              <span class="helptext">{{ form.primary_phone.help_text }}</span>
+              {% endif %}
+            </p>
           </div>
         </div>