Merge pull request #2792 from timvandermeij/settings-bar

Secondary toolbar

l10n/ar/viewer.properties

@@ -30,17 +30,25 @@ zoom_out_label=تصغير
 zoom_in.title=تكبير
 zoom_in_label=تكبير
 zoom.title=التكبير
-print.title=طباعة
-print_label=طباعة
 fullscreen.title=ملء الشاشة
 fullscreen_label=ملء الشاشة
 open_file.title=فتح الملف
 open_file_label=فتح
+print.title=طباعة
+print_label=طباعة
 download.title=تحميل
 download_label=تحميل
 bookmark.title=المشهد الحالي (نسخ أو فتح في نافذة جديدة)
 bookmark_label=المشهد الحالي
 
+# Secondary toolbar and context menu
+page_rotate_cw.title=تدوير مع عقارب الساعة
+page_rotate_cw.label=تدوير مع عقارب الساعة
+page_rotate_cw_label=تدوير مع عقارب الساعة
+page_rotate_ccw.title=تدوير عكس عقارب الساعة
+page_rotate_ccw.label=تدوير عكس عقارب الساعة
+page_rotate_ccw_label=تدوير عكس عقارب الساعة
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,10 +69,6 @@ thumb_page_title=الصفحة {{page}}
 # number.
 thumb_page_canvas=صورة مصغرة من الصفحة {{page}}
 
-# Context menu
-page_rotate_cw.label=تدوير مع عقارب الساعة
-page_rotate_ccw.label=تدوير عكس عقارب الساعة
-
 # Find panel button title and messages
 find=بحث
 find_terms_not_found=(لا يوجد)

l10n/ca/viewer.properties

@@ -30,19 +30,31 @@ zoom_out_label=Reduir
 zoom_in.title=Ampliar
 zoom_in_label=Ampliar
 zoom.title=Ampliació
-print.title=Imprimir
-print_label=Imprimir
-fullscreen.title=Pantalla completa
-fullscreen_label=Pantalla completa
 presentation_mode.title=Canviar a mode de Presentació
 presentation_mode_label=Mode de Presentació
 open_file.title=Obrir arxiu
 open_file_label=Obrir
+print.title=Imprimir
+print_label=Imprimir
 download.title=Descarregar
 download_label=Descarregar
 bookmark.title=Vista actual (copiï o obri en una finestra nova)
 bookmark_label=Vista actual
 
+# Secondary toolbar and context menu
+first_page.title=Primera pàgina
+first_page.label=Primera pàgina
+first_page_label=Primera pàgina
+last_page.title=Darrera pàgina
+last_page.label=Darrera pàgina
+last_page_label=Darrera pàgina
+page_rotate_cw.title=Rotar sentit horari
+page_rotate_cw.label=Rotar sentit horari
+page_rotate_cw_label=Rotar sentit horari
+page_rotate_ccw.title=Rotar sentit anti-horari
+page_rotate_ccw.label=Rotar sentit anti-horari
+page_rotate_ccw_label=Rotar sentit anti-horari
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -66,11 +78,6 @@ thumb_page_canvas=Miniatura de la pàgina {{page}}
 # Find panel button title and messages
 find=Cercar
 find_terms_not_found=(No trobat)
-# Context menu
-first_page.label=Primera pàgina
-last_page.label=Darrera pàgina
-page_rotate_cw.label=Rotar sentit horari
-page_rotate_ccw.label=Rotar sentit anti-horari
 
 # Find panel button title and messages
 find_label=Cerca:

l10n/da/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Zoom ud
 zoom_in.title=Zoom ind
 zoom_in_label=Zoom ind
 zoom.title=Zoom
-print_label=Udskriv
-print.title=Udskriv
 fullscreen.title=Fuldskærm
 fullscreen_label=Fuldskærm
 open_file.title=Åbn fil
 open_file_label=Åbn
+print_label=Udskriv
+print.title=Udskriv
 download.title=Hent
 download_label=Hent
 bookmark.title=Aktuel visning (kopier eller åbn i et nyt vindue)
 bookmark_label=Aktuel visning
 
+# Secondary toolbar and context menu
+first_page.title=Gå til første side
+first_page.label=Gå til første side
+first_page_label=Gå til første side
+last_page.title=Gå til sidste side
+last_page.label=Gå til sidste side
+last_page_label=Gå til sidste side
+page_rotate_cw.title=Rotér med uret
+page_rotate_cw.label=Rotér med uret
+page_rotate_cw_label=Rotér med uret
+page_rotate_ccw.title=Roéer mod uret
+page_rotate_ccw.label=Roéer mod uret
+page_rotate_ccw_label=Roéer mod uret
+
 # Tooltips of alternativ billedtekst til sidepanelet
 # (_label strengene er den alternative billedtekst, mens .title
 # strengene er tooltips
@@ -61,12 +75,6 @@ thumb_page_title=Side {{page}}
 # egentlige sidetal
 thumb_page_canvas=Thumbnail af side {{page}}
 
-# Popup menu
-first_page.label=Gå til første side
-last_page.label=Gå til sidste side
-page_rotate_cw.label=Rotér med uret
-page_rotate_ccw.label=Roéer mod uret
-
 # Søgepanelet samt knapper og beskeder
 find_label=Find:
 find_previous.title=Find den forrige forekomst

l10n/de/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Verkleinern
 zoom_in.title=Vergrößern
 zoom_in_label=Vergrößern
 zoom.title=Zoom
-print.title=Drucken
-print_label=Drucken
 presentation_mode.title=Zum Präsentationsmodus wechseln
 presentation_mode_label=Bildschirmpräsentation
 open_file.title=Datei öffnen
 open_file_label=Öffnen
+print.title=Drucken
+print_label=Drucken
 download.title=Herunterladen
 download_label=Herunterladen
 bookmark.title=Aktuelle Ansicht (Kopieren oder in einem neuen Fenster öffnen)
 bookmark_label=Aktuelle Ansicht
 
+# Secondary toolbar and context menu
+first_page.title=Erste Seite
+first_page.label=Erste Seite
+first_page_label=Erste Seite
+last_page.title=Letzte Seite
+last_page.label=Letzte Seite
+last_page_label=Letzte Seite
+page_rotate_cw.title=Im Uhrzeigersinn drehen
+page_rotate_cw.label=Im Uhrzeigersinn drehen
+page_rotate_cw_label=Im Uhrzeigersinn drehen
+page_rotate_ccw.title=Entgegen dem Uhrzeigersinn drehen
+page_rotate_ccw.label=Entgegen dem Uhrzeigersinn drehen
+page_rotate_ccw_label=Entgegen dem Uhrzeigersinn drehen
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Seite {{page}}
 # number.
 thumb_page_canvas=Vorschau von Seite {{page}}
 
-# Context menu
-first_page.label=Erste Seite
-last_page.label=Letzte Seite
-page_rotate_cw.label=Im Uhrzeigersinn drehen
-page_rotate_ccw.label=Entgegen dem Uhrzeigersinn drehen
-
 # Find panel button title and messages
 find_label=Suchen:
 find_previous.title=Das vorherige Auftreten des Ausdrucks suchen

l10n/en-US/viewer.properties

@@ -30,17 +30,33 @@ zoom_out_label=Zoom Out
 zoom_in.title=Zoom In
 zoom_in_label=Zoom In
 zoom.title=Zoom
-print.title=Print
-print_label=Print
 presentation_mode.title=Switch to Presentation Mode
 presentation_mode_label=Presentation Mode
 open_file.title=Open File
-open_file_label=Open
+open_file_label=Open File
+print.title=Print
+print_label=Print
 download.title=Download
 download_label=Download
 bookmark.title=Current view (copy or open in new window)
 bookmark_label=Current View
 
+# Secondary toolbar and context menu
+tools.title=Tools
+tools_label=Tools
+first_page.title=Go to First Page
+first_page.label=Go to First Page
+first_page_label=Go to First Page
+last_page.title=Go to Last Page
+last_page.label=Go to Last Page
+last_page_label=Go to Last Page
+page_rotate_cw.title=Rotate Clockwise
+page_rotate_cw.label=Rotate Clockwise
+page_rotate_cw_label=Rotate Clockwise
+page_rotate_ccw.title=Rotate Counterclockwise
+page_rotate_ccw.label=Rotate Counterclockwise
+page_rotate_ccw_label=Rotate Counterclockwise
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +77,6 @@ thumb_page_title=Page {{page}}
 # number.
 thumb_page_canvas=Thumbnail of Page {{page}}
 
-# Context menu
-first_page.label=Go to First Page
-last_page.label=Go to Last Page
-page_rotate_cw.label=Rotate Clockwise
-page_rotate_ccw.label=Rotate Counterclockwise
-
 # Find panel button title and messages
 find_label=Find:
 find_previous.title=Find the previous occurrence of the phrase

