From be17bfb8cd76af2d4f42bb81db8b959bc9620a48 Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 7 Jul 2013 12:55:12 +0100
Subject: png icons, and table for timeline

---
 forecast.html.tt        |  60 +++++++++++++++++++++++-------------------------
 icons/1.png             | Bin 0 -> 3128 bytes
 icons/10.png            | Bin 0 -> 3465 bytes
 icons/11.png            | Bin 0 -> 3085 bytes
 icons/12.png            | Bin 0 -> 3517 bytes
 icons/13.png            | Bin 0 -> 2076 bytes
 icons/14.png            | Bin 0 -> 4005 bytes
 icons/15.png            | Bin 0 -> 4828 bytes
 icons/16.png            | Bin 0 -> 4806 bytes
 icons/17.png            | Bin 0 -> 4577 bytes
 icons/18.png            | Bin 0 -> 5250 bytes
 icons/19.png            | Bin 0 -> 4161 bytes
 icons/2.png             | Bin 0 -> 3830 bytes
 icons/20.png            | Bin 0 -> 4603 bytes
 icons/21.png            | Bin 0 -> 5273 bytes
 icons/22.png            | Bin 0 -> 4901 bytes
 icons/23.png            | Bin 0 -> 6341 bytes
 icons/24.png            | Bin 0 -> 5623 bytes
 icons/25.png            | Bin 0 -> 5370 bytes
 icons/26.png            | Bin 0 -> 5870 bytes
 icons/27.png            | Bin 0 -> 5848 bytes
 icons/28.png            | Bin 0 -> 3402 bytes
 icons/29.png            | Bin 0 -> 2280 bytes
 icons/3.png             | Bin 0 -> 3140 bytes
 icons/30.png            | Bin 0 -> 4368 bytes
 icons/31.png            | Bin 0 -> 3728 bytes
 icons/32.png            | Bin 0 -> 2604 bytes
 icons/33.png            | Bin 0 -> 3132 bytes
 icons/34.png            | Bin 0 -> 2952 bytes
 icons/35.png            | Bin 0 -> 3576 bytes
 icons/36.png            | Bin 0 -> 2992 bytes
 icons/37.png            | Bin 0 -> 3549 bytes
 icons/38.png            | Bin 0 -> 3577 bytes
 icons/39.png            | Bin 0 -> 4703 bytes
 icons/4.png             | Bin 0 -> 3847 bytes
 icons/40.png            | Bin 0 -> 3927 bytes
 icons/41.png            | Bin 0 -> 2863 bytes
 icons/42.png            | Bin 0 -> 3296 bytes
 icons/43.png            | Bin 0 -> 1878 bytes
 icons/44.png            | Bin 0 -> 5092 bytes
 icons/45.png            | Bin 0 -> 3803 bytes
 icons/46.png            | Bin 0 -> 2579 bytes
 icons/47.png            | Bin 0 -> 2169 bytes
 icons/5.png             | Bin 0 -> 3616 bytes
 icons/6.png             | Bin 0 -> 2766 bytes
 icons/7.png             | Bin 0 -> 2974 bytes
 icons/8.png             | Bin 0 -> 5935 bytes
 icons/9.png             | Bin 0 -> 5327 bytes
 lib/HomePanel/Render.pm |   2 +-
 49 files changed, 30 insertions(+), 32 deletions(-)
 create mode 100644 icons/1.png
 create mode 100644 icons/10.png
 create mode 100644 icons/11.png
 create mode 100644 icons/12.png
 create mode 100644 icons/13.png
 create mode 100644 icons/14.png
 create mode 100644 icons/15.png
 create mode 100644 icons/16.png
 create mode 100644 icons/17.png
 create mode 100644 icons/18.png
 create mode 100644 icons/19.png
 create mode 100644 icons/2.png
 create mode 100644 icons/20.png
 create mode 100644 icons/21.png
 create mode 100644 icons/22.png
 create mode 100644 icons/23.png
 create mode 100644 icons/24.png
 create mode 100644 icons/25.png
 create mode 100644 icons/26.png
 create mode 100644 icons/27.png
 create mode 100644 icons/28.png
 create mode 100644 icons/29.png
 create mode 100644 icons/3.png
 create mode 100644 icons/30.png
 create mode 100644 icons/31.png
 create mode 100644 icons/32.png
 create mode 100644 icons/33.png
 create mode 100644 icons/34.png
 create mode 100644 icons/35.png
 create mode 100644 icons/36.png
 create mode 100644 icons/37.png
 create mode 100644 icons/38.png
 create mode 100644 icons/39.png
 create mode 100644 icons/4.png
 create mode 100644 icons/40.png
 create mode 100644 icons/41.png
 create mode 100644 icons/42.png
 create mode 100644 icons/43.png
 create mode 100644 icons/44.png
 create mode 100644 icons/45.png
 create mode 100644 icons/46.png
 create mode 100644 icons/47.png
 create mode 100644 icons/5.png
 create mode 100644 icons/6.png
 create mode 100644 icons/7.png
 create mode 100644 icons/8.png
 create mode 100644 icons/9.png

