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
1=== modified file 'summit/schedule/templates/schedule/interest.html'
2--- summit/schedule/templates/schedule/interest.html 2010-03-05 10:33:36 +0000
3+++ summit/schedule/templates/schedule/interest.html 2011-04-08 20:19:41 +0000
4@@ -2,6 +2,8 @@
5
6 {% block title %}{{ summit.title }} - Register interest{% endblock %}
7
8+{% block sub_nav %}{% endblock %}
9+
10 {% block content %}
11 <h1>{{ summit.title }}</h1>
12
13
14=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpaddone.html'
15--- summit/sponsor/templates/sponsor/nonlaunchpaddone.html 2010-03-05 10:33:36 +0000
16+++ summit/sponsor/templates/sponsor/nonlaunchpaddone.html 2011-04-08 20:19:41 +0000
17@@ -1,5 +1,7 @@
18 {% extends "base.html" %}
19
20+{% block sub_nav %}{% endblock %}
21+
22 {% block content %}
23 <h1>Request Sponsorship</h1>
24 <p>
25
26=== modified file 'summit/sponsor/templates/sponsor/nonlaunchpadreview.html'
27--- summit/sponsor/templates/sponsor/nonlaunchpadreview.html 2010-03-05 10:33:36 +0000
28+++ summit/sponsor/templates/sponsor/nonlaunchpadreview.html 2011-04-08 20:19:41 +0000
29@@ -1,6 +1,8 @@
30 {% extends "base.html" %}
31 {% load formatting %}
32
33+{% block sub_nav %}{% endblock %}
34+
35 {% block content %}
36 <h1>{{ sponsorship.name }}</h1>
37

Subscribers

People subscribed via source and target branches