Merge branch 'newui' of git@github.com:openlibrary/bookreader into newui

Conflicts:
	BookReader/BookReader.js

diff --cc BookReader/BookReader.js
index 9d6f3f3,7178d30..4838ce0
--- 1/BookReader/BookReader.js
--- 2/BookReader/BookReader.js
+++ b/BookReader/BookReader.js
@@@ -3404,27 -3428,26 +3452,29 @@@ BookReader.prototype.addSearchResult = 
      var uiStringSearch = "Search result"; // i18n
      var uiStringPage = "Page"; // i18n
      
-     var percentThrough = BookReader.util.cssPercentage(pageIndex, this.numLeafs);
-     
-     var re = new RegExp('{{{(.+?)}}}', 'g');
+     var percentThrough = BookReader.util.cssPercentage(pageIndex, this.numLeafs - 1);
+     var pageDisplayString = '';
+     if (pageNumber) {
+         pageDisplayString = uiStringPage + ' ' + pageNumber;
+     }
      
-     
-     // $$$mang add click-through to page
++    var re = new RegExp('{{{(.+?)}}}', 'g');    
 +    queryString = queryString.replace(re, '<a href="#" onclick="br.jumpToIndex('+pageIndex+'); return false;">$1</a>')
++
      $('<div class="search" style="left:' + percentThrough + ';" title="' + uiStringSearch + '"><div class="query">'
          + queryString + '<span>' + uiStringPage + ' ' + pageNumber + '</span></div>')
-     .appendTo('#BRnavpos').bt({
+     .data({'self': this, 'pageIndex': pageIndex })
+     .appendTo('#BRnavline').bt({
          contentSelector: '$(this).find(".query")',
-         trigger: 'click',
+         trigger: 'hover',
          closeWhenOthersOpen: true,
          cssStyles: {
-             padding: '10px 10px 15px',
+             padding: '12px 14px',
              backgroundColor: '#fff',
-             border: '3px solid #e2dcc5',
-             borderBottom: 'none',
+             border: '4px solid #e2dcc5',
              fontFamily: '"Lucida Grande","Arial",sans-serif',
-             fontSize: '12px',
-             lineHeight: '18px',
+             fontSize: '13px',
+             //lineHeight: '18px',
              color: '#615132'
          },
          shrinkToFit: false,