l10n/es/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Reducir
 zoom_in.title=Aumentar
 zoom_in_label=Aumentar
 zoom.title=Ampliación
-print.title=Imprimir
-print_label=Imprimir
 presentation_mode.title=Cambiar al modo de presentación
 presentation_mode_label=Modo de presentación
 open_file.title=Abrir un archivo
 open_file_label=Abrir
+print.title=Imprimir
+print_label=Imprimir
 download.title=Descargar
 download_label=Descargar
 bookmark.title=Vista actual (copie o abra en una ventana nueva)
 bookmark_label=Vista actual
 
+# Secondary toolbar and context menu
+first_page.title=Ir a la primera página
+first_page.label=Ir a la primera página
+first_page_label=Ir a la primera página
+last_page.title=Ir a la última página
+last_page.label=Ir a la última página
+last_page_label=Ir a la última página
+page_rotate_cw.title=Girar a la derecha
+page_rotate_cw.label=Girar a la derecha
+page_rotate_cw_label=Girar a la derecha
+page_rotate_ccw.title=Girar a la izquierda
+page_rotate_ccw.label=Girar a la izquierda
+page_rotate_ccw_label=Girar a la izquierda
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Página {{page}}
 # number.
 thumb_page_canvas=Miniatura de la página {{page}}
 
-# Context menu
-first_page.label=Ir a la primera página
-last_page.label=Ir a la última página
-page_rotate_cw.label=Girar a la derecha
-page_rotate_ccw.label=Girar a la izquierda
-
 # Find panel button title and messages
 find_label=Buscar:
 find_previous.title=Ir a la frase encontrada anterior

l10n/fi/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Suurenna
 zoom_in.title=Pienennä
 zoom_in_label=Pienennä
 zoom.title=Sivun suurennus
-print.title=Tulosta
-print_label=Tulosta
 presentation_mode.title=Esitystila
 presentation_mode_label=Esitystila
 open_file.title=Avaa tiedosto
 open_file_label=Avaa
+print.title=Tulosta
+print_label=Tulosta
 download.title=Lataa
 download_label=Lataa
 bookmark.title=Nykyinen näkymä (kopioi tai avaa uuteen ikkunaan)
 bookmark_label=Nykyinen näkymä
 
+# Secondary toolbar and context menu
+first_page.title=Ensimmäinen sivu
+first_page.label=Ensimmäinen sivu
+first_page_label=Ensimmäinen sivu
+last_page.title=Viimeinen sivu
+last_page.label=Viimeinen sivu
+last_page_label=Viimeinen sivu
+page_rotate_cw.title=Kierrä myötäpäivään
+page_rotate_cw.label=Kierrä myötäpäivään
+page_rotate_cw_label=Kierrä myötäpäivään
+page_rotate_ccw.title=Kierrä vastapäivään
+page_rotate_ccw.label=Kierrä vastapäivään
+page_rotate_ccw_label=Kierrä vastapäivään
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Sivu {{page}}
 # number.
 thumb_page_canvas=Sivun {{page}} esikatselukuva
 
-# Context menu
-first_page.label=Ensimmäinen sivu
-last_page.label=Viimeinen sivu
-page_rotate_cw.label=Kierrä myötäpäivään
-page_rotate_ccw.label=Kierrä vastapäivään
-
 # Find panel button title and messages
 find_label=Etsi
 find_previous.title=Etsi edellinen

l10n/fr/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Zoom arrière
 zoom_in.title=Zoom avant
 zoom_in_label=Zoom avant
 zoom.title=Zoom
-print.title=Imprimer
-print_label=Imprimer
 presentation_mode.title=Basculer en mode présentation
 presentation_mode_label=Mode présentation
-open_file.title=Ouvrir le fichier
+open_file.title=Ouvrir un fichier
 open_file_label=Ouvrir
+print.title=Imprimer
+print_label=Imprimer
 download.title=Télécharger
 download_label=Télécharger
 bookmark.title=Affichage courant (copier ou ouvrir dans une nouvelle fenêtre)
 bookmark_label=Affichage actuel
 
+# Secondary toolbar and context menu
+first_page.title=Aller à la première page
+first_page.label=Aller à la première page
+first_page_label=Aller à la première page
+last_page.title=Aller à la dernière page
+last_page.label=Aller à la dernière page
+last_page_label=Aller à la dernière page
+page_rotate_cw.title=Rotation horaire
+page_rotate_cw.label=Rotation horaire
+page_rotate_cw_label=Rotation horaire
+page_rotate_ccw.title=Rotation anti-horaire
+page_rotate_ccw.label=Rotation anti-horaire
+page_rotate_ccw_label=Rotation anti-horaire
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Page {{page}}
 # number.
 thumb_page_canvas=Vignette de la page {{page}}
 
-# Context menu
-first_page.label=Aller à la première page
-last_page.label=Aller à la dernière page
-page_rotate_cw.label=Rotation horaire
-page_rotate_ccw.label=Rotation anti-horaire
-
 # Find panel button title and messages
 find_label=Rechercher :
 find_previous.title=Trouver l'occurrence précédente de la phrase

l10n/it/viewer.properties

@@ -19,7 +19,7 @@ print.title=Stampa
 download.title=Download
 zoom_out.title=Riduci Zoom
 zoom_in.title=Aumenta Zoom
-error_more_info=Più Informazioni
+error_more_info=Più Informazioni
 error_less_info=Meno Informazioni
 error_close=Chiudi
 error_build=PDF.JS Build: {{build}}
@@ -36,8 +36,8 @@ thumbs.title=Mostra Miniature
 outline.title=Mostra Indice Documento
 loading=Caricamento... {{percent}}%
 loading_error_indicator=Errore
-loading_error=È accaduto un errore durante il caricamento del PDF.
-rendering_error=È accaduto un errore durante il rendering della pagina.
+loading_error=È accaduto un errore durante il caricamento del PDF.
+rendering_error=È accaduto un errore durante il rendering della pagina.
 page_label=Pagina:
 page_of=di {{pageCount}}
 open_file.title=Apri File

l10n/ja/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=縮小
 zoom_in.title=拡大
 zoom_in_label=拡大
 zoom.title=ズーム
-print.title=印刷
-print_label=印刷
 presentation_mode.title=プレゼンテーションモードに切り替えます
 presentation_mode_label=プレゼンテーションモード
 open_file.title=ファイルを開く
 open_file_label=開く
+print.title=印刷
+print_label=印刷
 download.title=ダウンロード
 download_label=ダウンロード
 bookmark.title=現在のビューをブックマーク
 bookmark_label=現在のビューをブックマーク
 
+# Secondary toolbar and context menu
+first_page.title=最初のページへ移動
+first_page.label=最初のページへ移動
+first_page_label=最初のページへ移動
+last_page.title=最後のページへ移動
+last_page.label=最後のページへ移動
+last_page_label=最後のページへ移動
+page_rotate_cw.title=右回転
+page_rotate_cw.label=右回転
+page_rotate_cw_label=右回転
+page_rotate_ccw.title=左回転
+page_rotate_ccw.label=左回転
+page_rotate_ccw_label=左回転
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title={{page}} ページ
 # number.
 thumb_page_canvas=ページの縮小版 {{page}}
 
-# Context menu
-first_page.label=最初のページへ移動
-last_page.label=最後のページへ移動
-page_rotate_cw.label=右回転
-page_rotate_ccw.label=左回転
-
 # Find panel button title and messages
 find_label=検索:
 find_previous.title=指定文字列に一致する 1 つ前の部分を検索します

l10n/ko/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=축소
 zoom_in.title=확대
 zoom_in_label=확대
 zoom.title=확대 비율
-print.title=출력
-print_label=출력
 presentation_mode.title=프레젠테이션 모드로 전환
 presentation_mode_label=프레젠테이션 모드
 open_file.title=파일 열기
 open_file_label=열기
+print.title=출력
+print_label=출력
 download.title=내려받기
 download_label=내려받기
 bookmark.title=현 화면 (복사하거나 새 창에서 열기)
 bookmark_label=현 화면
 
+# Secondary toolbar and context menu
+first_page.title=첫 쪽으로
+first_page.label=첫 쪽으로
+first_page_label=첫 쪽으로
+last_page.title=끝 쪽으로
+last_page.label=끝 쪽으로
+last_page_label=끝 쪽으로
+page_rotate_cw.title=시계방향 회전
+page_rotate_cw.label=시계방향 회전
+page_rotate_cw_label=시계방향 회전
+page_rotate_ccw.title=반시계방향 회전
+page_rotate_ccw.label=반시계방향 회전
+page_rotate_ccw_label=반시계방향 회전
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title={{page}} 쪽
 # number.
 thumb_page_canvas={{page}}쪽의 썸네일
 
-# Context menu
-first_page.label=첫 쪽으로
-last_page.label=끝 쪽으로
-page_rotate_cw.label=시계방향 회전
-page_rotate_ccw.label=반시계방향 회전
-
 # Find panel button title and messages
 find_label=찾기:
 find_previous.title=이전 구절 찾기

