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

diff --git a/BookReader/BookReader.js b/BookReader/BookReader.js
index 7bfbbc9..f2a02a0 100644 (file)
--- a/BookReader/BookReader.js
+++ b/BookReader/BookReader.js
@@ -2213,8 +2213,8 @@ BookReader.prototype.flipLeftToRight = function(newIndexL, newIndexR) {
             $(self.prefetchedImgs[newIndexL]).css('zIndex', 2);
 
             //jquery adds display:block to the element style, which interferes with our print css
-            $(self.prefetchedImgs[newIndexL]).css('display', null);
-            $(self.prefetchedImgs[newIndexR]).css('display', null);
+            $(self.prefetchedImgs[newIndexL]).css('display', '');
+            $(self.prefetchedImgs[newIndexR]).css('display', '');
             
             $(self.leafEdgeR).css({
                 // Moves the right leaf edge
@@ -2365,8 +2365,8 @@ BookReader.prototype.flipRightToLeft = function(newIndexL, newIndexR) {
             $(self.prefetchedImgs[newIndexR]).css('zIndex', 2);
 
             //jquery adds display:block to the element style, which interferes with our print css
-            $(self.prefetchedImgs[newIndexL]).css('display', null);
-            $(self.prefetchedImgs[newIndexR]).css('display', null);
+            $(self.prefetchedImgs[newIndexL]).css('display', '');
+            $(self.prefetchedImgs[newIndexR]).css('display', '');
             
             $(self.leafEdgeL).css({
                 width: newLeafEdgeWidthL+'px', 

diff --git a/BookReaderIA/datanode/BookReaderJSIA.php b/BookReaderIA/datanode/BookReaderJSIA.php
index 6d089db..006ad93 100644 (file)
--- a/BookReaderIA/datanode/BookReaderJSIA.php
+++ b/BookReaderIA/datanode/BookReaderJSIA.php
@@ -601,7 +601,7 @@ function OLAuth() {
 OLAuth.prototype.init = function() {
     var htmlStr =  'Checking loan status with Open Library';
 
-    this.showPopup("#ddd", "#000", htmlStr, 'Please wait as we check the status of this book...');
+    this.showPopup("#F0EEE2", "#000", htmlStr, 'Please wait as we check the status of this book...');
     var authUrl = this.authUrl+'?rand='+Math.random();
     if (false !== this.loanUUID) {
         authUrl += '&loan='+this.loanUUID
@@ -616,10 +616,10 @@ OLAuth.prototype.showPopup = function(bgColor, textColor, msg, resolution) {
     this.popup = document.createElement("div");
     $(this.popup).css({
         position: 'absolute',
-        top:      '20px',
+        top:      '50px',
         left:     ($('#BookReader').attr('clientWidth')-400)/2 + 'px',
         width:    '400px',
-        padding:  "20px",
+        padding:  "15px",
         border:   "3px double #999999",
         zIndex:   3,
         textAlign: 'center',
@@ -677,7 +677,7 @@ OLAuth.prototype.initCallback = function(obj) {
 
 OLAuth.prototype.callback = function(obj) {
     if (false == obj.success) {
-        this.showPopup("#fff", "#000", obj.msg, obj.resolution);
+        this.showPopup("#F0EEE2", "#000", obj.msg, obj.resolution);
         clearInterval(this.poller);
         this.ttsPoller = null;
     } else {
@@ -724,7 +724,7 @@ OLAuth.prototype.startPolling = function () {
     var self = this;
     this.poller=setInterval(function(){
         if (!self.olConnect) {
-          self.showPopup("#f00", "#fff", 'Connection error', 'The BookReader cannot reach Open Library. This might mean that you are offline or that Open Library is down. Please check your Internet connection and refresh this page or try again later.');
+          self.showPopup("#F0EEE2", "#000", 'Connection error', 'The BookReader cannot reach Open Library. This might mean that you are offline or that Open Library is down. Please check your Internet connection and refresh this page or try again later.');
           clearInterval(self.poller);
           self.ttsPoller = null;        
         } else {