Merge lp:~mhall119/summit/center-next into lp:summit

[Michael Hall]

center-align the next sessions table

center-align the next sessions table

Unmerged revisions

=== modified file 'summit/common/templatetags/qrcode.py'
--- summit/common/templatetags/qrcode.py	2012-04-30 16:48:43 +0000
+++ summit/common/templatetags/qrcode.py	2012-10-27 16:28:19 +0000
@@ -19,6 +19,7 @@
 from django.template.defaultfilters import stringfilter
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
+from django.conf import settings
 
 register = template.Library()
 
@@ -41,3 +42,25 @@
     alt = conditional_escape(alt or value)
     
     return mark_safe(u"""<img class="qrcode" src="%s" width="150" height="150" alt="%s" />""" % (url, alt))
+
+def build_qrhere(parser, token):
+    """
+    {% qrhere %}
+    
+    Returns an <img> with a QR Code pointing to the current URL
+    """
+    return QRHere()
+
+class QRHere(template.Node):
+    def __init__(self):
+        pass
+
+    def render(self, context):
+        if 'request' not in context:
+            return ''
+        current_url = '%s/%s' % (settings.SITE_ROOT, context['request'].path)
+        url = conditional_escape("http://chart.apis.google.com/chart?%s" % \
+            urllib.urlencode({'chs':'150x150', 'cht':'qr', 'chl':current_url, 'choe':'UTF-8'}))
+        return mark_safe(u"""<img class="qrcode" src="%s" width="150" height="150" />""" % url)
+
+register.tag('qrhere', build_qrhere)

=== modified file 'summit/media/css/site.css'
--- summit/media/css/site.css	2012-10-24 19:40:50 +0000
+++ summit/media/css/site.css	2012-10-27 16:28:19 +0000
@@ -92,12 +92,12 @@
 }
 
 div.schedule-head .qrcode {
-    height: 63px;
-    width: 63px;
-    vertical-align: top;
+    height: 96px;
+    width: 96px;
+    vertical-align: bottom;
     float: left;
     margin-left: -3px;
-    margin-top: -3px;
+    margin-top: -10px;
 }
 
 div.schedule-head .schedule-date {

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2012-10-04 13:57:34 +0000
+++ summit/schedule/models/summitmodel.py	2012-10-27 16:28:19 +0000
@@ -279,10 +279,10 @@
             in_db = set(m for m in self.meeting_set.exclude(launchpad_blueprint_id__isnull=True))
 
             for extra in in_db.difference(in_lp):
-                if not len(extra.agenda_set.all()):
-                    print "Marking %s as removed" % extra.name
-                    extra.approved='REMOVED'
-                    extra.save()
+                print "Marking %s as removed" % extra.name
+                extra.agenda_set.all().delete()
+                extra.approved='REMOVED'
+                extra.save()
 
         self.last_update = datetime.utcnow()
         self.save()

=== modified file 'summit/schedule/templates/schedule/by_participant.html'
--- summit/schedule/templates/schedule/by_participant.html	2012-10-06 17:26:26 +0000
+++ summit/schedule/templates/schedule/by_participant.html	2012-10-27 16:28:19 +0000
@@ -21,11 +21,7 @@
 <article class="span-8">
 
 <div class="schedule-head">
-    {% if summit.qr %}
-        {{summit.qr|qrcode}}
-    {% else %}
-        {{summit.get_absolute_url|qrcode}}
-    {% endif %}
+    {% qrhere %}
 <span class="schedule-date">{{ participant.name }}</span>
 </div>
 <br class="clear" />
@@ -127,6 +123,14 @@
         text-align: center;
         width: 100%;
     }
+    div.schedule-head .qrcode {
+        display: none;
+    }
+    
+    #sub-nav-container {
+        margin-bottom: 0px;
+    }
+
 }
 </style>
 <script language="JavaScript">

=== modified file 'summit/schedule/templates/schedule/by_room.html'
--- summit/schedule/templates/schedule/by_room.html	2012-10-06 17:26:26 +0000
+++ summit/schedule/templates/schedule/by_room.html	2012-10-27 16:28:19 +0000
@@ -20,11 +20,7 @@
 <article class="span-8">
 
 <div class="schedule-head">