l10n/lt/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Mažinti
 zoom_in.title=Didinti
 zoom_in_label=Didinti
 zoom.title=Mastelis
-print.title=Spausdinti
-print_label=Spausdinti
 presentation_mode.title=Įjungti pateikimo būseną
 presentation_mode_label=Pateikimo būsena
 open_file.title=Atverti bylą
 open_file_label=Atverti
+print.title=Spausdinti
+print_label=Spausdinti
 download.title=Atsiųsti
 download_label=Atsiųsti
 bookmark.title=Dabartinis rodymas (kopijuoti arba atidaryti naudojame lange)
 bookmark_label=Dabartinis rodymas
 
+# Secondary toolbar and context menu
+first_page.title=Nukreipimas į pirmą puslapį
+first_page.label=Nukreipimas į pirmą puslapį
+first_page_label=Nukreipimas į pirmą puslapį
+last_page.title=Nukreipimas į paskutinį puslapį
+last_page.label=Nukreipimas į paskutinį puslapį
+last_page_label=Nukreipimas į paskutinį puslapį
+page_rotate_cw.title=Sukimas pagal laikrodžio rodyklę
+page_rotate_cw.label=Sukimas pagal laikrodžio rodyklę
+page_rotate_cw_label=Sukimas pagal laikrodžio rodyklę
+page_rotate_ccw.title=Sukimas prieš laikrodžio rodyklę
+page_rotate_ccw.label=Sukimas prieš laikrodžio rodyklę
+page_rotate_ccw_label=Sukimas prieš laikrodžio rodyklę
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Puslapis {{page}}
 # number.
 thumb_page_canvas=Miniatūra iš {{page}} puslapio
 
-# Context menu
-first_page.label=Nukreipimas į pirmą puslapį
-last_page.label=Nukreipimas į paskutinį puslapį
-page_rotate_cw.label=Sukimas pagal laikrodžio rodyklę
-page_rotate_ccw.label=Sukimas prieš laikrodžio rodyklę
-
 # Find panel button title and messages
 find_label=Paieška:
 find_previous.title=Ankstesnis paieškos atitikmuo

l10n/nl/viewer.properties

@@ -30,17 +30,33 @@ zoom_out_label=Uitzoomen
 zoom_in.title=Inzoomen
 zoom_in_label=Inzoomen
 zoom.title=Zoomen
-print.title=Afdrukken
-print_label=Afdrukken
 presentation_mode.title=Omschakelen naar presentatiemodus
 presentation_mode_label=Presentatiemodus
 open_file.title=Bestand openen
-open_file_label=Openen
+open_file_label=Bestand openen
+print.title=Afdrukken
+print_label=Afdrukken
 download.title=Downloaden
 download_label=Downloaden
 bookmark.title=Huidige weergave (kopiëren of openen in nieuw venster)
 bookmark_label=Huidige weergave
 
+# Secondary toolbar and context menu
+tools.title=Hulpmiddelen
+tools_label=Hulpmiddelen
+first_page.title=Naar de eerste pagina gaan
+first_page.label=Naar de eerste pagina gaan
+first_page_label=Naar de eerste pagina gaan
+last_page.title=Naar de laatste pagina gaan
+last_page.label=Naar de laatste pagina gaan
+last_page_label=Naar de laatste pagina gaan
+page_rotate_cw.title=Met de klok mee roteren
+page_rotate_cw.label=Met de klok mee roteren
+page_rotate_cw_label=Met de klok mee roteren
+page_rotate_ccw.title=Tegen de klok in roteren
+page_rotate_ccw.label=Tegen de klok in roteren
+page_rotate_ccw_label=Tegen de klok in roteren
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +77,6 @@ thumb_page_title=Pagina {{page}}
 # number.
 thumb_page_canvas=Miniatuur van pagina {{page}}
 
-# Context menu
-first_page.label=Naar de eerste pagina gaan
-last_page.label=Naar de laatste pagina gaan
-page_rotate_cw.label=Met de klok mee roteren
-page_rotate_ccw.label=Tegen de klok in roteren
-
 # Find panel button title and messages
 find_label=Zoeken:
 find_previous.title=Het vorige voorkomen van de tekst zoeken

l10n/pl/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Pomniejsz
 zoom_in.title=Powiększ
 zoom_in_label=Powiększ
 zoom.title=Powiększenie
-print.title=Drukuj
-print_label=Drukuj
 presentation_mode.title=Przełącz do trybu prezentacji
 presentation_mode_label=Tryb prezentacji
 open_file.title=Otwórz plik
 open_file_label=Otwórz
+print.title=Drukuj
+print_label=Drukuj
 download.title=Pobierz
 download_label=Pobierz
 bookmark.title=Aktualny widok (kopiuj lub otwórz w nowym oknie)
 bookmark_label=Aktualny widok
 
+# Secondary toolbar and context menu
+first_page.title=Idź do pierwszej strony
+first_page.label=Idź do pierwszej strony
+first_page_label=Idź do pierwszej strony
+last_page.title=Idź do ostatniej strony
+last_page.label=Idź do ostatniej strony
+last_page_label=Idź do ostatniej strony
+page_rotate_cw.title=Obróć w prawo
+page_rotate_cw.label=Obróć w prawo
+page_rotate_cw_label=Obróć w prawo
+page_rotate_ccw.title=Obróć w lewo
+page_rotate_ccw.label=Obróć w lewo
+page_rotate_ccw_label=Obróć w lewo
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Strona {{page}}
 # number.
 thumb_page_canvas=Miniatura strony {{page}}
 
-# Context menu
-first_page.label=Idź do pierwszej strony
-last_page.label=Idź do ostatniej strony
-page_rotate_cw.label=Obróć w prawo
-page_rotate_ccw.label=Obróć w lewo
-
 # Find panel button title and messages
 find_label=Znajdź:
 find_previous.title=Znajdź poprzednie wystąpienie ostatnio szukanej frazy

l10n/sv/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Zooma ut
 zoom_in.title=Zooma in
 zoom_in_label=Zooma in
 zoom.title=Zooma
-print.title=Skriv ut
-print_label=Skriv ut
 presentation_mode.title=Presentationsläge
 presentation_mode_label=Presentationsläge
 open_file.title=Öppna fil
 open_file_label=Öppna
+print.title=Skriv ut
+print_label=Skriv ut
 download.title=Ladda ner
 download_label=Ladda ner
 bookmark.title=Aktuell vy (kopiera eller öppna i nytt fönster)
 bookmark_label=Aktuell vy
 
+# Secondary toolbar and context menu
+first_page.title=Gå till första sidan
+first_page.label=Gå till första sidan
+first_page_label=Gå till första sidan
+last_page.title=Gå till sista sidan
+last_page.label=Gå till sista sidan
+last_page_label=Gå till sista sidan
+page_rotate_cw.title=Rotera medurs
+page_rotate_cw.label=Rotera medurs
+page_rotate_cw_label=Rotera medurs
+page_rotate_ccw.title=Rotera moturs
+page_rotate_ccw.label=Rotera moturs
+page_rotate_ccw_label=Rotera moturs
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Sida {{page}}
 # number.
 thumb_page_canvas=Miniatyr av sida {{page}}
 
-# Context menu
-first_page.label=Gå till första sidan
-last_page.label=Gå till sista sidan
-page_rotate_cw.label=Rotera medurs
-page_rotate_ccw.label=Rotera moturs
-
 # Find panel button title and messages
 find_label=Sök:
 find_previous.title=Hitta föregående förekomst av frasen

l10n/tr/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Uzaklaş
 zoom_in.title=Yakınlaş
 zoom_in_label=Yakınlaş
 zoom.title=Yakınlaştır
-print.title=Yazdır
-print_label=Yazdır
 presentation_mode.title=Sunum moduna geçiş yap
 presentation_mode_label=Sunum Modu
 open_file.title=Dosya Aç
 open_file_label=Aç
+print.title=Yazdır
+print_label=Yazdır
 download.title=İndir
 download_label=İndir
 bookmark.title=Mevcut görünüm (kopyala yada yeni sayfada aç)
 bookmark_label=Mevcut Görünüm
 
+# Secondary toolbar and context menu
+first_page.title=İlk Sayfaya Git
+first_page.label=İlk Sayfaya Git
+first_page_label=İlk Sayfaya Git
+last_page.title=Son Sayfaya Git
+last_page.label=Son Sayfaya Git
+last_page_label=Son Sayfaya Git
+page_rotate_cw.title=Sağa Çevir
+page_rotate_cw.label=Sağa Çevir
+page_rotate_cw_label=Sağa Çevir
+page_rotate_ccw.title=Sola Çevir
+page_rotate_ccw.label=Sola Çevir
+page_rotate_ccw_label=Sola Çevir
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Sayfa {{page}}
 # number.
 thumb_page_canvas={{page}} sayfasının ön izlemesi
 
