Merge branch 'master' of https://github.com/unaio/una

modules/boonex/artificer/data/template/bx_timeline/css/view.css

@@ -233,7 +233,7 @@ div.bx-tl-item-attachment .bx-tl-iv-duration {
 
 
 /*+++ Showcase Layout +++*/
-div.bx-tl-item-attachments.bx-tl-ia-showcase {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase {
     display: -webkit-flex;
     display: flex;
     -webkit-flex-wrap: wrap;
@@ -241,18 +241,18 @@ div.bx-tl-item-attachments.bx-tl-ia-showcase {
     -webkit-justify-content: space-between;
     justify-content: space-between;
 }
-div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment {
     box-sizing: border-box;
     width: 33.2%;
     height: 8.5rem;
     border: 1px solid transparent;
 }
-div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment.bx-tl-ia-first,
-div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i2 div.bx-tl-item-attachment {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment.bx-tl-ia-first,
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i2 div.bx-tl-item-attachment {
     width: 100%;
     height: auto;
 }
-div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i3 div.bx-tl-item-attachment:not(.bx-tl-ia-first) {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i3 div.bx-tl-item-attachment:not(.bx-tl-ia-first) {
     width: 50%;
 }
 div.bx-tl-item-attachments.bx-tl-ia-showcase a,

modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -2629,7 +2629,7 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
 
         foreach($aImages as $aImage) {
             $sImageSrcKeyCur = $sImageSrcKey;
-            if($bAttachFirst && isset($aImage['id']) && (int)$aImage['id'] == $iImageFirst)
+            if(($bAttachFirst && isset($aImage['id']) && (int)$aImage['id'] == $iImageFirst) || $iTotal == 2)
                 $sImageSrcKeyCur = $sImageSrcKeyBig;
 
             $sImageSrc = !empty($aImage[$sImageSrcKeyCur]) ? $aImage[$sImageSrcKeyCur] : $aImage[$sImageSrcKeyDefault];
@@ -2756,7 +2756,9 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                 else {
                     $bUrl = !empty($aVideo['url']);
                     $sUrl = $bUrl ? $aVideo['url'] : '';
-                    
+
+                    $sSrc = $aVideo[isset($aVideo['src'], $aVideo['src_orig']) ? 'src' : 'src_poster'];
+
                     $bDuration = !empty($aVideo['duration']);
                     $sDuration = _t_format_duration($bDuration ? $aVideo['duration'] : 0);
 
@@ -2770,14 +2772,14 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                                 'content' => array(
                                     'style_prefix' => $sStylePrefix,
                                     'url' => $sUrl,
-                                    'src' => $aVideo['src_poster'],
+                                    'src' => $sSrc,
                                 )
                             ),
                             'bx_if:show_non_link' => array(
                                 'condition' => !$bUrl,
                                 'content' => array(
                                     'style_prefix' => $sStylePrefix,
-                                    'src' => $aVideo['src_poster'],
+                                    'src' => $sSrc,
                                 )
                             ),
                             'bx_if:show_duration' => array(
@@ -2791,9 +2793,8 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                     );
                 }
             }
-                
         }
-
+ 
         return array( 
             'display' => $sDisplay,
             'total' => $iTotal,

modules/boonex/timeline/template/css/view.css

@@ -841,7 +841,7 @@ div.bx-tl-item-attachment .bx-tl-iv-duration {
 
 
 /*+++ Showcase Layout +++*/
-div.bx-tl-item-attachments.bx-tl-ia-showcase {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase {
     display: -webkit-flex;
     display: flex;
     -webkit-flex-wrap: wrap;
@@ -849,18 +849,18 @@ div.bx-tl-item-attachments.bx-tl-ia-showcase {
     -webkit-justify-content: space-between;
     justify-content: space-between;
 }
-div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment {
     box-sizing: border-box;
     width: 33.2%;
     height: 8.5rem;
     border: 1px solid transparent;
 }
-div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment.bx-tl-ia-first,
-div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i2 div.bx-tl-item-attachment {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase div.bx-tl-item-attachment.bx-tl-ia-first,
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i2 div.bx-tl-item-attachment {
     width: 100%;
     height: auto;
 }
-div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i3 div.bx-tl-item-attachment:not(.bx-tl-ia-first) {
+div.bx-tl-view div.bx-tl-item-attachments.bx-tl-ia-showcase.bx-tl-ia-i3 div.bx-tl-item-attachment:not(.bx-tl-ia-first) {
     width: 50%;
 }
 div.bx-tl-item-attachments.bx-tl-ia-showcase a,