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

Proposed by Chris Johnston on 2011-05-15
Status: Merged
Approved by: Michael Hall on 2011-05-22
Approved revision: 110
Merged at revision: 115
Proposed branch: lp:~cjohnston/summit/664879
Merge into: lp:summit
Diff against target: 34 lines (+6/-1)
2 files modified
summit/schedule/templates/schedule/schedule.html (+1/-1)
summit/schedule/views.py (+5/-0)
To merge this branch: bzr merge lp:~cjohnston/summit/664879
Reviewer Review Type Date Requested Status
Summit Hackers 2011-05-15 Pending
Review via email: mp+61023@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/templates/schedule/schedule.html'
--- summit/schedule/templates/schedule/schedule.html 2011-04-13 20:55:16 +0000
+++ summit/schedule/templates/schedule/schedule.html 2011-05-15 14:42:41 +0000
@@ -112,7 +112,7 @@
112{% if schedule.date %}112{% if schedule.date %}
113 <div class="schedule-head">113 <div class="schedule-head">
114 <a href="{% url mobile %}"><img class="schedule-qrcode" src="/media/img/guidebook_50.png" /></a>114 <a href="{% url mobile %}"><img class="schedule-qrcode" src="/media/img/guidebook_50.png" /></a>
115 <span class="schedule-date">{{ schedule.date|strftime:"%A" }}</span>115 <span class="schedule-date"><a href="{% url summit.schedule.views.by_date summit.name previousday|date:"Y-m-d" %}">&lt;</a> {{ schedule.date|strftime:"%A" }} <a href="{% url summit.schedule.views.by_date summit.name nextday|date:"Y-m-d" %}">&gt;</a></span>
116 {% if schedule.crew %}116 {% if schedule.crew %}
117 <span class="schedule-crew">Crew: {% for crew in schedule.crew %}<a href="https://launchpad.net/~{{crew.attendee}}">{{crew.attendee}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}117 <span class="schedule-crew">Crew: {% for crew in schedule.crew %}<a href="https://launchpad.net/~{{crew.attendee}}">{{crew.attendee}}</a>{% if forloop.last %}{% else %}, {% endif %}{% endfor %}
118 </span>118 </span>
119119
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py 2011-05-03 13:34:22 +0000
+++ summit/schedule/views.py 2011-05-15 14:42:41 +0000
@@ -106,12 +106,17 @@
106 if request.method == 'POST':106 if request.method == 'POST':
107 return schedule.save_change()107 return schedule.save_change()
108 else:108 else:
109 viewdate = datetime.datetime.strptime(date, "%Y-%m-%d")
110 day = datetime.timedelta(days=1)
111
109 context = {112 context = {
110 'summit': summit,113 'summit': summit,
111 'attendee': attendee,114 'attendee': attendee,
112 'schedule': schedule,115 'schedule': schedule,
113 'ical': '/%s.ical' % summit.name,116 'ical': '/%s.ical' % summit.name,
114 'autoreload': 'reload' in request.GET,117 'autoreload': 'reload' in request.GET,
118 'nextday': viewdate + day,
119 'previousday': viewdate - day,
115 }120 }
116 converted_date = summit.delocalize(datetime.datetime.strptime(date, "%Y-%m-%d"))121 converted_date = summit.delocalize(datetime.datetime.strptime(date, "%Y-%m-%d"))
117 if Slot.objects.filter(summit=summit, start_utc__gte=converted_date, end_utc__lte=converted_date+datetime.timedelta(days=1)).count() > 0:122 if Slot.objects.filter(summit=summit, start_utc__gte=converted_date, end_utc__lte=converted_date+datetime.timedelta(days=1)).count() > 0:

Subscribers

People subscribed via source and target branches