Web: Cleanup

diff --git a/web/index.cgi b/web/index.cgi
index 760c662d622fadd0c35c31719b4dde400e75d2e9..519eec02dc624fa2c0097e927df3f1e795803eaf 100755 (executable)
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -36,7 +36,7 @@ sub links(@) {
        return $out;
 }
 
        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";
 
 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 9bfbfcbca8cef5937dbe1da002b16cf43e292cf9..710c33d5bbc7b9a98c2fd4f0a7ec52fb5e2cd04c 100755 (executable)
--- 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' \
        --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 dd0b1886abb20665ca94ba257f05044b4dcb73f6..9613985029341e4adf5bc5b7ef0a89a6752d9092 100755 (executable)
--- 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' \
        --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 07b82893a3d9a87ea897dfe89973952b9c011e09..76058aa111a904f59f16f64b7c8372aac6327e3a 100755 (executable)
--- 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' \
        --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 ed2f930ce61616d1c7ab210ab903ed1560a5a9cb..2c55dd43eb158f09920fe70163a94634423cbd6e 100755 (executable)
--- 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' \
        --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'