Summit

Merge lp:~cjohnston/summit/710779 into lp:summit

  1. 710779
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Merged at revision: 61
Proposed branch: lp:~cjohnston/summit/710779
Merge into: lp:summit
Diff against target: 228 lines (+92/-97)
3 files modified
summit/sponsor/templates/sponsor/nonlaunchpadstep0.html (+32/-33)
summit/sponsor/templates/sponsor/step0.html (+28/-31)
summit/sponsor/templates/sponsor/suggeststep0.html (+32/-33)
To merge this branch: bzr merge lp:~cjohnston/summit/710779
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+48087@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep0.html'
2--- summit/sponsor/templates/sponsor/nonlaunchpadstep0.html 2010-03-05 10:33:36 +0000
3+++ summit/sponsor/templates/sponsor/nonlaunchpadstep0.html 2011-02-01 00:15:14 +0000
4@@ -1,40 +1,39 @@
5 {% extends "base.html" %}
6
7 {% block head %}
8-{{ form.media }}
9+ {{ form.media }}
10 {% endblock %}
11
12 {% block content %}
13-<h1>Suggest Sponsorship</h1>
14-<p>
15-To suggest sponsorship for someone, we need a few details about your
16-suggestion, such as where they'll be travelling from. We also need to know a
17-bit about them so that we can judge your suggestion. Please take the time to
18-tell us about them in your own words a bit about them.
19-</p>
20-
21-<p>Is your suggested person a member of Launchpad? You'll want to <a
22-href="/{{summit.name}}/suggestsponsorship">fill out a Launchpad Suggestion
23-form</a>.</p>
24-
25-
26-<p>
27-If you have any problems with this app, please contact
28-<a href="mailto:scott@ubuntu.com">scott@ubuntu.com</a>.
29-</p>
30-
31-<form method="post">
32-<table>
33-<tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
34-<tr><td colspan="2"><h2>Your details</h2></td></tr>
35-<tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
36-<tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
37-
38-<tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>
39-{{ form }}
40-</table>
41-<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
42-{{ previous_fields|safe }}
43-<input type="submit" value="Next"/>
44-</form>
45+ <article class="main-content alone">
46+ <h1>Suggest Sponsorship</h1>
47+ <p>
48+ 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.
49+ </p>
50+
51+ <p>
52+ Is your suggested person a member of Launchpad? You'll want to <a href="/{{summit.name}}/suggestsponsorship">fill out a Launchpad Suggestion Form</a>.
53+ </p>
54+
55+ <p>
56+ If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
57+ </p>
58+ </article>
59+
60+ <article class='main-content'>
61+ <form method="post">
62+ <table>
63+ <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
64+ <tr><td colspan="2"><h2>Your details</h2></td></tr>
65+ <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
66+ <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
67+
68+ <tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>
69+ {{ form }}
70+ </table>
71+ <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
72+ {{ previous_fields|safe }}
73+ <input type="submit" value="Next"/>
74+ </form>
75+ </article>
76 {% endblock %}
77
78=== modified file 'summit/sponsor/templates/sponsor/step0.html'
79--- summit/sponsor/templates/sponsor/step0.html 2010-08-25 00:22:58 +0000
80+++ summit/sponsor/templates/sponsor/step0.html 2011-02-01 00:15:14 +0000
81@@ -1,40 +1,37 @@
82 {% extends "base.html" %}
83
84 {% block extrahead %}
85-{{ block.super }}
86-{{ form.media }}
87+ {{ block.super }}
88+ {{ form.media }}
89 {% endblock %}
90
91 {% block sub_nav %}{% endblock %}
92
93 {% block content %}
94-<article class="main-content alone">
95-<h1>Request Sponsorship</h1>
96-<p>
97-To request sponsorship we need a few details off you, such as where you'll
98-be travelling from. We also need to know a bit about you so that we can
99-judge your request, we'll get some of that from Launchpad, but please take
100-the time to tell us about yourself in your own words.
101-</p>
102-<p>
103-If you have any problems with this app, please contact
104-<a href="mailto:scott@ubuntu.com">scott@ubuntu.com</a>.
105-</p>
106-</article>
107-
108-<article class='main-content'>
109-
110-<form method="post">
111-<table>
112-<tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
113-<tr><td colspan="2"><h2>Your details</h2></td></tr>
114-<tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
115-<tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
116-{{ form }}
117-</table>
118-<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
119-{{ previous_fields|safe }}
120-<input type="submit" value="Next"/>
121-</form>
122-</article>
123+ <article class="main-content alone">
124+ <h1>Request Sponsorship</h1>
125+ <p>
126+ 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.
127+ </p>
128+
129+ <p>
130+ If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
131+ </p>
132+ </article>
133+
134+ <article class='main-content'>
135+
136+ <form method="post">
137+ <table>
138+ <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
139+ <tr><td colspan="2"><h2>Your details</h2></td></tr>
140+ <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
141+ <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
142+ {{ form }}
143+ </table>
144+ <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
145+ {{ previous_fields|safe }}
146+ <input type="submit" value="Next"/>
147+ </form>
148+ </article>
149 {% endblock %}
150
151=== modified file 'summit/sponsor/templates/sponsor/suggeststep0.html'
152--- summit/sponsor/templates/sponsor/suggeststep0.html 2010-10-03 22:43:07 +0000
153+++ summit/sponsor/templates/sponsor/suggeststep0.html 2011-02-01 00:15:14 +0000
154@@ -1,42 +1,41 @@
155 {% extends "base.html" %}
156
157 {% block head %}
158-{{ form.media }}
159+ {{ form.media }}
160 {% endblock %}
161
162 {% block sub_nav %}{% endblock %}
163
164 {% block content %}
165-<h1>Suggest Sponsorship</h1>
166-<p>
167-To suggest sponsorship for someone, we need a few details about your
168-suggestion, such as where they'll be travelling from. We also need to know a
169-bit about them so that we can judge your suggestion, we'll get some of that
170-from Launchpad, but please take the time to tell us about them in your own
171-words.
172-</p>
173-
174-<p>Is your suggested person not a member of Launchpad? You'll want to <a
175-href="/{{summit.name}}/nonlaunchpadsponsorship">fill out a Non-Launchpad
176-Suggestion form</a>.</p>
177-
178-<p>
179-If you have any problems with this app, please contact
180-<a href="mailto:scott@ubuntu.com">scott@ubuntu.com</a>.
181-</p>
182-
183-<form method="post">
184-<table>
185-<tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
186-<tr><td colspan="2"><h2>Your details</h2></td></tr>
187-<tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
188-<tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
189-
190-<tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>
191-{{ form }}
192-</table>
193-<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
194-{{ previous_fields|safe }}
195-<input type="submit" value="Next"/>
196-</form>
197+ <article class="main-content alone">
198+ <h1>Suggest Sponsorship</h1>
199+ <p>
200+ 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.
201+ </p>
202+
203+ <p>
204+ Is your suggested person not a member of Launchpad? You'll want to <a href="/{{summit.name}}/nonlaunchpadsponsorship">fill out a Non-Launchpad Suggestion Form</a>.
205+ </p>
206+
207+ <p>
208+ If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
209+ </p>
210+ </article>
211+
212+ <article class='main-content'>
213+ <form method="post">
214+ <table>
215+ <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
216+ <tr><td colspan="2"><h2>Your details</h2></td></tr>
217+ <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
218+ <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
219+
220+ <tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>
221+ {{ form }}
222+ </table>
223+ <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
224+ {{ previous_fields|safe }}
225+ <input type="submit" value="Next"/>
226+ </form>
227+ </article>
228 {% endblock %}

Subscribers

People subscribed via source and target branches