adding comment box to sensors

diff --git a/sensors/style.css b/sensors/style.css
index 9d891b23088171d48a6a995f1625a5eab1f30db6..d03c16fb887f17f798a9fb4e425899bdd0051c9d 100644 (file)
--- a/sensors/style.css
+++ b/sensors/style.css
@@ -106,3 +106,9 @@ input {
   top:10px;
   right:50px;
   }
+
+.sensor .comment {
+  width:200px;
+  background:#fff;
+  box-shadow:none;
+  }

diff --git a/sensors/update.pl b/sensors/update.pl
index 75e5dfb3cee9744d8469fac17ca8cab34997f275..722f94282b0f44afce4fc05508ffba5ffaa2018f 100755 (executable)
--- a/sensors/update.pl
+++ b/sensors/update.pl
@@ -4,6 +4,7 @@ print "Content-Type: text/html; charset=utf-8\r\n\r\n";
 use warnings;
 use strict;
 use CGI::Carp qw(warningsToBrowser fatalsToBrowser);
+use URI::Escape;
 use CGI;
 use utf8;
 use POSIX;
@@ -119,18 +120,23 @@ my $cfile = "config/default.conf";
 open(my $cdata, '<', $cfile) or die "Could not open '$cfile' $!\n";
 while (my $line = <$cdata>) {
   $line =~ s/#.*//;
-  my @f = split(" " , $line);
+  my @f = split(" " , $line,5);
   if(defined $f[3]) {
     $f[4] = $f[4] || '';
-    my $val = '--.--';
-    $val = sprintf('%02.2f',$values->[$f[0]*8+$f[1]]) if defined $values->[$f[0]*8+$f[1]];
-    print "
-      <div class=\"sensor\" id=\"$f[0].$f[1]\" style=\"left:".($f[3]*20)."px;top:".($f[2]*20)."px;background:".findcolor($values->[$f[0]*8+$f[1]],$min,$max)."\">
-        <div class=\"value\">$val</div>
-        <div class=\"sid\">$f[0].$f[1]</div>
-        <div class=\"name\">$f[4]</div>
-      </div>      
-      ";##/($count->[$f[0]*8+$f[1]]||0)
+    if($f[0] != 99) {
+      my $val = '--.--';
+      $val = sprintf('%02.2f',$values->[$f[0]*8+$f[1]]) if defined $values->[$f[0]*8+$f[1]];
+      print "
+        <div class=\"sensor\" id=\"$f[0].$f[1]\" style=\"left:".($f[3]*20)."px;top:".($f[2]*20)."px;background:".findcolor($values->[$f[0]*8+$f[1]],$min,$max)."\">
+          <div class=\"value\">$val</div>
+          <div class=\"sid\">$f[0].$f[1]</div>
+          <div class=\"name\">".uri_unescape($f[4])."</div>
+        </div>      
+        ";##/($count->[$f[0]*8+$f[1]]||0)
+      }
+    else {
+      print "<div class='sensor comment' id=\"$f[0].$f[1]\" style=\"left:".($f[3]*20)."px;top:".($f[2]*20)."px\"><div class='comment'>".uri_unescape($f[4])."</div> </div>";
+      } 
     }
     
   }

diff --git a/sensors/writeconfig.pl b/sensors/writeconfig.pl
index b99e9d433ad6561659633b04a8f3336f24a2d741..4a3ca06dc7b4d87f00b46675773111facf29a4c7 100755 (executable)
--- a/sensors/writeconfig.pl
+++ b/sensors/writeconfig.pl
@@ -11,7 +11,7 @@ use Data::Dumper;
 my $str = $ENV{'QUERY_STRING'};
 my @new = split(',', $str);
 $str =~ s/,/\t\t\t\t/g;
-
+print join('-', @new);
 my $out = "";
 
 my $cfile = "config/default.conf";
@@ -36,4 +36,4 @@ close($cdata);
 open($cdata, '>', $cfile) or die "Could not open '$cfile' $!\n";
 print $cdata $out;
 close($cdata);
-  
\ No newline at end of file
+