-# Context menu
-first_page.label=İlk Sayfaya Git
-last_page.label=Son Sayfaya Git
-page_rotate_cw.label=Sağa Çevir
-page_rotate_ccw.label=Sola Çevir
-
 # Find panel button title and messages
 find_label=Bul:
 find_previous.title=Önceki cümleyi bul

l10n/vi/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=Phóng to
 zoom_in.title=Thu nhỏ
 zoom_in_label=Thu nhỏ
 zoom.title=Thu phóng
-print.title=In
-print_label=In
 presentation_mode.title=Chuyển sang chế độ thuyết trình
 presentation_mode_label=Chế độ Thuyết trình
 open_file.title=Mở Tệp
 open_file_label=Tệp
+print.title=In
+print_label=In
 download.title=Tải xuống
 download_label=Tải xuống
 bookmark.title=Đánh dấu (sao chép hoặc mở cửa sổ mới)
 bookmark_label=Đánh dấu
 
+# Secondary toolbar and context menu
+first_page.title=Đến trang đầu tiên
+first_page.label=Đến trang đầu tiên
+first_page_label=Đến trang đầu tiên
+last_page.title=Đến trang cuối cùng
+last_page.label=Đến trang cuối cùng
+last_page_label=Đến trang cuối cùng
+page_rotate_cw.title=Quay sang phải
+page_rotate_cw.label=Quay sang phải
+page_rotate_cw_label=Quay sang phải
+page_rotate_ccw.title=Quay sang trái
+page_rotate_ccw.label=Quay sang trái
+page_rotate_ccw_label=Quay sang trái
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=Page {{page}}
 # number.
 thumb_page_canvas=Thumbnail of Page {{page}}
 
-# Context menu
-first_page.label=Đến trang đầu tiên
-last_page.label=Đến trang cuối cùng
-page_rotate_cw.label=Quay sang phải
-page_rotate_ccw.label=Quay sang trái
-
 # Find panel button title and messages
 find_label=Tìm:
 find_previous.title=Tìm kiếm câu xuất hiện phía trước

l10n/zh-CN/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=缩小
 zoom_in.title=放大
 zoom_in_label=放大
 zoom.title=缩放
-print.title=打印
-print_label=打印
 presentation_mode.title=切换至幻灯模式
 presentation_mode_label=幻灯模式
 open_file.title=打开文件
 open_file_label=打开
+print.title=打印
+print_label=打印
 download.title=下载
 download_label=下载
 bookmark.title=当前视图（复制或在新窗口中打开）
 bookmark_label=当前视图
 
+# Secondary toolbar and context menu
+first_page.title=转到第一页
+first_page.label=转到第一页
+first_page_label=转到第一页
+last_page.title=转到结尾页
+last_page.label=转到结尾页
+last_page_label=转到结尾页
+page_rotate_cw.title=顺时针旋转
+page_rotate_cw.label=顺时针旋转
+page_rotate_cw_label=顺时针旋转
+page_rotate_ccw.title=逆时针旋转
+page_rotate_ccw.label=逆时针旋转
+page_rotate_ccw_label=逆时针旋转
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=页码 {{page}}
 # number.
 thumb_page_canvas=页面 {{page}} 的缩略图
 
-# Context menu
-first_page.label=转到第一页
-last_page.label=转到结尾页
-page_rotate_cw.label=顺时针旋转
-page_rotate_ccw.label=逆时针旋转
-
 # Find panel button title and messages
 find_label=查找:
 find_previous.title=查找该短语上一次出现的位置

l10n/zh-TW/viewer.properties

@@ -30,17 +30,31 @@ zoom_out_label=縮小
 zoom_in.title=放大
 zoom_in_label=放大
 zoom.title=縮放
-print.title=列印
-print_label=列印
 presentation_mode.title=切換至簡報模式
 presentation_mode_label=簡報模式
 open_file.title=開啟檔案
 open_file_label=開啟
+print.title=列印
+print_label=列印
 download.title=下載
 download_label=下載
 bookmark.title=目前檢視的內容（複製或開啟於新視窗）
 bookmark_label=目前檢視
 
+# Secondary toolbar and context menu
+first_page.title=跳到第一頁
+first_page.label=跳到第一頁
+first_page_label=跳到第一頁
+last_page.title=跳到最後一頁
+last_page.label=跳到最後一頁
+last_page_label=跳到最後一頁
+page_rotate_cw.title=順時針旋轉
+page_rotate_cw.label=順時針旋轉
+page_rotate_cw_label=順時針旋轉
+page_rotate_ccw.title=逆時針旋轉
+page_rotate_ccw.label=逆時針旋轉
+page_rotate_ccw_label=逆時針旋轉
+
 # Tooltips and alt text for side panel toolbar buttons
 # (the _label strings are alt text for the buttons, the .title strings are
 # tooltips)
@@ -61,12 +75,6 @@ thumb_page_title=頁 {{page}}
 # number.
 thumb_page_canvas=頁 {{page}} 的縮圖
 
-# Context menu
-first_page.label=跳到第一頁
-last_page.label=跳到最後一頁
-page_rotate_cw.label=順時針旋轉
-page_rotate_ccw.label=逆時針旋轉
-
 # Find panel button title and messages
 find_label=尋找:
 find_previous.title=尋找文字前次出現的位置
@@ -122,4 +130,3 @@ printing_not_supported=警告: 此瀏覽器未完整支援列印功能。
 printing_not_ready=警告: 此 PDF 未完成下載以供列印。
 web_fonts_disabled=已停用網路字型 (Web fonts): 無法使用 PDF 內嵌字型。
 document_colors_disabled=瀏覽器的「優先使用網頁指定的色彩」未被勾選，PDF 文件無法使用自己的色彩。
-

web/secondary_toolbar.js

@@ -0,0 +1,139 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
+/* Copyright 2012 Mozilla Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* globals PDFView, SCROLLBAR_PADDING */
+
+'use strict';
+
+var SecondaryToolbar = {
+  opened: false,
+  previousContainerHeight: null,
+  newContainerHeight: null,
+
+  initialize: function secondaryToolbarInitialize(options) {
+    this.toolbar = options.toolbar;
+    this.toggleButton = options.toggleButton;
+
+    this.buttonContainer = this.toolbar.firstElementChild;
+
+    // Define the toolbar buttons.
+    this.presentationMode = options.presentationMode;
+    this.openFile = options.openFile;
+    this.print = options.print;
+    this.download = options.download;
+    this.firstPage = options.firstPage;
+    this.lastPage = options.lastPage;
+    this.pageRotateCw = options.pageRotateCw;
+    this.pageRotateCcw = options.pageRotateCcw;
+
+    // Attach the event listeners.
+    this.toggleButton.addEventListener('click', this.toggle.bind(this));
+
+    this.presentationMode.addEventListener('click',
+      this.presentationModeClick.bind(this));
+    this.openFile.addEventListener('click', this.openFileClick.bind(this));
+    this.print.addEventListener('click', this.printClick.bind(this));
+    this.download.addEventListener('click', this.downloadClick.bind(this));
+
+    this.firstPage.addEventListener('click', this.firstPageClick.bind(this));
+    this.lastPage.addEventListener('click', this.lastPageClick.bind(this));
+
+    this.pageRotateCw.addEventListener('click',
+      this.pageRotateCwClick.bind(this));
+    this.pageRotateCcw.addEventListener('click',
+      this.pageRotateCcwClick.bind(this));
+  },
+
+  // Event handling functions.
+  presentationModeClick: function secondaryToolbarPresentationModeClick(evt) {
+    PDFView.presentationMode();
+    this.close();
+  },
+
+  openFileClick: function secondaryToolbarOpenFileClick(evt) {
+    document.getElementById('fileInput').click();
+    this.close(evt.target);
+  },
+
+  printClick: function secondaryToolbarPrintClick(evt) {
+    window.print();
+    this.close(evt.target);
+  },
+
+  downloadClick: function secondaryToolbarDownloadClick(evt) {
+    PDFView.download();
+    this.close(evt.target);
+  },
+
+  firstPageClick: function secondaryToolbarFirstPageClick(evt) {
+    PDFView.page = 1;
+  },
+
+  lastPageClick: function secondaryToolbarLastPageClick(evt) {
+    PDFView.page = PDFView.pdfDocument.numPages;
+  },
+
+  pageRotateCwClick: function secondaryToolbarPageRotateCwClick(evt) {
+    PDFView.rotatePages(90);
+  },
+
+  pageRotateCcwClick: function secondaryToolbarPageRotateCcwClick(evt) {
+    PDFView.rotatePages(-90);
+  },
+
+  // Misc. functions for interacting with the toolbar.
+  setMaxHeight: function secondaryToolbarSetMaxHeight(container) {
+    this.newContainerHeight = container.clientHeight;
+    if (this.previousContainerHeight === this.newContainerHeight) {
+      return;
+    }
+    this.buttonContainer.setAttribute('style',
+      'max-height: ' + (this.newContainerHeight - SCROLLBAR_PADDING) + 'px;');
+    this.previousContainerHeight = this.newContainerHeight;
+  },
+
+  open: function secondaryToolbarOpen() {
+    if (this.opened) {
+      return;
+    }
+    this.opened = true;
+    this.toggleButton.classList.add('toggled');
+    this.toolbar.classList.remove('hidden');
+  },
+
+  close: function secondaryToolbarClose(target) {
+    if (!this.opened) {
+      return;
+    } else if (target && !this.toolbar.contains(target)) {
+      return;
+    }
+    this.opened = false;
+    this.toolbar.classList.add('hidden');
+    this.toggleButton.classList.remove('toggled');
+  },
+
+  toggle: function secondaryToolbarToggle() {
+    if (this.opened) {
+      this.close();
+    } else {
+      this.open();
+    }
+  },
+
+  get isOpen() {
+    return this.opened;
+  }
+};

