Stripping a bunch of stuff we don't want. Positioning corrections.

jhannah · Aug 31, 2012 · cd0d14a · cd0d14a
1 parent 390c01b
commit cd0d14a
Showing 1 changed file with 10 additions and 35 deletions.
diff --git a/src/hi.html b/src/hi.html
@@ -9,7 +9,7 @@
     <script src="http://code.highcharts.com/highcharts.js"></script>
     <script src="http://code.highcharts.com/modules/exporting.js"></script>
 
-<div id="container" style="position:fixed; top:140px; right:0px; width: 800px; height: 400px;"></div>
+<div id="container" style="position:fixed; top:160px; right:0px; width: 800px; height: 400px;"></div>
 <script>
 $(function () {
     var chart;
@@ -18,24 +18,12 @@
             chart: {
                 renderTo: 'container',
                 type: 'line',
-                marginRight: 130,
-                marginBottom: 25
-            },
-            title: {
-                text: 'Monthly Average Temperature',
-                x: -20 //center
-            },
-            subtitle: {
-                text: 'Source: WorldClimate.com',
-                x: -20
-            },
-            xAxis: {
-                categories: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-                    'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+                marginRight: 0,
+                marginBottom: 80
             },
             yAxis: {
                 title: {
-                    text: 'Temperature (°C)'
+                    text: 'Score'
                 },
                 plotLines: [{
                     value: 0,
@@ -49,26 +37,8 @@
                         this.x +': '+ this.y +'°C';
                 }
             },
-            legend: {
-                layout: 'vertical',
-                align: 'right',
-                verticalAlign: 'top',
-                x: -10,
-                y: 100,
-                borderWidth: 0
-            },
             series: [{
-                name: 'Tokyo',
                 data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6]
-            }, {
-                name: 'New York',
-                data: [-0.2, 0.8, 5.7, 11.3, 17.0, 22.0, 24.8, 24.1, 20.1, 14.1, 8.6, 2.5]
-            }, {
-                name: 'Berlin',
-                data: [-0.9, 0.6, 3.5, 8.4, 13.5, 17.0, 18.6, 17.9, 14.3, 9.0, 3.9, 1.0]
-            }, {
-                name: 'London',
-                data: [3.9, 4.2, 5.7, 8.5, 11.9, 15.2, 17.0, 16.6, 14.2, 10.3, 6.6, 4.8]
             }]
         });
     });
@@ -77,13 +47,18 @@
 
 
 
-<h1>Pistol Matches</h1>
+<h1>ENPS Pistol Matches</h1>
 <h2>Overall Results 2006 - 2012</h2>
 
 [% USE DBI; 
    DBI.connect("dbi:SQLite:dbname=enps.sqlite","","");
 %]
 <table>
+   <tr>
+      <th>Last name</th>
+      <th>First name</th>
+      <th>Total Points</th>
+   </tr>
 [% FOREACH user = DBI.query('select lname, fname, sum(points) points from results group by lname, fname order by sum(points) desc'); %]
    <tr>
       <td>[% user.lname %]</td>