From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 11 Sep 2013 13:56:07 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=bb6f8d6c65808912fc63600fc17d1e93f8aa2060;p=fluidbook-html5.git

---

diff --git a/_index.html b/_index.html
index 8579ab54..64471236 100644
--- a/_index.html
+++ b/_index.html
@@ -16,6 +16,7 @@
 		<div id="message"></div>
 
 		<div id="main">
+			<div id="background"></div>
 			<header>
 				<nav id="nav"></nav>
 				<div id="search"></div>
@@ -34,6 +35,7 @@
 			<a id="down" href="#"></a>
 			<footer><!-- $credits --></footer>
 		</div>
+		<div id="searchHints"></div>
 		<div id="view"></div>
 		<div id="innerView"></div>
 
diff --git a/js/libs/fluidbook/fluidbook.background.js b/js/libs/fluidbook/fluidbook.background.js
index 9a313e4a..4a27fe5d 100644
--- a/js/libs/fluidbook/fluidbook.background.js
+++ b/js/libs/fluidbook/fluidbook.background.js
@@ -6,8 +6,6 @@ function FluidbookBackground(fluidbook) {
 
 FluidbookBackground.prototype = {
 	init: function() {
-		$("#main").append('<div id="background"></div>');
-		
 		if (this.fluidbook.datas.links.background != undefined
 				&& this.fluidbook.datas.repeat != Fluidbook.REPEAT
 				&& this.fluidbook.datas.repeat != Fluidbook.STRETCH
@@ -45,7 +43,7 @@ FluidbookBackground.prototype = {
 		} else if (this.fluidbook.datas.backgroundVAlign == Fluidbook.MIDDLE) {
 			top = (h - ih) / 2;
 		}
-		
+
 		$("#background .links").css({
 			top: top,
 			left: left
diff --git a/js/libs/fluidbook/fluidbook.js b/js/libs/fluidbook/fluidbook.js
index 8cf6cf3b..c2a4ee22 100644
--- a/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@ -1130,7 +1130,16 @@ Fluidbook.prototype = {
 		$.each(hints, function(k, v) {
 			$("#searchHints").append('<a class="hint" term="' + v[0] + '" href="#/search/' + v[0] + '">' + v[0] + ' <em>(' + v[1] + ')</em></a>');
 		});
-		$("#searchHints").show();
+		var qoffset = $("#q").offset();
+		var top = qoffset.top + $("#q").outerHeight() + 5;
+
+		var left = qoffset.left;
+		if (this.l10n.dir == 'rtl') {
+			left = -1 * ($(window).width() - left - $("#q").outerWidth());
+		}
+
+
+		$("#searchHints").css({top: top, left: left}).show();
 	},
 	killLastSearchHint: function() {
 		this.search.kill();
diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 5e900b0c..f77437b3 100644
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -179,7 +179,6 @@ FluidbookNav.prototype = {
 		var res = '<form action="#" id="searchForm" method="post">';
 		res += '<input type="text" id="q" name="q" type="search" value="" placeholder="' + this.fluidbook.l10n.__('search') + '" autocorrect="off" autocomplete="off" autocapitalize="off" />';
 		res += this.getLink('interface-search', '#', 'submitSearch');
-		res += '<div id="searchHints"></div>';
 		res += '</form>';
 		$("#search").append(res);
 		$("#submitSearch").click(function() {
diff --git a/js/libs/fluidbook/fluidbook.resize.js b/js/libs/fluidbook/fluidbook.resize.js
index 863b5d7f..b534f7c3 100644
--- a/js/libs/fluidbook/fluidbook.resize.js
+++ b/js/libs/fluidbook/fluidbook.resize.js
@@ -17,24 +17,28 @@ function FluidbookResize(fluidbook) {
 
 FluidbookResize.prototype = {
 	init: function() {
-		$("#nav").transform({
-			origin: ['0%', '0%']
+
+		var left = this.fluidbook.l10n.dir == 'ltr' ? '0%' : '100%';
+		var right = this.fluidbook.l10n.dir == 'ltr' ? '100%' : '0%';
+
+		$("#nav,#searchHints").transform({
+			origin: [left, '0%']
 		});
 
 		$("#logo").transform({
-			origin: ['100%', '0%']
+			origin: [right, '0%']
 		});
 
 		$("#footer").transform({
-			origin: ['100%', '100%']
+			origin: [right, '100%']
 		});
 
 		$("#next").transform({
-			origin: ['100%', '50%']
+			origin: [right, '50%']
 		});
 
 		$("#previous").transform({
-			origin: ['0%', '50%']
+			origin: [left, '50%']
 		});
 	},
 	resize: function(init) {
@@ -125,7 +129,7 @@ FluidbookResize.prototype = {
 			translateX: -40 * (1 - interfaceScale) + 'px'
 		})
 
-		$("#nav,#logo,footer").transform({
+		$("#nav,#logo,footer,#searchHints").transform({
 			scale: navScale
 		});
 
diff --git a/style/fluidbook.css b/style/fluidbook.css
index 36181e9d..93899bbb 100644
--- a/style/fluidbook.css
+++ b/style/fluidbook.css
@@ -362,7 +362,7 @@ body{
 }
 
 /* Header */
-header{position:relative;z-index: 1;}
+header{position:relative;}
 
 
 #nav>a{
@@ -385,7 +385,6 @@ header{position:relative;z-index: 1;}
 
 #nav{
 	position:relative;
-	z-index:12;
 	white-space: nowrap;
 }
 
@@ -444,22 +443,17 @@ header{position:relative;z-index: 1;}
 	height:22px;
 	width:140px;
 	margin:2px;
-	background-color:#fff;
-	color:#000;
 	display:block;
 	font-size:12px;
 }
-.hint:hover{
-	background-color:#000;
-	color:#fff;
-}
 
 #searchHints{
-	background:#fff;
 	border-radius:5px;
 	width:150px;
 	padding:5px;
 	display:none;
+	z-index: 25;
+	position:relative;
 }
 
 #logo{