Merge lp:~mhall119/summit/meeting-emblems into lp:summit

[Michael Hall]

Adds emblems to the top-right corner of a meeting in both the list and wide displays.

Adds emblems to the top-right corner of a meeting in both the list and wide displays. Emblems are used for:
roundtable
workshop
presentation
panel
bof

[Chris Johnston (cjohnston)]

LGTM

review: Approve

=== modified file 'summit/media/css/schedule.css'
--- summit/media/css/schedule.css	2012-05-25 14:57:02 +0000
+++ summit/media/css/schedule.css	2012-10-09 21:03:20 +0000
@@ -131,7 +131,9 @@
 div.slot, div.meeting {
     display: block;
 
-    padding: 4px;
+    padding: 1px;
+    padding-top: 6px;
+    padding-right: 6px;
     border: 1px;
     overflow: hidden;
 

=== modified file 'summit/media/css/site.css'
--- summit/media/css/site.css	2012-04-30 16:48:43 +0000
+++ summit/media/css/site.css	2012-10-09 21:03:20 +0000
@@ -50,6 +50,21 @@
     white-space: pre-wrap;
 }
 
+div.meeting {
+    position: relative;
+}
+
+div.meeting .meeting_emblem {
+    position: absolute;
+    right:  1px;
+    top: 1px;
+    z-index: 10 !important;
+}
+
+div.unscheduled div.meeting .meeting_emblem {
+    display: none;
+}
+
 div.agenda-details ul {
     margin-bottom: 0;
 }

=== added file 'summit/media/img/meeting_emblem_bof.png'
Binary files summit/media/img/meeting_emblem_bof.png	1970-01-01 00:00:00 +0000 and summit/media/img/meeting_emblem_bof.png	2012-10-09 21:03:20 +0000 differ
=== added file 'summit/media/img/meeting_emblem_discussion.png'
Binary files summit/media/img/meeting_emblem_discussion.png	1970-01-01 00:00:00 +0000 and summit/media/img/meeting_emblem_discussion.png	2012-10-09 21:03:20 +0000 differ
=== added file 'summit/media/img/meeting_emblem_panel.png'
Binary files summit/media/img/meeting_emblem_panel.png	1970-01-01 00:00:00 +0000 and summit/media/img/meeting_emblem_panel.png	2012-10-09 21:03:20 +0000 differ
=== added file 'summit/media/img/meeting_emblem_presentation.png'
Binary files summit/media/img/meeting_emblem_presentation.png	1970-01-01 00:00:00 +0000 and summit/media/img/meeting_emblem_presentation.png	2012-10-09 21:03:20 +0000 differ
=== added file 'summit/media/img/meeting_emblem_roundtable.png'
Binary files summit/media/img/meeting_emblem_roundtable.png	1970-01-01 00:00:00 +0000 and summit/media/img/meeting_emblem_roundtable.png	2012-10-09 21:03:20 +0000 differ
=== added file 'summit/media/img/meeting_emblem_workshop.png'
Binary files summit/media/img/meeting_emblem_workshop.png	1970-01-01 00:00:00 +0000 and summit/media/img/meeting_emblem_workshop.png	2012-10-09 21:03:20 +0000 differ
=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2012-10-09 19:01:06 +0000
+++ summit/schedule/models/meetingmodel.py	2012-10-09 21:03:20 +0000
@@ -56,6 +56,19 @@
         (u'bof', u'BoF'),
     )
 
+    TYPE_ICONS = {
+        u'discussion': None,
+        u'boardroom': None,
+        u'plenary': None,
+        u'roundtable': 'meeting_emblem_roundtable.png',
+        u'workshop': 'meeting_emblem_workshop.png',
+        u'presentation': 'meeting_emblem_presentation.png',
+        u'panel': 'meeting_emblem_panel.png',
+        u'seminar': None,
+        u'special': None,
+        u'bof': 'meeting_emblem_bof.png',
+    }
+
     STATUS_CHOICES = (
         (u'NEW', u'New'),
         (u'DISCUSSION', u'Discussion'),
@@ -197,6 +210,11 @@
         return reverse('summit.schedule.views.meeting', args=args)
     meeting_page_url = property(get_meeting_page_url)
 
+    def get_meeting_type_icon(self):
+        if self.type in self.TYPE_ICONS:
+            return self.TYPE_ICONS[self.type]
+    icon = property(get_meeting_type_icon)
+    
     def __unicode__(self):
         if self.name:
             return self.name

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2012-09-09 21:15:17 +0000
+++ summit/schedule/render.py	2012-10-09 21:03:20 +0000
@@ -733,6 +733,9 @@
         html += '     class="%s"\n' % ' '.join(classes)
         html += '     style="%(style)s">\n'
 
+        if meeting.icon:
+            html += '<img src="/media/img/%s" class="meeting_emblem" title="%s" />\n' % (meeting.icon, meeting.get_type_display())
+        
         if slot and room:
             html += '  <span class="time">%s, %s</span>\n' % (slot.start.strftime("%A %H:%M"),
                                                               escape_strings(room.title))

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-10-06 17:26:26 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-10-09 21:03:20 +0000
@@ -51,6 +51,10 @@
 {% for room, agenda in meetings.items %}
 <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%">
+    <div class="meeting">
+    {% if agenda.meeting.icon %}
+    <img src="/media/img/{{agenda.meeting.icon}}" class="meeting_emblem" title="{{agenda.meeting.get_type_display}}" />
+    {% endif %}
     <span onMouseOver="show_agenda_details({{agenda.id}}, {{slot.id}});" onMouseOut="hide_agenda_details({{agenda.id}}, {{slot.id}});">
     <a href="{% url summit.schedule.views.attend_meeting agenda.meeting.summit.name, agenda.meeting.id %}">
         {% if attendee in agenda.meeting.attendees %}
@@ -68,6 +72,7 @@
             {% ifnotequal forloop.counter 1 %}, {% endifnotequal %}{{ track.title }}
         {% endfor %})</span>
     {% endif %}
+    </div>
     <div id="agenda-{{agenda.id}}-{{slot.id}}-details" class="agenda-details">
     <div class="arrow"></div>
     <div class="meeting-description">{{agenda.meeting.description}}</div>