Reformatted and reindented the submit registration form and also URLs to comply with scope based system.

1 files changed, 103 insertions, 79 deletions

diff --git a/project/templates/registration/submit-registration.html b/project/templates/registration/submit-registration.html
index f3909ac..c4394a2 100644
--- a/project/templates/registration/submit-registration.html
+++ b/project/templates/registration/submit-registration.html
@@ -3,9 +3,11 @@
 {% block title %}Submit Registration{% endblock %}
 
 {% block content %}
+    {% block formheading %}
+      <h1>Submit Registration</h1>
+    {% endblock formheading %}
 
-    <h1>Submit Registration</h1>
-
+    {% block overreg %}
     {% if over_reg %}
     <div class="notice">
       We have already reached the total number of registrations for the
@@ -15,92 +17,114 @@
       pay the admission fee.</strong>
     </div>
     {% endif %}
-        <form action="/submit-registration/"
-              method="post">
+    {% endblock overreg %}
+
+    <form action=
+    {% block url_select_login %}
+      "{% url scipycon_submit_registration params.scope %}"
+    {% endblock url_select_login %}
+        method="post">
     {% if not user.is_authenticated %}
-                <fieldset>
-                    <legend>Have you already registered for the conference?</legend>
-                    <table class="scipycon-default">
-                        {{ login_form }}
-                    </table>
-
-                <input type="hidden"
-                       name="action"
-                       value="login" />
-
-            <button class="button left"
-                    type="submit">
-                Login
-            </button>
-                </fieldset>
-
-        </form>
+      <fieldset>
+        <legend>Have you already registered for the conference?</legend>
+        <table class="scipycon-default">
+          {{ login_form }}
+        </table>
+
+        <input type="hidden" name="action" value="login" />
+
+        <button class="button left" type="submit">Login</button>
+      </fieldset>
+
+    </form>
     {% endif %}
 
     <p></p>
 
     {% if not user.is_authenticated %}
-        <br />
-        <form action="/submit-registration/"
-              enctype="multipart/form-data"
-              method="post">
-                <fieldset>
-                    <legend>Registrant Details</legend>
-                    <table class="scipycon-default required">
-                        {{ registrant_form }}
-                    </table>
-
-                <input type="hidden"
-                       name="action"
-                       value="register" />
-                </fieldset>
+    <br />
+    <form action=
+    {% block url_select_reg %}
+      "{% url scipycon_submit_registration params.scope %}"
+    {% endblock url_select_reg %}
+        enctype="multipart/form-data" method="post">
+      <fieldset>
+        <legend>Registrant Details</legend>
+        <table class="scipycon-default required">
+          {{ registrant_form }}
+        </table>
+
+        <input type="hidden" name="action" value="register" />
+      </fieldset>
+    {% endif %}
+    <br />
+
+    {% if registration_form.errors %}
+      <div class="errors">Please correct the errors below</div>
     {% endif %}
-                <br />
-
-{% if registration_form.errors %}<div class="errors">Please correct the errors below</div>{% endif %}
-
-                <fieldset>
-                    <legend>Details</legend>
-                    <table class="scipycon-default required">
-                        {% for field in registration_form.personal_fields %}
-                        <tr class="{% cycle odd,even %}"><th>{{ field.label_tag }}</th>
-                          <td>{{ field.errors }}{{ field }}<br />{{ field.help_text }} </td></tr>
-                         {% endfor %}
-
-                        {% for field in registration_form.other_fields %}
-                        <tr class="{% cycle odd,even %}"><th>{{ field.label_tag }}</th>
-                          <td>{{ field.errors }}{{ field }}<br />{{ field.help_text }} </td></tr>
-                         {% endfor %}
-
-                    </table>
-                  </fieldset>
-
-                <br />
-
-                <fieldset>
-                    <legend>Demographics</legend>
-                    <table class="scipycon-default required">
-                        {% for field in registration_form.demographic_fields %}
-                        <tr class="{% cycle odd,even %}"><th>{{ field.label_tag }}</th>
-                          <td>{{ field.errors }}{{ field }}<br />{{ field.help_text }} </td></tr>
-                         {% endfor %}
-                    </table>
-                </fieldset>
-                <fieldset>
-                    <legend>Others</legend>
-                    <table class="scipycon-default">
-                         {{ wifi_form }}
-                    </table>
-
-                <button class="button left"
-                        type="submit">
-                    Submit Registration
-                </button>
-                </fieldset>                
-        </form>
+
+      <fieldset>
+        <legend>Details</legend>
+        <table class="scipycon-default required">
+          {% for field in registration_form.personal_fields %}
+            <tr class="{% cycle odd,even %}">
+              <th>{{ field.label_tag }}</th>
+              <td>{{ field.errors }}{{ field }}<br />{{ field.help_text }}</td>
+            </tr>
+          {% endfor %}
+
+          {% for field in registration_form.other_fields %}
+            <tr class="{% cycle odd,even %}">
+              <th>{{ field.label_tag }}</th>
+              <td>{{ field.errors }}{{ field }}<br />{{ field.help_text }}</td>
+            </tr>
+          {% endfor %}
+        </table>
+      </fieldset>
+      <br />
+
+      <fieldset>
+        <legend>Occupation</legend>
+        <table class="scipycon-default required">
+          {% for field in registration_form.occupation_fields %}
+            <tr class="{% cycle odd,even %}">
+              <th>{{ field.label_tag }}</th>
+              <td>
+                {{ field.errors }}{{ field }}<br />{{ field.help_text }}
+              </td>
+            </tr>
+          {% endfor %}
+        </table>
+      </fieldset>
+
+      <fieldset>
+        <legend>Demographics</legend>
+        <table class="scipycon-default">
+          {% for field in registration_form.demographic_fields %}
+            <tr class="{% cycle odd,even %}">
+              <th>{{ field.label_tag }}</th>
+              <td>
+                {{ field.errors }}{{ field }}<br />{{ field.help_text }}
+              </td>
+            </tr>
+          {% endfor %}
+        </table>
+      </fieldset>
+
+      <fieldset>
+        <legend>Others</legend>
+        <table class="scipycon-default">
+          {{ wifi_form }}
+        </table>
+
+        <button class="button left" type="submit">Submit Registration</button>
+      </fieldset>
+
+      {% block formextras %}{% endblock formextras %}
+    </form>
     {% if message %}
     <script type="text/javascript">
         $.jGrowl("{{ message }}");
-</script>
+    </script>
     {% endif %}
 {% endblock content %}