improve ajar msg

[svn42.git] / raspberry-kiosk / kiosk.html
diff --git a/raspberry-kiosk/kiosk.html b/raspberry-kiosk/kiosk.html

index 14645bf..135e44c 100644 (file)
--- a/raspberry-kiosk/kiosk.html
+++ b/raspberry-kiosk/kiosk.html
@@ -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;">
@@ -14,12 +17,13 @@
    <div id="headerphoto" class="headerphoto">
    <img class="headerphoto" src="http://realraum.at/wiki/lib/exe/fetch.php?media=xro:realraum_hdr.jpg"></img>
    </div>
+  <!-- Calendar ------------------------ -->
    <div class="calendar">
      <p class="topic">Veranstaltungskalender</p>
      <div id="grical_upcoming_kiosk">Kalendar lädt ...</div>
    </div>
-   <!-- Sensor Data ------------------------ -->
   <table border="0" cellpadding="0" cellspacing="0"><tr>
+ <!-- Sensor Data ------------------------ -->
   <td style="vertical-align:top; padding-right:2px;">
    <div class="sensorgraphs">
      <p class="topic">Sensordaten</p>
@@ -29,19 +33,13 @@
      <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;">
  
+  </td><td style="vertical-align:top;">
+   <!-- Google Plus Wall ------------------------ -->
     <div class="gpluswall">
      <p class="topic">Google+</p>
      <div id="gplusevents">Lädt ...</div>