From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Wed, 5 Jun 2013 09:06:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=17c018c5622c8aa031a12a741e9c61887ae127b9;p=cubeextranet.git

---

diff --git a/fluidbook/fonts/gill/gill.ttf b/fluidbook/fonts/gill/gill.ttf
new file mode 100644
index 000000000..bb58254ba
Binary files /dev/null and b/fluidbook/fonts/gill/gill.ttf differ
diff --git a/fluidbook/icones/10/mobile/nav-friend.svg b/fluidbook/icones/10/mobile/nav-friend.svg
new file mode 100644
index 000000000..366e105d7
--- /dev/null
+++ b/fluidbook/icones/10/mobile/nav-friend.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!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="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
+<g>
+	<g>
+		<path fill="$colorize" d="M432.885,288.485c-5.271,0-9.546,3.624-9.546,8.096c0,1.472,0.47,2.848,1.28,4.036
+			c-1.549,1.601-3.622,2.653-6.39,2.367c4.776,1.951,7.867,1.649,9.862,0.588c1.409,0.697,3.044,1.104,4.794,1.104
+			c5.271,0,9.546-3.624,9.546-8.095C442.431,292.109,438.156,288.485,432.885,288.485z"/>
+	</g>
+</g>
+</svg>
diff --git a/fluidbook/icones/10/mobile/nav-help.svg b/fluidbook/icones/10/mobile/nav-help.svg
new file mode 100644
index 000000000..5b8d36cf9
--- /dev/null
+++ b/fluidbook/icones/10/mobile/nav-help.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!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="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
+<g>
+	<g>
+		<path fill="$colorize" d="M525.701,303.452h2.003v-2.002h-2.003V303.452z M530.067,290.034c-0.834-0.762-1.95-1.143-3.351-1.143
+			c-1.321,0-2.384,0.354-3.188,1.064c-0.805,0.71-1.287,1.731-1.45,3.066l1.806,0.215c0.156-0.996,0.485-1.729,0.986-2.197
+			c0.502-0.469,1.127-0.703,1.875-0.703c0.775,0,1.43,0.259,1.963,0.776c0.534,0.518,0.801,1.118,0.801,1.802
+			c0,0.378-0.091,0.726-0.273,1.045c-0.182,0.319-0.577,0.747-1.186,1.284c-0.609,0.537-1.031,0.945-1.266,1.226
+			c-0.318,0.384-0.55,0.765-0.693,1.143c-0.195,0.501-0.292,1.097-0.292,1.787c0,0.117,0.003,0.293,0.009,0.527h1.69
+			c0.013-0.703,0.062-1.211,0.146-1.523c0.084-0.313,0.214-0.589,0.391-0.83c0.175-0.241,0.55-0.615,1.122-1.123
+			c0.854-0.755,1.426-1.396,1.719-1.924s0.439-1.104,0.439-1.729C531.316,291.717,530.9,290.796,530.067,290.034z"/>
+	</g>
+</g>
+</svg>
diff --git a/fluidbook/icones/10/mobile/nav-print.svg b/fluidbook/icones/10/mobile/nav-print.svg
new file mode 100644
index 000000000..f0438d935
--- /dev/null
+++ b/fluidbook/icones/10/mobile/nav-print.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!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="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
+<g>
+	<g>
+		<path fill="$colorize" d="M383.008,298.411v-6.472l-3.513-3.447h-7.279v9.919h-2.649v6.265h16.146v-6.265H383.008z M381.508,298.411
+			h-7.792v-8.419h5.166l2.626,2.577V298.411z"/>
+	</g>
+</g>
+</svg>
diff --git a/fluidbook/icones/10/mobile/nav-sommaire.svg b/fluidbook/icones/10/mobile/nav-sommaire.svg
new file mode 100644
index 000000000..2655f2aa5
--- /dev/null
+++ b/fluidbook/icones/10/mobile/nav-sommaire.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!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="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
+<g>
+	<g>
+		<path fill="$colorize" d="M310.453,295.485h7v-7h-7V295.485z M319.453,295.485h7v-7h-7V295.485z M328.453,288.485v7h7v-7H328.453z
+			 M310.453,304.485h7v-7h-7V304.485z M319.453,304.485h7v-7h-7V304.485z"/>
+	</g>
+</g>
+</svg>
diff --git a/fluidbook/icones/10/nav-friend.png b/fluidbook/icones/10/nav-friend.png
new file mode 100644
index 000000000..104cf74f9
Binary files /dev/null and b/fluidbook/icones/10/nav-friend.png differ
diff --git a/fluidbook/icones/10/nav-help.png b/fluidbook/icones/10/nav-help.png
new file mode 100644
index 000000000..ad9755cf3
Binary files /dev/null and b/fluidbook/icones/10/nav-help.png differ
diff --git a/fluidbook/icones/10/nav-index.png b/fluidbook/icones/10/nav-index.png
new file mode 100644
index 000000000..f2c04630e
Binary files /dev/null and b/fluidbook/icones/10/nav-index.png differ
diff --git a/fluidbook/icones/10/nav-normal.png b/fluidbook/icones/10/nav-normal.png
new file mode 100644
index 000000000..87ef889cd
Binary files /dev/null and b/fluidbook/icones/10/nav-normal.png differ
diff --git a/fluidbook/icones/10/nav-print.png b/fluidbook/icones/10/nav-print.png
new file mode 100644
index 000000000..3a3ec7b52
Binary files /dev/null and b/fluidbook/icones/10/nav-print.png differ
diff --git a/fluidbook/icones/10/nav-save.png b/fluidbook/icones/10/nav-save.png
new file mode 100644
index 000000000..e9761c1a1
Binary files /dev/null and b/fluidbook/icones/10/nav-save.png differ
diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 8dbbec798..b18a74af7 100644
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -1323,6 +1323,11 @@ class wsDAOBook extends commonDAO {
 			$flex->addFont(FONT_PATH . '/vagrounded/VAGRoundedStd-Light.otf', 'GeneralFont', $lang->charset);
 			$flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');
 			$flexLight->addFont(FONT_PATH . '/vagrounded/VAGRoundedStd-Bold.otf', 'LoaderFont', 'Numerals');
+		}else if($theme->parametres->fontKit=='gill'){
+			$flex->addFont(FONT_PATH . '/gill/gill.ttf', 'BoldFont', $lang->charset);
+			$flex->addFont(FONT_PATH . '/gill/gill.ttf', 'GeneralFont', $lang->charset);
+			$flex->addFont(FONT_PATH . '/FluidbookCredits.ttf', 'CreditsFont', 'ASCII');
+			$flexLight->addFont(FONT_PATH . '/gill/gill.ttf', 'LoaderFont', 'Numerals');
 		}
 
 		$flexLight->addVariable('checksum', $hash, false, true, 'String');
diff --git a/inc/ws/Metier/class.ws.theme.parametres.php b/inc/ws/Metier/class.ws.theme.parametres.php
index 2eb782e06..913b15b36 100644
--- a/inc/ws/Metier/class.ws.theme.parametres.php
+++ b/inc/ws/Metier/class.ws.theme.parametres.php
@@ -82,7 +82,8 @@ class wsThemeParametres extends wsParametres {
 
 		$this->fields['fontKit'] = array('type' => 'combo', 'default' => 'auto', 'editable' => true,
 			'label' => __('Police de caractères'), 'datas' => array(__('Automatique') => 'auto',
-				'VAG Rounded' => 'vagrounded'));
+				'VAG Rounded' => 'vagrounded',
+				'Gill'=>'gill'));
 
 		$this->forms['icones'] = array('label' => __('Personnalisation des icônes'),
 			'fieldsnames' => array('iconSet', 'iconShadeColor', '|', 'iconsHMargin', '|', 'colorizeIcons', 'couleurI', '|', 'fontKit'));