done #645 @0.5

diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php
index 0c3d583fc358660ed969200d942ca72ee6bc0e6a..1cb83c1e750191033360318fd1bb7fd9405bb12a 100644 (file)
--- 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()\r
                        ->addJQueryTransform()\r
                        ->addTinysort()\r
-            ->addDotDotDot()\r
+                       ->addDotDotDot()\r
                        ->addScriptAndStyle('220-exemples');\r
 \r
                $exemples = Fluidbook_Model_Reference::factory()->order('date DESC')->find();\r
@@ -97,8 +97,14 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
                if (null === $f) {\r
                        return;\r
                }\r
+\r
+               $fr = $f->unserialize('fr');\r
                $f = $f->unserialize();\r
 \r
+               fb($fr->toArray());\r
+               fb($f->toArray());\r
+\r
+\r
                $res = '';\r
 \r
                $res .= $this->htmlElement($f->getTitle(), 'h3');\r
@@ -109,8 +115,18 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
 \r
                $image = CubeIT_Util_Cms::extractFile($f->getImage());\r
 \r
-               if (!$image && $f->getFluidbookId()) {\r
-                       $res .= $this->exemplePublication($f->getFluidbookId(), $f->getFluidbookPage());\r
+               $fluibdookId = $f->getFluidbookId();\r
+               $fluidbookPage = $f->getFluidbookPage();\r
+               if (!$fluibdookId) {\r
+                       $fluibdookId = $fr->getFluidbookId();\r
+                       $fluidbookPage = $fr->getFluidbookPage();\r
+               }\r
+               if ($fluidbookPage == 0) {\r
+                       $fluidbookPage = $fr->getFluidbookPage();\r
+               }\r
+\r
+               if (!$image && $fluibdookId) {\r
+                       $res .= $this->exemplePublication($fluibdookId, $fluidbookPage);\r
                } else {\r
                        $res .= $this->htmlElement('', 'div',\r
                                array('style' => 'background-image:url(' . $this->imageProcess()->imageProcessGetURL($image, $f->getTitle() . ' - ' . $f->getText(), 660, 440, array(), 'R') . ');',\r