better javascript updates

[svn42.git] / raspberry-kiosk / kiosk.html

diff --git a/raspberry-kiosk/kiosk.html b/raspberry-kiosk/kiosk.html
index 8a5b0e2..333da4c 100644 (file)
--- a/raspberry-kiosk/kiosk.html
+++ b/raspberry-kiosk/kiosk.html
@@ -13,30 +13,24 @@
   <div id="headerphoto" class="headerphoto">
   <img class="headerphoto" src="http://realraum.at/wiki/lib/exe/fetch.php?media=xro:realraum_hdr.jpg"></img>
   </div>
-  <div class="calendars">
-   <div class="calendar" style="float:left;">
-    <p class="topic">Upcoming Events</p>
-    <div id="grical_upcoming">Loading calendar ...</div>
-   </div>
-   <!--div class="calendar" style="float:right;">
-    <p class="topic">Previous Events</p>
-    <div id="grical_previous">Loading Old Events ...</div>
-   </div-->
+  <div class="calendar" style="float:left;">
+    <p class="topic">Veranstaltungskalender</p>
+    <div id="grical_upcoming">Kalendar lädt ...</div>
   </div>
-  <!-- Door and Presence Status ------------------------ -->
-  <br/>
    <!-- Sensor Data ------------------------ -->
+ <table border="0" cellpadding="0" cellspacing="0"><tr>
+ <td style="vertical-align:top; padding-right:2px;">
   <div class="sensorgraphs">
-    <p class="topic">Sensor Data</p>
+    <p class="topic">Sensordaten</p>
     <div class="sensorelem">
     <table class="status" style="">
-    <tr><td id="anwesenheit_status" style="height:100px; border:0px none black;">Loading ...</td></tr>
-    <tr><td id="sensor_status" style="border:1px solid black; margin-top:5px;">Loading ...</td></tr>
+    <tr><td id="anwesenheit_status" style="height:100px; border:0px none black;">Lädt ...</td></tr>
+    <tr><td id="sensor_status" style="border:0px none black; margin-top:5px;">Lädt ...</td></tr>
     </table>
     </div>
-    <!--div class="sensorelem">
+    <div class="sensorelem">
      <img id="tempsensor" class="sensorimg" src="http://realraum.at/get_sensor.php?sensor=temp"/>
-    </div-->
+    </div>
     <div class="sensorelem">
       <img id="lightsensor" class="sensorimg" src="http://realraum.at/get_sensor.php?sensor=light"/>
     </div>
@@ -44,5 +38,14 @@
       <img id="movementsensor" class="sensorimg" src="http://realraum.at/get_sensor.php?sensor=movement"/>
     </div>
   </div>
+  
+  </td><td style="vertical-align:top;">
+
+   <div class="gpluswall">
+    <p class="topic">Google+</p>
+    <div id="gplusevents">Lädt ...</div>
+   </div>
+  </td></tr>
+  </table>
 </body>
 </html>