Commits

Rufus Pollock committed 1be1546

[templates,style][s]: move embed and dataset selection to sidebar and put in link to source data.

  • Participants
  • Parent commits af9d77e

Comments (0)

Files changed (3)

eurostat/static/style.css

   * Fixes to underlying theme
   ****************************/
 
-#primary {
-  display: none;
-}
-
-#content {
-  margin-right: 0;
-}
-
 /***************************************
   * the chart and dataset stuff
   **************************************/
 
+#chart-heading {
+}
+
 #dataset-listing {
-  float: right;
-  width: 25%;
   font-size: 80%;
 }
 
 }
 
 .flot-chart {
-  height: 250px;
-  width: 70%;
+  height: 350px;
+  width: 100%;
 }
 
 .flot-chart-controls {
 
 textarea#embed-code {
   margin-top: 20px;
-  width: 80%;
-  height: 120px;
+  width: 95%;
+  height: 150px;
   font-size: 80%;
 }
 

eurostat/templates/index.html

     </script>
   </py:def>
 
+  <py:def function="primary_sidebar_extras">
+        <li class="widget-container widget_text">
+          <h3 class="widget-title">Embed this graph</h3>
+          <div class="textwidget">
+Copy and paste this code into your webe page to embed the graph shown on the left.
+    <textarea id="embed-code">
+    </textarea>
+          </div>
+        </li>
+        <li class="widget-container widget_text">
+          <h3 class="widget-title">Choose dataset to view</h3>
+          <div class="textwidget">
+    <ul id="dataset-listing">
+    </ul>
+          </div>
+        </li>
+  </py:def>
+
   <div py:def="content">
     <h2 id="chart-heading"></h2>
 
-    <ul id="dataset-listing">
-    </ul>
-
     <xi:include href="flot.html" />
-
-    <textarea id="embed-code">
-    </textarea>
   </div>
 
   <xi:include href="layout.html" />

eurostat/templates/layout.html

     <ul>
     <li class="menu-item"><a href="${url_for('home')}">Home</a></li> 
     <li class="menu-item"><a href="http://bitbucket.org/rgrp/eurostat">Source code</a></li> 
+    <li class="menu-item"><a href="http://ec.europa.eu/eurostat/euroindicators">Source data</a></li> 
     </ul>
     </div> <!-- .menu -->
   </div> <!-- #access -->
       <py:if test="defined('primary_sidebar_extras')">
         ${primary_sidebar_extras()}
       </py:if>
-        <li class="widget-container widget_text">
-          <h3 class="widget-title">About</h3>
-          <div class="textwidget">
-          </div>
-        </li>
       </ul>
     </div><!-- #primary .widget-area -->
 
                 <li>
                   <img src="http://assets.okfn.org/images/logo/okf_logo_white_and_green.png" id="footer-okf-logo" style="height: 20px; margin-bottom: -5px;" />
                   An
-                  <a href="http://www.okfn.org/">Open Knowledge Foundation</a> Project
+                  <a href="http://okfn.org/">Open Knowledge Foundation</a> Project
                 </li>
                 <li>
-                  &copy; <a href="http://www.okfn.org/">Open Knowledge Foundation</a>
+                  &copy; <a href="http://okfn.org/ip-policy/">Open Knowledge Foundation</a>
                 </li>
                 <li>
                   <a href="http://opendefinition.org/okd/">