Merge lp:~daker/summit/fix.summit-colors into lp:summit

[Adnane Belmadiaf]

* Added friendly colors for the track block
* Css fixes
* Removed the empty context_processors file

Preview : http://i.imgur.com/wBfwe.png

[Chris Johnston (cjohnston)]

review: Approve

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/common/utils.py

[lp:~daker/summit/fix.summit-colors]

477. By Adnane Belmadiaf on 2013-01-19

- Merged trunk
- Fixed text conflicts
- Removed unused imports

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'summit/common/utils.py'
--- summit/common/utils.py	2012-12-15 02:06:56 +0000
+++ summit/common/utils.py	2013-01-19 22:31:20 +0000
@@ -1,5 +1,14 @@
-import email
-import os
+# -*- coding: utf-8 -*-
+
+
+def hex_to_rgba(value):
+    """
+    return the rgba version of a hex color
+    """
+    value = value.lstrip('#')
+    lv = len(value)
+    return tuple(int(value[i:i + lv / 3], 16) for i in range(0, lv, lv / 3)) + (0.5,)
+
 
 def redirect(to, *args, **kwargs):
     from distutils.version import LooseVersion as V

=== modified file 'summit/media/css/schedule.css'
--- summit/media/css/schedule.css	2012-10-24 19:40:50 +0000
+++ summit/media/css/schedule.css	2013-01-19 22:31:20 +0000
@@ -112,7 +112,7 @@
     border-top: 1px solid #e0e0e0;
     font-size: 11px;
     color: #606060;
-    
+
     line-height: 1em;
 }
 
@@ -171,11 +171,10 @@
 
 /* Meeting block formatting */
 div.meeting {
-    border: 1px solid black;
-    -moz-border-radius: 6px;
-
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
     font-size: 15px;
-
     z-index: 5;
 }
 

=== removed file 'summit/schedule/context_processors.py'
--- summit/schedule/context_processors.py	2011-11-26 21:34:36 +0000
+++ summit/schedule/context_processors.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-

=== modified file 'summit/schedule/models/trackmodel.py'
--- summit/schedule/models/trackmodel.py	2012-01-23 01:18:55 +0000
+++ summit/schedule/models/trackmodel.py	2013-01-19 22:31:20 +0000
@@ -17,6 +17,7 @@
 from django.db import models
 
 from summit.schedule.models.summitmodel import Summit
+from summit.common.utils import hex_to_rgba
 
 __all__ = (
     'Track',
@@ -37,3 +38,15 @@
 
     def __unicode__(self):
         return "%s (%s)" % (self.title, self.summit.name)
+
+    def get_color(self):
+        if self.color:
+            return "#%s" % self.color
+        else:
+            return "#ffffff"
+
+    def get_bordercolor(self):
+        return "1px solid %s" % self.get_color()
+
+    def get_bgcolor(self):
+        return "rgba%s" % str(hex_to_rgba(self.get_color()))

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2012-10-24 19:40:50 +0000
+++ summit/schedule/render.py	2013-01-19 22:31:20 +0000
@@ -18,7 +18,6 @@
 import datetime
 import pytz
 import simplejson as json
-import urllib
 
 from django.conf import settings
 from django.core.cache import cache
@@ -56,7 +55,10 @@
             'min-height':  '%dpx' % height,
         }
     if meeting.tracks.count() > 0:
-        style['background-color'] = '#'+meeting.tracks.all()[0].color
+        _track = meeting.tracks.all()[0]
+        style['background-color'] = _track.get_bgcolor()
+        style['border'] = _track.get_bordercolor()
+
     return '; '.join(': '.join(x) for x in style.items())
 
 
@@ -209,10 +211,10 @@
 
         agenda_cache = {}
         for a in Agenda.objects.select_related().filter(slot__summit=self.summit):
-            if not agenda_cache.has_key(a.slot.id):
+            if not a.slot.id in agenda_cache:
                 agenda_cache[a.slot.id] = {}
             agenda_cache[a.slot.id][a.room.id] = a
-            
+
         # Work out what item goes into each slot, and the position in
         # the rendered schedule for it
         for date in self.dates:
@@ -237,7 +239,6 @@
                                      if r.available(slot)]
                             if len(rooms) > 0:
                                 self.meetings[slot].append((rooms[0], None))
-                                meeting_room = rooms[0]
                         except KeyError:
                             if not self.track:
                                 self.meetings[slot].append((None, None))
@@ -304,7 +305,7 @@
                 room_tracks = self.room.tracks.all()
                 if room_tracks.count() > 0:
                     query_parts.append(
-                        Q(tracks__isnull=True)|Q(tracks__in=room_tracks))
+                        Q(tracks__isnull=True) | Q(tracks__in=room_tracks))
                 only_plenary_meetings = Q(type__in=('plenary', 'talk', 'special'))
                 # Don't show unscheduled plenary tracks in room view unless
                 # it's the plenary room
