Bug 1356021 - Update about:preferences#advanced to fix inconsistencies with strings, show the bottom-border beneath the header to match other categories, and update the layout of radio buttons and checkboxes to match the requested layout. r?florian
draft
Bug 1356021 - Update about:preferences#advanced to fix inconsistencies with strings, show the bottom-border beneath the header to match other categories, and update the layout of radio buttons and checkboxes to match the requested layout. r?florian
MozReview-Commit-ID: GAepdok7x3R
--- a/browser/components/preferences/in-content/advanced.xul
+++ b/browser/components/preferences/in-content/advanced.xul
@@ -46,46 +46,49 @@
class="header"
hidden="true"
data-category="paneAdvanced">
<label class="header-name" flex="1">&paneUpdates.title;</label>
<html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
</hbox>
<!-- Update -->
-#ifdef MOZ_UPDATER
-<groupbox id="updateApp" align="start" data-category="paneAdvanced" hidden="true">
+<groupbox id="updateApp" data-category="paneAdvanced" hidden="true">
<caption><label>&updateApplication.label;</label></caption>
- <radiogroup id="updateRadioGroup" align="start">
- <radio id="autoDesktop"
- value="auto"
- label="&updateAuto1.label;"
- accesskey="&updateAuto1.accesskey;"/>
- <radio value="checkOnly"
- label="&updateCheckChoose.label;"
- accesskey="&updateCheckChoose.accesskey;"/>
- <radio value="manual"
- label="&updateManual.label;"
- accesskey="&updateManual.accesskey;"/>
- </radiogroup>
- <separator class="thin"/>
- <hbox>
- <button id="showUpdateHistory"
- label="&updateHistory.label;"
- accesskey="&updateHistory.accesskey;"
- preference="app.update.disable_button.showUpdateHistory"/>
+ <description>&updateApplication.description;</description>
+ <hbox align="start">
+ <vbox flex="1">
+#ifdef MOZ_UPDATER
+ <radiogroup id="updateRadioGroup" align="start">
+ <radio id="autoDesktop"
+ value="auto"
+ label="&updateAuto2.label;"
+ accesskey="&updateAuto2.accesskey;"/>
+ <radio value="checkOnly"
+ label="&updateCheckChoose2.label;"
+ accesskey="&updateCheckChoose2.accesskey;"/>
+ <radio value="manual"
+ label="&updateManual2.label;"
+ accesskey="&updateManual2.accesskey;"/>
+ </radiogroup>
+#ifdef MOZ_MAINTENANCE_SERVICE
+ <checkbox id="useService"
+ label="&useService.label;"
+ accesskey="&useService.accesskey;"
+ preference="app.update.service.enabled"/>
+#endif
+#endif
+ <checkbox id="enableSearchUpdate"
+ label="&enableSearchUpdate2.label;"
+ accesskey="&enableSearchUpdate2.accesskey;"
+ preference="browser.search.update"/>
+ </vbox>
+#ifdef MOZ_UPDATER
+ <spacer flex="1"/>
+ <vbox>
+ <button id="showUpdateHistory"
+ label="&updateHistory2.label;"
+ accesskey="&updateHistory2.accesskey;"
+ preference="app.update.disable_button.showUpdateHistory"/>
+ </vbox>
+#endif
</hbox>
-
-#ifdef MOZ_MAINTENANCE_SERVICE
- <checkbox id="useService"
- label="&useService.label;"
- accesskey="&useService.accesskey;"
- preference="app.update.service.enabled"/>
-#endif
</groupbox>
-#endif
-<groupbox id="updateOthers" align="start" data-category="paneAdvanced" hidden="true">
- <caption><label>&autoUpdateOthers.label;</label></caption>
- <checkbox id="enableSearchUpdate"
- label="&enableSearchUpdate.label;"
- accesskey="&enableSearchUpdate.accesskey;"
- preference="browser.search.update"/>
-</groupbox>
--- a/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -79,32 +79,32 @@
<!ENTITY clearOfflineAppCacheNow.label "Clear Now">
<!ENTITY clearOfflineAppCacheNow.accesskey "N">
<!ENTITY overrideSmartCacheSize.label "Override automatic cache management">
<!ENTITY overrideSmartCacheSize.accesskey "O">
<!ENTITY updateTab.label "Update">
<!ENTITY updateApplication.label "&brandShortName; Updates">
-<!ENTITY updateAuto1.label "Automatically install updates (recommended: improved security)">
-<!ENTITY updateAuto1.accesskey "A">
-<!ENTITY updateCheckChoose.label "Check for updates, but let you choose whether to install them">
-<!ENTITY updateCheckChoose.accesskey "C">
-<!ENTITY updateManual.label "Never check for updates (not recommended: security risk)">
-<!ENTITY updateManual.accesskey "N">
+<!ENTITY updateApplication.description "Allow &brandShortName; to">
+<!ENTITY updateAuto2.label "Automatically install updates (recommended for improved security)">
+<!ENTITY updateAuto2.accesskey "A">
+<!ENTITY updateCheckChoose2.label "Check for updates but let you choose to install them">
+<!ENTITY updateCheckChoose2.accesskey "C">
+<!ENTITY updateManual2.label "Never check for updates (not recommended)">
+<!ENTITY updateManual2.accesskey "N">
-<!ENTITY updateHistory.label "Show Update History">
-<!ENTITY updateHistory.accesskey "p">
+<!ENTITY updateHistory2.label "Show Update History…">
+<!ENTITY updateHistory2.accesskey "p">
<!ENTITY useService.label "Use a background service to install updates">
<!ENTITY useService.accesskey "b">
-<!ENTITY autoUpdateOthers.label "Automatically Update">
-<!ENTITY enableSearchUpdate.label "Search Engines">
-<!ENTITY enableSearchUpdate.accesskey "E">
+<!ENTITY enableSearchUpdate2.label "Automatically update search engines">
+<!ENTITY enableSearchUpdate2.accesskey "e">
<!ENTITY reports.label "Reports">
<!ENTITY offlineStorageNotify.label "Tell you when a website asks to store data for offline use">
<!ENTITY offlineStorageNotify.accesskey "T">
<!ENTITY offlineStorageNotifyExceptions.label "Exceptions…">
<!ENTITY offlineStorageNotifyExceptions.accesskey "x">
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -105,21 +105,16 @@ treecol {
align-items: center;
justify-content: space-between;
}
.header[hidden=true] {
display: none;
}
-#header-advanced {
- border-bottom: none;
- padding-bottom: 0;
-}
-
/* General Pane */
#startupTable {
border-collapse: collapse;
}
#startupTable > tr > td {
padding: 0; /* remove the padding from html.css */