From 6e6d30774e017c4547a05debdd55815f50392116 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 31 Jan 2013 10:00:31 +0000
Subject: [PATCH]

---
 fluidbook/icones/bookmark/bookmark-left-off.svg  |   2 +-
 fluidbook/icones/bookmark/bookmark-left-on.svg   |   2 +-
 fluidbook/icones/bookmark/bookmark-right-off.svg |   2 +-
 fluidbook/icones/bookmark/bookmark-right-on.svg  |   2 +-
 images/ws/favicon.ico                            | Bin 1150 -> 0 bytes
 inc/ws/Util/class.ws.tools.php                   |  11 +++++++++--
 inc/ws/Util/html5/class.ws.html5.compiler.php    |   7 +++++--
 7 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 images/ws/favicon.ico

diff --git a/fluidbook/icones/bookmark/bookmark-left-off.svg b/fluidbook/icones/bookmark/bookmark-left-off.svg
index 82a197cf2..89513f3e2 100644
--- a/fluidbook/icones/bookmark/bookmark-left-off.svg
+++ b/fluidbook/icones/bookmark/bookmark-left-off.svg
@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <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"
 	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<path fill="$star" 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
+<path fill="$star" stroke="$sstar" 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
 	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
 	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
 	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
diff --git a/fluidbook/icones/bookmark/bookmark-left-on.svg b/fluidbook/icones/bookmark/bookmark-left-on.svg
index 82a197cf2..89513f3e2 100644
--- a/fluidbook/icones/bookmark/bookmark-left-on.svg
+++ b/fluidbook/icones/bookmark/bookmark-left-on.svg
@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <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"
 	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<path fill="$star" 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
+<path fill="$star" stroke="$sstar" 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
 	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
 	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
 	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
diff --git a/fluidbook/icones/bookmark/bookmark-right-off.svg b/fluidbook/icones/bookmark/bookmark-right-off.svg
index 66dc04c18..9283e0db5 100644
--- a/fluidbook/icones/bookmark/bookmark-right-off.svg
+++ b/fluidbook/icones/bookmark/bookmark-right-off.svg
@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <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"
 	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<path fill="$star" 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
+<path fill="$star" stroke="$sstar" 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
 	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
 	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
 	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
diff --git a/fluidbook/icones/bookmark/bookmark-right-on.svg b/fluidbook/icones/bookmark/bookmark-right-on.svg
index 66dc04c18..9283e0db5 100644
--- a/fluidbook/icones/bookmark/bookmark-right-on.svg
+++ b/fluidbook/icones/bookmark/bookmark-right-on.svg
@@ -3,7 +3,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <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"
 	 width="50px" height="50px" viewBox="0 0 50 50" enable-background="new 0 0 50 50" xml:space="preserve">
-<path fill="$star" 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
+<path fill="$star" stroke="$sstar" 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
 	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
 	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
 	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
diff --git a/images/ws/favicon.ico b/images/ws/favicon.ico
deleted file mode 100644
index 252c8fa2ba939461d8bf86861bf873b11c1a70f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmci8OHWfl6bJAznz-wO(uPM6BAU4gTQ(*{6B0Kj@&QcHg$w-%T_CbR5E7-72tL39
zl}F`KkhUl-Mp~Lcp+zXIS}Ycd5m59LsMNwqJ(U>A4G`nPJNeJdJu|<VWEeX_O(tX1
z=dkO?7*jFE1PYa?vRkKtF<KLUi9~|^uS8-oiD7y1@|l^@;NRTo--zUy7lIe7eV)=Q
zZb$EFhxu!|YX~!Z4m`+5w&N1*a!7r4%;r-(u0@5u9+f>hR1J1w+DJd9PgpV2ZQIxT
zW6`{#kk^^(v}~l*Rigai9aKCa-`h;yK>itKkU#&{H6^}3va>BIT=IE&U>uY>ZCs`)
zCx4fG!>)f$-addClQz5>@brkiHnO7TA3Si%Yu}Jml%Py=3+0c<x7|mju?1Bxo?@DV
zyn7gHg8mY*&;R5P^LY>C*iBJsCHdM4lsDF(qW!n;B5%S>dcU!y#e%(l?8jyS|2PXg
z=!VSh<}K;%8z|RSU`nHg`~y_>wW4Z>{HO^}4zz9UwaK}5^Rt>Sd4a#5{NwA$H)$}n
zgM7apRn~6IHg&|*BSQ^hU;J&s%)>Ll=O!SvzB(?gDn&WHzq0inrgt^PvyA#!ZnrKf
zv^IeM%W9t37p=`Z`QkKr7i5{+w{k3oD0dEm@UjntK?4XzJqVqR(BhxICbr3czVZh6
z!fW6G7jUlw_=FAks0D;!BM6pG$TxL_d*<I=+Ry&-%YNXYDe~jMXY9aTR^SdZ6ua%_
z@>zFPcys;4K{i=0T%GfluZ63u>uVRnvG0fOJ?xx+TVpJ-O>r=`bCfZlgpxVV*sDD$
SlQLG8O*u!o$(SxdhVm2r0MrKn

diff --git a/inc/ws/Util/class.ws.tools.php b/inc/ws/Util/class.ws.tools.php
index 077d10d5e..c5260e483 100644
--- a/inc/ws/Util/class.ws.tools.php
+++ b/inc/ws/Util/class.ws.tools.php
@@ -62,8 +62,15 @@ class wsTools {
 			// Colorize it
 			foreach ($colors as $k => $v) {
 				$replace = "#" . $v['hex'];
-				if ($v['alpha'] < 1) {
-					$replace.='" fill-opacity="' . $v['alpha'];
+				if ($v['opacity'] < 1) {
+					$replace.='" stroke-opacity="' . $v['opacity'];
+				}
+				$svg = str_replace('$s' . $k, $replace, $svg);
+
+
+				$replace = "#" . $v['hex'];
+				if ($v['opacity'] < 1) {
+					$replace.='" fill-opacity="' . $v['opacity'];
 				}
 				$svg = str_replace('$' . $k, $replace, $svg);
 			}
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index fda990d9f..af8ee46a8 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -996,7 +996,10 @@ class wsHTML5Compiler {
 		$res[] = '.link a.displayArea{-webkit-tap-highlight-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.4) . ';background-color:' . self::colorToCSS($this->theme->parametres->linksColor, 0.0001) . ';}';
 
 		// Bookmarks
-		$size = round($this->book->parametres->width * $this->book->parametres->bookmarkCornerSize * 0.0075);
+		if(!isset($this->book->parametres->bookmarkCornerSize)){
+			$this->book->parametres->bookmarkCornerSize=10;
+		}
+		$size = round($this->book->parametres->width * $s * 0.0075);
 		$res[] = '#links .bookmark{width:' . $size . 'px;height:' . $size . 'px;}';
 
 		// Menus
@@ -1087,7 +1090,7 @@ class wsHTML5Compiler {
 			$hex = $color;
 			$alpha = 1;
 		} else {
-			$alpha = substr($color, 0, 2) / 255;
+			$alpha = hexdec(substr($color, 0, 2)) / 255;
 			$hex = substr($color, 2, 6);
 		}
 
-- 
2.39.5