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
=== modified file 'summit/sponsor/templates/sponsor/done.html'
--- summit/sponsor/templates/sponsor/done.html 2010-08-25 00:22:58 +0000
+++ summit/sponsor/templates/sponsor/done.html 2011-01-31 20:28:02 +0000
@@ -3,12 +3,14 @@
3{% block sub_nav %}{% endblock %}3{% block sub_nav %}{% endblock %}
44
5{% block content %}5{% block content %}
6<article class="main-content alone">6 <article class="main-content alone">
7<h1>Request Sponsorship</h1>7 <h1>Request Sponsorship</h1>
8<p>8 <p>
9Thanks very much for requesting sponsorship to {{ summit.name }}. If you9 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>.
10have any queries about your request, please e-mail10 </p>
11<a href="mailto:jorge@ubuntu.com">jorge@ubuntu.com</a>.11
12</p>12 <p>
13</article>13 We'll let you know whether or not your request has been accepted soon via email.
14 </p>
15 </article>
14{% endblock %}16{% endblock %}
1517
=== modified file 'summit/sponsor/templates/sponsor/existing.html'
--- summit/sponsor/templates/sponsor/existing.html 2010-09-25 14:08:52 +0000
+++ summit/sponsor/templates/sponsor/existing.html 2011-01-31 20:28:02 +0000
@@ -1,10 +1,12 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block content %}3{% block content %}
4<h1>Request Sponsorship</h1>4 <h1>Request Sponsorship</h1>
5<p>5 <p>
6You've already requested sponsorship to {{ summit.name }}. If you6 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>.
7have any queries about your request, please e-mail7 </p>
8<a href="mailto:jorge@ubuntu.com">jorge@ubuntu.com</a>.8
9</p>9 <p>
10 We'll let you know whether or not your request has been accepted soon via email.
11 </p>
10{% endblock %}12{% endblock %}

Subscribers

People subscribed via source and target branches