Merge lp:~jose/summit/1030187-fix into lp:summit

[José Antonio Rey]

Sponsorship application and suggestion CSS error (bug # 1030187) fix. Classes updated as per ~chrisjohnston request.

[Chris Johnston (cjohnston)]

There are more pages that I believe will have the issue. Could you please update the sponsorship template files to follow the new layout by using:

<div class="row">
    <article class="span-8">

review: Needs Fixing

[José Antonio Rey (jose)]

Classes updated as requested.

review: Needs Resubmitting

[José Antonio Rey (jose)]

review: Approve

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/sponsor/templates/sponsor/done.html'
--- summit/sponsor/templates/sponsor/done.html	2012-02-01 04:25:13 +0000
+++ summit/sponsor/templates/sponsor/done.html	2012-07-31 00:25:22 +0000
@@ -5,7 +5,8 @@
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
-    <article class="main-content alone">
+    <div class="row">
+      <article class="span-8">
         <h1>Request Sponsorship</h1>
         <p>
             Thanks very much for requesting sponsorship to {{ summit.name }}. If you have any queries about your request, please e-mail <a href="mailto:[e-mail]">[e-mail]</a>.
@@ -14,5 +15,6 @@
         <p>
             We'll let you know whether or not your request has been accepted soon via email.
         </p>
-    </article>
+      </article>
+    </div>
 {% endblock %}

=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep0.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadstep0.html	2012-03-25 14:00:41 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadstep0.html	2012-07-31 00:25:22 +0000
@@ -7,7 +7,8 @@
 {% endblock %}
 
 {% block content %}
-    <article class="main-content alone">
+    <div class="row">
+      <article class="span-8">
         <h1>Suggest Sponsorship</h1>
         <p>
             To suggest sponsorship for someone, we need a few details about your suggestion, such as where they'll be travelling from. We also need to know a bit about them so that we can judge your suggestion. Please take the time to tell us about them in your own words a bit about them.
@@ -20,9 +21,11 @@
         <p>
             If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
         </p>
-    </article>
+      </article>
+    </div>
 
-    <article class='main-content'>
+    <div class="row">
+      <article class="span-8">
         <form method="post">
             {% csrf_token %}
             <table>
@@ -38,5 +41,6 @@
             {{ previous_fields|safe }}
             <input type="submit" value="Next"/>
         </form>
-    </article>
+      </article>
+    </div>
 {% endblock %}

=== modified file 'summit/sponsor/templates/sponsor/step0.html'
--- summit/sponsor/templates/sponsor/step0.html	2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/step0.html	2012-07-31 00:25:22 +0000
@@ -11,7 +11,8 @@
 
 {% block content %}
 {% ifequal summit.state "sponsor" %}
-    <article class="main-content alone">
+    <div class="row">
+      <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.
@@ -20,10 +21,11 @@
         <p>
             If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
         </p>
-    </article>
-
-    <article class='main-content'>
-
+      </article>
+    </div>
+
+    <div class="row">
+      <article class="span-8">
         <form method="post">
             {% csrf_token %}
             <table>
@@ -37,11 +39,14 @@
             {{ previous_fields|safe }}
             <input type="submit" value="Next"/>
         </form>
-    </article>
+      </article>
+    </div>
 {% else %}
-    <article class="main-content alone">
+    <div class="row">
+      <article class="span-8">
         <h1>UDS Sponsorship</h1>
         <p>We are not currently accepting sponsorship applications for {{ summit.name }} in {{ summit.location }}. Please check back again later!</p>
-    </article>
+      </article>
+    </div>
 {% endifequal %}
 {% endblock %}

=== modified file 'summit/sponsor/templates/sponsor/step1.html'
--- summit/sponsor/templates/sponsor/step1.html	2012-01-23 01:18:55 +0000
+++ summit/sponsor/templates/sponsor/step1.html	2012-07-31 00:25:22 +0000
@@ -10,7 +10,8 @@
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
-<article class="main-content alone">
+<div class="row">
+<article class="span-8">
 <h1>Request Sponsorship</h1>
 
 <br />
@@ -21,8 +22,10 @@
 judging your request.
 </p>
 </article>
+</div>
 
-<article class="main-content">
+<div class="row">
+<article class="span-8">
 <form method="post">
 {% csrf_token %}
 <table>
@@ -33,4 +36,5 @@
 <input type="submit" value="Finish"/>
 </form>
 </article>
+</div>
 {% endblock %}

=== modified file 'summit/sponsor/templates/sponsor/suggeststep0.html'
--- summit/sponsor/templates/sponsor/suggeststep0.html	2012-03-25 14:00:41 +0000
+++ summit/sponsor/templates/sponsor/suggeststep0.html	2012-07-31 00:25:22 +0000
@@ -9,7 +9,8 @@
 {% block sub_nav %}{% endblock %}
 
 {% block content %}
-    <article class="main-content alone">
+    <div class="row">
+      <article class="span-8">
         <h1>Suggest Sponsorship</h1>
         <p>
             To suggest sponsorship for someone, we need a few details about your suggestion, such as where they'll be travelling from. We also need to know a bit about them so that we can judge your suggestion, we'll get some of that from Launchpad, but please take the time to tell us about them in your own words.
@@ -22,9 +23,11 @@
         <p>
             If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
         </p>
-    </article>
+      </article>
+    </div>
 
-    <article class='main-content'>
+    <div class="row">
+      <article class="span-8">
         <form method="post">
             {% csrf_token %}
             <table>
@@ -40,5 +43,6 @@
             {{ previous_fields|safe }}
             <input type="submit" value="Next"/>
         </form>
-    </article>
+      </article>
+    </div>
 {% endblock %}