Merge lp:~cjohnston/summit/scheduler-tools into lp:summit

[Chris Johnston]

Adds admin info to the meeting page

[Michael Hall (mhall119)]

Looks okay, but why is the theme_media line being added in this MP?

review: Approve

=== added file 'summit/schedule/templates/schedule/admin.html'
--- summit/schedule/templates/schedule/admin.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/admin.html	2012-06-10 20:38:20 +0000
@@ -0,0 +1,8 @@
+<div class="action-links">
+    <p style="font-size: 16px; font-weight: bold;">Admin Info</p>
+    <ul>
+        <li><strong>Created by:</strong> {{ meeting.drafter.name }}</li>
+        <li><strong>Approved by:</strong> {{ meeting.approver.name }}</li>
+        <li><strong>Scheduled:</strong> {% for ai in agenda_items %}{% if ai.auto %}Auto{% else %}Manual{% endif %}{% endfor %}</li>
+    </ul>
+</div>

=== modified file 'summit/schedule/templates/schedule/meeting.html'
--- summit/schedule/templates/schedule/meeting.html	2012-05-06 00:02:48 +0000
+++ summit/schedule/templates/schedule/meeting.html	2012-06-10 20:38:20 +0000
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load datetime markup %}
+{% load schedule_perms datetime markup %}
 
 {% block page_name %}
     {{ meeting.title }} - 
@@ -107,15 +107,19 @@
 </div>
 <div class="row">
        {% ifnotequal meeting.type 'plenary' %}
-    <div id="Attendees" class="span-7">
+    <div id="Attendees" class="span-5">
         <h3>Attendees</h3>
         {% for attendee in attendees %}
             <a href="http://launchpad.net/~{{ attendee.user.username }}">{% if attendee.required %}<strong>{% endif %}{{ attendee.name }}{% if attendee.required %}</strong>{% endif %}</a>{% if not forloop.last %}, {% endif %}
         {% endfor %}
     </div>
         {% endifnotequal %}
-
-    <div id="Links" class="span-5 last">
+    <div class="span-4">
+{% if summit_organizer %}
+    {% include "schedule/admin.html" %}
+{% endif %}
+    </div>
+    <div id="Links" class="span-3 last">
         <h3>Links</h3>
         <ul>
             <li><a href="{{meeting.link_to_pad}}" target="_new">Notes in a separate window</a></li>

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2012-02-25 01:28:31 +0000
+++ summit/schedule/tests.py	2012-06-10 20:38:20 +0000
@@ -42,6 +42,7 @@
 factory.default_mapping[NameField] = str
 
 site_root = getattr(settings, 'SITE_ROOT', 'http://summit.ubuntu.com')
+theme_media = getattr(settings, 'THEME_MEDIA', 'ubuntu_website.MEDIA_ROOT')
 
 class RequestFactory(djangotest.Client):
     """