CSS cleanup

[bookreader.git] / BookReader / BookReader.js

diff --git a/BookReader/BookReader.js b/BookReader/BookReader.js
index 72bf5ff..2082923 100644 (file)
--- a/BookReader/BookReader.js
+++ b/BookReader/BookReader.js
@@ -1435,21 +1435,13 @@ BookReader.prototype.prepareTwoPageView = function(centerPercentageX, centerPerc
         width:  this.twoPage.bookCoverDivWidth + 'px',
         height: this.twoPage.bookCoverDivHeight+'px',
         visibility: 'visible',
-        position: 'absolute',
-        backgroundColor: 'transparent',
-        /* XXXmang move to CSS */
-        backgroundImage: 'url(images/back_pages.png)',
-        left: this.twoPage.bookCoverDivLeft + 'px',
-        top: this.twoPage.bookCoverDivTop+'px',
-        MozBoxShadow: '0 0 2px #000',
-        WebkitBoxShadow: '0 0 2px #000'
     }).appendTo('#BRtwopageview');
     
     this.leafEdgeR = document.createElement('div');
     this.leafEdgeR.className = 'BRleafEdgeR';
     $(this.leafEdgeR).css({
         width: this.twoPage.leafEdgeWidthR + 'px',
-        height: this.twoPage.height-1 + 'px',
+        height: this.twoPage.height + 'px',
         left: this.twoPage.gutter+this.twoPage.scaledWR+'px',
         top: this.twoPage.bookCoverDivTop+this.twoPage.coverInternalPadding+'px'
     }).appendTo('#BRtwopageview');
@@ -1458,7 +1450,7 @@ BookReader.prototype.prepareTwoPageView = function(centerPercentageX, centerPerc
     this.leafEdgeL.className = 'BRleafEdgeL';
     $(this.leafEdgeL).css({
         width: this.twoPage.leafEdgeWidthL + 'px',
-        height: this.twoPage.height-1 + 'px',
+        height: this.twoPage.height + 'px',
         left: this.twoPage.bookCoverDivLeft+this.twoPage.coverInternalPadding+'px',
         top: this.twoPage.bookCoverDivTop+this.twoPage.coverInternalPadding+'px'
     }).appendTo('#BRtwopageview');
@@ -1537,20 +1529,7 @@ BookReader.prototype.prepareTwoPagePopUp = function() {
     this.twoPagePopUp = document.createElement('div');
     this.twoPagePopUp.className = 'BRtwoPagePopUp';
     $(this.twoPagePopUp).css({
-        zIndex: '1000',
-        // XXXmang move to CSS
-        padding: '6px',
-        position: 'absolute',
-        fontFamily: 'Arial,sans-serif',
-        fontSize: '11px',
-        color: 'white',
-        zIndex: '1000',
-        backgroundColor: '#939598',
-        opacity: 0.85,
-        webkitBorderRadius: '4px',
-        mozBorderRadius: '4px',
-        borderRadius: '4px',
-        whiteSpace: 'nowrap'
+        zIndex: '1000'
     }).appendTo('#BRcontainer');
     $(this.twoPagePopUp).hide();
     
@@ -1639,7 +1618,7 @@ BookReader.prototype.calculateSpreadSize = function() {
     // Book cover
     // The width of the book cover div.  The combined width of both pages, twice the width
     // of the book cover internal padding (2*10) and the page edges
-    this.twoPage.bookCoverDivWidth = this.twoPage.scaledWL + this.twoPage.scaledWR + 2 * this.twoPage.coverInternalPadding + this.twoPage.edgeWidth;
+    this.twoPage.bookCoverDivWidth = this.twoPageCoverWidth(this.twoPage.scaledWL + this.twoPage.scaledWR);
     // The height of the book cover div
     this.twoPage.bookCoverDivHeight = this.twoPage.height + 2 * this.twoPage.coverInternalPadding;
     
@@ -2079,7 +2058,7 @@ BookReader.prototype.flipLeftToRight = function(newIndexL, newIndexR) {
     this.leafEdgeTmp.className = 'BRleafEdgeTmp';
     $(this.leafEdgeTmp).css({
         width: leafEdgeTmpW + 'px',
-        height: this.twoPage.height-1 + 'px',
+        height: this.twoPage.height + 'px',
         left: leftEdgeTmpLeft + 'px',
         top: top+'px',
         zIndex:1000
@@ -2228,7 +2207,7 @@ BookReader.prototype.flipRightToLeft = function(newIndexL, newIndexR) {
     this.leafEdgeTmp.className = 'BRleafEdgeTmp';
     $(this.leafEdgeTmp).css({
         width: leafEdgeTmpW + 'px',
-        height: this.twoPage.height-1 + 'px',
+        height: this.twoPage.height + 'px',
         left: gutter+scaledW+'px',
         top: top+'px',    
         zIndex:1000
@@ -3197,6 +3176,7 @@ BookReader.prototype.initToolbar = function(mode, ui) {
         + "<span>"
         +   "<a class='logo' href='" + this.logoURL + "'></a>"
         +   "<button class='BRicon glass'></button>"
+        /* XXXmang integrate search */
         +   "<form method='get' id='booksearch'><input type='search' id='textSrch' name='textSrch' val='' placeholder='Search'/><button type='submit' id='btnSrch' name='btnSrch'>GO</button></form>"
         +   "<button class='BRicon fit'></button>"
         +   "<button class='BRicon thumb' onclick='br.switchMode(3); return false;'></button>"