X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=raspberry-kiosk%2Fkiosk.js;h=edbef059ff54cf6aa4d7149b4a39fe6422edafd1;hb=2acf320899ee18e6fb7e86bd7c5d6e959fec26bd;hp=7315033e680d9464982be008ff486e128e028c50;hpb=bdda5e42a0334cd2152b1d77a48f3ae5103f29de;p=svn42.git
diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index 7315033..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.actor.image.url+')
'+item.updated.substring(0,16).replace("T"," ")+'
';
ghtml += ''+notetxt+'
';
if (noteimgs.length>0)
- {
+ {
+ var bigimglimit;
ghtml += '';
- for (var ni=0; ni 3)
{
- ghtml += '![]('+noteimgs[ni]+') | ';
+ var gplusimgmaxwidth = gplusimgwidth - (minimgwidth * ((noteimgs.length -1) / 3));
+ bigimglimit = "max-height:"+(minimgwidth*3)+"px; max-width:"+gplusimgmaxwidth+"px;"
+ ghtml += '![]('+noteimgs[0]+') | ';
+ for (var ni=1; ni';
+ var niimax = min(noteimgs.length, ni+3);
+ for (var nii=ni; nii
';
+ }
+ ghtml += '';
+ }
+ }
+ else
+ {
+ var gplusimgmaxwidth = gplusimgwidth / noteimgs.length;
+ bigimglimit = "max-width:"+gplusimgmaxwidth+"px;"
+ for (var ni=0; ni
';
+ }
}
ghtml += '
';
}
@@ -57,6 +90,22 @@ function loadGooglePlusEvents()
});
}
+function weekday2str(dow)
+{
+ var weekday=new Array(7);
+ weekday[0]="So";
+ weekday[1]="Mo";
+ weekday[2]="Di";
+ weekday[3]="Mi";
+ weekday[4]="Do";
+ weekday[5]="Fr";
+ weekday[6]="Sa";
+ weekday[7]="So";
+ if (dow >=0 && dow <=7)
+ return weekday[dow];
+ else
+ return "";
+}
function writeCalendar(data, elem)
{
@@ -71,13 +120,20 @@ function writeCalendar(data, elem)
}
else
{
+ var weekday = weekday2str((new Date(dt)).getDay());
var stime = data[s].starttime;
+ var month = data[s].start.substring(5,7);
+ if (month[0] == '0')
+ month = month[1];
+ var dayofmonth = data[s].start.substring(8,10);
+ if (dayofmonth[0] == '0')
+ dayofmonth = dayofmonth[1];
while (stime.substring(stime.length-3,stime.length) == ":00")
{
stime=stime.substring(0,stime.length-3);
}
if (stime.length <= 2) { stime+="h"; }
- when = data[s].start.substring(8,10)+"."+data[s].start.substring(5,7) +", "+stime;
+ when = weekday + " " + dayofmonth+"."+month +", "+stime;
}
calhtml += ''+when+' - '+data[s].title+''+"\n";
}
@@ -213,7 +269,7 @@ function IsImageOk(img) {
}
var img_orig_src = {};
-function reloadImg(element)
+function reloadImgAlt(element)
{
if(element.complete)
{
@@ -233,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();
+}