From af46dbdcf0537580d7512b7ee3365f5163701fac Mon Sep 17 00:00:00 2001
From: Miquel Torres <tobami@googlemail.com>
Date: Sun, 2 Jan 2011 19:43:22 +0100
Subject: [PATCH] Use @media queries to optimize the Changes view's layout for
 smaller screens

---
 speedcenter/media/css/main.css                | 39 ++++++++++++++-----
 speedcenter/templates/codespeed/changes.html  |  2 +-
 .../templates/codespeed/changes_table.html    |  3 ++
 .../templates/codespeed/comparison.html       | 20 +++++-----
 4 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/speedcenter/media/css/main.css b/speedcenter/media/css/main.css
index c81fca04..59aa76f6 100644
--- a/speedcenter/media/css/main.css
+++ b/speedcenter/media/css/main.css
@@ -1,5 +1,5 @@
 body {
-    min-width: 700px;
+    min-width: 710px;
     margin: 0;
     padding: 0;
     background-color: #596A74;
@@ -146,9 +146,9 @@ div#configbar span {
     border-radius: 5px;
 }
 
-div#configbar span.options { padding-right: 4em; font-size: 90%; }
-div#configbar input { margin-left: 1.5em; margin-right: 0; vertical-align: middle; }
-    
+div#configbar span.options { padding-right: 1.8em; font-size: 90%; white-space: nowrap; }
+div#configbar input { margin-right: 0; vertical-align: middle; }
+
 div#content, div.about_content {
     margin-left: 14.5em;
     text-align: center;
@@ -210,12 +210,31 @@ a.checkall { margin-left: 0.4em; }
 
 p.errormessage { line-height: 10em; margin-bottom: 10em; }
 
-/* tables */
-div.leftcolumn { float: left; margin-right: 0.8em;  }
-table.tablesorter, table.info { width: 100%; }
+/* Changes table layout */
+div#contentwrap { display: table; table-layout: fixed; width: 100%; }
+div#contentwrap div { display: table-cell; }
+div#contentwrap div.leftcolumn { width: 28em;}
+div#contentwrap div.rightcolumn { padding-left: 0.8em; }
+
+div#contentwrap div div { display: block; }
+
+/*Remove outher margins so that it comfortably fits in a 1024px wide screen */
+@media only screen and (max-width:1090px)  {
+    div#containter { width: 100%; margin: 0; }
+    div#sidebar { width: 12em; }
+    div#configbar { margin-left: 12.8em; }
+    div#content { margin-left: 12.8em; }
+}
 
+/* For smaller screens the changes view should only show one colunm */
+@media only screen and (max-width:1020px)  {
+    div#contentwrap div { display: table-row!important; }
+    table.info { margin-bottom: 0.8em; }
+}
+
+/* tables */
 table.tablesorter, table.info, table.revision {
-    margin-bottom: 0.8em;
+    width: 100%;
     font-family:arial;
     font-size: 11pt;
     text-align: left;
@@ -225,7 +244,7 @@ table.tablesorter, table.info, table.revision {
     background-color: #fafafa;
 }
 
-table.tablesorter { float: left; margin-right: 0.8em; clear: both; }
+table.tablesorter { margin-right: 0.8em; margin-bottom: 0.8em; }
 
 table.tablesorter thead tr th {
     padding: 4px;
@@ -281,7 +300,6 @@ table.tablesorter tbody tr.highlight td {
     cursor: pointer;
 }
 
-table.info { float:left; clear: both; }
 table.info th, table.revision th { background-color: #F1F1F1; }
 table.info th, table.info td, table.revision th, table.revision td { padding: 0.3em; }
 table.info tbody td.infofirst { width: 10em; text-align: left; }
@@ -298,6 +316,7 @@ div > pre { margin-top: 2px; margin-bottom: 2px; white-space: pre-wrap; }
 a#permalink { float: right; font-size: small; }
 a#permalink:hover { text-decoration: underline; }
 
+/* Plot styles */
 div#plot { text-align: left; height: 500px; width: 100%; }
 div.miniplot {
     cursor: pointer;
diff --git a/speedcenter/templates/codespeed/changes.html b/speedcenter/templates/codespeed/changes.html
index e0c37fa1..cff0f6ea 100644
--- a/speedcenter/templates/codespeed/changes.html
+++ b/speedcenter/templates/codespeed/changes.html
@@ -172,6 +172,6 @@
   <a id="permalink" href="javascript:permalink();">Permalink</a>
 </div>
 <div id="content" class="clearfix">
-<div id="contentwrap""></div>
+<div id="contentwrap"></div>
 </div>
 {% endblock %}
diff --git a/speedcenter/templates/codespeed/changes_table.html b/speedcenter/templates/codespeed/changes_table.html
index af80b1b3..e1ebea0b 100644
--- a/speedcenter/templates/codespeed/changes_table.html
+++ b/speedcenter/templates/codespeed/changes_table.html
@@ -39,6 +39,8 @@
 </tbody>
 </table>
 </div>
+
+<div class="rightcolumn">
 <table class="revision">
 <thead>
   <tr>
@@ -66,3 +68,4 @@
   </script>
 {% endifnotequal %}
 </table>
+</div>
diff --git a/speedcenter/templates/codespeed/comparison.html b/speedcenter/templates/codespeed/comparison.html
index 2af02b87..d7e5bc6e 100644
--- a/speedcenter/templates/codespeed/comparison.html
+++ b/speedcenter/templates/codespeed/comparison.html
@@ -191,17 +191,19 @@
 
 <div id="configbar">
   <span class="options">Chart type:
-  <select id="chart_type" title="Select chart type">{% for chart in charts %}
-    <option value="{{ chart }}">{{ chart }}</option>{% endfor %}
-  </select>
+    <select id="chart_type" title="Select chart type">{% for chart in charts %}
+      <option value="{{ chart }}">{{ chart }}</option>{% endfor %}
+    </select>
   </span>
   <span class="options">Normalization:
-  <select id="baseline" title="Select baseline for normalization">
-    <option value="none">None</option>{% ifnotequal executables|length 1 %}{% for exe in executables %}
-    <option value="{{ exe.key }}">{{ exe.name }}</option>{% endfor %}{% endifnotequal %}
-  </select>
-  <input id="direction" type="checkbox" name="direction" value="horizontal"/>
-  <label for="direction">horizontal</label>
+    <select id="baseline" title="Select baseline for normalization">
+      <option value="none">None</option>{% ifnotequal executables|length 1 %}{% for exe in executables %}
+      <option value="{{ exe.key }}">{{ exe.name }}</option>{% endfor %}{% endifnotequal %}
+    </select>
+  </span>
+  <span class="options">
+    <label for="direction">horizontal</label>
+    <input id="direction" type="checkbox" name="direction" value="horizontal"/>
   </span>
   <a id="permalink" href="javascript:permalink();">Permalink</a>
 </div>