update migdal

[prawokultury.git] / prawokultury / templates / contact / register / form.html

diff --git a/prawokultury/templates/contact/register/form.html b/prawokultury/templates/contact/register/form.html
index 516fcfe..dff155b 100644 (file)
--- a/prawokultury/templates/contact/register/form.html
+++ b/prawokultury/templates/contact/register/form.html
@@ -1,53 +1,44 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 

-{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
+{% block titleextra %}{{ form.form_title }} :: {% endblock %}

 
 

-{% block "body" %}
+{% block body %}

     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 

-    <div class="form-info">
-    {% block contact_form_description %}
-        {% chunk "contact_form__"|add:form.form_tag %}
-    {% endblock %}
-    </div>

 
 {% if not form.started %}
   {# Not yet started. #}
 
 {% if not form.started %}
   {# Not yet started. #}

-  <div class="warning">
+  <div class="form-info">

     {% chunk "contact_form__"|add:form.form_tag|add:"__not_started" %}
   </div>
 {% else %}
   {# Already started. #}
     {% chunk "contact_form__"|add:form.form_tag|add:"__not_started" %}
   </div>
 {% else %}
   {# Already started. #}

-  {% if form.limit_reached and not form.open_call %}
+  {% if form.limit_reached %}

     {# Already closed. #}
     {# Already closed. #}

-    <div class="warning">
+    <div class="form-info">

       {% chunk "contact_form__"|add:form.form_tag|add:"__closed" %}
     </div>
   {% else %}
     {# Still running. #}
       {% chunk "contact_form__"|add:form.form_tag|add:"__closed" %}
     </div>
   {% else %}
     {# Still running. #}

-    {% if form.limit_reached %}
-      {# Only taking presentation submissions. #}
-      <div class="warning">
-        {% chunk "contact_form__"|add:form.form_tag|add:"__presentations_only" %}
-      </div>
-    {% else %}
-      {% if not form.open_call %}
-      {# Not taking presentations any more. #}
-      <div class="warning">
-        {% chunk "contact_form__"|add:form.form_tag|add:"__no_presentations" %}
-      </div>
-      {% else %}
-        <div class="warning">
-          {% chunk "contact_form__"|add:form.form_tag|add:"__running" %}
-        </div>
-      {% endif %}
-    {% endif %}
-
+    <div class="form-info">
+        {% chunk "contact_form__"|add:form.form_tag|add:"__running" %}
+    </div>

     <form method="POST" action="." enctype="multipart/form-data" class="submit-form">
       {% csrf_token %}
       <table>
     <form method="POST" action="." enctype="multipart/form-data" class="submit-form">
       {% csrf_token %}
       <table>

-        {{ form.as_table }}
+        {% if form.non_field_errors %}<tr><td colspan="2">{{ form.non_field_errors }}</td></tr>{% endif %}
+        {% for field in form.main_fields %}
+          {% include "snippets/field_as_table_row.html" %}
+        {% endfor %}
+        <tr><td colspan="2"><h3>{% trans "We would be grateful if you could answer our questions below. This will allow us to better adapt to your expectations in the future." %}</h3></td></tr>
+        {% for field in form.survey_fields %}
+          {% include "snippets/field_as_table_row.html" %}
+        {% endfor %}
+        <tr><td colspan="2"></td></tr>
+        {% for field in form.agreement_fields %}
+          {% include "snippets/field_as_table_row.html" %}
+        {% endfor %}

         <tr><td></td><td><button>{% block contact_form_submit %}{{ form.submit_label }}{% endblock %}</button></td></tr>
       </table>
     </form>
         <tr><td></td><td><button>{% block contact_form_submit %}{{ form.submit_label }}{% endblock %}</button></td></tr>
       </table>
     </form>