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
=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadstep0.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadstep0.html 2010-03-05 10:33:36 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadstep0.html 2011-02-01 00:15:14 +0000
@@ -1,40 +1,39 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block head %}3{% block head %}
4{{ form.media }}4 {{ form.media }}
5{% endblock %}5{% endblock %}
66
7{% block content %}7{% block content %}
8<h1>Suggest Sponsorship</h1>8 <article class="main-content alone">
9<p>9 <h1>Suggest Sponsorship</h1>
10To suggest sponsorship for someone, we need a few details about your10 <p>
11suggestion, such as where they'll be travelling from. We also need to know a11 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.
12bit about them so that we can judge your suggestion. Please take the time to12 </p>
13tell us about them in your own words a bit about them.13
14</p>14 <p>
1515 Is your suggested person a member of Launchpad? You'll want to <a href="/{{summit.name}}/suggestsponsorship">fill out a Launchpad Suggestion Form</a>.
16<p>Is your suggested person a member of Launchpad? You'll want to <a16 </p>
17href="/{{summit.name}}/suggestsponsorship">fill out a Launchpad Suggestion17
18form</a>.</p>18 <p>
1919 If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
2020 </p>
21<p>21 </article>
22If you have any problems with this app, please contact22
23<a href="mailto:scott@ubuntu.com">scott@ubuntu.com</a>.23 <article class='main-content'>
24</p>24 <form method="post">
2525 <table>
26<form method="post">26 <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
27<table>27 <tr><td colspan="2"><h2>Your details</h2></td></tr>
28<tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>28 <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
29<tr><td colspan="2"><h2>Your details</h2></td></tr>29 <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
30<tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>30
31<tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>31 <tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>
3232 {{ form }}
33<tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>33 </table>
34{{ form }}34 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
35</table>35 {{ previous_fields|safe }}
36<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />36 <input type="submit" value="Next"/>
37{{ previous_fields|safe }}37 </form>
38<input type="submit" value="Next"/>38 </article>
39</form>
40{% endblock %}39{% endblock %}
4140
=== modified file 'summit/sponsor/templates/sponsor/step0.html'
--- summit/sponsor/templates/sponsor/step0.html 2010-08-25 00:22:58 +0000
+++ summit/sponsor/templates/sponsor/step0.html 2011-02-01 00:15:14 +0000
@@ -1,40 +1,37 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block extrahead %}3{% block extrahead %}
4{{ block.super }}4 {{ block.super }}
5{{ form.media }}5 {{ form.media }}
6{% endblock %}6{% endblock %}
77
8{% block sub_nav %}{% endblock %}8{% block sub_nav %}{% endblock %}
99
10{% block content %}10{% block content %}
11<article class="main-content alone">11 <article class="main-content alone">
12<h1>Request Sponsorship</h1>12 <h1>Request Sponsorship</h1>
13<p>13 <p>
14To request sponsorship we need a few details off you, such as where you'll14 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.
15be travelling from. We also need to know a bit about you so that we can15 </p>
16judge your request, we'll get some of that from Launchpad, but please take16
17the time to tell us about yourself in your own words.17 <p>
18</p>18 If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
19<p>19 </p>
20If you have any problems with this app, please contact20 </article>
21<a href="mailto:scott@ubuntu.com">scott@ubuntu.com</a>.21
22</p>22 <article class='main-content'>
23</article>23
2424 <form method="post">
25<article class='main-content'>25 <table>
2626 <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
27<form method="post">27 <tr><td colspan="2"><h2>Your details</h2></td></tr>
28<table>28 <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
29<tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>29 <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
30<tr><td colspan="2"><h2>Your details</h2></td></tr>30 {{ form }}
31<tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>31 </table>
32<tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>32 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
33{{ form }}33 {{ previous_fields|safe }}
34</table>34 <input type="submit" value="Next"/>
35<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />35 </form>
36{{ previous_fields|safe }}36 </article>
37<input type="submit" value="Next"/>
38</form>
39</article>
40{% endblock %}37{% endblock %}
4138
=== modified file 'summit/sponsor/templates/sponsor/suggeststep0.html'
--- summit/sponsor/templates/sponsor/suggeststep0.html 2010-10-03 22:43:07 +0000
+++ summit/sponsor/templates/sponsor/suggeststep0.html 2011-02-01 00:15:14 +0000
@@ -1,42 +1,41 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block head %}3{% block head %}
4{{ form.media }}4 {{ form.media }}
5{% endblock %}5{% endblock %}
66
7{% block sub_nav %}{% endblock %}7{% block sub_nav %}{% endblock %}
88
9{% block content %}9{% block content %}
10<h1>Suggest Sponsorship</h1>10 <article class="main-content alone">
11<p>11 <h1>Suggest Sponsorship</h1>
12To suggest sponsorship for someone, we need a few details about your12 <p>
13suggestion, such as where they'll be travelling from. We also need to know a13 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.
14bit about them so that we can judge your suggestion, we'll get some of that14 </p>
15from Launchpad, but please take the time to tell us about them in your own15
16words.16 <p>
17</p>17 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>.
1818 </p>
19<p>Is your suggested person not a member of Launchpad? You'll want to <a19
20href="/{{summit.name}}/nonlaunchpadsponsorship">fill out a Non-Launchpad20 <p>
21Suggestion form</a>.</p>21 If you have any problems with Summit, please <a href="https://bugs.launchpad.net/summit/+filebug">file a bug</a>.
2222 </p>
23<p>23 </article>
24If you have any problems with this app, please contact24
25<a href="mailto:scott@ubuntu.com">scott@ubuntu.com</a>.25 <article class='main-content'>
26</p>26 <form method="post">
2727 <table>
28<form method="post">28 <tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>
29<table>29 <tr><td colspan="2"><h2>Your details</h2></td></tr>
30<tr><th>Summit:</th><td><span>{{ summit.name }}<br/>{{ summit.location }}</span></td></tr>30 <tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>
31<tr><td colspan="2"><h2>Your details</h2></td></tr>31 <tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>
32<tr><th>Your name:</th><td><span>{{ user.get_full_name }}</span></td></tr>32
33<tr><th>E-mail address:</th><td><span>{{ user.email }}</span></td></tr>33 <tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>
3434 {{ form }}
35<tr><td colspan="2"><h2>Your suggested person&apos;s details</h2></td></tr>35 </table>
36{{ form }}36 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
37</table>37 {{ previous_fields|safe }}
38<input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />38 <input type="submit" value="Next"/>
39{{ previous_fields|safe }}39 </form>
40<input type="submit" value="Next"/>40 </article>
41</form>
42{% endblock %}41{% endblock %}

Subscribers

People subscribed via source and target branches