fix #549 @1

diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php
index 196e63416fb660cf669587a2a4c9b0fbb291de34..05019e90c0afdf920f191403782c5600548dc11f 100644 (file)
--- a/framework/application/views/helpers/Exemples.php
+++ b/framework/application/views/helpers/Exemples.php
@@ -46,7 +46,7 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
                $featured = array_slice($featured, 0, $max_featured);\r
                $normal = array_slice($normal, 0, $max_normal);\r
 \r
-               $res = $this->htmlElement($title, 'h2', array('class' => 'title col-2'));\r
+               $res = $this->title($title, 'h2', array('class' => 'col-2'));\r
 \r
                $e = 0;\r
 \r

diff --git a/framework/application/views/helpers/Title.php b/framework/application/views/helpers/Title.php
index 39682cb865142861d1ea2bf7b270ec2eae587042..8866b0757d35effaf335eaf2ccc2f649d7270027 100644 (file)
--- a/framework/application/views/helpers/Title.php
+++ b/framework/application/views/helpers/Title.php
@@ -5,6 +5,9 @@ class Fluidbook_View_Helper_Title extends CubeIT_View_Helper_HtmlElement {
         * @return string\r
         */\r
        public function title($content, $markup = 'h1', $attributes = array()) {\r
+               if(!$content){\r
+                       return '';\r
+               }\r
                $attributes = $this->_mergeAttributes($attributes, array('class' => 'title'));\r
                return $this->htmlElement(str_replace("\n", ' <br />', $content), $markup, $attributes);\r
        }\r

diff --git a/js/002-common.js b/js/002-common.js
index 8e7c6b0a7e85d938b16d3901ee2cbbb0dd04e953..f33cc6e59f299ec7f7b94b517df74c90cc63d750 100644 (file)
--- a/js/002-common.js
+++ b/js/002-common.js
@@ -36,6 +36,4 @@ function setZoom(ww) {
     }\r
 \r
     $('#z,header').css('transform', transform);\r
-\r
-\r
 }
\ No newline at end of file

diff --git a/less/002-common.less b/less/002-common.less
index b3a34e4fd64d9d513b5061430c6cfb04e47730c7..fee54f407aa046e7b4afd3781544383569f4fd52 100644 (file)
--- a/less/002-common.less
+++ b/less/002-common.less
@@ -32,6 +32,11 @@ main {
        transform-origin: 50% 0 0;\r
 }\r
 \r
+#mm-0 {\r
+       max-width: 100%;\r
+       overflow: hidden;\r
+}\r
+\r
 // Main heading style\r
 h1, h2 {\r
        &.title {\r