From ad712ba22b46d30440c6aa80a30bae97bd459829 Mon Sep 17 00:00:00 2001
From: scollett <stephanie.collett@ucop.edu>
Date: Mon, 16 Nov 2009 14:42:47 -0800
Subject: [PATCH] Fixed location of thumbnail icon and added thumbnail view
 toolbar mode

---
 GnuBook/GnuBook.css                     |   2 ++
 GnuBook/GnuBook.js                      |  36 ++++++++++++++++++++----
 GnuBook/images/book_thumb_next_icon.png | Bin 0 -> 1063 bytes
 GnuBook/images/book_thumb_prev_icon.png | Bin 0 -> 803 bytes
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 GnuBook/images/book_thumb_next_icon.png
 create mode 100644 GnuBook/images/book_thumb_prev_icon.png

diff --git a/GnuBook/GnuBook.css b/GnuBook/GnuBook.css
index 839e6d0..23a67e9 100644
--- a/GnuBook/GnuBook.css
+++ b/GnuBook/GnuBook.css
@@ -114,6 +114,8 @@
 .GBicon.book_rightmost { background: url(images/book_rightmost_icon.png) no-repeat; }
 .GBicon.book_top { background: url(images/book_top_icon.png) no-repeat; }
 .GBicon.book_bottom { background: url(images/book_bottom_icon.png) no-repeat; }
+.GBicon.book_thumb_next { background: url(images/book_thumb_next_icon.png) no-repeat; }
+.GBicon.book_thumb_prev { background: url(images/book_thumb_prev_icon.png) no-repeat; }
 
 
 .GBicon.play { background: url(images/control_play_icon.png) no-repeat; }
