Merge lp:~cjohnston/summit/daily-updates into lp:summit

[Chris Johnston]

[lp:~cjohnston/summit/daily-updates]

257. By Michael Hall on 2012-01-24

[r=chrisjohnston] Fix localtime conversion issues

258. By Michael Hall on 2012-01-24

[r=chrisjohnston] Fix wide schedule links and tests

[Michael Hall (mhall119)]

Merge conflicts in the diff

[Michael Hall (mhall119)]

review: Needs Fixing

[lp:~cjohnston/summit/daily-updates]

259. By Chris Johnston on 2012-01-24

[r=mhall119] Renames the app to "The Summit Scheduler" and adds/fixes page titles across the board.

260. By Chris Johnston on 2012-01-24

Removes conflict

Unmerged revisions

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-01-23 01:18:55 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-01-24 05:14:24 +0000
@@ -95,10 +95,17 @@
 
 {% for slot, meetings in schedule.items %}
 <table  class="basic">
-<thead><tr><th colspan="2">{{slot.start.time|strftime:"%H:%M"}} - {{slot.end.time|strftime:"%H:%M"}}</th></tr></thead>
+<thead><tr><th colspan="2">{{slot.start.time|strftime:"%H:%M"}} - {{slot.end.time|strftime:"%H:%M"}} {% ifequal slot.type 'plenary' %}[PLENARY]{% endifequal %}</th></tr></thead>
 <tbody>
+{% if slot.type == 'lunch' %}
+<tr style="background-color: #AAFFAA;">
+<td colspan="2" style="text-align: center;">
+Lunch
+</td>
+</tr>
+{% else %}
 {% for room, agenda in meetings.items %}
-<tr style="background-color: {{ agenda.meeting.track_color }};">
+<tr style="background-color: {% ifequal agenda.meeting.type 'plenary' %}#ffffe0{% else %}{{ agenda.meeting.track_color }}{% endifequal %}; {% if agenda.meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
 <td width="75%">
     <span onMouseOver="show_agenda_details({{agenda.id}});" onMouseOut="hide_agenda_details({{agenda.id}});;">
     <a href="{{agenda.meeting.meeting_page_url}}" style="color: #000000;">
@@ -138,6 +145,7 @@
 </td>
 </tr>
 {% endfor %} 
+{% endif %}
 </tbody>
 </table>
 {% endfor %}

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2012-01-24 04:30:40 +0000
+++ summit/schedule/views.py	2012-01-24 05:14:24 +0000
@@ -74,8 +74,9 @@
     day = datetime.timedelta(days=1)
 
     schedule = SortedDict()
+
     for slot in summit.slot_set.filter(start_utc__gte=utc_date, end_utc__lte=(utc_date+day)).order_by('start_utc'):
-        if not (slot.type == 'open' or slot.type == 'plenary'):
+        if not (slot.type == 'open' or slot.type == 'plenary' or slot.type == 'lunch'):
             continue
         if not slot in schedule:
             schedule[slot] = SortedDict()