stuff
authorBernhard Tittelbach <xro@realraum.at>
Thu, 10 Oct 2013 03:55:39 +0000 (03:55 +0000)
committerBernhard Tittelbach <xro@realraum.at>
Thu, 10 Oct 2013 03:55:39 +0000 (03:55 +0000)
raspberry-kiosk/kiosk.html
raspberry-kiosk/kiosk.js

index 9313be9..135e44c 100644 (file)
@@ -5,7 +5,10 @@
   <link rel="stylesheet" href="kiosk.css" type="text/css" />
   <script type="text/javascript" src="/jquery.min.js"></script>
   <!--script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script-->
-  <!--script src="/purl.js"></script-->
+   <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+   <script type="text/javascript">
+      google.load('visualization', '1', {packages: ['corechart']});
+  </script>
   <script type="text/javascript" src="kiosk.js"></script>
  </head>
  <body style="max-width:900px; max-height:1440px;">
     <tr><td id="sensor_status" style="border:0px none black; margin-top:5px;">Lädt ...</td></tr>
     </table>
     </div>
-    <div class="sensorelem">
-     <img id="tempsensor" class="sensorimg" src="http://realraum.at/shmcache/temp0.png"/>
-    </div>
-    <div class="sensorelem">
-      <img id="lightsensor" class="sensorimg" src="http://realraum.at/shmcache/light0.png"/>
-    </div>
-    <div class="sensorelem">
-      <img id="movementsensor" class="sensorimg" src="http://realraum.at/shmcache/movement.png"/>
-    </div>
+    <div class="sensorelem" id="tempgooglegraph" style="height:300px;"></div>
+    <div class="sensorelem" id="lightgooglegraph" style="height:300px;"></div>
+  <div class="sensorelem" id="movementgooglegraph" style="height:300px;"></div>
   </div>
 
   </td><td style="vertical-align:top;">
index 8919004..278d3d6 100644 (file)
@@ -423,11 +423,11 @@ $(document).ready(function()
     loadCalendarMainPage();
     setInterval("loadCalendarMainPage()", 123*1000);
   }
-  if (document.getElementById("sensorgraphs"))
-  {
-    setInterval("updateSensors()",145*1000);
-  }
-  if (document.getElementById("tempgooglegraph") || document.getElementById("lightgooglegraph"))
+//  if (document.getElementById("sensorgraphs"))
+//  {
+//    setInterval("updateSensors()",145*1000);
+//  }
+  if (document.getElementById("tempgooglegraph") || document.getElementById("lightgooglegraph") || document.getElementById("movementgooglegraph"))
   {
     loadAndDrawSensorData();
     setInterval("loadAndDrawSensorData()",145*1000);