Merge lp:~salgado/summit/highlight-linaro-sessions into lp:summit

[Guilherme Salgado]

This branch highlights the linaro sessions with a different icon and a green border.

Some discussion about the change: https://wiki.canonical.com/UbuntuPlatform/Linaro/Summit_Changes

And there's a screenshot at http://people.canonical.com/~salgado/linaro-summit.png

[Elliot Murphy (statik)]

Looks good to me!

[Michael Hall (mhall119)]

In def is_linaro, is there a reason you didn't just include the leading / in the string literal, thus saving the call to startswith() and a string concatination?

[Guilherme Salgado (salgado)]

On Wed, 2010-09-22 at 15:41 +0000, Michael Hall wrote:
> In def is_linaro, is there a reason you didn't just include the leading / in the string literal, thus saving the call to startswith() and a string concatination?

Just to avoid repeating the slash in all lines, I guess. Note that the
startswith() call can't be avoided, though, as the path won't ever be
just /project for a blueprint URL.

--
Guilherme Salgado <https://launchpad.net/~salgado>

[Michael Hall (mhall119)]

In that case, the first 'linaro' in the list will also match any URL for 'linaro-kernel-wg', 'linaro-pm-wg' and 'linaro-toolchain-misc'. Same with 'gcc-linaro' and 'gcc-linaro-tracking'. Not that it will break anything in this case, just to be aware that those others won't ever be used.

[Guilherme Salgado (salgado)]

On Wed, 2010-09-22 at 16:27 +0000, Michael Hall wrote:
> In that case, the first 'linaro' in the list will also match any URL for 'linaro-kernel-wg', 'linaro-pm-wg' and 'linaro-toolchain-misc'. Same with 'gcc-linaro' and 'gcc-linaro-tracking'. Not that it will break anything in this case, just to be aware that those others won't ever be used.

Good catch, I could leave just 'linaro' and the ones that don't start
with that (with a comment explaining that it should catch all), although
it may be worth leaving the whole list of projects there -- you know,
explicit is better than implicit. ;)

What do you think?

[Michael Hall (mhall119)]

As long as there's no need to match them exactly, I don't see any harm in leaving them in there, it does serve to document what it is expecting to find.

[Guilherme Salgado (salgado)]

On Wed, 2010-09-22 at 17:43 +0000, Michael Hall wrote:
> As long as there's no need to match them exactly, I don't see any harm in leaving them in there, it does serve to document what it is expecting to find.

Cool. Are you happy with the rest of the changes as well?

Also, is there anything else I need to do to get this merged?

Cheers

[Dave Walker (davewalker)]

Looks good, and I think Michael is also satisfied. Merging.

review: Approve

=== modified file 'summit/media/css/schedule.css'
--- summit/media/css/schedule.css	2010-05-05 08:53:41 +0000
+++ summit/media/css/schedule.css	2010-09-22 14:44:45 +0000
@@ -180,6 +180,12 @@
     font-size: 8px;
 }
 
+/* Linaro-related sessions get a green border to make it easier to distinguish
+ * them. */
+div.meeting.linaro {
+    border: 1px solid green;
+}
+
 
 /* Meetings have additional classes for their type, which we use to set
  * a pretty background colour.

=== added file 'summit/media/img/blueprint-linaro.png'
Binary files summit/media/img/blueprint-linaro.png	1970-01-01 00:00:00 +0000 and summit/media/img/blueprint-linaro.png	2010-09-22 14:44:45 +0000 differ
=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2010-05-05 08:49:24 +0000
+++ summit/schedule/models/meetingmodel.py	2010-09-22 14:44:45 +0000
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import urllib2
+from urlparse import urlparse
 
 from BeautifulSoup import BeautifulSoup
 
@@ -111,6 +112,27 @@
             return self.title
 
     @property
+    def is_linaro(self):
+        path = urlparse(self.spec_url).path
+        linaro_projects = [
+            'linaro',
+            'linaro-kernel-wg',
+            'linaro-pm-wg',
+            'binutils-linaro',
+            'cortex-strings',
+            'gcc-linaro',
+            'gcc-linaro-tracking',
+            'gdb-linaro',
+            'linaro-toolchain-misc',
+            'qemu-linaro',
+            'tcwg-web',
+            ]
+        for project in linaro_projects:
+            if path.startswith('/%s' % project):
+                return True
+        return False
+
+    @property
     def attendees(self):
         attendees = []
         if self.scribe and self.scribe not in attendees:

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2010-05-05 08:49:24 +0000
+++ summit/schedule/render.py	2010-09-22 14:44:45 +0000
@@ -618,6 +618,12 @@
         else:
             spec = label = icon = None
 
+        if meeting.is_linaro:
+            # Linaro blueprints get a different icon/class to make it easier
+            # to distinguish them.
+            icon = 'linaro'
+            classes.append("linaro")
+
         html += '<div id="meeting%d"\n' % meeting.id
         html += '     class="%s"\n' % ' '.join(classes)
         html += '     style="%(style)s">\n'