mall adjustments #493 @0.5

diff --git a/framework/application/models/Reference.php b/framework/application/models/Reference.php
index 288bde58889f5c3986d3a58427874c1eac9ac7ea..d26d094ce22ce657900e1a91eca427e821cb8ada 100644 (file)
--- a/framework/application/models/Reference.php
+++ b/framework/application/models/Reference.php
@@ -45,4 +45,8 @@ class Fluidbook_Model_Reference extends CubeIT_Model_Data_Table {
                }\r
                return $res;\r
        }\r
+\r
+       public function hasUrl() {\r
+               return $this->getUrl() != '';\r
+       }\r
 }
\ No newline at end of file

diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php
index 975741fd2242467529e7309fdfb90f72bfd6b7e9..c7a1cf9bda71b9e59f73afd40c9e9bcdc6b7eab3 100644 (file)
--- a/framework/application/views/helpers/Exemples.php
+++ b/framework/application/views/helpers/Exemples.php
@@ -93,7 +93,8 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
                $res = '';\r
 \r
                $res .= $this->htmlElement($f->getTitle(), 'h3');\r
-               if ($featured) {\r
+               if ($featured && !is_array($f->getText())) {\r
+\r
                        $res .= $this->htmlElement($f->getText(), 'p');\r
                }\r
 \r

diff --git a/framework/application/views/helpers/HomeReferences.php b/framework/application/views/helpers/HomeReferences.php
index 66ce89e5ad22a34790053975f2c59035e3ee154e..f24d6d15f2ed2d40977cb6ecf8a740086a42ea68 100644 (file)
--- a/framework/application/views/helpers/HomeReferences.php
+++ b/framework/application/views/helpers/HomeReferences.php
@@ -41,9 +41,11 @@ class Fluidbook_View_Helper_HomeReferences extends Fluidbook_View_Helper_HomeLay
                                'class' => 'img',\r
                        )\r
                );\r
-               $rollover = $this->htmlElement($fluidbook->getTitle(), 'h3');\r
-               $rollover .= $this->link('Voir le fluidbook', $fluidbook->getUrl());\r
-               $res .= $this->htmlElement($this->htmlElement($rollover, 'div', array('class' => 'content')), 'div', array('class' => 'hover'));\r
+               if ($fluidbook->hasUrl()) {\r
+                       $rollover = $this->htmlElement($fluidbook->getTitle(), 'h3');\r
+                       $rollover .= $this->link('Voir le fluidbook', $fluidbook->getUrl());\r
+                       $res .= $this->htmlElement($this->htmlElement($rollover, 'div', array('class' => 'content')), 'div', array('class' => 'hover'));\r
+               }\r
 \r
                $attributes = array('class' => array('reference'));\r
                if ($big) {\r