X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=web%2Ftemp-12h.cgi;h=432014d222e72fc84216219fd3b9658502b97f3d;hb=eeae054932ce08bbacfcf9a38261bf5a9d41f86d;hp=4374a12ef7450c66eb5db9e13964ad9f15d47404;hpb=4d53e3f4c49c1bb92e2ba90a65c60d44a523548d;p=arexx.git

diff --git a/web/temp-12h.cgi b/web/temp-12h.cgi
index 4374a12..432014d 100755
--- a/web/temp-12h.cgi
+++ b/web/temp-12h.cgi
@@ -7,9 +7,9 @@ current ()
 {
 	Z=$(rrdtool fetch $1 AVERAGE -s-5min -r900 | grep : | grep -v nan | tail -1 | cut -d ' ' -f 2)
 	if [ -z "$Z" ] ; then
-		echo -n "---"
+		echo -n "---- "
 	else
-		printf "%5.1f" "$Z"
+		printf "%4.1f°" "$Z"
 	fi
 }
 
@@ -24,30 +24,30 @@ exec rrdtool graph - \
 	--units-exponent 0 --lower-limit -20 --upper-limit 40 --rigid \
 	--legend-position east \
 	--pango-markup \
-	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:g=$D/sensor-garage.rrd:temp:AVERAGE \
 	DEF:u=$D/sensor-ursarium.rrd:temp:AVERAGE \
-	DEF:b=$D/sensor-balcony.rrd:temp:AVERAGE \
-	DEF:o=$D/sensor-outside.rrd:temp:AVERAGE \
-	DEF:t=$D/sensor-aquarium.rrd:temp:AVERAGE \
-	'AREA:c#cc7777' \
+	DEF:c=$D/sensor-catarium.rrd:temp:AVERAGE \
+	DEF:m=$D/sensor-machinarium.rrd:temp:AVERAGE \
+	DEF:a=$D/sensor-aquarium.rrd:temp:AVERAGE \
 	'AREA:u#7777cc' \
-	'AREA:b#cc77cc' \
-	'AREA:o#77cc77' \
-	'LINE2:c#cc0000:Catarium\n' \
+	'AREA:m#77cc77' \
+	'AREA:c#cc77cc' \
+	'AREA:g#cc7777' \
+	'LINE2:g#cc0000:Garage\n' \
 	'LINE2:u#0000cc:Ursarium\n' \
-	'LINE2:t#00cccc:Aquarium\n' \
-	'LINE2:b#cc00cc:Balcony\n' \
-	'LINE2:o#00cc00:Outside\n' \
+	'LINE2:a#00cccc:Aquarium\n' \
+	'LINE2:c#cc00cc:Catarium\n' \
+	'LINE2:m#00cc00:Machinarium\n' \
 	'HRULE:0#0000ff' \
 	'COMMENT:\s' \
 	'COMMENT:\s' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#cc0000" font-size="x-large" weight="bold">'"$(current $D/sensor-catarium.rrd)"'°</span>\l' \
+	'COMMENT:<span foreground="#cc0000" font-size="x-large" weight="bold">'"$(current $D/sensor-garage.rrd)"'</span>\l' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#0000cc" font-size="x-large" weight="bold">'"$(current $D/sensor-ursarium.rrd)"'°</span>\l' \
+	'COMMENT:<span foreground="#0000cc" font-size="x-large" weight="bold">'"$(current $D/sensor-ursarium.rrd)"'</span>\l' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#00cccc" font-size="x-large" weight="bold">'"$(current $D/sensor-aquarium.rrd)"'°</span>\l' \
+	'COMMENT:<span foreground="#00cccc" font-size="x-large" weight="bold">'"$(current $D/sensor-aquarium.rrd)"'</span>\l' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#cc00cc" font-size="x-large" weight="bold">'"$(current $D/sensor-balcony.rrd)"'°</span>\l' \
+	'COMMENT:<span foreground="#cc00cc" font-size="x-large" weight="bold">'"$(current $D/sensor-catarium.rrd)"'</span>\l' \
 	'COMMENT:\s' \
-	'COMMENT:<span foreground="#00cc00" font-size="x-large" weight="bold">'"$(current $D/sensor-outside.rrd)"'°</span>\l' \
+	'COMMENT:<span foreground="#00cc00" font-size="x-large" weight="bold">'"$(current $D/sensor-machinarium.rrd)"'</span>\l' \