Merge lp:~cjohnston/summit/quick-links into lp:summit

Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 521
Merged at revision: 525
Proposed branch: lp:~cjohnston/summit/quick-links
Merge into: lp:summit
Prerequisite: lp:~cjohnston/summit/add-summit-registration-links
Diff against target: 29 lines (+8/-3)
1 file modified
summit/schedule/templates/schedule/actions.html (+8/-3)
To merge this branch: bzr merge lp:~cjohnston/summit/quick-links
Reviewer Review Type Date Requested Status
Adnane Belmadiaf Approve
Review via email: mp+157551@code.launchpad.net

This proposal supersedes a proposal from 2013-04-07.

To post a comment you must log in.
Revision history for this message
Adnane Belmadiaf (daker) wrote :

+1

review: Approve
lp:~cjohnston/summit/quick-links updated
521. By Chris Johnston

Update from other branches

Revision history for this message
Adnane Belmadiaf (daker) wrote :

looks 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/actions.html'
2--- summit/schedule/templates/schedule/actions.html 2012-08-08 15:10:25 +0000
3+++ summit/schedule/templates/schedule/actions.html 2013-04-08 21:09:23 +0000
4@@ -1,9 +1,10 @@
5 {% load schedule_perms %}
6
7 {% ifnotequal summit.state "public" %}
8-<div class="action-links">
9- <p style="font-size: 16px; font-weight: bold;">Actions</p>
10- <ul>
11+<div class="box box-padded">
12+ <h3>Quick Links</h3>
13+ <div>
14+ <ul class="list">
15
16 {% ifchangeschedule summit attendee %}
17 {% if schedule.date %}
18@@ -43,7 +44,11 @@
19 {% endif %}
20 {% endifequal %}
21
22+{% if attendee %}
23+ <li><a href="{% url registration summit.name %}">Update registration</a></li>
24+{% endif %}
25 </ul>
26 </div>
27+</div>
28
29 {% endifnotequal %}

Subscribers

People subscribed via source and target branches