@@ -318,7 +319,7 @@
             # If we are just a track lead, limit schedulable session to your tracks only
             if self.summit.is_tracklead(self.attendee) and not self.summit.is_scheduler(self.attendee):
                 query_parts.append(Q(tracks__lead__lead=self.attendee))
-                
+
             self.unscheduled = list(
                 self.summit.meeting_set.filter(*query_parts))
 
@@ -347,7 +348,7 @@
             for slot_num, slot in enumerate(self.slots[date]):
                 for room_num, info in enumerate(self.meetings[slot]):
                     (room, meeting) = info
-                    if room is None: 
+                    if room is None:
                         continue
                     if meeting is None:
                         meeting_title = ''
@@ -388,7 +389,7 @@
         # with 12px added for each column for borders and margin
         if slot.type == 'plenary':
             meeting_width = (
-                112*self.day_width/len(self.meetings[slot]))
+                112 * self.day_width / len(self.meetings[slot]))
             pos['left'] = (date_num * meeting_width) + (room_num * 112)
         else:
             pos['left'] = (date_num * self.day_width + room_num) * 112
@@ -481,7 +482,6 @@
         html = (u'<span class="last-updated" style="float: right;">Updated '
             '<span id="refresh-time">0</span> seconds ago</span>'
             '<div style="clear: both;"></div>')
-        
 
         if self.endofday:
             html += '<p><strong>No more sessions for today.</strong></p>'
@@ -587,7 +587,7 @@
                     had_lunch = True
 
                 # Avoid duplicating markers
-                if slot.start.strftime("%H:%M")  not in markers:
+                if slot.start.strftime("%H:%M") not in markers:
                     markers.append(slot.start.strftime("%H:%M"))
 
                     style = {
@@ -605,8 +605,8 @@
                 height = 12
 
                 # Avoid duplicating markers
-                if slot.end.strftime("%H:%M")  not in markers:
-                    markers.append(slot.end.strftime("%H:%M") )
+                if slot.end.strftime("%H:%M") not in markers:
+                    markers.append(slot.end.strftime("%H:%M"))
 
                     style = {
                         'top': '%dpx' % top,
@@ -659,7 +659,7 @@
                 }
         else:
             style = {}
-        
+
         if room.type == 'private':
             classes.append('private')
 
@@ -735,10 +735,10 @@
 
         if meeting.icon:
             html += '<img src="/media/img/%s" class="meeting_emblem" title="%s" />\n' % (meeting.icon, meeting.get_type_display())
-        
+
         if self.edit and meeting.agenda_set.filter(auto=False).exists():
             html += '<img src="/media/img/lock_mono_dark.png" class="meeting_lock" title="Manually Scheduled" />\n'
-            
+
         if slot and room:
             html += '  <span class="time">%s, %s</span>\n' % (slot.start.strftime("%A %H:%M"),
                                                               escape_strings(room.title))
@@ -860,7 +860,6 @@
 
             meeting_slots[meeting_ref] = meeting.slots
 
-
         js = u'\n'
         js += 'var Data = {\n'
         js += '  slot: %s,\n' % json.dumps(slot_table, indent=4)
@@ -984,10 +983,8 @@
 
         return csv
 
-    def as_ical(self, only_username=None, 
-                      only_room=None, 
-                      only_track=None, 
-                      show_private=False):
+    def as_ical(self, only_username=None, only_room=None,
+                only_track=None, show_private=False):
         """
         return a schedule as ical
         """
@@ -1028,14 +1025,15 @@
 X-TYPE:%(type)s
 X-ROOMNAME:%(roomname)s
 END:VEVENT
-''' % {'id':meeting.id, 'dtstart':dtstart, 'dtend':dtend, 'category':categories,
-       'eventname':meeting.title, 'eventplace': room.title, 'type': meeting.type,
-       'roomname':room.name, 'description': meeting.get_decription().replace('\r', '').replace('\n', '\N'),
+''' % {'id': meeting.id, 'dtstart': dtstart, 'dtend': dtend, 'category': categories,
+       'eventname': meeting.title, 'eventplace': room.title, 'type': meeting.type,
+       'roomname': room.name, 'description': meeting.get_decription().replace('\r', '').replace('\n', '\N'),
        'meeting_url':meeting.meeting_page_url,
        'base_url':getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')}
         ical += 'END:VCALENDAR'
         return ical
 
+
 def schedule_factory(
         request, summit, attendee=None, date=None, room=None, track=None):
     """Create and return a Schedule instance with the given arguments.