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

---
 fluidbook/icones/interface/interface-close.svg | 10 ++++++++++
 inc/ws/Util/html5/class.ws.html5.compiler.php  | 11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 fluidbook/icones/interface/interface-close.svg

diff --git a/fluidbook/icones/interface/interface-close.svg b/fluidbook/icones/interface/interface-close.svg
new file mode 100644
index 000000000..2b2929873
--- /dev/null
+++ b/fluidbook/icones/interface/interface-close.svg
@@ -0,0 +1,10 @@
+<?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="14px" height="14px" viewBox="0 0 14 14" enable-background="new 0 0 14 14" xml:space="preserve">
+<path fill="#ffffff" d="M9.805,7l3.614-3.613c0.774-0.774,0.774-2.029,0.001-2.805c-0.774-0.775-2.031-0.775-2.807,0L7,4.195
+	L3.387,0.582C2.613-0.193,1.358-0.193,0.583,0.581c-0.775,0.775-0.775,2.031,0,2.807L4.194,7l-3.613,3.612
+	c-0.775,0.774-0.775,2.03-0.001,2.806c0.774,0.773,2.031,0.773,2.807,0L7,9.805l3.612,3.614c0.774,0.774,2.03,0.774,2.806,0.001
+	c0.774-0.774,0.774-2.031,0-2.807L9.805,7z"/>
+</svg>
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 22cbcb313..2b2ed28b8 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -33,6 +33,7 @@ class wsHTML5Compiler {
 		'js/libs/screenfull.js',
 		'js/libs/jquery/jquery.js',
 		'js/libs/jquery/jquery.transform.js',
+		'js/libs/jquery/jquery.form.js',
 		'js/libs/jquery/jquery.mousewheel.js',
 		'js/libs/jquery/jquery.hashchange.js',
 		'js/libs/jquery/jquery.scrollto.js',
@@ -41,6 +42,7 @@ class wsHTML5Compiler {
 		'js/libs/gsap/jquery.gsap.js',
 		'js/libs/gal/gal.js',
 		'js/libs/gal/gal.filesystem.js',
+		'js/libs/fluidbook/forms/fluidbook.form.bulle.js',
 		'js/libs/fluidbook/fluidbook.utils.js',
 		'js/libs/fluidbook/fluidbook.support.js',
 		'js/libs/fluidbook/fluidbook.video.js',
@@ -885,7 +887,7 @@ class wsHTML5Compiler {
 		$icons = array('nav-bookmark' => $couleurI, 'nav-friend' => $couleurI, 'nav-help' => $couleurI, 'nav-index' => $couleurI, 'nav-sommaire' => $couleurI,
 			'nav-zoomin' => $couleurI, 'nav-zoomout' => $couleurI, 'nav-fullscreen' => $couleurI,
 			'interface-next' => $arrowsColor, 'interface-previous' => $arrowsColor, 'interface-search' => $couleurI, 'interface-back-arrow' => $subTextColor, 'interface-print' => $subTextColor,
-			'interface-down' => $arrowsColor,
+			'interface-down' => $arrowsColor, 'interface-close' => $arrowsColor,
 			'help-fingers' => $couleurI, 'help-mouse' => $couleurI, 'nav-home' => $couleurI, 'nav-archives' => $couleurI, 'nav-map' => $couleurI,
 			'nav-tag' => $couleurI, 'nav-print' => $couleurI, 'nav-friend' => $couleurI,
 			'share-facebook' => $couleurM, 'share-twitter' => $couleurM, 'share-email' => $couleurM, 'share-googleplus' => $couleurM, 'share-linkedin' => $couleurM, 'share-viadeo' => $couleurM,
@@ -1120,6 +1122,7 @@ class wsHTML5Compiler {
 		// Menus
 		$menuColor = new CubeIT_Graphics_Color($this->theme->parametres->couleurB);
 		$menuColor->setAlpha(1);
+		$menuTextColor = self::colorToCSS($this->theme->parametres->subTextColor);
 
 		$menuMultiply = $menuColor->multiply($menuColor);
 		$menuMultiply2 = $menuMultiply->multiply($menuColor);
@@ -1127,7 +1130,11 @@ class wsHTML5Compiler {
 		# View
 		$res[] = '.portrait .mview{width:' . $w . ';min-height:' . $h . '}';
 		$res[] = '.landscape .mview{width:' . $w2 . ';min-height:' . $h . '}';
-		$res[] = '.mview{background-color:' . $menuColor->toCSS() . ';color:' . self::colorToCSS($this->theme->parametres->subTextColor) . ';}';
+		$res[] = '.mview{background-color:' . $menuColor->toCSS() . ';color:' . $menuTextColor . ';}';
+
+		# Inner View
+		$res[].='#innerView>div{background-color:' . $menuColor->toCSS() . ';color:' . $menuTextColor . ';}';
+		$res[].='form input[type="text"],form input[type="email"]{background-color:' . self::colorToCSS($this->theme->parametres->subFieldColor) . ';color:' . self::colorToCSS($this->theme->parametres->subTextFieldColor) . ';}';
 
 		// Archives
 		if ($this->book->parametres->externalArchivesBack) {
-- 
2.39.5