Merge lp:~salgado/summit/linaro into lp:summit

[Guilherme Salgado]

This branch adds a new wsgi script to be used in summit.linaro.org. That wsgi script sets an environment variable that is picked up in settings.py to set LINARO_ONLY to true. That config in turn changes the daily/room schedule to show only linaro sessions and changes the main summit page (e.g. /uds-o) to only list the tracks that contain the string 'linaro' on their name.

There's also instructions to getting a copy of the light-django-theme branch that has the css/images for summit.linaro.org.

Although these changes are not ideal and we plan to implement support for co-located events before the next UDS, they will make it possible to have a single deployment of lp:summit serving both summit.l.o and summit.u.c without intrusive changes that would require more work and testing than we have time for.

=== modified file '.bzrignore'
--- .bzrignore	2010-09-20 23:31:20 +0000
+++ .bzrignore	2011-04-20 20:20:56 +0000
@@ -3,3 +3,4 @@
 summit/lp-cache
 summit/summit.db
 summit/ubuntu_website
+summit/linaro_website

=== modified file 'INSTALL'
--- INSTALL	2011-04-01 15:08:33 +0000
+++ INSTALL	2011-04-20 20:20:56 +0000
@@ -11,6 +11,7 @@
  - cp local_settings.py.sample local_settings.py
    # edit local_settings.py and set DATABASE_USER, DATABASE_PASSWORD, SECRET_KEY
  - bzr branch lp:ubuntu-community-webthemes/light-django-theme ubuntu_website
+ - bzr branch lp:~salgado/ubuntu-community-webthemes/light-django-linaro-theme linaro_website
  - ./manage.py syncdb
  - ./manage.py migrate
  - ./manage.py runserver

=== added file 'summit/linaro.wsgi'
--- summit/linaro.wsgi	1970-01-01 00:00:00 +0000
+++ summit/linaro.wsgi	2011-04-20 20:20:56 +0000
@@ -0,0 +1,11 @@
+import os
+import sys
+
+root = os.path.join(os.path.dirname(__file__), '..')
+sys.path.append(root)
+sys.path.append(os.path.join(root, 'summit'))
+
+os.environ['SUMMIT_LINARO'] = '1'
+os.environ['DJANGO_SETTINGS_MODULE'] = 'summit.settings'
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()

=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py	2011-04-18 19:24:13 +0000
+++ summit/schedule/render.py	2011-04-20 20:20:56 +0000
@@ -1067,3 +1067,16 @@
                 elif meeting not in linaro_meetings:
                     idx = meetings.index((room, meeting))
                     meetings[idx] = (room, None)
+
+
+def schedule_factory(
+        request, summit, attendee=None, date=None, room=None, track=None):
+    """Create and return a Schedule instance with the given arguments.
+
+    If settings.LINARO_ONLY is True, create a LinaroSchedule instance instead.
+    """
+    schedule_class = Schedule
+    if settings.LINARO_ONLY:
+        schedule_class = LinaroSchedule
+    return schedule_class(
+        request, summit, attendee, room=room, date=date, track=track)

=== modified file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2010-10-16 16:38:18 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	2011-04-20 20:20:56 +0000
@@ -14,7 +14,7 @@
 <td>
 By track:
 <ul>
-  {% for track in summit.track_set.all %}
+  {% for track in tracks %}
     <li><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></li>
   {% endfor %}
 </ul>

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2011-04-19 21:50:43 +0000
+++ summit/schedule/views.py	2011-04-20 20:20:56 +0000
@@ -32,7 +32,7 @@
 
 from summit.schedule.forms import AttendeeInterestForm
 
-from summit.schedule.render import LinaroSchedule, Schedule
+from summit.schedule.render import schedule_factory, Schedule
 
 __all__ = (
     'index',
@@ -64,10 +64,15 @@
         if request.user.is_authenticated() \
                 and request.user.has_perm('schedule.change_agenda'):
             edit = True
+    tracks = summit.track_set.all()
+    if settings.LINARO_ONLY:
+        tracks = tracks.filter(slug__contains='linaro')
+
     context = {
         'summit': summit,
         'attendee': attendee,
         'edit': edit,
+        'tracks': tracks,
     }
     return render_to_response("schedule/summit.html", context,
                               context_instance=RequestContext(request))
@@ -96,10 +101,7 @@
 
 @summit_required
 def by_date(request, summit, attendee, date):
-    if 'linaro_only' in request.GET:
-        schedule = LinaroSchedule(request, summit, attendee, date=date)
-    else:
-        schedule = Schedule(request, summit, attendee, date=date)
+    schedule = schedule_factory(request, summit, attendee, date=date)
 
     if request.method == 'POST':
         return schedule.save_change()
@@ -148,7 +150,7 @@
     except (ObjectDoesNotExist, MultipleObjectsReturned):
         room = get_object_or_404(summit.room_set, name__exact=room_name)
 
-    schedule = Schedule(request, summit, attendee, room=room)
+    schedule = schedule_factory(request, summit, attendee, room=room)
 
     if request.method == 'POST':
         return schedule.save_change()

=== modified file 'summit/settings.py'
--- summit/settings.py	2011-04-19 20:25:36 +0000
+++ summit/settings.py	2011-04-20 20:20:56 +0000
@@ -96,6 +96,10 @@
 
 ROOT_URLCONF = 'summit.urls'
 
+LINARO_ONLY = False
+if os.environ.get('SUMMIT_LINARO'):
+    LINARO_ONLY = True
+
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.