From 55d9a53e40fa4b41c0710e82b0758103352437dd Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Mon, 21 May 2012 11:23:12 -0500
Subject: [PATCH] Fixes tab order, temp icon and localization

---
 l10n/en-US/viewer.properties        |   2 ++
 web/images/toolbarButton-search.png | Bin 0 -> 744 bytes
 web/viewer.css                      |   3 +--
 web/viewer.html                     |  16 ++++++++--------
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 web/images/toolbarButton-search.png

diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index c8dbe4aba..1cc46eedf 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -42,3 +42,5 @@ zoom_in_label=Zoom In
 zoom.title=Zoom
 thumb_page_title=Page {{page}}
 thumb_page_canvas=Thumbnail of Page {{page}}
+search.title=Search Document
+search_label=Search
diff --git a/web/images/toolbarButton-search.png b/web/images/toolbarButton-search.png
new file mode 100644
index 0000000000000000000000000000000000000000..78878b417d038c93cb5b3e6a1a4605659db98f9f
GIT binary patch
literal 744
zcmV<E0vG*>P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0000-0000-0Y?D!vH$=88FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10%b`=K~y-6osz#x8(|p7zwddMym{{~cU;URS%iR!f=HHv)eb?j
zG)o6Nbn4ti{|A>YE(Pi2QYe%z_7BLYp-Pu7+EN;5(8Y+FA9(k^XW~6wG&D9{`kmf~
z=lgzmela2f04yyny~t!TPo<PF3<E(B$a=m0iZPa0U0r=+7zVq&y#?nS?RNV^y<Xo3
z03CO79A|lbef{P6`8k9T*xTFtahDR6N@Z<kX2uW05V>3qTU%Sd0PF*RhJT2NG{%?<
zz#$^`FCV*ap;Rh8ab5SL=Xsepjv<7g#l=Mx$1#qMj(ES{2LQC&?dJ9M_4C8S!*3%1
z0NB{r_`I^R@;HhjSe6CLvOq)#f&f7fU}9nd2L}hAwzs#}Mk=UQt6wb3N-L!boO3;n
zV{p!ULI{fE7=yt8S65f*L?XeIQcBnLmXuPf)oKemV@%uJ+$_z{&l|m753cJX3_~cT
zM6p-|5uw}dqS<U>c6Jt>PDkjv?p<75pjN9bXaI`YY*znsFhU3@rG{}BhA>TYWO%;s
zV|seJtW8Z#ReaxP4*^ojVJxMD5Ml)2I1X~T+#|hEC@kByjc&I)OeT{_G#ZTnKtx3B
z^z>9Om&^9U6?&eR*Yo*&bKHJUPEKC$?CiV+z~<)Wo>i;WcZ0!T#4|ZL+0Z=C%Z>v$
zjsqg<5>Y3ePNyEW006dadzxvQ{y0D?l^XsKLYR#GeT=4QW;M?F*a|r3sr$EOS*dZJ
zWHOo6kB^VPwpy*9Q53O$zYie<gb+A8JNtfbyt%n)?C$Qqmr_y?1kf~%IOlYEc{zH@
a|D)fYjQW58DPqw80000<MNUMnLSTYdo<|)3

literal 0
HcmV?d00001

diff --git a/web/viewer.css b/web/viewer.css
index 4fc426c64..3446c1627 100644
--- a/web/viewer.css
+++ b/web/viewer.css
@@ -530,8 +530,7 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
 
 #viewSearch.toolbarButton::before {
   display: inline-block;
-  font-size: 18px;
-  content: 'S';
+  content: url(images/toolbarButton-search.png);
 }
 
 
diff --git a/web/viewer.html b/web/viewer.html
index 11c6ad0b7..17688ef0c 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -76,26 +76,26 @@
 
             <div id="toolbarViewer">
               <div id="toolbarViewerLeft">
-                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3" data-l10n-id="toggle_slider">
+                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="4" data-l10n-id="toggle_slider">
                   <span data-l10n-id="toggle_slider_label">Toggle Sidebar</span>
                 </button>
                 <div class="toolbarButtonSpacer"></div>
                 <div class="splitToolbarButton">
-                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4" data-l10n-id="previous">
+                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="5" data-l10n-id="previous">
                     <span data-l10n-id="previous_label">Previous</span>
                   </button>
                   <div class="splitToolbarButtonSeparator"></div>
-                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5" data-l10n-id="next">
+                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="6" data-l10n-id="next">
                     <span data-l10n-id="next_label">Next</span>
                   </button>
                 </div>
                 <label class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
-                <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" tabindex="6">
+                <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" tabindex="7">
                 </input>
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
               <div id="toolbarViewerRight">
-                <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="10" />
+                <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="11" />
 
                 <!--
                 <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" style="visibility: hidden; position: fixed; right: 0; top: 0" />
@@ -119,16 +119,16 @@
               <div class="outerCenter">
                 <div class="innerCenter" id="toolbarViewerMiddle">
                   <div class="splitToolbarButton">
-                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7" data-l10n-id="zoom_out">
+                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="8" data-l10n-id="zoom_out">
                       <span data-l10n-id="zoom_out_label">Zoom Out</span>
                     </button>
                     <div class="splitToolbarButtonSeparator"></div>
-                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8" data-l10n-id="zoom_in">
+                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="9" data-l10n-id="zoom_in">
                       <span data-l10n-id="zoom_in_label">Zoom In</span>
                      </button>
                   </div>
                   <span class="dropdownToolbarButton">
-                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" oncontextmenu="return false;" tabindex="9" data-l10n-id="zoom">
+                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" oncontextmenu="return false;" tabindex="10" data-l10n-id="zoom">
                       <option id="pageAutoOption" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
                       <option id="pageActualOption" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
                       <option id="pageFitOption" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>