Merge lp:~cjohnston/summit/schedule-list-changes into lp:summit

[Chris Johnston]

Makes schedule list info look nicer

[lp:~cjohnston/summit/schedule-list-changes]

525. By Chris Johnston on 2013-04-07

Fixes twitter js loading

526. By Chris Johnston on 2013-04-07

Update branch revno requirement

[Adnane Belmadiaf (daker)]

+1

review: Approve

=== modified file 'summit/media/css/site.css'
--- summit/media/css/site.css	2012-10-27 15:27:30 +0000
+++ summit/media/css/site.css	2013-04-07 23:44:21 +0000
@@ -155,32 +155,6 @@
     float: none;
 }
 
-/* Reset default unordered list display style to remove bulleting/spacing */
-#column-schedule ul {
-    list-style: none;
-}
-/* Stack LI elements horizontally instead of the default vertical orientation */
-#column-schedule li {
-    float: left;
-    margin-right: 1em;
-}
-
-/* Reset default unordered list display style to remove bulleting/spacing */
-#column-schedule-inner ul {
-    list-style: disc;
-    /*border-right: dotted;
-    border-right-width: 1px;*/
-}
-/* Stack LI elements horizontally instead of the default vertical orientation */
-#column-schedule-inner li {
-    float: none;
-    margin-right: 1em;
-    padding: 0em;
-    line-height: 1.5em;
-    margin-bottom: 0px;
-    margin-top: 0px;
-}
-
 /* Social widgets */
 .social-widget {
     float: left;

=== removed file 'summit/schedule/templates/schedule/schedule_list.html'
--- summit/schedule/templates/schedule/schedule_list.html	2013-03-05 22:42:44 +0000
+++ summit/schedule/templates/schedule/schedule_list.html	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-{% load datetime %}
-
-<h2>Schedule</h2>
-<div id="column-schedule">
-<ul>
-<li>
-By date:
-<div id="column-schedule-inner">
-<ul>
-  {% for date in summit.days %}
-  <li><a href="/{{ summit.name }}/{{ date|strftime:"%Y-%m-%d" }}">{{ date|strftime:"%A" }}</a></li>
-  {% endfor %}
-</ul>
-</div>
-</li>
-<li>
-<div id="column-schedule-inner">
-    By {{ TRACK_DISPLAY_NAME }}:
-<ul>
-  {% for track in tracks %}
-    <li><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></li>
-  {% endfor %}
-</ul>
-</div>
-</li>
-<li>
-<div id="column-schedule-inner">
-By room:
-<ul>
-    {% for room in summit.public_rooms %}
-        {% if edit %}
-            {% ifequal room.type 'plenary' %}
-                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> (plenary)</li>
-            {% else %}
-                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> ({{ room.size }})</li>
-            {% endifequal %}
-        {% else %}
-            {% ifequal room.type 'plenary' %}{% else %}
-            <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a></li>
-            {% endifequal %}
-        {% endif %}
-    {% endfor %}
-    {% if summit.private_rooms %}
-        {% if edit %}
-            <br />
-            Private:
-            {% for room in summit.private_rooms %}
-                <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> ({{ room.size }})</li>
-            {% endfor %}
-        {% endif %}
-    {% endif %}
-</ul>
-</div>
-</li>
-</div>

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2013-03-20 02:00:45 +0000
+++ summit/schedule/templates/schedule/summit.html	2013-04-07 23:44:21 +0000
@@ -78,25 +78,62 @@
     </article>
 </div>
 <div class="row">
-    <article class="span-8">
-            {% include "schedule/schedule_list.html" %}
-    </article>
-    <article class="span-4 last">
-        {% if summit.hashtag %}
-        <div class="share alone">
-            <h3>Latest from Twitter</h3>
-                <div id="tweets">
-                    <ul id="twitter_update_list">
-                        <li>Loading tweets&hellip;</li>
-                    </ul>
-                    <a href="http://twitter.com/{{ summit.hashtag }}">@{{ summit.hashtag }}</a>
-                </div>
-        </div>
-        <script type="text/javascript" src="http://twitter.com/javascripts/blogger.js"></script>
-        <script type="text/javascript" src="http://api.twitter.com/1/statuses/user_timeline.json?screen_name={{ summit.hashtag }}&callback=twitterCallback2&amp;count=5"></script>  
-        {% endif %}
-    </article>    
+ <div class="twelve-col">
+  <h2>Schedule</h2>
+ </div>
 </div>
+<div class="row">
+ <div class="two-col box box-highlight">
+  By date:
+  <ul class="list list-ubuntu">
+   {% for date in summit.days %}
+    <li><a href="/{{ summit.name }}/{{ date|strftime:"%Y-%m-%d" }}">{{ date|strftime:"%A" }}</a></li>
+   {% endfor %}
+  </ul>
+ </div>
+ <div class="three-col box box-highlight">
+  By {{ TRACK_DISPLAY_NAME }}:
+  <ul class="list list-ubuntu">
+   {% for track in tracks %}
+    <li><a href="/{{ summit.name }}/track/{{ track.slug|lower }}">{{ track.title }}</a></li>
+   {% endfor %}
+  </ul>
+ </div>
+ <div class="three-col box box-highlight">
+  By room:
+  <ul class="list list-ubuntu">
+   {% for room in summit.public_rooms %}
+    {% ifnotequal room.type 'plenary' %}
+     <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a>{% if edit %} ({{ room.size }}){% endif %}</li>
+    {% endifnotequal %}
+   {% endfor %}
+   {% if edit %}
+    {% ifequal room.type 'plenary' %}
+	 <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> (plenary)</li>
+	{% endifequal %}
+    {% if summit.private_rooms %}
+     <br />
+     Private:
+     {% for room in summit.private_rooms %}
+      <li><a href="/{{ summit.name }}/{{ room.name }}">{{ room.title }}</a> ({{ room.size }})</li>
+     {% endfor %}
+    {% endif %}
+   {% endif %}
+  </ul>
+ </div>
+ <div class="three-col last-col box box-padded-feature">
+  {% if summit.hashtag %}
+    <h3>Latest from Twitter</h3>
+     <div id="tweets">
+      <ul id="twitter_update_list">
+       <li>Loading tweets&hellip;</li>
+      </ul>
+      <a href="http://twitter.com/{{ summit.hashtag }}">@{{ summit.hashtag }}</a>
+  </div>
+  <script type="text/javascript" src="https://search.twitter.com/search.json?q={{ summit.hashtag|urlencode }}&callback=twitterCallback2&count=5"></script>
+   {% endif %}
+  </div>    
+ </div>
 {% endblock %}
 {% block closure %}
 <style>
@@ -106,19 +143,6 @@
     #page-header { text-align: center; }
     #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
     .span-8, .span-9, .span-3, .span-12 { width: 100%; }
-    #column-schedule ul li {
-        background: #efefef;
-        border-bottom: 1px dotted #cccccc;
-        list-style: none;
-        text-align: center;
-        font-size: 24px;
-        line-height: 24px;
-        min-height: 24px;
-        width: 100%;
-        display: block;
-        padding: 0;
-        margin: 0;
-    }
     #fb-root * { width: auto; }
 
     #sub-nav-container {

=== modified file 'summit/settings.py'
--- summit/settings.py	2013-04-07 18:54:26 +0000
+++ summit/settings.py	2013-04-07 23:44:21 +0000
@@ -167,7 +167,7 @@
     'bzr_apps': ('http://bazaar.launchpad.net/~django-foundations-dev/ubuntu-django-foundations/bzr_apps', '7'),
 
     ## ubuntu-website supplied templates and styles
-    'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '63'),
+    'ubuntu_website': ('http://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '64'),
 
     ## linaro-website supplied templates and styles
     'linaro_website': ('http://bazaar.launchpad.net/~linaro-connect-theme-devs/ubuntu-community-webthemes/light-django-linaro-theme', '52'),