Merge lp:~cjohnston/summit/minor-my-schedule-link-changes into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 399
Merged at revision: 400
Proposed branch: lp:~cjohnston/summit/minor-my-schedule-link-changes
Merge into: lp:summit
Diff against target: 28 lines (+2/-5)
2 files modified
summit/schedule/templates/schedule/by_participant.html (+2/-1)
summit/schedule/templates/schedule/summit.html (+0/-4)
To merge this branch: bzr merge lp:~cjohnston/summit/minor-my-schedule-link-changes
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+106182@code.launchpad.net

Commit message

Moves my schedule type links to the my schedule page

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Good

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/by_participant.html'
2--- summit/schedule/templates/schedule/by_participant.html 2012-05-02 18:02:26 +0000
3+++ summit/schedule/templates/schedule/by_participant.html 2012-05-17 13:04:23 +0000
4@@ -11,7 +11,8 @@
5 {% endblock %}
6
7 {% block sub_nav_links %}
8-<li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
9+ <li><a class="sub-nav-item mobile" href="{% url summit.schedule.views.mobile summit.name %}">Mobile</a></li>
10+ <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My sessions (iCal)</a></li>
11 {% endblock %}
12
13 {% block content %}
14
15=== modified file 'summit/schedule/templates/schedule/summit.html'
16--- summit/schedule/templates/schedule/summit.html 2012-05-03 19:45:00 +0000
17+++ summit/schedule/templates/schedule/summit.html 2012-05-17 13:04:23 +0000
18@@ -19,10 +19,6 @@
19
20 {% block sub_nav_links %}
21 <li><a class="sub-nav-item" href="/{{ summit.name }}/tracks" title="Tracks">Tracks</a></li>
22- {% if attendee %}
23- <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/{{attendee.user.username}}/">My sessions</a></li>
24- <li><a class="sub-nav-item" href="/{{ summit.name }}/participant/my_schedule_{{ attendee.secret_key }}.ical">My sessions (iCal)</a></li>
25- {% endif %}
26 <li><a class="sub-nav-item" href="/{{ summit.name }}.ical">All sessions (iCal)</a></li>
27 <li><a class="sub-nav-item" href="{% url summit.schedule.views.past %}">Past summits</a></li>
28 {% endblock %}

Subscribers

People subscribed via source and target branches