#487 @2

diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php
index 523346587a0762df345114a9acd074f790db5932..d917485ceeee506704537d201b1db4b444e9fe22 100644 (file)
--- a/framework/application/views/helpers/ExemplePublication.php
+++ b/framework/application/views/helpers/ExemplePublication.php
@@ -63,9 +63,7 @@ class Fluidbook_View_Helper_ExemplePublication extends CubeIT_View_Helper_Abstra
                $url = '/files/' . $path . $page . '.jpg';\r
                $file = $dir . $page . '.jpg';\r
                if (!file_exists($file) || !filesize($file)) {\r
-                       $fb = 'https://workshop.fluidbook.com/viewerh/' . $fluidbook_id . '_bcf26f9cf4a795ec00b9a44f42750d58_12345678900/';\r
-                       file_get_contents($fb);\r
-                       $wsurl = $fb . 'data/background/150/t' . $page . '.jpg';\r
+                       $wsurl = 'http://workshop.fluidbook.com/services/getFluidbookPage/' . $fluidbook_id . '/' . $page;\r
                        file_put_contents($file, file_get_contents($wsurl));\r
                }\r
                $size = CubeIT_Image::getDimensions($file, $width, $height);\r

diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php
index d5a6918b57605bf03627426e8f4a48485b2a61e6..cdd9ed9c497ebfad5d14adbd59f4990e173ce5da 100644 (file)
--- a/framework/application/views/helpers/Exemples.php
+++ b/framework/application/views/helpers/Exemples.php
@@ -23,11 +23,14 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
                $featured = array();\r
                $normal = array();\r
                $c = 0;\r
+\r
+               $okexemples = array();\r
+\r
                foreach ($exemples as $id => $exemple) {\r
                        if ($category > 0 && !in_array($category, $exemple->getCategories())) {\r
                                continue;\r
                        }\r
-\r
+                       $okexemples[$id] = $exemple;\r
                        $c++;\r
                }\r
 \r
@@ -37,7 +40,7 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract {
                $normal_per_featured = $perline - 1;\r
                $max_normal = $max_featured * $normal_per_featured;\r
 \r
-               foreach ($exemples as $id => $exemple) {\r
+               foreach ($okexemples as $id => $exemple) {\r
                        if ($exemple->getFeatured()) {\r
                                $featured[] = $id;\r
                        } else {\r

diff --git a/js/101-header.js b/js/101-header.js
index c51675f63f29acfe23d6be1631a214a845aaa6a0..638b67ef011c107f141afc0e9b48530170b2d635 100644 (file)
--- a/js/101-header.js
+++ b/js/101-header.js
@@ -128,9 +128,13 @@ function changeHeaderStyle() {
 \r
     var headerClass = $(section).data('headerstyle');\r
     if (headerClass == 'light') {\r
-        $("header").addClass('light').removeClass('dark');\r
+        if (!$("header").hasClass('light')) {\r
+            $("header").addClass('light').removeClass('dark');\r
+        }\r
     } else {\r
-        $("header").addClass('dark').removeClass('light');\r
+        if (!$("header").hasClass('dark')) {\r
+            $("header").addClass('dark').removeClass('light');\r
+        }\r
     }\r
 \r
 }
\ No newline at end of file