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

Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 71
Merged at revision: 85
Proposed branch: lp:~cjohnston/summit/subnav
Merge into: lp:summit
Diff against target: 36 lines (+6/-0)
3 files modified
summit/schedule/templates/schedule/interest.html (+2/-0)
summit/sponsor/templates/sponsor/nonlaunchpaddone.html (+2/-0)
summit/sponsor/templates/sponsor/nonlaunchpadreview.html (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/subnav
Reviewer Review Type Date Requested Status
Nigel Babu (community) Approve
Summit Hackers Pending
Review via email: mp+57008@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Nigel Babu (nigelbabu) wrote :

Looks good. Although I find it strange we have to add something to get something removed ;)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/templates/schedule/interest.html'
--- summit/schedule/templates/schedule/interest.html 2010-03-05 10:33:36 +0000
+++ summit/schedule/templates/schedule/interest.html 2011-04-08 20:19:41 +0000
@@ -2,6 +2,8 @@
22
3{% block title %}{{ summit.title }} - Register interest{% endblock %}3{% block title %}{{ summit.title }} - Register interest{% endblock %}
44
5{% block sub_nav %}{% endblock %}
6
5{% block content %}7{% block content %}
6<h1>{{ summit.title }}</h1>8<h1>{{ summit.title }}</h1>
79
810
=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpaddone.html'
--- summit/sponsor/templates/sponsor/nonlaunchpaddone.html 2010-03-05 10:33:36 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpaddone.html 2011-04-08 20:19:41 +0000
@@ -1,5 +1,7 @@
1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block sub_nav %}{% endblock %}
4
3{% block content %}5{% block content %}
4<h1>Request Sponsorship</h1>6<h1>Request Sponsorship</h1>
5<p>7<p>
68
=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadreview.html'
--- summit/sponsor/templates/sponsor/nonlaunchpadreview.html 2010-03-05 10:33:36 +0000
+++ summit/sponsor/templates/sponsor/nonlaunchpadreview.html 2011-04-08 20:19:41 +0000
@@ -1,6 +1,8 @@
1{% extends "base.html" %}1{% extends "base.html" %}
2{% load formatting %}2{% load formatting %}
33
4{% block sub_nav %}{% endblock %}
5
4{% block content %}6{% block content %}
5<h1>{{ sponsorship.name }}</h1>7<h1>{{ sponsorship.name }}</h1>
68

Subscribers

People subscribed via source and target branches