From: vincent@cubedesigners.com Date: Thu, 21 Jul 2016 15:35:00 +0000 (+0000) Subject: #487 @2 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=25a2ba8438ade653d5a608f396d795f059648a54;p=fluidbook-v3.git #487 @2 --- diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php index 5233465..d917485 100644 --- 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'; $file = $dir . $page . '.jpg'; if (!file_exists($file) || !filesize($file)) { - $fb = 'https://workshop.fluidbook.com/viewerh/' . $fluidbook_id . '_bcf26f9cf4a795ec00b9a44f42750d58_12345678900/'; - file_get_contents($fb); - $wsurl = $fb . 'data/background/150/t' . $page . '.jpg'; + $wsurl = 'http://workshop.fluidbook.com/services/getFluidbookPage/' . $fluidbook_id . '/' . $page; file_put_contents($file, file_get_contents($wsurl)); } $size = CubeIT_Image::getDimensions($file, $width, $height); diff --git a/framework/application/views/helpers/Exemples.php b/framework/application/views/helpers/Exemples.php index d5a6918..cdd9ed9 100644 --- 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(); $normal = array(); $c = 0; + + $okexemples = array(); + foreach ($exemples as $id => $exemple) { if ($category > 0 && !in_array($category, $exemple->getCategories())) { continue; } - + $okexemples[$id] = $exemple; $c++; } @@ -37,7 +40,7 @@ class Fluidbook_View_Helper_Exemples extends CubeIT_View_Helper_Abstract { $normal_per_featured = $perline - 1; $max_normal = $max_featured * $normal_per_featured; - foreach ($exemples as $id => $exemple) { + foreach ($okexemples as $id => $exemple) { if ($exemple->getFeatured()) { $featured[] = $id; } else { diff --git a/js/101-header.js b/js/101-header.js index c51675f..638b67e 100644 --- a/js/101-header.js +++ b/js/101-header.js @@ -128,9 +128,13 @@ function changeHeaderStyle() { var headerClass = $(section).data('headerstyle'); if (headerClass == 'light') { - $("header").addClass('light').removeClass('dark'); + if (!$("header").hasClass('light')) { + $("header").addClass('light').removeClass('dark'); + } } else { - $("header").addClass('dark').removeClass('light'); + if (!$("header").hasClass('dark')) { + $("header").addClass('dark').removeClass('light'); + } } } \ No newline at end of file