|
|
@@ -0,0 +1,123 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Jared Wein <jwein@mozilla.com>
|
|
|
+# Date 1505854927 14400
|
|
|
+# Node ID 4c93bc2592827f23e1acdef73216f24c68d3a522
|
|
|
+# Parent c21a648327d2ec27b7ee574c2cc2f1b29a3432ff
|
|
|
+Bug 1400975 - Add specific placeholders for the sidebar search boxes. r=adw
|
|
|
+
|
|
|
+MozReview-Commit-ID: KtIFalMLw0B
|
|
|
+
|
|
|
+diff --git a/browser/components/places/content/bookmarksPanel.xul b/browser/components/places/content/bookmarksPanel.xul
|
|
|
+--- a/browser/components/places/content/bookmarksPanel.xul
|
|
|
++++ b/browser/components/places/content/bookmarksPanel.xul
|
|
|
+@@ -26,17 +26,17 @@
|
|
|
+ <commandset id="editMenuCommands"/>
|
|
|
+ <menupopup id="placesContext"/>
|
|
|
+
|
|
|
+ <!-- Bookmarks and history tooltip -->
|
|
|
+ <tooltip id="bhTooltip"/>
|
|
|
+
|
|
|
+ <hbox id="sidebar-search-container" align="center">
|
|
|
+ <textbox id="search-box" flex="1" type="search"
|
|
|
+- placeholder="&search.placeholder;"
|
|
|
++ placeholder="&bookmarksSearch.placeholder;"
|
|
|
+ aria-controls="bookmarks-view"
|
|
|
+ oncommand="searchBookmarks(this.value);"/>
|
|
|
+ </hbox>
|
|
|
+
|
|
|
+ <tree id="bookmarks-view" class="sidebar-placesTree" type="places"
|
|
|
+ flex="1"
|
|
|
+ hidecolumnpicker="true"
|
|
|
+ context="placesContext"
|
|
|
+diff --git a/browser/components/places/content/history-panel.xul b/browser/components/places/content/history-panel.xul
|
|
|
+--- a/browser/components/places/content/history-panel.xul
|
|
|
++++ b/browser/components/places/content/history-panel.xul
|
|
|
+@@ -41,17 +41,17 @@
|
|
|
+ <!-- required to overlay the context menu -->
|
|
|
+ <menupopup id="placesContext"/>
|
|
|
+
|
|
|
+ <!-- Bookmarks and history tooltip -->
|
|
|
+ <tooltip id="bhTooltip"/>
|
|
|
+
|
|
|
+ <hbox id="sidebar-search-container">
|
|
|
+ <textbox id="search-box" flex="1" type="search"
|
|
|
+- placeholder="&search.placeholder;"
|
|
|
++ placeholder="&historySearch.placeholder;"
|
|
|
+ aria-controls="historyTree"
|
|
|
+ oncommand="searchHistory(this.value);"/>
|
|
|
+ <button id="viewButton" style="min-width:0px !important;" type="menu"
|
|
|
+ label="&view.label;" accesskey="&view.accesskey;" selectedsort="day"
|
|
|
+ persist="selectedsort">
|
|
|
+ <menupopup>
|
|
|
+ <menuitem id="bydayandsite" label="&byDayAndSite.label;"
|
|
|
+ accesskey="&byDayAndSite.accesskey;" type="radio"
|
|
|
+diff --git a/browser/components/syncedtabs/sidebar.xhtml b/browser/components/syncedtabs/sidebar.xhtml
|
|
|
+--- a/browser/components/syncedtabs/sidebar.xhtml
|
|
|
++++ b/browser/components/syncedtabs/sidebar.xhtml
|
|
|
+@@ -92,17 +92,20 @@
|
|
|
+ </template>
|
|
|
+
|
|
|
+ <div class="content-container">
|
|
|
+ <!-- the non-scrollable header -->
|
|
|
+ <div class="content-header">
|
|
|
+ <div class="sidebar-search-container tabs-container sync-state">
|
|
|
+ <div class="search-box">
|
|
|
+ <div class="textbox-input-box">
|
|
|
+- <input type="text" class="tabsFilter textbox-input" tabindex="1"/>
|
|
|
++ <input type="text"
|
|
|
++ class="tabsFilter textbox-input"
|
|
|
++ placeholder="&syncedTabs.sidebar.searchPlaceholder;"
|
|
|
++ tabindex="1"/>
|
|
|
+ <div class="textbox-search-icons">
|
|
|
+ <a class="textbox-search-clear"></a>
|
|
|
+ <a class="textbox-search-icon"></a>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
|
|
|
+--- a/browser/locales/en-US/chrome/browser/browser.dtd
|
|
|
++++ b/browser/locales/en-US/chrome/browser/browser.dtd
|
|
|
+@@ -800,16 +800,17 @@ you can use these alternative items. Oth
|
|
|
+ <!ENTITY syncedTabs.sidebar.noclients.title "No synced tabs… yet!">
|
|
|
+ <!ENTITY syncedTabs.sidebar.noclients.subtitle "Want to see your tabs from other devices here?">
|
|
|
+ <!ENTITY syncedTabs.sidebar.notsignedin.label "Sign in to view a list of tabs from your other devices.">
|
|
|
+ <!ENTITY syncedTabs.sidebar.notabs.label "No open tabs">
|
|
|
+ <!ENTITY syncedTabs.sidebar.openprefs.label "Open &syncBrand.shortName.label; Preferences">
|
|
|
+ <!-- LOCALIZATION NOTE (syncedTabs.sidebar.tabsnotsyncing.label): This is shown
|
|
|
+ when Sync is configured but syncing tabs is disabled. -->
|
|
|
+ <!ENTITY syncedTabs.sidebar.tabsnotsyncing.label "Turn on tab syncing to view a list of tabs from your other devices.">
|
|
|
++<!ENTITY syncedTabs.sidebar.searchPlaceholder "Search synced tabs">
|
|
|
+
|
|
|
+ <!-- LOCALIZATION NOTE (syncedTabs.context.open.accesskey,
|
|
|
+ syncedTabs.context.openAllInTabs.accesskey):
|
|
|
+ These access keys are identical because their associated menu items are
|
|
|
+ mutually exclusive -->
|
|
|
+ <!ENTITY syncedTabs.context.open.label "Open">
|
|
|
+ <!ENTITY syncedTabs.context.open.accesskey "O">
|
|
|
+ <!ENTITY syncedTabs.context.openInNewTab.label "Open in a New Tab">
|
|
|
+diff --git a/browser/locales/en-US/chrome/browser/places/places.dtd b/browser/locales/en-US/chrome/browser/places/places.dtd
|
|
|
+--- a/browser/locales/en-US/chrome/browser/places/places.dtd
|
|
|
++++ b/browser/locales/en-US/chrome/browser/places/places.dtd
|
|
|
+@@ -80,17 +80,18 @@
|
|
|
+ <!ENTITY col.tags.label "Tags">
|
|
|
+ <!ENTITY col.url.label "Location">
|
|
|
+ <!ENTITY col.mostrecentvisit.label "Most Recent Visit">
|
|
|
+ <!ENTITY col.visitcount.label "Visit Count">
|
|
|
+ <!ENTITY col.description.label "Description">
|
|
|
+ <!ENTITY col.dateadded.label "Added">
|
|
|
+ <!ENTITY col.lastmodified.label "Last Modified">
|
|
|
+
|
|
|
+-<!ENTITY search.placeholder "Search">
|
|
|
++<!ENTITY historySearch.placeholder "Search history">
|
|
|
++<!ENTITY bookmarksSearch.placeholder "Search bookmarks">
|
|
|
+
|
|
|
+ <!ENTITY cmd.find.key "f">
|
|
|
+
|
|
|
+ <!ENTITY maintenance.label "Import and Backup">
|
|
|
+ <!ENTITY maintenance.accesskey "I">
|
|
|
+ <!ENTITY maintenance.tooltip "Import and backup your bookmarks">
|
|
|
+
|
|
|
+ <!ENTITY backButton.tooltip "Go back">
|
|
|
+
|
Frank-Rainer Grahl