From 63f49fa89bc631d89e916aa05bf2e769cd10b90f Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 1 Sep 2016 11:43:50 +0000 Subject: [PATCH] done #645 @0.5 --- .../application/views/helpers/Exemples.php | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php index 0c3d583..1cb83c1 100644 --- a/framework/application/views/helpers/Exemples.php +++ b/framework/application/views/helpers/Exemples.php @@ -13,7 +13,7 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract { ->addMasonry() ->addJQueryTransform() ->addTinysort() - ->addDotDotDot() + ->addDotDotDot() ->addScriptAndStyle('220-exemples'); $exemples = Fluidbook_Model_Reference::factory()->order('date DESC')->find(); @@ -97,8 +97,14 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract { if (null === $f) { return; } + + $fr = $f->unserialize('fr'); $f = $f->unserialize(); + fb($fr->toArray()); + fb($f->toArray()); + + $res = ''; $res .= $this->htmlElement($f->getTitle(), 'h3'); @@ -109,8 +115,18 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract { $image = CubeIT_Util_Cms::extractFile($f->getImage()); - if (!$image && $f->getFluidbookId()) { - $res .= $this->exemplePublication($f->getFluidbookId(), $f->getFluidbookPage()); + $fluibdookId = $f->getFluidbookId(); + $fluidbookPage = $f->getFluidbookPage(); + if (!$fluibdookId) { + $fluibdookId = $fr->getFluidbookId(); + $fluidbookPage = $fr->getFluidbookPage(); + } + if ($fluidbookPage == 0) { + $fluidbookPage = $fr->getFluidbookPage(); + } + + if (!$image && $fluibdookId) { + $res .= $this->exemplePublication($fluibdookId, $fluidbookPage); } else { $res .= $this->htmlElement('', 'div', array('style' => 'background-image:url(' . $this->imageProcess()->imageProcessGetURL($image, $f->getTitle() . ' - ' . $f->getText(), 660, 440, array(), 'R') . ');', -- 2.39.5