projects
/
svn42.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
date in graph
[svn42.git]
/
raspberry-kiosk
/
kiosk.html
diff --git
a/raspberry-kiosk/kiosk.html
b/raspberry-kiosk/kiosk.html
index
14645bf
..
9313be9
100644
(file)
--- a/
raspberry-kiosk/kiosk.html
+++ b/
raspberry-kiosk/kiosk.html
@@
-14,12
+14,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>
<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>
<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>
<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>
<td style="vertical-align:top; padding-right:2px;">
<div class="sensorgraphs">
<p class="topic">Sensordaten</p>
@@
-39,9
+40,9
@@
<img id="movementsensor" class="sensorimg" src="http://realraum.at/shmcache/movement.png"/>
</div>
</div>
<img id="movementsensor" class="sensorimg" src="http://realraum.at/shmcache/movement.png"/>
</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>
<div class="gpluswall">
<p class="topic">Google+</p>
<div id="gplusevents">Lädt ...</div>