diff --git a/forecast.html.tt b/forecast.html.tt
index eedc078..1a91bdd 100644
--- a/forecast.html.tt
+++ b/forecast.html.tt
@@ -26,33 +26,28 @@
     <title>Forecast</title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <style type="text/css">
+      body, table { font-size: 10px }
+      div.currently, div.next-hour, div.next-day { float: left; clear: none }
+      div.days { clear: both }
+      div.days dl { float: left; width: 30% }
+
+      div.bus, div.tube { float: left  }
+      
+      table { border-collapse: collapse; empty-cells: show }
+      table td { border: dotted thin black }
+
       .icon img {
         width: 2em; height: 2em;
         float: left;
       }
-      .timeline {
-        position: relative;
-        height: 6em;
-      }
       .stripes {
-        position: absolute;
         text-align: center;
         border: solid thin black;
-        height: 2em; line-height: 2em;
       }
       .stripes span {
         font-size: 30%;
         vertical-align: middle;
       }
-      .timeline .summary > span {
-        top: 0;
-      }
-      .timeline .hours > span {
-        top: 2em;
-      }
-      .timeline .temperature > span {
-        top: 4em;
-      }
     </style>
   </head>
   <body>
@@ -93,6 +88,7 @@
       </div>
       <div class="days">
         <div class="day today">
+          <h2>Today</h2>
           <span class="icon"><img src="[% icon_for(today.icon) %]" alt="[% today.icon %]" /></span>
           <dl class="today">
             <dt class="summary">Summary:</dt>
@@ -107,22 +103,24 @@
             <dd class="sunset"><span class="time">[% time(today.sunsetTime) %]</span></dd>
           </dl>
           <div class="timeline">
-            <div class="summary">
-              [% left=0 ;FOR span IN hourly.spans_by_string('summary');
-              width=3*hours_length(span) %]
-              <span class="stripes" style="width: [% width %]em; left: [% left %]em"><span>[% span.value %]</span></span>
-              [% left=left+width; END %]
-            </div>
-            <div class="hours">
-              [% left=0; FOR h IN hourly.data; BREAK IF loop.last %]
-              <span class="stripes" style="width: 3em; left: [% left %]em"><span>[% time(h.time) %]</span></span>
-              [% left=left+3; END %]
-            </div>
-            <div class="temperature">
-              [% left=0; FOR h IN hourly.data; BREAK IF loop.last %]
-              <span class="stripes" style="width: 3em; left: [% left %]em"><span>[% h.temperature %]°</span></span>
-              [% left=left+3; END %]
-            </div>
+            <table class="timeline">
+              <tr class="summary">
+                [% FOR span IN hourly.spans_by_string('summary');
+                width=hours_length(span) %]
+                <td class="stripes" colspan="[% width %]"><span>[% span.value %]</span></td>
+                [% END %]
+              </tr>
+              <tr class="hours">
+                [% FOR h IN hourly.data; BREAK IF loop.last %]
+                <td class="stripes"><span>[% time(h.time) %]</span></td>
+                [% END %]
+              </tr>
+              <tr class="temperature">
+                [% FOR h IN hourly.data; BREAK IF loop.last %]
+                <td class="stripes"><span>[% h.temperature %]°</span></td>
+                [% END %]
+              </tr>
+            </table>
           </div>
         </div>
       </div>