diff --git a/GnuBook/GnuBook.js b/GnuBook/GnuBook.js
index 7e2bc6e..8b4714f 100644
--- a/GnuBook/GnuBook.js
+++ b/GnuBook/GnuBook.js
@@ -3012,17 +3012,18 @@ GnuBook.prototype.initToolbar = function(mode, ui) {
         +   "<form class='GBpageform' action='javascript:' onsubmit='gb.jumpToPage(this.elements[0].value)'> <span class='label'>Page:<input id='GBpagenum' type='text' size='3' onfocus='gb.autoStop();'></input></span></form>"
         +   "<div class='GBtoolbarmode2' style='display: none'><button class='GBicon rollover book_leftmost' /><button class='GBicon rollover book_left' /><button class='GBicon rollover book_right' /><button class='GBicon rollover book_rightmost' /></div>"
         +   "<div class='GBtoolbarmode1' style='display: none'><button class='GBicon rollover book_top' /><button class='GBicon rollover book_up' /> <button class='GBicon rollover book_down' /><button class='GBicon rollover book_bottom' /></div>"
-		+ 	"<button class='GBicon rollover thumbnail_mode' onclick='gb.switchMode(3); return false;'/>"
+        +   "<div class='GBtoolbarmode3' style='display: none'><button class='GBicon rollover book_top' /><button class='GBicon rollover book_thumb_prev' /> <button class='GBicon rollover book_thumb_next' /><button class='GBicon rollover book_bottom' /></div>"
         +   "<button class='GBicon rollover play' /><button class='GBicon rollover pause' style='display: none' />"
         + "</span>"
         
         + "<span>"
         +   "<a class='GBicon logo rollover' href='" + this.logoURL + "'>&nbsp;</a>"
-        +   " <button class='GBicon rollover zoom_out' onclick='gb.zoom(-1); return false;'/>" 
+        +   "<div class='GBtoolbarzoom' style='display: none'><button class='GBicon rollover zoom_out' onclick='gb.zoom(-1); return false;'/>" 
         +   "<button class='GBicon rollover zoom_in' onclick='gb.zoom(1); return false;'/>"
-        +   " <span class='label'>Zoom: <span id='GBzoom'>"+parseInt(100/this.reduce)+"</span></span>"
+        +   " <span class='label'>Zoom: <span id='GBzoom'>"+parseInt(100/this.reduce)+"</span></span></div>"
         +   " <button class='GBicon rollover one_page_mode' onclick='gb.switchMode(1); return false;'/>"
         +   " <button class='GBicon rollover two_page_mode' onclick='gb.switchMode(2); return false;'/>"
+		+ 	" <button class='GBicon rollover thumbnail_mode' onclick='gb.switchMode(3); return false;'/>"
         + "</span>"
         
         + "<span id='#GBbooktitle'>"
@@ -3060,7 +3061,9 @@ GnuBook.prototype.initToolbar = function(mode, ui) {
                    '.play': 'Play',
                    '.pause': 'Pause',
                    '.book_top': 'First page',
-                   '.book_bottom': 'Last page'
+                   '.book_bottom': 'Last page',
+                   '.book_thumb_next': 'Next',
+                   '.book_thumb_prev': 'Previous'
                   };
     if ('rl' == this.pageProgression) {
         titles['.book_leftmost'] = 'Last page';
@@ -3091,14 +3094,25 @@ GnuBook.prototype.initToolbar = function(mode, ui) {
 // Update the toolbar for the given mode (changes navigation buttons)
 // $$$ we should soon split the toolbar out into its own module
 GnuBook.prototype.switchToolbarMode = function(mode) {
+	       
     if (1 == mode) {
-        // 1-up     
+        // 1-up
+     	$('#GBtoolbar .GBtoolbarzoom').show().css('display', 'inline');
         $('#GBtoolbar .GBtoolbarmode2').hide();
+        $('#GBtoolbar .GBtoolbarmode3').hide();
         $('#GBtoolbar .GBtoolbarmode1').show().css('display', 'inline');
-    } else {
+    } else if (2 == mode) {
         // 2-up
+     	$('#GBtoolbar .GBtoolbarzoom').show().css('display', 'inline');
         $('#GBtoolbar .GBtoolbarmode1').hide();
+        $('#GBtoolbar .GBtoolbarmode3').hide();
         $('#GBtoolbar .GBtoolbarmode2').show().css('display', 'inline');
+	} else {
+	    // 3-up    
+	    $('#GBtoolbar .GBtoolbarzoom').hide();
+        $('#GBtoolbar .GBtoolbarmode2').hide();
+        $('#GBtoolbar .GBtoolbarmode1').hide();
+        $('#GBtoolbar .GBtoolbarmode3').show().css('display', 'inline');
     }
 }
 
@@ -3166,6 +3180,16 @@ GnuBook.prototype.bindToolbarNavHandlers = function(jToolbar) {
         gb.rightmost();
         return false;
     });
+
+    jToolbar.find('.book_thumb_prev').bind('click', function(e) {
+        gb.prev();
+        return false;
+    });        
+        
+    jToolbar.find('.book_thumb_next').bind('click', function(e) {
+        gb.next();
+        return false;
+    });
 }
 
 // updateToolbarZoom(reduce)
diff --git a/GnuBook/images/book_thumb_next_icon.png b/GnuBook/images/book_thumb_next_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..edc6478ccf0cb49c1c35d3931648bcc762a9987c
GIT binary patch
literal 1063
zcmV+?1laqDP)<h;3K|Lk000e1NJLTq001xm000;W1^@s6y#0RM00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXe{
z76&sn7OC0*00XB<L_t(o!|j;OZyQAvz<)El9<SF)ghE_OMA9@tII&$snn($UUQ%&G
z;vV4d$N>QrBC5)NK<_znY^7dN#UUa>v|M8Hje=;aiV~W{_U^vn;I);Fns^Pes!Ggl
zcILg`ym?<^!~f&u4h1kVK4QlvE@Q<aA}D3iTB9OCDTOFOi^Za2At5B<;2>me?I+a<
z(o6j=z~ZML@#T%rySDy=g%4Bh>!p4dz;P6g1fZSxvj7I<sJ+o5C^F57c8Jipu9xZ{
zz0~glSaCp~^ppld&?Xsc@dz4%HX4*lWk4_WYXGHecfQqOe6n<Mz0}_{KwGS&hp0$m
zx9fEKwQZqdk3{G0&$tGMCL^eAk9G_pKkK2|@tGXE+q=IX*Xmp-TpR`%92y|B3fJ1y
zH|uA;QwF`5wYRfJy%F&GV4?jjwCZU`1GLs0J+I-qE+(5L4C^T6U~$;p`)&Ba!=EX>
zGexCbA_{!6**-)G)~3q=t&^TQi?y@6$4M5z&E=bi9Ss1;<#RlK{0Hmn)uW)%aJ*bj
zSqs%_)ogF?^5oGIwl=Dbw?;3Sk<l@VQ^oFM`xL8M{gt56AnSR=ELyCctqtCvD*>zk
zA9pZ7BUZ7$|A^Jq)r>@e>v^6MY2I>SsKB#le{uhZAB|c2g<^4%(aV=odw^59a)Lz^
zHt;-;)2#3BuVR{^w|MK;XNyZq%j)bhYK1?a9^j}9SIQMDB4SKdYe%!OvB`S%0f&cm
z{Jz(inSNKz&&|@8_fy}vwUU^(Sd~%*kqBe5D6L}F!#3+;p%37brKRPS4t+qVA0Ly?
z`;;cHL?Yn(z6I>o=05d$#LV=2%+Jp<J~5stTqqz)VX-OuK+=E~YpPhrTFB*mES9a!
zeHsm6_Ubfqb2EH#;~VbX`)=i{ufIJ%2b5MgMq|XFP&ws56h%ZLluJ{T%9Ff3K87(_
zA`$AxH8OrS*_+NSqsfgemPR3fh!BZTDVHc$rrNBgu{9mH?z0UDqmaCx$GDlq;`4*Q
z8GiE(0FIApIPtn_b;y*BER4d$yi1mJtU|SVNPk~H=peB;I5hA=p`g)SBdgUzkW5>D
z|9}U0XR?}42^WjT^G7<D2Wu^&x-W+cNtwjG)2~kiYWk;&YyQP)dZS;rW7<k;AxD{H
zE_8g%^-g~~gftl}Uh|!fL2$sHQR`!X5Tp*FUg>}3e^S2Gare&cxrOW3GI#IXzWU1k
htFUnWn*J~H{{Ta3@YWA3>3RSF002ovPDHLkV1nNm07L))

literal 0
HcmV?d00001

diff --git a/GnuBook/images/book_thumb_prev_icon.png b/GnuBook/images/book_thumb_prev_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bd7aa26738ea19fb939cee6b3ad8d644a9912f2
GIT binary patch
literal 803
zcmV+;1Kj+HP)<h;3K|Lk000e1NJLTq001xm000;W1^@s6y#0RM00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXe{
z7A6!Qg9%aq00N^)L_t(o!|j;APg7A8$3O4(y=PmXRD@7ds-m%$0TaN)#DqnolMF@%
z@lRke#(^L)GDrxCVRGU>Fkyuab&%+!rU=@BLO@Lwkw9DelY1RdU@&sq@?uOl$=%NV
zobx^B+~m9mhxTvH*w3M(qfPmICMGTv;@2gK6b3>Glu{^{KuU>H20{o7VX!#Az<hk!
zalW}<fa_hIJa{;O3#nZdsVuHt?P5N@jMIGKOkah=bF<5LCX$lQ3fRMUM1U{~j^-~E
z`T}aIJdP$)Q{^dX{<pI(l-_~tW`Xq|DOM7ztRz->J^iNQ<TL3d0aU~lx^722Zu0pY
zGqX|p?ho>QcJ9EsPzl%6dox95qH|2Yd_m&tH*8xVRhDN{&rwp5&*u=rMIaC&*c76^
zp;{~W@bFL%!1(ynvbkCUMjt-`U?%#GU@*X`lTD=4NutrW2qDO3v$#x~hQ<I#kNH4j
zrbk8wR4n!pfcV0vvbkCU?%eGq_94c6e38#zzEddXX^BLLv_vor$YrxwwoNeDh%l6H
z_wUvDt1o%I?wg5~RM}juH(**8t*z&IG}zCD_BPhmGK9ln!lzp}+uXv5&>4<5hDfew
z$)qz{+4uDgje5QAUSF-hBCeJIr6jpr3V_=^-9#eiuuU(8Vi74Nwr%g6jZ|9u0rn5{
z?>Lvs-FJkN=?sQpU>XXSX_4AUa;y6W09(a89$yVM){ehr+u8zLs8BMUsfcUp22(CU
zUA>RGdY{g^rMJ=;Yy#BQ`>FA}u}od@<*X9Y<e<%RH!oGn*S=-h0_4_qHz;82)h@h1
zezzV{l`f`CzQcR3^QPT_Ed+?)daXaq<Q|kLy)NbQ|JzSWWPz!vSAXYEPK;f=e5KQx
hoEU3A{C(h%{RHxFa8hb~d4~W1002ovPDHLkV1hBmbX5QV

literal 0
HcmV?d00001

-- 
2.20.1