Merge lp:~cjohnston/summit/sponsorship-form-follow-guidelines into lp:summit

[Chris Johnston]

Updates request sponsorship form to follow guidelines.

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/sponsor/forms.py'
--- summit/sponsor/forms.py	2012-01-23 01:18:55 +0000
+++ summit/sponsor/forms.py	2012-08-08 21:19:18 +0000
@@ -25,6 +25,7 @@
 
 from summit.extra.formsets import WizardFormSet
 from summit.extra.fields import CountryField
+from common.forms import RenderableMixin
 
 from summit.sponsor.models import (Sponsorship, SponsorshipSuggestion,
     SponsorshipScore, NonLaunchpadSponsorship)
@@ -74,10 +75,10 @@
 http://creativecommons.org/licenses/by-sa/3.0/''')
 
 
-class SponsorshipForm1(forms.Form):
-    location = forms.CharField(max_length=50,
+class SponsorshipForm1(forms.Form, RenderableMixin):
+    location = forms.CharField(max_length=50, label="Closest airport",
                                help_text='Enter your nearest city or airport')
-    country = CountryField()
+    country = CountryField(label="Country")
     about = forms.CharField(max_length=3000,
                             label='About yourself',
                             help_text='Tell us about yourself and your work within the Ubuntu community',
@@ -142,7 +143,7 @@
         return mark_safe(u'\n'.join([unicode(self.management_form), forms]))
 
 
-class SponsorshipForm3(forms.Form):
+class SponsorshipForm3(forms.Form, RenderableMixin):
     needs_travel = forms.BooleanField(label='Sponsorship of Travel:',
                                       required=False,
                                       initial=True)
 
=== modified file 'summit/sponsor/templates/sponsor/step0.html'
--- summit/sponsor/templates/sponsor/step0.html	2012-07-31 00:22:01 +0000
+++ summit/sponsor/templates/sponsor/step0.html	2012-08-08 21:19:18 +0000
@@ -15,29 +15,21 @@
       <article class="span-8">
         <h1>Request Sponsorship</h1>
         <p>
-            To request sponsorship we need to get a few details from you, such as where you'll be travelling from. We also need to know a bit about you so that we can judge your request. We'll get some of that from Launchpad, but please take the time to tell us about yourself in your own words.
-        </p>
-
-        <p>
-            If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
+            To request sponsorship for {{ summit.title }} in {{ summit.location }} we need to get a few details from you, such as where you'll be travelling from. We also need to know a bit about you so that we can judge your request. We'll get some of that from Launchpad, but please take the time to tell us about yourself in your own words.
         </p>
       </article>
     </div>
 
     <div class="row">
-      <article class="span-8">
-        <form method="post">
-            {% csrf_token %}
-            <table>
-                <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
-                <tr><td colspan="2"><h2>Your details</h2></td></tr>
-                <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
-                <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
-                {{ form }}
-            </table>
+      <article id="form" class="span-8">
+        <form method="post">{% csrf_token %}
+            <fieldset>
+            <h3>Your details</h3>
+            {{ form.as_template }}
             <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
             {{ previous_fields|safe }}
             <input type="submit" value="Next"/>
+            </fieldset>
         </form>
       </article>
     </div>
 
=== modified file 'summit/sponsor/templates/sponsor/step1.html'
--- summit/sponsor/templates/sponsor/step1.html	2012-07-31 00:22:01 +0000
+++ summit/sponsor/templates/sponsor/step1.html	2012-08-08 21:19:18 +0000
@@ -13,9 +13,6 @@
 <div class="row">
 <article class="span-8">
 <h1>Request Sponsorship</h1>
-
-<br />
-<h2>Further information</h2>
 <p>
 Almost done, there's just a few final details we need for your application;
 and you've a chance to add anything else that you think is important when
@@ -25,15 +22,15 @@
 </div>
 
 <div class="row">
-<article class="span-8">
-<form method="post">
-{% csrf_token %}
-<table>
-{{ form }}
-</table>
+<article id="form" class="span-8">
+<form method="post">{% csrf_token %}
+<fieldset>
+<h3>Further information</h3>
+{{ form.as_template }}
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
 <input type="submit" value="Finish"/>
+</fieldset>
 </form>
 </article>
 </div>