]> _ Git - cubeextranet.git/commitdiff
(no commit message)
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 29 Jan 2013 11:00:17 +0000 (11:00 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Tue, 29 Jan 2013 11:00:17 +0000 (11:00 +0000)
fluidbook/icones/bookmarks/bookmark-left-off.svg [new file with mode: 0644]
fluidbook/icones/bookmarks/bookmark-left-on.svg [new file with mode: 0644]
fluidbook/icones/bookmarks/bookmark-right-off.svg [new file with mode: 0644]
fluidbook/icones/bookmarks/bookmark-right-on.svg [new file with mode: 0644]
inc/ws/DAO/class.ws.dao.book.php
inc/ws/Util/class.ws.tools.php

diff --git a/fluidbook/icones/bookmarks/bookmark-left-off.svg b/fluidbook/icones/bookmarks/bookmark-left-off.svg
new file mode 100644 (file)
index 0000000..aabfc09
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">\r
+<path d="M49.292,24.43L25.636,0.71C25.182,0.255,24.566,0,23.925,0H2.406C1.069,0,0,1.086,0,2.426v21.038\r
+       c0,0.641,0.246,1.256,0.697,1.711l23.915,24.11C25.075,49.752,25.694,50,26.325,50c0.312,0,0.624-0.061,0.922-0.184\r
+       c0.906-0.374,1.497-1.045,1.497-2.026L28.75,29h18.831c0.979,0,1.86-0.805,2.234-1.711C50.19,26.382,49.983,25.124,49.292,24.43z\r
+        M30.074,19.532c-0.102,0.63-0.6,1.122-1.23,1.219l-6.959,1.063l-1.065,6.879c-0.05,0.318-0.2,0.604-0.419,0.819\r
+       c-0.213,0.21-0.488,0.356-0.799,0.407c-0.629,0.102-1.251-0.213-1.542-0.779l-3.212-6.252l-7.155,1.092\r
+       c-0.629,0.096-1.249-0.225-1.535-0.793s-0.174-1.256,0.277-1.704l5.094-5.055l-3.17-6.178C8.067,9.682,8.182,8.997,8.635,8.547\r
+       c0.002-0.002,0.003-0.003,0.005-0.005c0.451-0.447,1.131-0.563,1.697-0.272l6.236,3.161l5.052-5.02c0,0,0,0,0,0\r
+       c0.524-0.446,1.112-0.53,1.678-0.242c0.565,0.288,0.871,0.919,0.773,1.546l-1.094,7.029l6.313,3.243\r
+       C29.863,18.278,30.176,18.903,30.074,19.532z"/>\r
+</svg>\r
diff --git a/fluidbook/icones/bookmarks/bookmark-left-on.svg b/fluidbook/icones/bookmarks/bookmark-left-on.svg
new file mode 100644 (file)
index 0000000..56b7415
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">\r
+<path fill="#FF0000" d="M20.4,29.512c-0.213,0.21-0.488,0.356-0.799,0.407c-0.629,0.102-1.251-0.213-1.542-0.779l-3.212-6.252\r
+       l-7.155,1.092c-0.629,0.096-1.249-0.225-1.535-0.793s-0.174-1.256,0.277-1.704l5.094-5.055l-3.17-6.178\r
+       C8.067,9.682,8.182,8.997,8.635,8.547c0.002-0.002,0.003-0.003,0.005-0.005c0.451-0.447,1.131-0.563,1.697-0.272l6.236,3.161\r
+       l5.052-5.02c0,0,0,0,0,0c0.524-0.446,1.112-0.53,1.678-0.242c0.565,0.288,0.871,0.919,0.773,1.546l-1.094,7.029l6.313,3.243\r
+       c0.567,0.291,0.88,0.916,0.778,1.545c-0.102,0.63-0.6,1.122-1.23,1.219l-6.959,1.063l-1.065,6.879\r
+       C20.77,29.011,20.619,29.296,20.4,29.512z"/>\r
+<path d="M49.292,24.43L25.636,0.71C25.182,0.255,24.566,0,23.925,0H2.406C1.069,0,0,1.086,0,2.426v21.038\r
+       c0,0.641,0.246,1.256,0.697,1.711l23.915,24.11C25.075,49.752,25.694,50,26.325,50c0.312,0,0.624-0.061,0.922-0.184\r
+       c0.906-0.374,1.497-1.045,1.497-2.026L28.75,29h18.831c0.979,0,1.86-0.805,2.234-1.711C50.19,26.382,49.983,25.124,49.292,24.43z\r
+        M30.074,19.532c-0.102,0.63-0.6,1.122-1.23,1.219l-6.959,1.063l-1.065,6.879c-0.05,0.318-0.2,0.604-0.419,0.819\r
+       c-0.213,0.21-0.488,0.356-0.799,0.407c-0.629,0.102-1.251-0.213-1.542-0.779l-3.212-6.252l-7.155,1.092\r
+       c-0.629,0.096-1.249-0.225-1.535-0.793s-0.174-1.256,0.277-1.704l5.094-5.055l-3.17-6.178C8.067,9.682,8.182,8.997,8.635,8.547\r
+       c0.002-0.002,0.003-0.003,0.005-0.005c0.451-0.447,1.131-0.563,1.697-0.272l6.236,3.161l5.052-5.02c0,0,0,0,0,0\r
+       c0.524-0.446,1.112-0.53,1.678-0.242c0.565,0.288,0.871,0.919,0.773,1.546l-1.094,7.029l6.313,3.243\r
+       C29.863,18.278,30.176,18.903,30.074,19.532z"/>\r
+</svg>\r
diff --git a/fluidbook/icones/bookmarks/bookmark-right-off.svg b/fluidbook/icones/bookmarks/bookmark-right-off.svg
new file mode 100644 (file)
index 0000000..c9544d7
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">\r
+<path d="M0.716,24.43L24.622,0.71C25.081,0.255,25.703,0,26.351,0h21.747C49.449,0,50,1.086,50,2.426v21.038\r
+       c0,0.641,0.018,1.256-0.439,1.711l-24.036,24.11C25.056,49.752,24.496,50,23.858,50c-0.314,0-0.597-0.061-0.898-0.184\r
+       c-0.917-0.374-1.496-1.045-1.496-2.026L21.475,29H2.445c-0.989,0-1.88-0.805-2.258-1.711C-0.192,26.382,0.017,25.124,0.716,24.43z\r
+        M20.136,19.532c0.103,0.63,0.606,1.122,1.244,1.219l7.033,1.063l1.075,6.879c0.051,0.318,0.202,0.604,0.424,0.819\r
+       c0.216,0.21,0.494,0.356,0.808,0.407c0.636,0.102,1.265-0.213,1.559-0.779l3.246-6.252l7.23,1.092\r
+       c0.637,0.096,1.262-0.225,1.551-0.793s0.177-1.256-0.28-1.704l-5.147-5.055l3.203-6.178c0.295-0.568,0.18-1.253-0.279-1.702\r
+       c-0.002-0.002-0.003-0.003-0.005-0.005c-0.456-0.447-1.144-0.563-1.715-0.272l-6.302,3.161l-5.105-5.02c0,0,0,0,0,0\r
+       c-0.53-0.446-1.124-0.53-1.695-0.242c-0.571,0.288-0.88,0.919-0.781,1.546l1.104,7.029l-6.38,3.243\r
+       C20.35,18.278,20.034,18.903,20.136,19.532z"/>\r
+</svg>\r
diff --git a/fluidbook/icones/bookmarks/bookmark-right-on.svg b/fluidbook/icones/bookmarks/bookmark-right-on.svg
new file mode 100644 (file)
index 0000000..f45323d
--- /dev/null
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">\r
+<path fill="#FF0000" d="M29.912,29.512c0.216,0.21,0.494,0.356,0.808,0.407c0.636,0.102,1.265-0.213,1.559-0.779l3.246-6.252\r
+       l7.23,1.092c0.637,0.096,1.262-0.225,1.551-0.793s0.177-1.256-0.28-1.704l-5.147-5.055l3.203-6.178\r
+       c0.295-0.568,0.18-1.253-0.279-1.702c-0.002-0.002-0.003-0.003-0.005-0.005c-0.456-0.447-1.144-0.563-1.715-0.272l-6.302,3.161\r
+       l-5.105-5.02c0,0,0,0,0,0c-0.53-0.446-1.124-0.53-1.695-0.242c-0.571,0.288-0.88,0.919-0.781,1.546l1.104,7.029l-6.38,3.243\r
+       c-0.573,0.291-0.889,0.916-0.787,1.545c0.103,0.63,0.606,1.122,1.244,1.219l7.033,1.063l1.075,6.879\r
+       C29.539,29.011,29.69,29.296,29.912,29.512z"/>\r
+<path d="M0.716,24.43L24.622,0.71C25.081,0.255,25.703,0,26.351,0h21.747C49.449,0,50,1.086,50,2.426v21.038\r
+       c0,0.641,0.018,1.256-0.439,1.711l-24.036,24.11C25.056,49.752,24.496,50,23.858,50c-0.314,0-0.597-0.061-0.898-0.184\r
+       c-0.917-0.374-1.496-1.045-1.496-2.026L21.475,29H2.445c-0.989,0-1.88-0.805-2.258-1.711C-0.192,26.382,0.017,25.124,0.716,24.43z\r
+        M20.136,19.532c0.103,0.63,0.606,1.122,1.244,1.219l7.033,1.063l1.075,6.879c0.051,0.318,0.202,0.604,0.424,0.819\r
+       c0.216,0.21,0.494,0.356,0.808,0.407c0.636,0.102,1.265-0.213,1.559-0.779l3.246-6.252l7.23,1.092\r
+       c0.637,0.096,1.262-0.225,1.551-0.793s0.177-1.256-0.28-1.704l-5.147-5.055l3.203-6.178c0.295-0.568,0.18-1.253-0.279-1.702\r
+       c-0.002-0.002-0.003-0.003-0.005-0.005c-0.456-0.447-1.144-0.563-1.715-0.272l-6.302,3.161l-5.105-5.02c0,0,0,0,0,0\r
+       c-0.53-0.446-1.124-0.53-1.695-0.242c-0.571,0.288-0.88,0.919-0.781,1.546l1.104,7.029l-6.38,3.243\r
+       C20.35,18.278,20.034,18.903,20.136,19.532z"/>\r
+</svg>\r
index b749040a6da8c23e13a0b10c5b80efeb0c8f28d0..a577363e085d12f0eea6a8f128f381e7e2927b16 100644 (file)
@@ -1283,11 +1283,9 @@ class wsDAOBook extends commonDAO {
                }\r
                $mini = WS_COMPILE_ASSETS . '/_widget/' . $file;\r
 \r
-\r
                $from = max(1, $book->parametres->widgetStart);\r
                $to = min($book->parametres->widgetEnd, count($pages));\r
 \r
-\r
                $swfcombine = new cubeCommandLine('swfcombine');\r
                $swfcombine->setPath(CONVERTER_PATH);\r
                $swfcombine->setArg('merge');\r
@@ -1300,7 +1298,6 @@ class wsDAOBook extends commonDAO {
                $tempswf = array();\r
                $timg = array();\r
 \r
-\r
                for ($i = $from; $i <= $to; $i++) {\r
                        $page = $pages[$i];\r
 \r
@@ -1308,11 +1305,8 @@ class wsDAOBook extends commonDAO {
                        $tempswf[$i] = cubeFiles::tempnam();\r
 \r
                        $it = new imageTools();\r
-\r
-\r
                        $image = WS_DOCS . '/' . $page['document_id'] . '/html/t150-' . $page['document_page'] . '.jpg';\r
 \r
-\r
                        try {\r
                                $it->loadImage($image);\r
                                $it->resize($book->parametres->widgetSize, 10000);\r
index 06c6de7da99f3508533255cd5cee690309d43d49..e65989989a01df1fa6dbb2b19c0dc5b13623251a 100644 (file)
@@ -30,8 +30,13 @@ class wsTools {
                $nav = ($e[0] != 'share');
 
                if ($nav) {
-                       $dirColorized = WS_ICONS . '/' . $iconSet . '/mobile/' . $color . '/';
                        $svgRef = WS_ICONS . '/' . $iconSet . '/mobile/' . $icon . '.svg';
+                       if (!file_exists($svgRef)) {
+                               $iconSet = 1;
+                               $svgRef = WS_ICONS . '/' . $iconSet . '/mobile/' . $icon . '.svg';
+                       }
+
+                       $dirColorized = WS_ICONS . '/' . $iconSet . '/mobile/' . $color . '/';
                        $svgColorized = $dirColorized . '/' . $icon . '.svg';
                } else {
                        $dirColorized = WS_ICONS . '/share/' . $color;
@@ -62,7 +67,7 @@ class wsTools {
                        $w = rtrim($w, 'px');
                        $h = rtrim($h, 'px');
                        // Finally rasterize it
-                       $batik = new cubeCommandLine('/usr/local/batik/batik-rasterizer');
+                       $batik = new cubeCommandLine('batik-rasterizer');
                        $batik->setArg('d', $dirColorized);
                        $batik->setArg('m', 'image/png');
                        if ($scale != 1) {