From: Bernhard Tittelbach <xro@realraum.at>
Date: Wed, 24 Apr 2013 00:50:44 +0000 (+0000)
Subject: show multiple image if album
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=ada40a47ddd05e721fa8b449bd0e6e9b9aee0949;p=svn42.git

show multiple image if album
---

diff --git a/raspberry-kiosk/kiosk.css b/raspberry-kiosk/kiosk.css
index cc29079..1621337 100644
--- a/raspberry-kiosk/kiosk.css
+++ b/raspberry-kiosk/kiosk.css
@@ -178,7 +178,7 @@ p.gplustimestamp {
   background-color: Gainsboro;
   border-bottom-left-radius:9px;
 }
-p.gplusimg {
+table.gplusimg {
   display:block;
   margin-left:0;
   margin-top:6px;
@@ -186,9 +186,11 @@ p.gplusimg {
   margin-right:0;
   overflow:hidden;
   max-height:275px;
-}
-img.gplusimg {
   width:495px;
+  border: 0px none black;
+  padding: 0;
+  border-spacing: 0;
+  border-collapse:collapse;
 }
 p.gplustxt {
   display:block;
diff --git a/raspberry-kiosk/kiosk.js b/raspberry-kiosk/kiosk.js
index d453cda..338f8da 100644
--- a/raspberry-kiosk/kiosk.js
+++ b/raspberry-kiosk/kiosk.js
@@ -7,18 +7,21 @@ function writeGooglePlusEvents(data, elem)
     var noteobj = item.object;
     var attach = noteobj.attachments;
     var notetxt = noteobj.content;
-    var noteimg = false;
+    var noteimgs = new Array();
     if (attach)
     {
       for (var a=0; a<attach.length; a++)
       {
         if ( attach[a].objectType == "album")
         {
-          noteimg = attach[a].thumbnails[0].image.url;
+          for (var t=0; t<attach[a].thumbnails.length; t++)
+          {
+            noteimgs.push(attach[a].thumbnails[t].image.url);
+          }
         }
         else if ( attach[a].objectType == "photo")
         {
-          noteimg = attach[a].image.url;
+          noteimgs.push(attach[a].image.url);
         }
         else if (attach[a].objectType == "event")
         {
@@ -29,9 +32,14 @@ function writeGooglePlusEvents(data, elem)
     ghtml += '<div class="gpluspost">'
     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 (noteimg)
+    if (noteimgs.length>0)
     {
-      ghtml += '<p class="gplusimg"><img class="gplusimg" src="'+noteimg+'"/></p>';
+      ghtml += '<table class="gplusimg" cellspacing="0"><tr>';
+      for (var ni=0; ni<noteimgs.length; ni++)
+      {
+        ghtml += '<td><img class="gplusimg" src="'+noteimgs[ni]+'"/></td>';
+      }
+      ghtml += '</tr></table>';
     }
     ghtml += '</div>';
   }