Merge lp:~sil/summit/more-mobile-summit into lp:summit

[Stuart Langridge]

More mobile tweaks!

More mobile tweaks!

[Michael Hall (mhall119)]

Nice work, thanks!

review: Approve

=== modified file 'summit/common/templates/common/index.html'
--- summit/common/templates/common/index.html	2012-01-24 19:07:39 +0000
+++ summit/common/templates/common/index.html	2012-01-29 15:10:29 +0000
@@ -2,6 +2,26 @@
 {% load datetime %}
 
 {% block page_name %}Home{%endblock %}
+{% block head %}
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+{{ block.super }}
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 481px) {
+    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .minor-content, #page-footer div.container { 
+        width: auto;
+        margin: 0; padding: 0;
+    }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    #top-logo { display: none; }
+    .minor-content {
+        text-align: center;
+    }
+}
+
+</style>
+{% endblock %}
 
 {% block sub_nav %}{% endblock %}
 {% block content %}

=== modified file 'summit/schedule/templates/schedule/daily.html'
--- summit/schedule/templates/schedule/daily.html	2012-01-28 02:35:58 +0000
+++ summit/schedule/templates/schedule/daily.html	2012-01-29 15:10:29 +0000
@@ -74,11 +74,18 @@
 /* Mobile view */
 @media screen and (max-width: 481px) {
     /* turn off a bunch of stuff */
-    aside#top-nav, header#page-header, aside#page-related, footer#page-footer { display: none; }
-    section#main-section .container, article.main-content { 
+    nav#top-related, header#page-header, aside#page-related, footer#page-footer { display: none; }
+    section#main-section .container, article.main-content, aside#top-nav, aside#top-nav .container { 
         width: auto; 
         margin: 0; padding: 0;
     }
+    #top-login { display: block; }
+    aside#top-nav {
+        display: block;
+        text-align: center;
+        font-size: 16px;
+        min-height: 24px;
+    }
     .schedule-head > a { display: none; } /* qr code */
     div.schedule-head .schedule-date { 
         display: block;
@@ -118,6 +125,16 @@
         background: #101010;
         padding-left: 4px;
     }
+    .main-agenda-item-name {
+        display: block;
+        min-height: 24px;
+    }
+    .main-agenda-item-name img.icon {
+        height: 24px;
+        width: 24px;
+        float: left;
+        margin-right: 4px;
+    }
 }
 
 </style>

=== modified file 'summit/schedule/templates/schedule/summit.html'
--- summit/schedule/templates/schedule/summit.html	2012-01-25 13:47:02 +0000
+++ summit/schedule/templates/schedule/summit.html	2012-01-29 15:10:29 +0000
@@ -3,7 +3,10 @@
 
 {% block page_name %}{{ summit.title }} {{ summit.date_start|strftime:"%d %b" }} - {{ summit.date_end|strftime:"%d %b %Y" }} {%endblock %}
 
-{% block extrahead %}{{ block.super }}
+{% block extrahead %}
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+
+{{ block.super }}
     <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
     <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
     <script type="text/javascript"> 
@@ -24,6 +27,41 @@
     <meta property="og:type" content="summit-scheduler:meeting"/>
     <meta itemprop="name" content="{{ summit.title }} {{ summit.date_start|strftime:"%d" }} - {{ summit.date_end|strftime:"%d, %b. %Y" }}" />
     <meta itemprop="description" content="{{ summit.description|linebreaks|striptags }}" />
+
+<style>
+/* Mobile-friendly styles */
+@media screen and (max-width: 481px) {
+    aside#top-nav, header#page-header, aside#page-related, footer#page-footer, section#main-section .container, article.main-content, .container, #main-nav, .double-side-content, #page-footer div.container, #sub-nav-container, .side-content { 
+        width: auto;
+        margin: 0; padding: 0;
+    }
+    #page-header { text-align: center; }
+    #page-header a { height: 24px; line-height: 1; float: none; display: inline; }
+    #top-logo { display: none; }
+    table.column { width: 100%; }
+    table.column td { display: block; width: 100%; }
+    table.column td ul {
+        width: 100%;
+    }
+    article.main-content { width: 100%; }
+    table.column td ul li {
+        background: #efefef;
+        border-bottom: 1px solid black;
+        list-style: none;
+        text-align: center;
+        font-size: 24px;
+        line-height: 24px;
+        min-height: 24px;
+        width: 100%;
+        display: block;
+        padding: 4px 0;
+    }
+    .double-side-content {
+        text-align: center;
+    }
+    .side-content { display: none; }
+}
+</style>
 {% endblock %}
 
 {% block sub_nav_links %}