From: rajbot <raj@archive.org>
Date: Wed, 10 Nov 2010 20:49:03 +0000 (+0000)
Subject: Merge branch 'newui' of git@github.com:openlibrary/bookreader into newui
X-Git-Url: http://git.rot13.org/?p=bookreader.git;a=commitdiff_plain;h=16035a78509d0ec1d023dd92ea90d45e69f7748e;hp=-c

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

16035a78509d0ec1d023dd92ea90d45e69f7748e
diff --combined BookReaderIA/datanode/BookReaderJSIA.php
index 5b2dcad,f894d23..016e988
--- a/BookReaderIA/datanode/BookReaderJSIA.php
+++ b/BookReaderIA/datanode/BookReaderJSIA.php
@@@ -358,6 -358,52 +358,52 @@@ br.getOpenLibraryRecord = function(call
      });
  }
  
+ // getInfoDiv
+ br.getInfoDiv = function() {
+     // $$$ it might make more sense to have a URL on openlibrary.org that returns this info
+ 
+     var escapedTitle = BookReader.util.escapeHTML(this.bookTitle);
+     var domainRe = /(\w+\.(com|org))/;
+     var domain = domainRe.exec(this.bookUrl)[1];
+     // XXX use different icon for archive.org
+     var html = [
+                 '<div class="BRfloatCover">',
+                     '<a href="', this.bookUrl, '"><img src="http://www.archive.org/download/', this.bookId, '/page/cover_t.jpg" alt="', escapedTitle, '" height="140"/></a>',
+                 '</div>',
+                 '<div class="BRfloatMeta">',
+                     '<div class="BRfloatTitle">',
+                         '<h2><a href="', this.bookUrl, '" class="title">', escapedTitle, '</a></h2>',
+                         // $$$ lookup on OL
+                         // 'by',
+                         // '<a href="Open Library Author Page">Book Author</a>',
+                     '</div>',
+                     '<p>Published ', this.bookPublished,
+                     //, <a href="Open Library Publisher Page">Publisher name</a>',
+                     '</p>',
+                     //'<p>Written in <a href="Open Library Language page">Language</a></p>',
+                     '<h3>Other Formats</h3>',
+                     '<ul class="links">',
+                         '<li><a href="http://www.archive.org/download/', this.bookId, '/', this.subPrefix, '.pdf">PDF</a><span>|</span></li>',
+                         '<li><a href="http://www.archive.org/download/', this.bookId, '/', this.subPrefix, '_djvu.txt">Plain Text</a><span>|</span></li>',
+                         '<li><a href="http://www.archive.org/download/', this.bookId, '/', this.subPrefix, '_daisy.zip">DAISY</a><span>|</span></li>',
+                         '<li><a href="http://www.archive.org/download/', this.bookId, '/', this.subPrefix, '.epub">ePub</a><span>|</span></li>',
+                         '<li><a href="https://www.amazon.com/gp/digital/fiona/web-to-kindle?clientid=IA&itemid=', this.bookId, '&docid=', this.subPrefix, '">Send to Kindle</a><span>|</span></li>',
+                         '<li><a href="', this.bookUrl, '">More...</a></li>',
+                     '</ul>',
+                     '<p class="moreInfo"><span></span>More information on <a href="'+ this.bookUrl + '">' + domain + '</a>.</p>',
+                 '</div>',
+             '</div>',
+             '<div class="BRfloatFoot">',
+                 // XXX add link to bug tracker
+                 '<a href="http://openlibrary.org/contact" class="problem">Report a problem</a>',
+                 '<span>|</span>',
+                 '<a href="http://openlibrary.org/dev/docs/bookreader">About the Bookreader</a>',
+             '</div>'
+     ];
+     
+     return html.join('\n');
+ }
+ 
  br.pageW =  [
              <?
              $i=0;
@@@ -489,7 -535,6 +535,7 @@@ if (typeof(brConfig) != 'undefined') 
  
  function OLAuth() {
      this.authUrl = 'http://openlibrary.org/ia_auth/' + br.bookId;
 +    this.olConnect = false;
      return this;
  }
  
@@@ -532,7 -577,6 +578,7 @@@ OLAuth.prototype.initCallback = functio
      
      //user is authenticated
      this.setCookie(obj.token);
 +    this.olConnect = true;
      this.startPolling();    
      br.init();
  }
@@@ -543,7 -587,6 +589,7 @@@ OLAuth.prototype.callback = function(ob
          clearInterval(this.poller);
          this.ttsPoller = null;
      } else {
 +        this.olConnect = true;
          this.setCookie(obj.token);
      }
  }
@@@ -561,15 -604,7 +607,15 @@@ OLAuth.prototype.setCookie = function(v
  OLAuth.prototype.startPolling = function () {    
      var self = this;
      this.poller=setInterval(function(){
 -        $.ajax({url:self.authUrl, dataType:'jsonp', jsonpCallback:'olAuth.callback'});
 +        if (!self.olConnect) {
 +          self.showPopup("#f00", "#fff", 'Cound not connect to Open Library for authentication. Please check to see if you are still connected to the Internet, and then reload this web page.');
 +          clearInterval(self.poller);
 +          self.ttsPoller = null;        
 +        } else {
 +          self.olConnect = false;
 +          //be sure to add random param to authUrl to avoid stale cache
 +          $.ajax({url:self.authUrl+'?rand='+Math.random(), dataType:'jsonp', jsonpCallback:'olAuth.callback'});
 +        }
      },300000);   
  }