Summit

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

  1. 925815
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 296
Merged at revision: 300
Proposed branch: lp:~cjohnston/summit/925815
Merge into: lp:summit
Diff against target: 35 lines (+5/-0)
2 files modified
summit/schedule/templates/schedule/daily.html (+3/-0)
summit/schedule/templates/schedule/schedule.html (+2/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/925815
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+91699@code.launchpad.net

Commit message

Removes QR img if summit.qr does not exist. Removes QR code on mobile devices

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) 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/daily.html'
2--- summit/schedule/templates/schedule/daily.html 2012-02-02 16:40:27 +0000
3+++ summit/schedule/templates/schedule/daily.html 2012-02-06 19:10:34 +0000
4@@ -106,6 +106,7 @@
5 text-align: center;
6 margin: 0;
7 }
8+ div.schedule-head .schedule-qrcode { display: none; }
9 div.schedule-head .schedule-date a {
10 display: block;
11 float: right;
12@@ -167,7 +168,9 @@
13 <article class="main-content">
14
15 <div class="schedule-head">
16+{% if summit.qr %}
17 <img class="schedule-qrcode" src="{{summit.qr}}" />
18+{% endif %}
19 <span class="schedule-date"><a href="{% url summit.schedule.views.daily_schedule summit.name previousday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&lt;</a> {{ viewdate.date|strftime:"%A" }} <a href="{% url summit.schedule.views.daily_schedule summit.name nextday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&gt;</a></span>
20
21 {% if schedule.crew %}
22
23=== modified file 'summit/schedule/templates/schedule/schedule.html'
24--- summit/schedule/templates/schedule/schedule.html 2012-02-05 21:01:37 +0000
25+++ summit/schedule/templates/schedule/schedule.html 2012-02-06 19:10:34 +0000
26@@ -59,7 +59,9 @@
27
28 {% if schedule.date %}
29 <div class="schedule-head">
30+ {% if summit.qr %}
31 <img class="schedule-qrcode" src="{{summit.qr}}" />
32+ {% endif %}
33 <span class="schedule-date"><a href="{% url summit.schedule.views.by_date summit.name previousday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}">&lt;</a> {{ schedule.date|strftime:"%A" }} <a href="{% url summit.schedule.views.by_date summit.name nextday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}">&gt;</a></span>
34 {% if schedule.crew %}
35 <span class="schedule-crew">Crew: {% for crew in schedule.crew %}<a href="https://launchpad.net/~{{crew.attendee.user}}">{{crew.attendee.name}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}

Subscribers

People subscribed via source and target branches