-    {% if summit.qr %}
-        {{summit.qr|qrcode}}
-    {% else %}
-        {{summit.get_absolute_url|qrcode}}
-    {% endif %}
+    {% qrhere %}
 <span class="schedule-date">{{ room.title }}</span>
 </div>
 <br class="clear" />

=== modified file 'summit/schedule/templates/schedule/by_track.html'
--- summit/schedule/templates/schedule/by_track.html	2012-10-06 17:26:26 +0000
+++ summit/schedule/templates/schedule/by_track.html	2012-10-27 16:28:19 +0000
@@ -20,11 +20,7 @@
 <article class="span-8">
 
 <div class="schedule-head">
-    {% if summit.qr %}
-        {{summit.qr|qrcode}}
-    {% else %}
-        {{summit.get_absolute_url|qrcode}}
-    {% endif %}
+    {% qrhere %}
 <span class="schedule-date">{{ track.title }}</span>
 </div>
 <br class="clear" />

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-10-25 09:31:21 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-10-27 16:28:19 +0000
@@ -24,11 +24,7 @@
 <article class="span-8">
 
 <div class="schedule-head">
-    {% if summit.qr %}
-        {{summit.qr|qrcode}}
-    {% else %}
-        {{summit.get_absolute_url|qrcode}}
-    {% endif %}
+{% qrhere %}
 <span class="schedule-date"><a href="{% url summit.schedule.views.daily_schedule summit.name previousday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&lt;</a> {{ viewdate.date|strftime:"%A" }} <a href="{% url summit.schedule.views.daily_schedule summit.name nextday|date:"Y-m-d" %}{% if is_popup %}?_popup=1{% endif %}" target="_self">&gt;</a></span>
 
 {% if schedule.crew %}

=== modified file 'summit/schedule/templates/schedule/nextsession.html'
--- summit/schedule/templates/schedule/nextsession.html	2012-10-26 11:58:11 +0000
+++ summit/schedule/templates/schedule/nextsession.html	2012-10-27 16:28:19 +0000
@@ -49,7 +49,7 @@
 </head>
 
 <body>
-<div id="scheduletable">
+<div id="scheduletable" align="center">
 </div>
 </body>
 </html>

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-10-10 17:17:10 +0000
+++ summit/schedule/tests.py	2012-10-27 16:28:19 +0000
@@ -1760,9 +1760,25 @@
         self.assertEqual(0, summit.meeting_set.filter(name__exact="name").count())
         self.assertEqual(1, summit.meeting_set.filter(name__exact="other").count())
 
-    def test_update_from_launchpad_deletes_unseen_meetings(self):
-        summit = factory.make_one(Summit)
-        meeting = summit.meeting_set.create(spec_url='test_url', name="name", launchpad_blueprint_id="42")
+    def test_update_from_launchpad_deletes_missing_unscheduled_meetings(self):
+        summit = factory.make_one(Summit)
+        meeting = summit.meeting_set.create(spec_url='test_url', name="name", launchpad_blueprint_id="42")
+        def get_sprint_info(url):
+            elem = self.get_basic_launchpad_response()
+            meeting_node = LaunchpadExportNode(name="other")
+            elem.find("unscheduled").add_child("meeting", meeting_node)
+            return elem
+        summit._get_sprint_info_from_launchpad = get_sprint_info
+        summit.update_from_launchpad()
+        self.assertEqual(1, summit.meeting_set.filter(name__exact="name").count())
+        self.assertEqual(0, summit.meeting_set.filter(name__exact="name").exclude(approved='REMOVED').count())
+
+    def test_update_from_launchpad_deletes_missing_scheduled_meetings(self):
+        summit = factory.make_one(Summit)
+        meeting = summit.meeting_set.create(spec_url='test_url', name="name", launchpad_blueprint_id="42")
+        room = factory.make_one(Room, summit=summit)
+        slot = factory.make_one(Slot)
+        agenda = meeting.agenda_set.create(room=room, slot=slot, auto=True)
         def get_sprint_info(url):
             elem = self.get_basic_launchpad_response()
             meeting_node = LaunchpadExportNode(name="other")