projects / svn42.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7afc1fb)
resolutions
authorBernhard Tittelbach <xro@realraum.at>
Mon, 21 Oct 2013 07:42:22 +0000 (07:42 +0000)
committerBernhard Tittelbach <xro@realraum.at>
Mon, 21 Oct 2013 07:42:22 +0000 (07:42 +0000)
raspberry-kiosk/kiosk.html [deleted file] patch | blob | history
raspberry-kiosk/kiosk1024x768.html [new file with mode: 0644] patch | blob
raspberry-kiosk/kiosk2cal.html [deleted file] patch | blob | history
raspberry-kiosk/kiosk900x1440.html [new file with mode: 0644] patch | blob
raspberry-kiosk/start-kiosk.sh patch | blob | history

diff --git a/raspberry-kiosk/kiosk.html b/raspberry-kiosk/kiosk.html
deleted file mode 100644 (file)
index 135e44c..0000000
--- a/raspberry-kiosk/kiosk.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<html>
-  <head>
-  <meta charset="utf-8">
-  <title>Realraum Kiosk Seite</title>
-  <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 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;">
-  <div id="dateclock"></div>
-  <div id="siteheader">Neuigkeiten auf <span style="font-size:110%;">http://realraum.at</span></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>
- <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>
-    <div class="sensorelem">
-    <table class="status" style="">
-    <tr><td id="anwesenheit_status_kiosk" 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" 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;">
-   <!-- Google Plus Wall ------------------------ -->
-   <div class="gpluswall">
-    <p class="topic">Google+</p>
-    <div id="gplusevents">Lädt ...</div>
-   </div>
-  </td></tr>
-  </table>
-</body>
-</html>
diff --git a/raspberry-kiosk/kiosk1024x768.html b/raspberry-kiosk/kiosk1024x768.html
new file mode 100644 (file)
index 0000000..51336a8
--- /dev/null
+++ b/raspberry-kiosk/kiosk1024x768.html
@@ -0,0 +1,23 @@
+<html>
+  <head>
+  <meta charset="utf-8">
+  <title>Realraum Kiosk Seite</title>
+  <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="kiosk.js"></script>
+ </head>
+ <body style="max-width:1024px; max-height:768px;">
+  <div id="dateclock"></div>
+  <div id="siteheader">Neuigkeiten auf <span style="font-size:110%;">http://realraum.at</span></div>
+  <div id="headerphoto2" class="headerphoto2">
+  <img class="headerphoto2" 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>
+</body>
+</html>
diff --git a/raspberry-kiosk/kiosk2cal.html b/raspberry-kiosk/kiosk2cal.html
deleted file mode 100644 (file)
index 51336a8..0000000
--- a/raspberry-kiosk/kiosk2cal.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-  <head>
-  <meta charset="utf-8">
-  <title>Realraum Kiosk Seite</title>
-  <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="kiosk.js"></script>
- </head>
- <body style="max-width:1024px; max-height:768px;">
-  <div id="dateclock"></div>
-  <div id="siteheader">Neuigkeiten auf <span style="font-size:110%;">http://realraum.at</span></div>
-  <div id="headerphoto2" class="headerphoto2">
-  <img class="headerphoto2" 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>
-</body>
-</html>
diff --git a/raspberry-kiosk/kiosk900x1440.html b/raspberry-kiosk/kiosk900x1440.html
new file mode 100644 (file)
index 0000000..135e44c
--- /dev/null
+++ b/raspberry-kiosk/kiosk900x1440.html
@@ -0,0 +1,50 @@
+<html>
+  <head>
+  <meta charset="utf-8">
+  <title>Realraum Kiosk Seite</title>
+  <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 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;">
+  <div id="dateclock"></div>
+  <div id="siteheader">Neuigkeiten auf <span style="font-size:110%;">http://realraum.at</span></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>
+ <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>
+    <div class="sensorelem">
+    <table class="status" style="">
+    <tr><td id="anwesenheit_status_kiosk" 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" 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;">
+   <!-- Google Plus Wall ------------------------ -->
+   <div class="gpluswall">
+    <p class="topic">Google+</p>
+    <div id="gplusevents">Lädt ...</div>
+   </div>
+  </td></tr>
+  </table>
+</body>
+</html>
diff --git a/raspberry-kiosk/start-kiosk.sh b/raspberry-kiosk/start-kiosk.sh
index a32269f..edb4366 100644 (file)
--- a/raspberry-kiosk/start-kiosk.sh
+++ b/raspberry-kiosk/start-kiosk.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-KIOSKURI_DEFAULT="http://www.realraum.at/kiosk.html"
-KIOSKURI_900x1440="http://www.realraum.at/kiosk.html"
+KIOSKURI_DEFAULT="http://www.realraum.at/kiosk900x1440.html"
+KIOSKURI_900x1440="http://www.realraum.at/kiosk900x1440.html"
 KIOSKURI_768x1366="http://www.realraum.at/kiosk768x1366.html"
-KIOSKURI_1024x768="http://www.realraum.at/kiosk2cal.html"
+KIOSKURI_1024x768="http://www.realraum.at/kiosk1024x768.html"
 #KIOSKURI="http://grical.realraum.at"
 #KIOSKURI="http://radi-o-matic.helsinki.at/nextshows/index.php?len=11"
 sleep 1
@@ -21,7 +21,7 @@ xset s noblank
 RESOLUTION=$(xrandr -q | awk -F'current' -F',' 'NR==1 {gsub("( |current)","");print $2}')
 KIOSKURI=$(eval echo -n \${KIOSKURI_${RESOLUTION}:-$KIOSKURI_DEFAULT})
 unclutter &
-#midori -e Fullscreen -a "$KIOSKURI"
-chromium --kiosk --incognito "$KIOSKURI"
+midori -e Fullscreen -a "$KIOSKURI"
+#chromium --kiosk --incognito "$KIOSKURI"
 
 exit 0
import from old svn repo https://svn.spreadspace.org/realraum