diff --git a/icons/1.png b/icons/1.png
new file mode 100644
index 0000000..7955877
Binary files /dev/null and b/icons/1.png differ
diff --git a/icons/10.png b/icons/10.png
new file mode 100644
index 0000000..4df9fb8
Binary files /dev/null and b/icons/10.png differ
diff --git a/icons/11.png b/icons/11.png
new file mode 100644
index 0000000..e4ad1a3
Binary files /dev/null and b/icons/11.png differ
diff --git a/icons/12.png b/icons/12.png
new file mode 100644
index 0000000..f3a7665
Binary files /dev/null and b/icons/12.png differ
diff --git a/icons/13.png b/icons/13.png
new file mode 100644
index 0000000..3095b73
Binary files /dev/null and b/icons/13.png differ
diff --git a/icons/14.png b/icons/14.png
new file mode 100644
index 0000000..c05b879
Binary files /dev/null and b/icons/14.png differ
diff --git a/icons/15.png b/icons/15.png
new file mode 100644
index 0000000..798906a
Binary files /dev/null and b/icons/15.png differ
diff --git a/icons/16.png b/icons/16.png
new file mode 100644
index 0000000..9e42891
Binary files /dev/null and b/icons/16.png differ
diff --git a/icons/17.png b/icons/17.png
new file mode 100644
index 0000000..db86c80
Binary files /dev/null and b/icons/17.png differ
diff --git a/icons/18.png b/icons/18.png
new file mode 100644
index 0000000..8a74cb2
Binary files /dev/null and b/icons/18.png differ
diff --git a/icons/19.png b/icons/19.png
new file mode 100644
index 0000000..7a506f5
Binary files /dev/null and b/icons/19.png differ
diff --git a/icons/2.png b/icons/2.png
new file mode 100644
index 0000000..6a97c89
Binary files /dev/null and b/icons/2.png differ
diff --git a/icons/20.png b/icons/20.png
new file mode 100644
index 0000000..fd3cee0
Binary files /dev/null and b/icons/20.png differ
diff --git a/icons/21.png b/icons/21.png
new file mode 100644
index 0000000..3c30a00
Binary files /dev/null and b/icons/21.png differ
diff --git a/icons/22.png b/icons/22.png
new file mode 100644
index 0000000..56dcb0b
Binary files /dev/null and b/icons/22.png differ
diff --git a/icons/23.png b/icons/23.png
new file mode 100644
index 0000000..9160d1b
Binary files /dev/null and b/icons/23.png differ
diff --git a/icons/24.png b/icons/24.png
new file mode 100644
index 0000000..76665aa
Binary files /dev/null and b/icons/24.png differ
diff --git a/icons/25.png b/icons/25.png
new file mode 100644
index 0000000..38f7ab5
Binary files /dev/null and b/icons/25.png differ
diff --git a/icons/26.png b/icons/26.png
new file mode 100644
index 0000000..5dd980a
Binary files /dev/null and b/icons/26.png differ
diff --git a/icons/27.png b/icons/27.png
new file mode 100644
index 0000000..7fb6722
Binary files /dev/null and b/icons/27.png differ
diff --git a/icons/28.png b/icons/28.png
new file mode 100644
index 0000000..19c96f1
Binary files /dev/null and b/icons/28.png differ
diff --git a/icons/29.png b/icons/29.png
new file mode 100644
index 0000000..6d1eee8
Binary files /dev/null and b/icons/29.png differ
diff --git a/icons/3.png b/icons/3.png
new file mode 100644
index 0000000..cc1ff51
Binary files /dev/null and b/icons/3.png differ
diff --git a/icons/30.png b/icons/30.png
new file mode 100644
index 0000000..18271f5
Binary files /dev/null and b/icons/30.png differ
diff --git a/icons/31.png b/icons/31.png
new file mode 100644
index 0000000..941a74d
Binary files /dev/null and b/icons/31.png differ
diff --git a/icons/32.png b/icons/32.png
new file mode 100644
index 0000000..1b1f90f
Binary files /dev/null and b/icons/32.png differ
diff --git a/icons/33.png b/icons/33.png
new file mode 100644
index 0000000..7b43b58
Binary files /dev/null and b/icons/33.png differ
diff --git a/icons/34.png b/icons/34.png
new file mode 100644
index 0000000..1e2b863
Binary files /dev/null and b/icons/34.png differ
diff --git a/icons/35.png b/icons/35.png
new file mode 100644
index 0000000..80b0cfc
Binary files /dev/null and b/icons/35.png differ
diff --git a/icons/36.png b/icons/36.png
new file mode 100644
index 0000000..3826de1
Binary files /dev/null and b/icons/36.png differ
diff --git a/icons/37.png b/icons/37.png
new file mode 100644
index 0000000..66f188e
Binary files /dev/null and b/icons/37.png differ
diff --git a/icons/38.png b/icons/38.png
new file mode 100644
index 0000000..3d40b1a
Binary files /dev/null and b/icons/38.png differ
diff --git a/icons/39.png b/icons/39.png
new file mode 100644
index 0000000..28621bf
Binary files /dev/null and b/icons/39.png differ
diff --git a/icons/4.png b/icons/4.png
new file mode 100644
index 0000000..f7fd2d8
Binary files /dev/null and b/icons/4.png differ
diff --git a/icons/40.png b/icons/40.png
new file mode 100644
index 0000000..b78380f
Binary files /dev/null and b/icons/40.png differ
diff --git a/icons/41.png b/icons/41.png
new file mode 100644
index 0000000..568028d
Binary files /dev/null and b/icons/41.png differ
diff --git a/icons/42.png b/icons/42.png
new file mode 100644
index 0000000..5c22311
Binary files /dev/null and b/icons/42.png differ
diff --git a/icons/43.png b/icons/43.png
new file mode 100644
index 0000000..454f3c0
Binary files /dev/null and b/icons/43.png differ
diff --git a/icons/44.png b/icons/44.png
new file mode 100644
index 0000000..52793ad
Binary files /dev/null and b/icons/44.png differ
diff --git a/icons/45.png b/icons/45.png
new file mode 100644
index 0000000..a02545e
Binary files /dev/null and b/icons/45.png differ
diff --git a/icons/46.png b/icons/46.png
new file mode 100644
index 0000000..f18c735
Binary files /dev/null and b/icons/46.png differ
diff --git a/icons/47.png b/icons/47.png
new file mode 100644
index 0000000..a29da24
Binary files /dev/null and b/icons/47.png differ
diff --git a/icons/5.png b/icons/5.png
new file mode 100644
index 0000000..fc04308
Binary files /dev/null and b/icons/5.png differ
diff --git a/icons/6.png b/icons/6.png
new file mode 100644
index 0000000..84b789e
Binary files /dev/null and b/icons/6.png differ
diff --git a/icons/7.png b/icons/7.png
new file mode 100644
index 0000000..53da68d
Binary files /dev/null and b/icons/7.png differ
diff --git a/icons/8.png b/icons/8.png
new file mode 100644
index 0000000..6f565b7
Binary files /dev/null and b/icons/8.png differ
diff --git a/icons/9.png b/icons/9.png
new file mode 100644
index 0000000..b4d97bf
Binary files /dev/null and b/icons/9.png differ
diff --git a/lib/HomePanel/Render.pm b/lib/HomePanel/Render.pm
index 6984048..df9a653 100644
--- a/lib/HomePanel/Render.pm
+++ b/lib/HomePanel/Render.pm
@@ -56,7 +56,7 @@ my %icon_for=(
 sub icon_for {
     my ($status) = @_;
 
-    return "icons/".($icon_for{$status}//'45').".svg";
+    return "icons/".($icon_for{$status}//'45').".png";
 }
 }
 
-- 
cgit v1.2.3