From d57ef1c1854f770d60940f42e9fa0d1a83b4aa35 Mon Sep 17 00:00:00 2001
From: Francesco Siddi <francesco.siddi@gmail.com>
Date: Mon, 23 Jun 2014 14:47:15 +0200
Subject: [PATCH] Tweaks to submission form

---
 blender-bfct/application/controllers/main.py  |  2 +-
 blender-bfct/application/templates/apply.html | 21 +++----------------
 .../application/templates/my_application.html |  4 ++--
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/blender-bfct/application/controllers/main.py b/blender-bfct/application/controllers/main.py
index ca03df1..b645ebd 100644
--- a/blender-bfct/application/controllers/main.py
+++ b/blender-bfct/application/controllers/main.py
@@ -51,7 +51,7 @@ def apply():
                 blender_id=current_user.id,
                 website=form.website.data,
                 city_country=form.city_country.data,
-                teaching=form.teaching.data,
+                institution_name=form.institution_name.data,
                 video_example=form.video_example.data,
                 written_example=form.written_example.data,
                 portfolio_cv=form.portfolio_cv.data,
diff --git a/blender-bfct/application/templates/apply.html b/blender-bfct/application/templates/apply.html
index 66363e1..b1fcdbe 100755
--- a/blender-bfct/application/templates/apply.html
+++ b/blender-bfct/application/templates/apply.html
@@ -30,17 +30,10 @@
 
                     <div class="row">
                         <div class="col-md-6">
-                         <div class="input-group input-group-lg input-checkbox width-full" id="is_teaching">
-                            <div class="btn-group" data-toggle="buttons">
-                              <label class="btn btn-squishy">
-                                {{ form.teaching() }}
-                              </label>
-                            </div>
-                            <label class="control-label ">Are you currently teaching at a university?</label>
-                         </div>
+                            Are you currently teaching at a university?
                         </div>
                         <div class="col-md-6">
-                         <div class="input-group input-group-lg width-full disabled" id="is_teaching_where">
+                         <div class="input-group input-group-lg width-full" id="is_teaching_where">
                             {{ form.institution_name(class="form-control", placeholder="School or Institution's name") }} 
                             <label class="control-label">School or Institution Name</label>
                          </div>
@@ -49,7 +42,7 @@
 
                     <div class="row">
                         <div class="col-md-6">
-                            A set of essential skills is required to be
+                            A set of essential skills is required
                         </div>
                         <div class="col-md-6">
                          <div class="input-group input-group-lg width-full">
@@ -124,11 +117,3 @@
 </div>
 
 {% endblock %}
-
-{% block footer_scripts %}
-    <script>
-        $('#is_teaching').click(function() {
-            $("#is_teaching_where").toggleClass('disabled');
-        });
-    </script>
-{% endblock %}
diff --git a/blender-bfct/application/templates/my_application.html b/blender-bfct/application/templates/my_application.html
index b9bdc3f..2421273 100755
--- a/blender-bfct/application/templates/my_application.html
+++ b/blender-bfct/application/templates/my_application.html
@@ -16,13 +16,13 @@
                 <td>{{application.show_pretty_date('submission')}}</td>
                 <td>You submitted your application</td>
             </tr>
-            {% if application.show_pretty_date('review_start') %}
+            {% if application.review_start_date %}
             <tr>
                 <td>{{application.show_pretty_date('review_start')}}</td>
                 <td>Application review started</td>
             </tr>
             {% endif%}
-            {% if application.show_pretty_date('review_end') %}
+            {% if application.review_end_date %}
             <tr>
                 <td>{{application.show_pretty_date('review_end')}}</td>
                 <td>Application review ended</td>