X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=edbef059ff54cf6aa4d7149b4a39fe6422edafd1;hb=2acf320899ee18e6fb7e86bd7c5d6e959fec26bd;hp=db879b5ea058460248c6da3be60b6c406db2db5d;hpb=4ad8d086222b54bf878f851583ffd4d877c7b79e;p=svn42.git
diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index db879b5..edbef05 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -1,6 +1,17 @@
+function min(a,b)
+{
+ if (a > b)
+ return b;
+ else
+ return a;
+}
+
function writeGooglePlusEvents(data, elem)
{
var ghtml = "";
+ //var gplusimgwidth = parseInt($('
').css("width"));
+ var gplusimgwidth = 495;
+ var minimgwidth=78;
for (var i=0; i< data.items.length; i++)
{
var item = data.items[i];
@@ -33,11 +44,33 @@ function writeGooglePlusEvents(data, elem)
ghtml += ''+item.updated.substring(0,16).replace("T"," ")+'
';
ghtml += ''+notetxt+'
';
if (noteimgs.length>0)
- {
+ {
+ var bigimglimit;
ghtml += '';
- for (var ni=0; ni 3)
+ {
+ var gplusimgmaxwidth = gplusimgwidth - (minimgwidth * ((noteimgs.length -1) / 3));
+ bigimglimit = "max-height:"+(minimgwidth*3)+"px; max-width:"+gplusimgmaxwidth+"px;"
+ ghtml += ' | ';
+ for (var ni=1; ni';
+ var niimax = min(noteimgs.length, ni+3);
+ for (var nii=ni; nii
';
+ }
+ ghtml += '';
+ }
+ }
+ else
{
- ghtml += ' | ';
+ var gplusimgmaxwidth = gplusimgwidth / noteimgs.length;
+ bigimglimit = "max-width:"+gplusimgmaxwidth+"px;"
+ for (var ni=0; ni';
+ }
}
ghtml += '
';
}
@@ -236,7 +269,7 @@ function IsImageOk(img) {
}
var img_orig_src = {};
-function reloadImg(element)
+function reloadImgAlt(element)
{
if(element.complete)
{
@@ -256,3 +289,11 @@ function reloadImg(element)
}
}
}
+function reloadImg(element)
+{
+ if (! img_orig_src[element.id])
+ {
+ img_orig_src[element.id] = element.src;
+ }
+ element.src = img_orig_src[element.id] + "?dt="+Math.floor(new Date().getTime() / 1000).toString();
+}