web/viewer.css

@@ -36,7 +36,7 @@ select {
 }
 
 .hidden {
-  display: none;
+  display: none !important;
 }
 [hidden] {
   display: none !important;
@@ -75,7 +75,6 @@ select {
   cursor: none;
 }
 
-
 :-webkit-full-screen .page {
   margin-bottom: 100%;
 }
@@ -241,7 +240,7 @@ html[dir='rtl'] #sidebarContent {
               0 0 1px hsla(0,0%,0%,.1);
 }
 
-#toolbarContainer, .findbar {
+#toolbarContainer, .findbar, .secondaryToolbar {
   position: relative;
   height: 32px;
   background-color: #474747; /* fallback */
@@ -311,7 +310,7 @@ html[dir='rtl'] #sidebarContent {
   animation: progressIndeterminate 2s linear infinite;
 }
 
-.findbar {
+.findbar, .secondaryToolbar {
   top: 32px;
   position: absolute;
   z-index: 10000;
@@ -346,12 +345,32 @@ html[dir='rtl'] .findbar {
   background-position: right;
 }
 
-.doorHanger {
+.secondaryToolbar {
+  padding: 6px;
+  height: auto;
+  z-index: 30000;
+}
+html[dir='ltr'] .secondaryToolbar {
+  right: 4px;
+}
+html[dir='rtl'] .secondaryToolbar {
+  left: 4px;
+}
+
+#secondaryToolbarButtonContainer {
+  max-width: 200px;
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.doorHanger,
+.doorHangerRight {
   border: 1px solid hsla(0,0%,0%,.5);
   border-radius: 2px;
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
 }
-.doorHanger:after, .doorHanger:before {
+.doorHanger:after, .doorHanger:before,
+.doorHangerRight:after, .doorHangerRight:before {
   bottom: 100%;
   border: solid transparent;
   content: " ";
@@ -360,31 +379,37 @@ html[dir='rtl'] .findbar {
   position: absolute;
   pointer-events: none;
 }
-.doorHanger:after {
+.doorHanger:after,
+.doorHangerRight:after {
   border-bottom-color: hsla(0,0%,32%,.99);
   border-width: 8px;
 }
-.doorHanger:before {
+.doorHanger:before,
+.doorHangerRight:before {
   border-bottom-color: hsla(0,0%,0%,.5);
   border-width: 9px;
 }
 
-html[dir='ltr'] .doorHanger:after {
+html[dir='ltr'] .doorHanger:after,
+html[dir='rtl'] .doorHangerRight:after {
   left: 13px;
   margin-left: -8px;
 }
 
-html[dir='ltr'] .doorHanger:before {
+html[dir='ltr'] .doorHanger:before,
+html[dir='rtl'] .doorHangerRight:before {
   left: 13px;
   margin-left: -9px;
 }
 
-html[dir='rtl'] .doorHanger:after {
+html[dir='rtl'] .doorHanger:after,
+html[dir='ltr'] .doorHangerRight:after {
   right: 13px;
   margin-right: -8px;
 }
 
-html[dir='rtl'] .doorHanger:before {
+html[dir='rtl'] .doorHanger:before,
+html[dir='ltr'] .doorHangerRight:before {
   right: 13px;
   margin-right: -9px;
 }
@@ -450,7 +475,8 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton {
   float: right;
 }
 
-.toolbarButton {
+.toolbarButton,
+.secondaryToolbarButton {
   border: 0 none;
   background-color: rgba(0, 0, 0, 0);
   width: 32px;
@@ -464,7 +490,8 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton {
   overflow: hidden;
 }
 
-.toolbarButton[disabled] {
+.toolbarButton[disabled],
+.secondaryToolbarButton[disabled] {
   opacity: .5;
 }
 
@@ -528,7 +555,7 @@ html[dir='rtl'] .splitToolbarButton > .toolbarButton:first-child {
 .splitToolbarButtonSeparator {
   padding: 8px 0;
   width: 1px;
-  background-color: hsla(0,0%,00%,.5);
+  background-color: hsla(0,0%,0%,.5);
   z-index: 99;
   box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
   display: inline-block;
@@ -554,12 +581,13 @@ html[dir='rtl'] .splitToolbarButtonSeparator {
 }
 
 .toolbarButton,
-.dropdownToolbarButton {
+.dropdownToolbarButton,
+.secondaryToolbarButton {
   min-width: 16px;
   padding: 2px 6px 0;
   border: 1px solid transparent;
   border-radius: 2px;
-  color: hsl(0,0%,95%);
+  color: hsla(0,0%,100%,.8);
   font-size: 12px;
   line-height: 14px;
   -webkit-user-select: none;
@@ -586,7 +614,9 @@ html[dir='rtl'] .dropdownToolbarButton {
 
 .toolbarButton:hover,
 .toolbarButton:focus,
-.dropdownToolbarButton {
+.dropdownToolbarButton,
+.secondaryToolbarButton:hover,
+.secondaryToolbarButton:focus {
   background-color: hsla(0,0%,0%,.12);
   background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
   background-clip: padding-box;
@@ -598,7 +628,8 @@ html[dir='rtl'] .dropdownToolbarButton {
 }
 
 .toolbarButton:hover:active,
-.dropdownToolbarButton:hover:active {
+.dropdownToolbarButton:hover:active,
+.secondaryToolbarButton:hover:active {
   background-color: hsla(0,0%,0%,.2);
   background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
   border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.4) hsla(0,0%,0%,.45);
@@ -614,7 +645,8 @@ html[dir='rtl'] .dropdownToolbarButton {
 }
 
 .toolbarButton.toggled,
-.splitToolbarButton.toggled > .toolbarButton.toggled {
+.splitToolbarButton.toggled > .toolbarButton.toggled,
+.secondaryToolbarButton.toggled {
   background-color: hsla(0,0%,0%,.3);
   background-image: linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));
   border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.45) hsla(0,0%,0%,.5);
@@ -630,7 +662,8 @@ html[dir='rtl'] .dropdownToolbarButton {
 }
 
 .toolbarButton.toggled:hover:active,
-.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active {
+.splitToolbarButton.toggled > .toolbarButton.toggled:hover:active,
+.secondaryToolbarButton.toggled:hover:active {
   background-color: hsla(0,0%,0%,.4);
   border-color: hsla(0,0%,0%,.4) hsla(0,0%,0%,.5) hsla(0,0%,0%,.55);
   box-shadow: 0 1px 1px hsla(0,0%,0%,.2) inset,
@@ -701,11 +734,6 @@ html[dir='rtl'] .toolbarButton:first-child {
   min-width: 30px;
 }
 
-.toolbarButton#sidebarToggle::before {
-  display: inline-block;
-  content: url(images/toolbarButton-sidebarToggle.png);
-}
-
 html[dir='ltr'] #findPrevious {
   margin-left: 3px;
 }
@@ -719,83 +747,96 @@ html[dir='rtl'] #findPrevious {
 html[dir='rtl'] #findNext {
   margin-left: 3px;
 }
-.toolbarButton::before {
+
+.toolbarButton::before,
+.secondaryToolbarButton::before {
   /* All matching images have a size of 16x16
    * (except for the print button: 18x16)
    * All relevant containers have a size of 32x25 */
   position: absolute;
+  display: inline-block;
   top: 4px;
   left: 7px;
 }
+html[dir="ltr"] .secondaryToolbarButton::before {
+  left: 4px;
+}
+html[dir="rtl"] .secondaryToolbarButton::before {
+  right: 4px;
+}
+
+.toolbarButton#sidebarToggle::before {
+  content: url(images/toolbarButton-sidebarToggle.png);
+}
+
+.toolbarButton#secondaryToolbarToggle::before {
+  content: url(images/toolbarButton-secondaryToolbarToggle.png);
+}
 
 html[dir='ltr'] .toolbarButton.findPrevious::before {
-  display: inline-block;
   content: url(images/findbarButton-previous.png);
 }
 
 html[dir='rtl'] .toolbarButton.findPrevious::before {
-  display: inline-block;
   content: url(images/findbarButton-previous-rtl.png);
 }
 
 html[dir='ltr'] .toolbarButton.findNext::before {
-  display: inline-block;
   content: url(images/findbarButton-next.png);
 }
 
 html[dir='rtl'] .toolbarButton.findNext::before {
-  display: inline-block;
   content: url(images/findbarButton-next-rtl.png);
 }
 
 html[dir='ltr'] .toolbarButton.pageUp::before {
-  display: inline-block;
   content: url(images/toolbarButton-pageUp.png);
 }
 
 html[dir='rtl'] .toolbarButton.pageUp::before {
-  display: inline-block;
   content: url(images/toolbarButton-pageUp-rtl.png);
 }
 
 html[dir='ltr'] .toolbarButton.pageDown::before {
-  display: inline-block;
   content: url(images/toolbarButton-pageDown.png);
 }
 
 html[dir='rtl'] .toolbarButton.pageDown::before {
-  display: inline-block;
   content: url(images/toolbarButton-pageDown-rtl.png);
 }
 
 .toolbarButton.zoomOut::before {
-  display: inline-block;
   content: url(images/toolbarButton-zoomOut.png);
 }
 
 .toolbarButton.zoomIn::before {
-  display: inline-block;
   content: url(images/toolbarButton-zoomIn.png);
 }
 
-.toolbarButton.presentationMode::before {
-  display: inline-block;
+.toolbarButton.presentationMode::before,
+.secondaryToolbarButton.presentationMode::before {
   content: url(images/toolbarButton-presentationMode.png);
 }
 
-.toolbarButton.print::before {
-  display: inline-block;
+.toolbarButton.print::before,
+.secondaryToolbarButton.print::before {
   content: url(images/toolbarButton-print.png);
   left: 6px;
 }
+html[dir="ltr"] .secondaryToolbarButton.print::before {
+  left: 3px;
+}
+html[dir="rtl"] .secondaryToolbarButton.print::before {
+  right: 3px;
+}
 
-.toolbarButton.openFile::before {
-  display: inline-block;
+.toolbarButton.openFile::before,
+.secondaryToolbarButton.openFile::before {
   content: url(images/toolbarButton-openFile.png);
 }
 
-.toolbarButton.download::before {
-  display: inline-block;
+.toolbarButton.download::before,
+.secondaryToolbarButton.download::before {
   content: url(images/toolbarButton-download.png);
 }
 
@@ -817,20 +858,86 @@ html[dir='rtl'] .toolbarButton.pageDown::before {
 }
 
 #viewThumbnail.toolbarButton::before {
-  display: inline-block;
   content: url(images/toolbarButton-viewThumbnail.png);
 }
 
 #viewOutline.toolbarButton::before {
-  display: inline-block;
   content: url(images/toolbarButton-viewOutline.png);
 }
 
 #viewFind.toolbarButton::before {
-  display: inline-block;
   content: url(images/toolbarButton-search.png);
 }
 
+.secondaryToolbarButton {
+  position: relative;
+  margin: 0 0 4px 0;
+  padding: 3px 0 1px 0;
+  height: auto;
+  min-height: 25px;
+  width: auto;
+  min-width: 100%;
+  white-space: normal;
+}
+html[dir="ltr"] .secondaryToolbarButton {
+  padding-left: 24px;
+  text-align: left;
+}
+html[dir="rtl"] .secondaryToolbarButton {
+  padding-right: 24px;
+  text-align: right;
+}
+
+#secondaryToolbarButtonContainer :last-child {
+  margin-bottom: 0;
+}
+
+html[dir="ltr"] .secondaryToolbarButton > span {
+  padding-right: 4px;
+}
+html[dir="rtl"] .secondaryToolbarButton > span {
+  padding-left: 4px;
+}
+
+.secondaryToolbarButton.firstPage::before {
+  content: url(images/secondaryToolbarButton-firstPage.png);
+}
+
+.secondaryToolbarButton.lastPage::before {
+  content: url(images/secondaryToolbarButton-lastPage.png);
+}
+
+.secondaryToolbarButton.rotateCcw::before {
+  content: url(images/secondaryToolbarButton-rotateCcw.png);
+}
+
+.secondaryToolbarButton.rotateCw::before {
+  content: url(images/secondaryToolbarButton-rotateCw.png);
+}
+
+.verticalToolbarSeparator {
+  display: block;
+  padding: 8px 0;
+  margin: 8px 4px;
+  width: 1px;
+  background-color: hsla(0,0%,0%,.5);
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+}
+html[dir='ltr'] .verticalToolbarSeparator {
+  margin-left: 2px;
+}
+html[dir='rtl'] .verticalToolbarSeparator {
+  margin-right: 2px;
+}
+
+.horizontalToolbarSeparator {
+  display: block; 
+  margin: 0 0 4px 0;
+  height: 1px;
+  width: 100%;
+  background-color: hsla(0,0%,0%,.5);
+  box-shadow: 0 0 0 1px hsla(0,0%,100%,.08);
+}
 
 .toolbarField {
   padding: 3px 6px;
@@ -1276,7 +1383,7 @@ canvas {
   }
 
   /* Rules for browsers that don't support mozPrintCallback. */
-  #sidebarContainer, .toolbar, #loadingBox, #errorWrapper, .textLayer {
+  #sidebarContainer, #secondaryToolbar, .toolbar, #loadingBox, #errorWrapper, .textLayer {
     display: none;
   }
   #viewerContainer {
@@ -1314,16 +1421,40 @@ canvas {
   }
 }
 
-@media all and (max-width: 950px) {
+.visibleLargeView,
+.visibleMediumView,
+.visibleSmallView {
+  display: none;
+}
+
+@media all and (max-width: 960px) {
   html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
   html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter {
     float: left;
-    left: 180px;
+    left: 185px;
   }
   html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
   html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter {
     float: right;
-    right: 180px;
+    right: 185px;
+  }
+}
+
+@media all and (max-width: 900px) {
+  .sidebarOpen .hiddenLargeView {
+    display: none;
+  }
+  .sidebarOpen .visibleLargeView {
+    display: inherit;
+  }
+}
+
+@media all and (max-width: 860px) {
+  .sidebarOpen .hiddenMediumView {
+    display: none;
+  }
+  .sidebarOpen .visibleMediumView {
+    display: inherit;
   }
 }
 
@@ -1349,11 +1480,38 @@ canvas {
 
   html[dir='ltr'] .outerCenter {
     float: left;
-    left: 180px;
+    left: 185px;
   }
   html[dir='rtl'] .outerCenter {
     float: right;
-    right: 180px;
+    right: 185px;
+  }
+
+  #outerContainer .hiddenLargeView,
+  #outerContainer .hiddenMediumView {
+    display: inherit;
+  }
+  #outerContainer .visibleLargeView,
+  #outerContainer .visibleMediumView {
+    display: none;
+  }
+}
+
+@media all and (max-width: 700px) {
+  #outerContainer .hiddenLargeView {
+    display: none;
+  }
+  #outerContainer .visibleLargeView {
+    display: inherit;
+  }
+}
+
+@media all and (max-width: 660px) {
+  #outerContainer .hiddenMediumView {
+    display: none;
+  }
+  #outerContainer .visibleMediumView {
+    display: inherit;
   }
 }
 
@@ -1361,10 +1519,17 @@ canvas {
   .hiddenSmallView {
     display: none;
   }
+  .visibleSmallView {
+    display: inherit;
+  }
+  html[dir='ltr'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='ltr'] #outerContainer.sidebarOpen .outerCenter,
   html[dir='ltr'] .outerCenter {
     left: 156px;
   }
-  html[dir='rtr'] .outerCenter {
+  html[dir='rtl'] #outerContainer.sidebarMoving .outerCenter,
+  html[dir='rtl'] #outerContainer.sidebarOpen .outerCenter,
+  html[dir='rtl'] .outerCenter {
     right: 156px;
   }
   .toolbarButtonSpacer {
@@ -1372,7 +1537,7 @@ canvas {
   }
 }
 
-@media all and (max-width: 500px) {
+@media all and (max-width: 510px) {
   #scaleSelectContainer, #pageNumberLabel {
     display: none;
   }

web/viewer.html

@@ -65,6 +65,7 @@ limitations under the License.
     <script type="text/javascript" src="pdf_find_bar.js"></script>
     <script type="text/javascript" src="pdf_find_controller.js"></script>
     <script type="text/javascript" src="pdf_history.js"></script>
+    <script type="text/javascript" src="secondary_toolbar.js"></script> 
 <!--#endif-->
 
     <script type="text/javascript" src="debugger.js"></script>
@@ -97,22 +98,61 @@ limitations under the License.
       <div id="mainContainer">
         <div class="findbar hidden doorHanger hiddenSmallView" id="findbar">
           <label for="findInput" class="toolbarLabel" data-l10n-id="find_label">Find:</label>
-          <input id="findInput" class="toolbarField" tabindex="21">
+          <input id="findInput" class="toolbarField" tabindex="41">
           <div class="splitToolbarButton">
-            <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="22" data-l10n-id="find_previous">
+            <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="42" data-l10n-id="find_previous">
               <span data-l10n-id="find_previous_label">Previous</span>
             </button>
             <div class="splitToolbarButtonSeparator"></div>
-            <button class="toolbarButton findNext" title="" id="findNext" tabindex="23" data-l10n-id="find_next">
+            <button class="toolbarButton findNext" title="" id="findNext" tabindex="43" data-l10n-id="find_next">
               <span data-l10n-id="find_next_label">Next</span>
             </button>
           </div>
           <input type="checkbox" id="findHighlightAll" class="toolbarField">
-          <label for="findHighlightAll" class="toolbarLabel" tabindex="24" data-l10n-id="find_highlight">Highlight all</label>
+          <label for="findHighlightAll" class="toolbarLabel" tabindex="44" data-l10n-id="find_highlight">Highlight all</label>
           <input type="checkbox" id="findMatchCase" class="toolbarField">
-          <label for="findMatchCase" class="toolbarLabel" tabindex="25" data-l10n-id="find_match_case_label">Match case</label>
+          <label for="findMatchCase" class="toolbarLabel" tabindex="45" data-l10n-id="find_match_case_label">Match case</label>
           <span id="findMsg" class="toolbarLabel"></span>
-        </div>
+        </div>  <!-- findbar -->
+
+        <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
+          <div id="secondaryToolbarButtonContainer">
+            <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="18" data-l10n-id="presentation_mode">
+              <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+            </button>
+
+            <button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="19" data-l10n-id="open_file">
+              <span data-l10n-id="open_file_label">Open</span>
+            </button>
+
+            <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="20" data-l10n-id="print">
+              <span data-l10n-id="print_label">Print</span>
+            </button>
+
+            <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="21" data-l10n-id="download">
+              <span data-l10n-id="download_label">Download</span>
+            </button>
+
+            <div class="horizontalToolbarSeparator visibleLargeView"></div>
+
+            <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="22" data-l10n-id="first_page">
+              <span data-l10n-id="first_page_label">Go to First Page</span>
+            </button>
+            <button id="lastPage" class="secondaryToolbarButton lastPage" title="Go to Last Page" tabindex="23" data-l10n-id="last_page">
+              <span data-l10n-id="last_page_label">Go to Last Page</span>
+            </button>
+
+            <div class="horizontalToolbarSeparator"></div>
+
+            <button id="pageRotateCw" class="secondaryToolbarButton rotateCw" title="Rotate Clockwise" tabindex="24" data-l10n-id="page_rotate_cw">
+              <span data-l10n-id="page_rotate_cw_label">Rotate Clockwise</span>
+            </button>
+            <button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise" tabindex="25" data-l10n-id="page_rotate_ccw">
+              <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
+            </button>
+          </div>
+        </div>  <!-- secondaryToolbar -->
+
         <div class="toolbar">
           <div id="toolbarContainer">
             <div id="toolbarViewer">
@@ -139,23 +179,29 @@ limitations under the License.
                 <span id="numPages" class="toolbarLabel"></span>
               </div>
               <div id="toolbarViewerRight">
-                <button id="presentationMode" class="toolbarButton presentationMode hiddenSmallView" title="Switch to Presentation Mode" tabindex="12" data-l10n-id="presentation_mode">
+                <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="12" data-l10n-id="presentation_mode">
                   <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
                 </button>
 
-                <button id="openFile" class="toolbarButton openFile hiddenSmallView" title="Open File" tabindex="13" data-l10n-id="open_file">
-                   <span data-l10n-id="open_file_label">Open</span>
+                <button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="13" data-l10n-id="open_file">
+                  <span data-l10n-id="open_file_label">Open</span>
                 </button>
 
-                <button id="print" class="toolbarButton print" title="Print" tabindex="14" data-l10n-id="print">
+                <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="14" data-l10n-id="print">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
 
-                <button id="download" class="toolbarButton download" title="Download" tabindex="15" data-l10n-id="download">
+                <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="15" data-l10n-id="download">
                   <span data-l10n-id="download_label">Download</span>
                 </button>
                 <!-- <div class="toolbarButtonSpacer"></div> -->
                 <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="16" data-l10n-id="bookmark"><span data-l10n-id="bookmark_label">Current View</span></a>
+
+                <div class="verticalToolbarSeparator hiddenSmallView"></div>
+                
+                <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="17" data-l10n-id="tools">
+                  <span data-l10n-id="tools_label">Tools</span>
+                </button> 
               </div>
               <div class="outerCenter">
                 <div class="innerCenter" id="toolbarViewerMiddle">
@@ -196,14 +242,14 @@ limitations under the License.
         </div>
 
         <menu type="context" id="viewerContextMenu">
-          <menuitem id="firstPage" label="First Page"
-                    data-l10n-id="first_page" ></menuitem>
-          <menuitem id="lastPage" label="Last Page"
-                    data-l10n-id="last_page" ></menuitem>
-          <menuitem id="pageRotateCcw" label="Rotate Counter-Clockwise"
-                    data-l10n-id="page_rotate_ccw" ></menuitem>
-          <menuitem id="pageRotateCw" label="Rotate Clockwise"
-                    data-l10n-id="page_rotate_cw" ></menuitem>
+          <menuitem id="contextFirstPage" label="First Page"
+                    data-l10n-id="first_page"></menuitem>
+          <menuitem id="contextLastPage" label="Last Page"
+                    data-l10n-id="last_page"></menuitem>
+          <menuitem id="contextPageRotateCw" label="Rotate Clockwise"
+                    data-l10n-id="page_rotate_cw"></menuitem>
+          <menuitem id="contextPageRotateCcw" label="Rotate Counter-Clockwise"
+                    data-l10n-id="page_rotate_ccw"></menuitem>
         </menu>
 
 <!--#if (FIREFOX || MOZCENTRAL) -->
@@ -211,7 +257,7 @@ limitations under the License.
 <!--#else -->
         <div id="viewerContainer" tabindex="0">
 <!--#endif -->
-          <div id="viewer" contextmenu="viewerContextMenu"></div>
+          <div id="viewer"></div>
         </div>
 
         <div id="errorWrapper" hidden='true'>

web/viewer.js

@@ -17,7 +17,7 @@
 /* globals PDFJS, PDFBug, FirefoxCom, Stats, Cache, PDFFindBar, CustomStyle,
            PDFFindController, ProgressBar, TextLayerBuilder, DownloadManager,
            getFileName, getOutputScale, scrollIntoView, getPDFFileNameFromURL,
-           PDFHistory, ThumbnailView, noContextMenuHandler */
+           PDFHistory, ThumbnailView, noContextMenuHandler, SecondaryToolbar */
 
 'use strict';
 
@@ -167,6 +167,7 @@ var currentPageNumber = 1;
 //#include pdf_find_bar.js
 //#include pdf_find_controller.js
 //#include pdf_history.js
+//#include secondary_toolbar.js
 
 var PDFView = {
   pages: [],
@@ -204,21 +205,34 @@ var PDFView = {
     this.watchScroll(thumbnailContainer, this.thumbnailViewScroll,
                      this.renderHighestPriority.bind(this));
 
+    SecondaryToolbar.initialize({
+      toolbar: document.getElementById('secondaryToolbar'),
+      toggleButton: document.getElementById('secondaryToolbarToggle'),
+      presentationMode: document.getElementById('secondaryPresentationMode'),
+      openFile: document.getElementById('secondaryOpenFile'),
+      print: document.getElementById('secondaryPrint'),
+      download: document.getElementById('secondaryDownload'),
+      firstPage: document.getElementById('firstPage'),
+      lastPage: document.getElementById('lastPage'),
+      pageRotateCw: document.getElementById('pageRotateCw'),
+      pageRotateCcw: document.getElementById('pageRotateCcw')
+    });
+
     PDFFindBar.initialize({
-        bar: document.getElementById('findbar'),
-        toggleButton: document.getElementById('viewFind'),
-        findField: document.getElementById('findInput'),
-        highlightAllCheckbox: document.getElementById('findHighlightAll'),
-        caseSensitiveCheckbox: document.getElementById('findMatchCase'),
-        findMsg: document.getElementById('findMsg'),
-        findStatusIcon: document.getElementById('findStatusIcon'),
-        findPreviousButton: document.getElementById('findPrevious'),
-        findNextButton: document.getElementById('findNext')
+      bar: document.getElementById('findbar'),
+      toggleButton: document.getElementById('viewFind'),
+      findField: document.getElementById('findInput'),
+      highlightAllCheckbox: document.getElementById('findHighlightAll'),
+      caseSensitiveCheckbox: document.getElementById('findMatchCase'),
+      findMsg: document.getElementById('findMsg'),
+      findStatusIcon: document.getElementById('findStatusIcon'),
+      findPreviousButton: document.getElementById('findPrevious'),
+      findNextButton: document.getElementById('findNext')
     });
 
     PDFFindController.initialize({
-        pdfPageSource: this,
-        integratedFind: this.supportsIntegratedFind
+      pdfPageSource: this,
+      integratedFind: this.supportsIntegratedFind
     });
 
     this.initialized = true;
@@ -1410,6 +1424,9 @@ var PDFView = {
     this.page = this.presentationModeArgs.page;
     this.parseScale('page-fit', true);
     this.showPresentationControls();
+
+    var viewer = document.getElementById('viewer');
+    viewer.setAttribute('contextmenu', 'viewerContextMenu');
   },
 
   exitPresentationMode: function pdfViewExitPresentationMode() {
@@ -1420,6 +1437,9 @@ var PDFView = {
     this.hidePresentationControls();
     this.presentationModeArgs = null;
 
+    var viewer = document.getElementById('viewer');
+    viewer.removeAttribute('contextmenu');
+
     // Ensure that the thumbnail of the current page is visible
     // when exiting presentation mode.
     scrollIntoView(document.getElementById('thumbnailContainer' + this.page));
@@ -2169,11 +2189,13 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
 
   if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
     document.getElementById('openFile').setAttribute('hidden', 'true');
+    document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
   } else {
     document.getElementById('fileInput').value = null;
   }
 //#else
 //document.getElementById('openFile').setAttribute('hidden', 'true');
+//document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
 //#endif
 
   // Special debugging flags in the hash section of the URL.
@@ -2240,10 +2262,13 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
 
   if (!PDFView.supportsPrinting) {
     document.getElementById('print').classList.add('hidden');
+    document.getElementById('secondaryPrint').classList.add('hidden');
   }
 
   if (!PDFView.supportsFullscreen) {
     document.getElementById('presentationMode').classList.add('hidden');
+    document.getElementById('secondaryPresentationMode').
+      classList.add('hidden');
   }
 
   if (PDFView.supportsIntegratedFind) {
@@ -2311,28 +2336,6 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
       PDFView.zoomOut();
     });
 
-  document.getElementById('presentationMode').addEventListener('click',
-    function() {
-      PDFView.presentationMode();
-    });
-
-//#if !(FIREFOX || MOZCENTRAL || CHROME)
-  document.getElementById('openFile').addEventListener('click',
-    function() {
-      document.getElementById('fileInput').click();
-    });
-//#endif
-
-  document.getElementById('print').addEventListener('click',
-    function() {
-      window.print();
-    });
-
-  document.getElementById('download').addEventListener('click',
-    function() {
-      PDFView.download();
-    });
-
   document.getElementById('pageNumber').addEventListener('click',
     function() {
       this.select();
@@ -2353,25 +2356,29 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
       PDFView.parseScale(this.value);
     });
 
-  document.getElementById('firstPage').addEventListener('click',
-    function() {
-      PDFView.page = 1;
-    });
+  document.getElementById('presentationMode').addEventListener('click',
+    SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
 
-  document.getElementById('lastPage').addEventListener('click',
-    function() {
-      PDFView.page = PDFView.pdfDocument.numPages;
-    });
+  document.getElementById('openFile').addEventListener('click',
+    SecondaryToolbar.openFileClick.bind(SecondaryToolbar));
 
-  document.getElementById('pageRotateCcw').addEventListener('click',
-    function() {
-      PDFView.rotatePages(-90);
-    });
+  document.getElementById('print').addEventListener('click',
+    SecondaryToolbar.printClick.bind(SecondaryToolbar));
 
-  document.getElementById('pageRotateCw').addEventListener('click',
-    function() {
-      PDFView.rotatePages(90);
-    });
+  document.getElementById('download').addEventListener('click',
+    SecondaryToolbar.downloadClick.bind(SecondaryToolbar));
+
+  document.getElementById('contextFirstPage').addEventListener('click',
+    SecondaryToolbar.firstPageClick.bind(SecondaryToolbar));
+
+  document.getElementById('contextLastPage').addEventListener('click',
+    SecondaryToolbar.lastPageClick.bind(SecondaryToolbar));
+
+  document.getElementById('contextPageRotateCw').addEventListener('click',
+    SecondaryToolbar.pageRotateCwClick.bind(SecondaryToolbar));
+
+  document.getElementById('contextPageRotateCcw').addEventListener('click',
+    SecondaryToolbar.pageRotateCcwClick.bind(SecondaryToolbar));
 
 //#if (FIREFOX || MOZCENTRAL)
 //PDFView.setTitleUsingUrl(file);
@@ -2458,6 +2465,9 @@ window.addEventListener('resize', function webViewerResize(evt) {
     PDFView.parseScale(document.getElementById('scaleSelect').value);
   }
   updateViewarea();
+
+  // Set the 'max-height' CSS property of the secondary toolbar.
+  SecondaryToolbar.setMaxHeight(PDFView.container);
 });
 
 window.addEventListener('hashchange', function webViewerHashchange(evt) {
@@ -2486,6 +2496,7 @@ window.addEventListener('change', function webViewerChange(evt) {
   // URL does not reflect proper document location - hiding some icons.
   document.getElementById('viewBookmark').setAttribute('hidden', 'true');
   document.getElementById('download').setAttribute('hidden', 'true');
+  document.getElementById('secondaryDownload').setAttribute('hidden', 'true');
 }, true);
 
 function selectScaleOption(value) {
@@ -2506,10 +2517,10 @@ function selectScaleOption(value) {
 window.addEventListener('localized', function localized(evt) {
   document.getElementsByTagName('html')[0].dir = mozL10n.getDirection();
 
-  // Adjust the width of the zoom box to fit the content.
-  // Note: This is only done if the zoom box is actually visible,
-  // since otherwise element.clientWidth will return 0.
   PDFView.animationStartedPromise.then(function() {
+    // Adjust the width of the zoom box to fit the content.
+    // Note: This is only done if the zoom box is actually visible,
+    // since otherwise element.clientWidth will return 0.
     var container = document.getElementById('scaleSelectContainer');
     if (container.clientWidth > 0) {
       var select = document.getElementById('scaleSelect');
@@ -2520,6 +2531,9 @@ window.addEventListener('localized', function localized(evt) {
       container.setAttribute('style', 'min-width: ' + width + 'px; ' +
                                       'max-width: ' + width + 'px;');
     }
+
+    // Set the 'max-height' CSS property of the secondary toolbar.
+    SecondaryToolbar.setMaxHeight(PDFView.container);
   });
 }, true);
 
@@ -2609,9 +2623,13 @@ window.addEventListener('mousedown', function mousedown(evt) {
 }, false);
 
 window.addEventListener('click', function click(evt) {
-  if (PDFView.isPresentationMode && evt.button === 0) {
+  if (!PDFView.isPresentationMode) {
+    if (SecondaryToolbar.isOpen && PDFView.container.contains(evt.target)) {
+      SecondaryToolbar.close();
+    }
+  } else if (evt.button === 0) {
     // Necessary since preventDefault() in 'mousedown' won't stop
-    // the event propagation in all circumstances.
+    // the event propagation in all circumstances in presentation mode.
     evt.preventDefault();
   }
 }, false);
@@ -2670,6 +2688,7 @@ window.addEventListener('keydown', function keydown(evt) {
     switch (evt.keyCode) {
       case 80: // p
         PDFView.presentationMode();
+        SecondaryToolbar.close();
         handled = true;
         break;
     }
@@ -2685,7 +2704,10 @@ window.addEventListener('keydown', function keydown(evt) {
   var curElement = document.activeElement || document.querySelector(':focus');
   if (curElement && (curElement.tagName.toUpperCase() === 'INPUT' ||
                      curElement.tagName.toUpperCase() === 'SELECT')) {
-    return;
+    // Make sure that the secondary toolbar is closed when Escape is pressed.
+    if (evt.keyCode !== 27) { // 'Esc'
+      return;
+    }
   }
   var controlsElement = document.getElementById('toolbar');
   while (curElement) {
@@ -2717,6 +2739,10 @@ window.addEventListener('keydown', function keydown(evt) {
         handled = true;
         break;
       case 27: // esc key
+        if (SecondaryToolbar.isOpen) {
+          SecondaryToolbar.close();
+          handled = true;
+        }
         if (!PDFView.supportsIntegratedFind && PDFFindBar.opened) {
           PDFFindBar.close();
           handled = true;