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

Proposed by Chris Johnston
Status: Merged
Merged at revision: 62
Proposed branch: lp:~cjohnston/summit/654566
Merge into: lp:summit
Diff against target: 49 lines (+18/-14)
2 files modified
summit/sponsor/templates/sponsor/done.html (+10/-8)
summit/sponsor/templates/sponsor/existing.html (+8/-6)
To merge this branch: bzr merge lp:~cjohnston/summit/654566
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+48046@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) :
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/done.html'
2--- summit/sponsor/templates/sponsor/done.html 2010-08-25 00:22:58 +0000
3+++ summit/sponsor/templates/sponsor/done.html 2011-01-31 20:28:02 +0000
4@@ -3,12 +3,14 @@
5 {% block sub_nav %}{% endblock %}
6
7 {% block content %}
8-<article class="main-content alone">
9-<h1>Request Sponsorship</h1>
10-<p>
11-Thanks very much for requesting sponsorship to {{ summit.name }}. If you
12-have any queries about your request, please e-mail
13-<a href="mailto:jorge@ubuntu.com">jorge@ubuntu.com</a>.
14-</p>
15-</article>
16+ <article class="main-content alone">
17+ <h1>Request Sponsorship</h1>
18+ <p>
19+ Thanks very much for requesting sponsorship to {{ summit.name }}. If you have any queries about your request, please e-mail <a href="mailto:jorge@ubuntu.com">jorge@ubuntu.com</a>.
20+ </p>
21+
22+ <p>
23+ We'll let you know whether or not your request has been accepted soon via email.
24+ </p>
25+ </article>
26 {% endblock %}
27
28=== modified file 'summit/sponsor/templates/sponsor/existing.html'
29--- summit/sponsor/templates/sponsor/existing.html 2010-09-25 14:08:52 +0000
30+++ summit/sponsor/templates/sponsor/existing.html 2011-01-31 20:28:02 +0000
31@@ -1,10 +1,12 @@
32 {% extends "base.html" %}
33
34 {% block content %}
35-<h1>Request Sponsorship</h1>
36-<p>
37-You've already requested sponsorship to {{ summit.name }}. If you
38-have any queries about your request, please e-mail
39-<a href="mailto:jorge@ubuntu.com">jorge@ubuntu.com</a>.
40-</p>
41+ <h1>Request Sponsorship</h1>
42+ <p>
43+ You've already requested sponsorship to {{ summit.name }}. If you have any queries about your request, please e-mail <a href="mailto:jorge@ubuntu.com">jorge@ubuntu.com</a>.
44+ </p>
45+
46+ <p>
47+ We'll let you know whether or not your request has been accepted soon via email.
48+ </p>
49 {% endblock %}

Subscribers

People subscribed via source and target branches