From 88653b6c29b55da138dca1f5f84c805a465ed51a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sat, 14 Jan 2012 11:52:25 +0100
Subject: [PATCH] Web: Cleanup

---
 web/index.cgi      |  2 +-
 web/temp-12h.cgi   |  5 +++--
 web/temp-48h.cgi   |  5 +++--
 web/temp-month.cgi | 10 ++++++----
 web/temp-quick.cgi |  5 +++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/web/index.cgi b/web/index.cgi
index 760c662..519eec0 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -36,7 +36,7 @@ sub links(@) {
 	return $out;
 }
 
-print "<p>Temperature:", links("temp-", "12h", "48h", "month"), "\n";
+print "<p>Temperature:", links("temp-", "quick", "12h", "48h", "month"), "\n";
 print "<p>Humidity:", links("rh-", "12h", "48h", "month"), "\n";
 print "<p>Power:", links("power-", "2h", "2h-detail", "day", "day-detail", "month"), "\n";
 
diff --git a/web/temp-12h.cgi b/web/temp-12h.cgi
index 9bfbfcb..710c33d 100755
--- a/web/temp-12h.cgi
+++ b/web/temp-12h.cgi
@@ -13,5 +13,6 @@ exec rrdtool graph - \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
 	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE1:a#0000cc:Ursarium\n' \
-	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:b#00cc00:Balcony\n' \
-	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:c#cc0000:Catarium'
+	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:d#cc0000:Catarium\n' \
+	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:c#cc00cc:Balcony\n' \
+	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE1:b#00cc00:Outside'
diff --git a/web/temp-48h.cgi b/web/temp-48h.cgi
index dd0b188..9613985 100755
--- a/web/temp-48h.cgi
+++ b/web/temp-48h.cgi
@@ -13,5 +13,6 @@ exec rrdtool graph - \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
 	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE1:a#0000cc:Ursarium\n' \
-	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:b#00cc00:Balcony\n' \
-	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:c#cc0000:Catarium'
+	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:d#cc0000:Catarium\n' \
+	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:c#cc00cc:Balcony\n' \
+	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE1:b#00cc00:Outside'
diff --git a/web/temp-month.cgi b/web/temp-month.cgi
index 07b8289..76058aa 100755
--- a/web/temp-month.cgi
+++ b/web/temp-month.cgi
@@ -14,7 +14,9 @@ exec rrdtool graph - \
 	--legend-position east \
 	DEF:alo=$D/sensor-ursarium.rrd:temp:MIN 'LINE1:alo#0000cc:Ursarium\n' \
 	DEF:ahi=$D/sensor-ursarium.rrd:temp:MAX 'LINE1:ahi#0000cc' \
-	DEF:blo=$D/sensor-balcony.rrd:temp:MIN 'LINE1:blo#00cc00:Balcony\n' \
-	DEF:bhi=$D/sensor-balcony.rrd:temp:MAX 'LINE1:bhi#00cc00' \
-	DEF:clo=$D/sensor-catarium.rrd:temp:MIN 'LINE1:clo#cc0000:Catarium' \
-	DEF:chi=$D/sensor-catarium.rrd:temp:MAX 'LINE1:chi#cc0000'
+	DEF:dlo=$D/sensor-catarium.rrd:temp:MIN 'LINE1:dlo#cc0000:Catarium\n' \
+	DEF:dhi=$D/sensor-catarium.rrd:temp:MAX 'LINE1:dhi#cc0000' \
+	DEF:clo=$D/sensor-balcony.rrd:temp:MIN 'LINE1:clo#cc00cc:Balcony\n' \
+	DEF:chi=$D/sensor-balcony.rrd:temp:MAX 'LINE1:chi#cc00cc' \
+	DEF:blo=$D/sensor-outside.rrd:temp:MIN 'LINE1:blo#00cc00:Outside' \
+	DEF:bhi=$D/sensor-outside.rrd:temp:MAX 'LINE1:bhi#00cc00'
diff --git a/web/temp-quick.cgi b/web/temp-quick.cgi
index ed2f930..2c55dd4 100755
--- a/web/temp-quick.cgi
+++ b/web/temp-quick.cgi
@@ -13,5 +13,6 @@ exec rrdtool graph - \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
 	DEF:a=$D/sensor-ursarium.rrd:temp:AVERAGE 'LINE1:a#0000cc:Ursarium\n' \
-	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:b#00cc00:Balcony\n' \
-	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:c#cc0000:Catarium'
+	DEF:d=$D/sensor-catarium.rrd:temp:AVERAGE 'LINE1:d#cc0000:Catarium\n' \
+	DEF:c=$D/sensor-balcony.rrd:temp:AVERAGE 'LINE1:c#cc00cc:Balcony\n' \
+	DEF:b=$D/sensor-outside.rrd:temp:AVERAGE 'LINE1:b#00cc00:Outside'
-- 
2.39.2