X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=84104fbd4566e4276df449abf41461fbbbafaa59;hb=3953406616a8bd43f61fa98d72af02166c490c36;hp=5b670edd418ccef983a32879b4308eed94e646ac;hpb=2114d3f614c0ecc75de9fde689fcbb9f90ca80fe;p=svn42.git

diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index 5b670ed..84104fb 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -1,6 +1,16 @@
+function min(a,b)
+{
+	if (a > b)
+		return b;
+	else
+		return a;
+}
+
 function writeGooglePlusEvents(data, elem)
 {
   var ghtml = "";
+  var gplusimgwidth = parseInt($('<table class="gplusimg" />').css("width"));
+  var minimgwidth=78;
   for (var i=0; i< data.items.length; i++)
   {
     var item = data.items[i];
@@ -33,11 +43,33 @@ function writeGooglePlusEvents(data, elem)
     ghtml += '<img class="gplusactor" src="'+item.actor.image.url+'"/><p class="gplustimestamp">'+item.updated.substring(0,16).replace("T"," ")+'</p>';
     ghtml += '<p class="gplustxt">'+notetxt+'</p>';
     if (noteimgs.length>0)
-    {
+    { 
+      var bigimglimit;
       ghtml += '<table class="gplusimg" cellspacing="0"><tr>';
-      for (var ni=0; ni<noteimgs.length; ni++)
+      if (noteimgs.length > 3)
+      {
+              var gplusimgmaxwidth = gplusimgwidth - (minimgwidth * ((noteimgs.length -1) / 3));
+	      bigimglimit = "max-height:"+(minimgwidth*3)+"px; max-width:"+gplusimgmaxwidth+"px;"
+	      ghtml += '<td><img class="gplusimg" style="'+bigimglimit+'" src="'+noteimgs[0]+'"/></td>';
+	      for (var ni=1; ni<noteimgs.length; ni+=3)
+	      {
+		  ghtml += '<td>';
+		  var niimax = min(noteimgs.length, ni+3);
+		  for (var nii=ni; nii<niimax; nii++)
+		  {
+			ghtml += '<img class="gplusimg" style="max-width:'+minimgwidth+'px; max-height:'+minimgwidth+'px;" src="'+noteimgs[nii]+'"/><br/>';
+		  }
+	          ghtml += '</td>';
+             }
+      }
+      else
       {
-        ghtml += '<td><img class="gplusimg" src="'+noteimgs[ni]+'"/></td>';
+             var gplusimgmaxwidth = gplusimgwidth / noteimgs.length;
+	     bigimglimit = "max-width:"+gplusimgmaxwidth+"px;"
+             for (var ni=0; ni<noteimgs.length; ni++)
+	     {
+		ghtml += '<td><img class="gplusimg" style="'+bigimglimit+'" src="'+noteimgs[ni]+'"/></td>';
+	     }
       }
       ghtml += '</tr></table>';
     }
@@ -171,8 +203,7 @@ $(document).ready(function()
   loadGooglePlusEvents();
   setInterval("updateAnwesenheitStatus()", 10*1000);
   setInterval("loadCalendar()", 123*1000);
-  //setInterval("updateSensors()",145*1000);
-  setInterval("updateSensors()",1000);
+  setInterval("updateSensors()",145*1000);
   setInterval("loadGooglePlusEvents()", 1207*1000);
 });