forked from mirrors/gecko-dev
571fe4ac33
This implements the spec in https://mozilla-hub.atlassian.net/browse/SNT-26, but Natalie and I have made some tweaks over Slack that aren't reflected in that ticket. We want to move the Firefox Suggest preferences from the Search pane to the Address Bar section of the Privacy pane. There are now two Firefox Suggest checkboxes instead of one: a main one that enables Firefox Suggest suggestions and another one that enables sponsored suggestions separately. If the main one is checked but the sponsored one isn't, then the user will see only non-sponsored suggestions. I renamed and modified the browser_searchQuickSuggest.js test I added in D105701, but a lot of the test changed and it's probably not helpful to look at the diff against the old version. Previously strings were hardcoded in search.js. I've added the new ones to the new preview Fluent file for Firefox Suggest. Depends on D124300 Differential Revision: https://phabricator.services.mozilla.com/D124431
124 lines
5.6 KiB
HTML
124 lines
5.6 KiB
HTML
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
|
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
|
|
|
<script src="chrome://browser/content/preferences/search.js"/>
|
|
<html:template id="template-paneSearch">
|
|
<hbox id="searchCategory"
|
|
class="subcategory"
|
|
hidden="true"
|
|
data-category="paneSearch">
|
|
<html:h1 data-l10n-id="pane-search-title"/>
|
|
</hbox>
|
|
|
|
<groupbox id="searchbarGroup" data-category="paneSearch" hidden="true">
|
|
<label control="searchBarVisibleGroup"><html:h2 data-l10n-id="search-bar-header"/></label>
|
|
<radiogroup id="searchBarVisibleGroup" preference="browser.search.widget.inNavBar" align="start">
|
|
<radio id="searchBarHiddenRadio" value="false" data-l10n-id="search-bar-hidden"/>
|
|
<image class="searchBarImage searchBarHiddenImage" role="presentation"/>
|
|
<radio id="searchBarShownRadio" value="true" data-l10n-id="search-bar-shown"/>
|
|
<image class="searchBarImage searchBarShownImage" role="presentation"/>
|
|
</radiogroup>
|
|
</groupbox>
|
|
|
|
<!-- Default Search Engine -->
|
|
<groupbox id="defaultEngineGroup" data-category="paneSearch" hidden="true">
|
|
<label><html:h2 data-l10n-id="search-engine-default-header" /></label>
|
|
<description data-l10n-id="search-engine-default-desc-2" />
|
|
|
|
<hbox>
|
|
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
|
|
<hbox>
|
|
<menulist id="defaultEngine">
|
|
<menupopup/>
|
|
</menulist>
|
|
</hbox>
|
|
</hbox>
|
|
<checkbox id="browserSeparateDefaultEngine"
|
|
data-l10n-id="search-separate-default-engine"
|
|
hidden="true"/>
|
|
<vbox id="browserPrivateEngineSelection" class="indent" hidden="true">
|
|
<description data-l10n-id="search-engine-default-private-desc-2" />
|
|
<hbox>
|
|
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
|
|
<hbox>
|
|
<menulist id="defaultPrivateEngine">
|
|
<menupopup/>
|
|
</menulist>
|
|
</hbox>
|
|
</hbox>
|
|
</vbox>
|
|
</groupbox>
|
|
|
|
<groupbox id="searchSuggestionsGroup" data-category="paneSearch" hidden="true">
|
|
<label><html:h2 data-l10n-id="search-suggestions-header" /></label>
|
|
<description id="searchSuggestionsDesc"
|
|
data-l10n-id="search-suggestions-desc" />
|
|
|
|
<checkbox id="suggestionsInSearchFieldsCheckbox"
|
|
data-l10n-id="search-suggestions-option"
|
|
preference="browser.search.suggest.enabled"/>
|
|
<vbox class="indent">
|
|
<checkbox id="urlBarSuggestion" data-l10n-id="search-show-suggestions-url-bar-option" />
|
|
<checkbox id="showSearchSuggestionsFirstCheckbox"
|
|
data-l10n-id="search-show-suggestions-above-history-option"
|
|
preference="browser.urlbar.showSearchSuggestionsFirst"/>
|
|
<checkbox id="showSearchSuggestionsPrivateWindows"
|
|
data-l10n-id="search-show-suggestions-private-windows"/>
|
|
<hbox id="urlBarSuggestionPermanentPBLabel"
|
|
align="center" class="indent">
|
|
<label flex="1" data-l10n-id="search-suggestions-cant-show" />
|
|
</hbox>
|
|
</vbox>
|
|
<label id="openLocationBarPrivacyPreferences" is="text-link"
|
|
data-l10n-id="suggestions-addressbar-settings-generic2"/>
|
|
</groupbox>
|
|
|
|
<groupbox id="oneClickSearchProvidersGroup" data-category="paneSearch" hidden="true">
|
|
<label><html:h2 data-l10n-id="search-one-click-header2" /></label>
|
|
<description data-l10n-id="search-one-click-desc" />
|
|
|
|
<tree id="engineList" flex="1" rows="11" hidecolumnpicker="true" editable="true"
|
|
seltype="single" allowunderflowscroll="true">
|
|
<treechildren id="engineChildren" flex="1"/>
|
|
<treecols>
|
|
<treecol id="engineShown" type="checkbox" editable="true" sortable="false"/>
|
|
<treecol id="engineName" flex="1" data-l10n-id="search-choose-engine-column" sortable="false"/>
|
|
<treecol id="engineKeyword" flex="1" data-l10n-id="search-choose-keyword-column" sortable="false"/>
|
|
</treecols>
|
|
</tree>
|
|
|
|
<hbox>
|
|
<button id="restoreDefaultSearchEngines"
|
|
is="highlightable-button"
|
|
data-l10n-id="search-restore-default"
|
|
/>
|
|
<spacer flex="1"/>
|
|
<button id="removeEngineButton"
|
|
is="highlightable-button"
|
|
class="searchEngineAction"
|
|
data-l10n-id="search-remove-engine"
|
|
disabled="true"
|
|
/>
|
|
<!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
|
|
<hbox>
|
|
<button id="addEngineButton"
|
|
is="highlightable-button"
|
|
class="searchEngineAction"
|
|
hidden="true"
|
|
data-l10n-id="search-add-engine"
|
|
search-l10n-ids="
|
|
add-engine-button,
|
|
add-engine-name,
|
|
add-engine-alias,
|
|
add-engine-url,
|
|
add-engine-dialog.buttonlabelaccept,
|
|
"
|
|
/>
|
|
</hbox>
|
|
</hbox>
|
|
<hbox id="addEnginesBox" pack="start">
|
|
<label id="addEngines" data-l10n-id="search-find-more-link" is="text-link"></label>
|
|
</hbox>
|
|
</groupbox>
|
|
</html:template>
|