From ffc1ca4e74d4978a04342dcf7288c1bb7bb2c38d Mon Sep 17 00:00:00 2001
From: Matthew Wall <mwall>
Date: Tue, 28 Jan 2014 14:06:46 +0000
Subject: [PATCH] better out-of-box look

---
 extensions/cmon/skins/cmon/index.html.tmpl    |   6 +-
 extensions/cmon/skins/cmon/skin.conf          | 123 ++++++++++++++++++
 .../forecast/skins/forecast/index.html.tmpl   |  13 ++
 3 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/extensions/cmon/skins/cmon/index.html.tmpl b/extensions/cmon/skins/cmon/index.html.tmpl
index fa833690..2327f94e 100644
--- a/extensions/cmon/skins/cmon/index.html.tmpl
+++ b/extensions/cmon/skins/cmon/index.html.tmpl
@@ -8,7 +8,11 @@
     <!-- cmon for weewx - Copyright Matthew Wall -->
     <title>cmon</title>
     <script>
-var metrics = [ 'rx','battery','cpu','load','disk','mem','net','ups','upstemp','upstime' ];
+var metrics = [
+  'rx','battery',
+  'cpu','load','disk','mem','net',
+/* 'ups', 'upstemp','upstime' */
+];
 var periods = [ 'day','week','month' ];
 
 function setup() {
diff --git a/extensions/cmon/skins/cmon/skin.conf b/extensions/cmon/skins/cmon/skin.conf
index 70660146..af364d5e 100644
--- a/extensions/cmon/skins/cmon/skin.conf
+++ b/extensions/cmon/skins/cmon/skin.conf
@@ -8,6 +8,17 @@
             template = index.html.tmpl
 
 [ImageGenerator]
+    image_width = 700
+    image_height = 200
+    image_background_color = 0xffffff
+    chart_background_color = 0xffffff
+    chart_gridline_color = 0xeaeaea
+    unit_label_font_color = 0xaaaaaa
+    bottom_label_font_color = 0xaaaaaa
+    axis_label_font_color = 0xaaaaaa
+    chart_line_colors = 0x30a030, 0x90d080, 0x111a11, 0x3030a0, 0x8090d0, 0x11111a, 0xa03030
+    marker_type = 'none'
+
     [[day_images]]
         [[[dayrx]]]
             yscale = 0, 100, 10
@@ -64,5 +75,117 @@
             archive_database = computer_sqlite
             [[[[ups_time]]]]
 
+    [[week_images]]
+        [[[weekrx]]]
+            yscale = 0, 100, 10
+            [[[[rxCheckPercent]]]]
+
+        [[[weekbattery]]]
+            [[[[windBatteryStatus]]]]
+            [[[[rainBatteryStatus]]]]
+            [[[[outTempBatteryStatus]]]]
+            [[[[inTempBatteryStatus]]]]
+            [[[[txBatteryStatus]]]]
+
+        [[[weekcpu]]]
+            archive_database = computer_sqlite
+            [[[[cpu_user]]]]
+            [[[[cpu_idle]]]]
+            [[[[cpu_nice]]]]
+            [[[[cpu_system]]]]
+            [[[[cpu_iowait]]]]
+            [[[[cpu_irq]]]]
+            [[[[cpu_softirq]]]]
+
+        [[[weekload]]]
+            archive_database = computer_sqlite
+            [[[[load1]]]]
+            [[[[load5]]]]
+            [[[[load15]]]]
+
+        [[[weekdisk]]]
+            archive_database = computer_sqlite
+            [[[[disk_root_total]]]]
+            [[[[disk_root_used]]]]
+
+        [[[weekmem]]]
+            archive_database = computer_sqlite
+            [[[[mem_total]]]]
+            [[[[mem_used]]]]
+
+        [[[weeknet]]]
+            archive_database = computer_sqlite
+            [[[[net_eth0_rbytes]]]]
+            [[[[net_eth0_tbytes]]]]
+
+        [[[weekups]]]
+            archive_database = computer_sqlite
+            [[[[ups_load]]]]
+            [[[[ups_charge]]]]
+
+        [[[weekupsvoltage]]]
+            archive_database = computer_sqlite
+            [[[[ups_voltage]]]]
+
+        [[[weekupstime]]]
+            archive_database = computer_sqlite
+            [[[[ups_time]]]]
+
+    [[month_images]]
+        [[[monthrx]]]
+            yscale = 0, 100, 10
+            [[[[rxCheckPercent]]]]
+
+        [[[monthbattery]]]
+            [[[[windBatteryStatus]]]]
+            [[[[rainBatteryStatus]]]]
+            [[[[outTempBatteryStatus]]]]
+            [[[[inTempBatteryStatus]]]]
+            [[[[txBatteryStatus]]]]
+
+        [[[monthcpu]]]
+            archive_database = computer_sqlite
+            [[[[cpu_user]]]]
+            [[[[cpu_idle]]]]
+            [[[[cpu_nice]]]]
+            [[[[cpu_system]]]]
+            [[[[cpu_iowait]]]]
+            [[[[cpu_irq]]]]
+            [[[[cpu_softirq]]]]
+
+        [[[monthload]]]
+            archive_database = computer_sqlite
+            [[[[load1]]]]
+            [[[[load5]]]]
+            [[[[load15]]]]
+
+        [[[monthdisk]]]
+            archive_database = computer_sqlite
+            [[[[disk_root_total]]]]
+            [[[[disk_root_used]]]]
+
+        [[[monthmem]]]
+            archive_database = computer_sqlite
+            [[[[mem_total]]]]
+            [[[[mem_used]]]]
+
+        [[[monthnet]]]
+            archive_database = computer_sqlite
+            [[[[net_eth0_rbytes]]]]
+            [[[[net_eth0_tbytes]]]]
+
+        [[[monthups]]]
+            archive_database = computer_sqlite
+            [[[[ups_load]]]]
+            [[[[ups_charge]]]]
+
+        [[[monthupsvoltage]]]
+            archive_database = computer_sqlite
+            [[[[ups_voltage]]]]
+
+        [[[monthupstime]]]
+            archive_database = computer_sqlite
+            [[[[ups_time]]]]
+
 [Generators]
     generator_list = weewx.cheetahgenerator.CheetahGenerator, weewx.imagegenerator.ImageGenerator
diff --git a/extensions/forecast/skins/forecast/index.html.tmpl b/extensions/forecast/skins/forecast/index.html.tmpl
index 9a29ae00..32b8bd0b 100644
--- a/extensions/forecast/skins/forecast/index.html.tmpl
+++ b/extensions/forecast/skins/forecast/index.html.tmpl
@@ -6,6 +6,16 @@
 <html>
   <head>
     <title>Forecast Sampler</title>
+    <style>
+body {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+  background-color: #ffffff;
+}
+h1 {
+  font-size: 110%;
+}
+    </style>
   </head>
   <body>
 
@@ -16,6 +26,9 @@ This skin illustrates the use of data from the forecasting module.
 #if $varExists('forecast')
 
 <h1>Forecast Table</h1>
+<p>The table of forecast data is displayed automatically by including a single
+file called forecast_table.inc.  Modify the first part of that file to control
+which data are shown in the table.</p>
 #include $Extras.forecast_table
 
 #set $periods = $forecast.weather_periods('WU',max_events=6)