зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1429940 - Part 2 - Use HTML headings inside the "label" element for labeling "groupbox" elements in Preferences, instead of the "caption" element. r=MarcoZ,dao,jaws,flod
This makes it possible to navigate by headings when using accessibility technology. Information labels displayed when removing the master password are also restored. Differential Revision: https://phabricator.services.mozilla.com/D11792 --HG-- extra : rebase_source : 42f156dbccf074445cf7e08d8de246058437c91b
This commit is contained in:
Paolo Amadini
Родитель
4d52da3cb2
Коммит
5d354ce421
|
|
@ -279,9 +279,7 @@
|
|||
<vbox id="securityPanel">
|
||||
<!-- Identity Section -->
|
||||
<groupbox>
|
||||
<caption>
|
||||
<label class="header" value="&securityView.identity.header;"/>
|
||||
</caption>
|
||||
<label class="header" value="&securityView.identity.header;"/>
|
||||
<grid>
|
||||
<columns>
|
||||
<column/>
|
||||
|
|
@ -326,9 +324,7 @@
|
|||
|
||||
<!-- Privacy & History section -->
|
||||
<groupbox>
|
||||
<caption>
|
||||
<label class="header" value="&securityView.privacy.header;"/>
|
||||
</caption>
|
||||
<label class="header" value="&securityView.privacy.header;"/>
|
||||
<grid>
|
||||
<columns>
|
||||
<column flex="1"/>
|
||||
|
|
@ -373,9 +369,7 @@
|
|||
|
||||
<!-- Technical Details section -->
|
||||
<groupbox>
|
||||
<caption>
|
||||
<label class="header" value="&securityView.technical.header;"/>
|
||||
</caption>
|
||||
<label class="header" value="&securityView.technical.header;"/>
|
||||
<label id="security-technical-shortform"/>
|
||||
<description id="security-technical-longform1"/>
|
||||
<description id="security-technical-longform2"/>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
<dialog id="SanitizeDialog" type="child"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
buttons="accept,cancel"
|
||||
persist="lastSelected screenX screenY"
|
||||
role="dialog"
|
||||
|
|
@ -71,7 +72,7 @@
|
|||
<separator class="thin"/>
|
||||
|
||||
<groupbox>
|
||||
<caption><label data-l10n-id="history-section-label"></label></caption>
|
||||
<label><html:h2 data-l10n-id="history-section-label"/></label>
|
||||
<grid flex="1">
|
||||
<columns>
|
||||
<column data-l10n-id="sanitize-prefs-style" data-l10n-attrs="style"/>
|
||||
|
|
@ -103,7 +104,7 @@
|
|||
</grid>
|
||||
</groupbox>
|
||||
<groupbox>
|
||||
<caption><label data-l10n-id="data-section-label"></label></caption>
|
||||
<label><html:h2 data-l10n-id="data-section-label"/></label>
|
||||
<grid flex="1">
|
||||
<columns>
|
||||
<column data-l10n-id="sanitize-prefs-style" data-l10n-attrs="style"/>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,8 @@ const {actionTypes: at} = ChromeUtils.import("resource://activity-stream/common/
|
|||
|
||||
XPCOMUtils.defineLazyGlobalGetters(this, ["fetch"]);
|
||||
|
||||
const HTML_NS = "http://www.w3.org/1999/xhtml";
|
||||
|
||||
const PREFERENCES_LOADED_EVENT = "home-pane-loaded";
|
||||
|
||||
// These "section" objects are formatted in a way to be similar to the ones from
|
||||
|
|
@ -162,11 +164,11 @@ this.AboutPreferences = class AboutPreferences {
|
|||
const contentsGroup = homeGroup.insertAdjacentElement("afterend", homeGroup.cloneNode());
|
||||
contentsGroup.id = "homeContentsGroup";
|
||||
contentsGroup.setAttribute("data-subcategory", "contents");
|
||||
const caption = createAppend("caption", contentsGroup);
|
||||
const captionLabel = createAppend("label", caption);
|
||||
captionLabel.setAttribute("value", formatString("prefs_home_header"));
|
||||
const description = createAppend("description", contentsGroup);
|
||||
description.textContent = formatString("prefs_home_description");
|
||||
createAppend("label", contentsGroup)
|
||||
.appendChild(document.createElementNS(HTML_NS, "h2"))
|
||||
.textContent = formatString("prefs_home_header");
|
||||
createAppend("description", contentsGroup)
|
||||
.textContent = formatString("prefs_home_description");
|
||||
|
||||
// Add preferences for each section
|
||||
prefStructure.forEach(sectionData => {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
<hbox>
|
||||
<groupbox flex="1">
|
||||
<caption><label data-l10n-id="colors-text-and-background"/></caption>
|
||||
<label><html:h2 data-l10n-id="colors-text-and-background"/></label>
|
||||
<hbox align="center">
|
||||
<label data-l10n-id="colors-text-header" control="foregroundtextmenu"/>
|
||||
<spacer flex="1"/>
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
</groupbox>
|
||||
|
||||
<groupbox flex="1">
|
||||
<caption><label data-l10n-id="colors-links-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="colors-links-header"/></label>
|
||||
<hbox align="center">
|
||||
<label data-l10n-id="colors-unvisited-links" control="unvisitedlinkmenu" />
|
||||
<spacer flex="1"/>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
|
||||
<dialog id="ConnectionsDialog" type="child"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
data-l10n-id="connection-window"
|
||||
data-l10n-attrs="title, style"
|
||||
buttons="accept,cancel,help"
|
||||
|
|
@ -45,7 +46,7 @@
|
|||
</hbox>
|
||||
|
||||
<groupbox>
|
||||
<caption><label data-l10n-id="connection-proxy-configure" /></caption>
|
||||
<label><html:h2 data-l10n-id="connection-proxy-configure"/></label>
|
||||
|
||||
<radiogroup id="networkProxyType" preference="network.proxy.type"
|
||||
onsyncfrompreference="return gConnectionsDialog.readProxyType();">
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
<dialog id="FontsDialog" type="child"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
data-l10n-id="fonts-window"
|
||||
data-l10n-attrs="title"
|
||||
buttons="accept,cancel,help"
|
||||
|
|
@ -31,48 +32,46 @@
|
|||
|
||||
<!-- Fonts for: [ Language ] -->
|
||||
<groupbox>
|
||||
<caption>
|
||||
<hbox align="center">
|
||||
<label data-l10n-id="fonts-langgroup-header" control="selectLangs"/>
|
||||
</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="selectLangs" preference="font.language.group"
|
||||
onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();">
|
||||
<menupopup>
|
||||
<menuitem value="ar" data-l10n-id="fonts-langgroup-arabic"/>
|
||||
<menuitem value="x-armn" data-l10n-id="fonts-langgroup-armenian"/>
|
||||
<menuitem value="x-beng" data-l10n-id="fonts-langgroup-bengali"/>
|
||||
<menuitem value="zh-CN" data-l10n-id="fonts-langgroup-simpl-chinese"/>
|
||||
<menuitem value="zh-HK" data-l10n-id="fonts-langgroup-trad-chinese-hk"/>
|
||||
<menuitem value="zh-TW" data-l10n-id="fonts-langgroup-trad-chinese"/>
|
||||
<menuitem value="x-cyrillic" data-l10n-id="fonts-langgroup-cyrillic"/>
|
||||
<menuitem value="x-devanagari" data-l10n-id="fonts-langgroup-devanagari"/>
|
||||
<menuitem value="x-ethi" data-l10n-id="fonts-langgroup-ethiopic"/>
|
||||
<menuitem value="x-geor" data-l10n-id="fonts-langgroup-georgian"/>
|
||||
<menuitem value="el" data-l10n-id="fonts-langgroup-el"/>
|
||||
<menuitem value="x-gujr" data-l10n-id="fonts-langgroup-gujarati"/>
|
||||
<menuitem value="x-guru" data-l10n-id="fonts-langgroup-gurmukhi"/>
|
||||
<menuitem value="he" data-l10n-id="fonts-langgroup-hebrew"/>
|
||||
<menuitem value="ja" data-l10n-id="fonts-langgroup-japanese"/>
|
||||
<menuitem value="x-knda" data-l10n-id="fonts-langgroup-kannada"/>
|
||||
<menuitem value="x-khmr" data-l10n-id="fonts-langgroup-khmer"/>
|
||||
<menuitem value="ko" data-l10n-id="fonts-langgroup-korean"/>
|
||||
<menuitem value="x-western" data-l10n-id="fonts-langgroup-latin"/>
|
||||
<menuitem value="x-mlym" data-l10n-id="fonts-langgroup-malayalam"/>
|
||||
<menuitem value="x-math" data-l10n-id="fonts-langgroup-math"/>
|
||||
<menuitem value="x-orya" data-l10n-id="fonts-langgroup-odia"/>
|
||||
<menuitem value="x-sinh" data-l10n-id="fonts-langgroup-sinhala"/>
|
||||
<menuitem value="x-tamil" data-l10n-id="fonts-langgroup-tamil"/>
|
||||
<menuitem value="x-telu" data-l10n-id="fonts-langgroup-telugu"/>
|
||||
<menuitem value="th" data-l10n-id="fonts-langgroup-thai"/>
|
||||
<menuitem value="x-tibt" data-l10n-id="fonts-langgroup-tibetan"/>
|
||||
<menuitem value="x-cans" data-l10n-id="fonts-langgroup-canadian"/>
|
||||
<menuitem value="x-unicode" data-l10n-id="fonts-langgroup-other"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</hbox>
|
||||
</caption>
|
||||
<hbox align="center">
|
||||
<label control="selectLangs"><html:h2 data-l10n-id="fonts-langgroup-header"/></label>
|
||||
</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="selectLangs" preference="font.language.group"
|
||||
onsyncfrompreference="return gFontsDialog.readFontLanguageGroup();">
|
||||
<menupopup>
|
||||
<menuitem value="ar" data-l10n-id="fonts-langgroup-arabic"/>
|
||||
<menuitem value="x-armn" data-l10n-id="fonts-langgroup-armenian"/>
|
||||
<menuitem value="x-beng" data-l10n-id="fonts-langgroup-bengali"/>
|
||||
<menuitem value="zh-CN" data-l10n-id="fonts-langgroup-simpl-chinese"/>
|
||||
<menuitem value="zh-HK" data-l10n-id="fonts-langgroup-trad-chinese-hk"/>
|
||||
<menuitem value="zh-TW" data-l10n-id="fonts-langgroup-trad-chinese"/>
|
||||
<menuitem value="x-cyrillic" data-l10n-id="fonts-langgroup-cyrillic"/>
|
||||
<menuitem value="x-devanagari" data-l10n-id="fonts-langgroup-devanagari"/>
|
||||
<menuitem value="x-ethi" data-l10n-id="fonts-langgroup-ethiopic"/>
|
||||
<menuitem value="x-geor" data-l10n-id="fonts-langgroup-georgian"/>
|
||||
<menuitem value="el" data-l10n-id="fonts-langgroup-el"/>
|
||||
<menuitem value="x-gujr" data-l10n-id="fonts-langgroup-gujarati"/>
|
||||
<menuitem value="x-guru" data-l10n-id="fonts-langgroup-gurmukhi"/>
|
||||
<menuitem value="he" data-l10n-id="fonts-langgroup-hebrew"/>
|
||||
<menuitem value="ja" data-l10n-id="fonts-langgroup-japanese"/>
|
||||
<menuitem value="x-knda" data-l10n-id="fonts-langgroup-kannada"/>
|
||||
<menuitem value="x-khmr" data-l10n-id="fonts-langgroup-khmer"/>
|
||||
<menuitem value="ko" data-l10n-id="fonts-langgroup-korean"/>
|
||||
<menuitem value="x-western" data-l10n-id="fonts-langgroup-latin"/>
|
||||
<menuitem value="x-mlym" data-l10n-id="fonts-langgroup-malayalam"/>
|
||||
<menuitem value="x-math" data-l10n-id="fonts-langgroup-math"/>
|
||||
<menuitem value="x-orya" data-l10n-id="fonts-langgroup-odia"/>
|
||||
<menuitem value="x-sinh" data-l10n-id="fonts-langgroup-sinhala"/>
|
||||
<menuitem value="x-tamil" data-l10n-id="fonts-langgroup-tamil"/>
|
||||
<menuitem value="x-telu" data-l10n-id="fonts-langgroup-telugu"/>
|
||||
<menuitem value="th" data-l10n-id="fonts-langgroup-thai"/>
|
||||
<menuitem value="x-tibt" data-l10n-id="fonts-langgroup-tibetan"/>
|
||||
<menuitem value="x-cans" data-l10n-id="fonts-langgroup-canadian"/>
|
||||
<menuitem value="x-unicode" data-l10n-id="fonts-langgroup-other"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</hbox>
|
||||
|
||||
<grid>
|
||||
<columns>
|
||||
|
|
@ -254,7 +253,7 @@
|
|||
|
||||
<!-- Text Encoding -->
|
||||
<groupbox>
|
||||
<caption><label data-l10n-id="fonts-languages-fallback-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="fonts-languages-fallback-header"/></label>
|
||||
<description data-l10n-id="fonts-languages-fallback-desc"/>
|
||||
<hbox align="center">
|
||||
<label data-l10n-id="fonts-languages-fallback-label" control="DefaultCharsetList"/>
|
||||
|
|
|
|||
|
|
@ -310,7 +310,7 @@ var gSearchResultsPane = {
|
|||
gotoPref("paneGeneral");
|
||||
|
||||
// Hide some special second level headers in normal view
|
||||
for (let element of document.querySelectorAll("caption.search-header")) {
|
||||
for (let element of document.querySelectorAll(".search-header")) {
|
||||
element.hidden = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<groupbox id="homepageGroup"
|
||||
data-category="paneHome"
|
||||
hidden="true">
|
||||
<caption><label data-l10n-id="home-new-windows-tabs-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="home-new-windows-tabs-header"/></label>
|
||||
<description data-l10n-id="home-new-windows-tabs-description2" />
|
||||
|
||||
<hbox id="homepageAndNewWindowsOption">
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<groupbox id="startupGroup"
|
||||
data-category="paneGeneral"
|
||||
hidden="true">
|
||||
<caption><label data-l10n-id="startup-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="startup-header"/></label>
|
||||
|
||||
#ifdef MOZ_DEV_EDITION
|
||||
<vbox id="separateProfileBox">
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<!-- Tab preferences -->
|
||||
<groupbox data-category="paneGeneral"
|
||||
hidden="true">
|
||||
<caption><label data-l10n-id="tabs-group-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="tabs-group-header"/></label>
|
||||
|
||||
<checkbox id="ctrlTabRecentlyUsedOrder" data-l10n-id="ctrl-tab-recently-used-order"
|
||||
preference="browser.ctrlTab.recentlyUsedOrder"
|
||||
|
|
@ -138,7 +138,7 @@
|
|||
|
||||
<!-- Fonts and Colors -->
|
||||
<groupbox id="fontsGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption><label data-l10n-id="fonts-and-colors-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="fonts-and-colors-header"/></label>
|
||||
|
||||
<hbox id="fontSettings">
|
||||
<hbox align="center" flex="1">
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
|
||||
<!-- Languages -->
|
||||
<groupbox id="languagesGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption><label data-l10n-id="language-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="language-header"/></label>
|
||||
|
||||
<vbox id="browserLanguagesBox" align="start" hidden="true">
|
||||
<description flex="1" controls="chooseBrowserLanguage" data-l10n-id="choose-browser-language-description"/>
|
||||
|
|
@ -353,7 +353,7 @@
|
|||
|
||||
<!--Downloads-->
|
||||
<groupbox id="downloadsGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption><label data-l10n-id="download-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="download-header"/></label>
|
||||
|
||||
<radiogroup id="saveWhere"
|
||||
preference="browser.download.useDownloadDir"
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
</groupbox>
|
||||
|
||||
<groupbox id="applicationsGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption><label data-l10n-id="applications-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="applications-header"/></label>
|
||||
<description data-l10n-id="applications-description"/>
|
||||
<textbox id="filter" flex="1"
|
||||
type="search"
|
||||
|
|
@ -403,7 +403,7 @@
|
|||
|
||||
<!-- DRM Content -->
|
||||
<groupbox id="drmGroup" data-category="paneGeneral" data-subcategory="drm" hidden="true">
|
||||
<caption><label data-l10n-id="drm-content-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="drm-content-header"/></label>
|
||||
<grid id="contentGrid2">
|
||||
<columns>
|
||||
<column flex="1"/>
|
||||
|
|
@ -435,7 +435,7 @@
|
|||
|
||||
<!-- Update -->
|
||||
<groupbox id="updateApp" data-category="paneGeneral" hidden="true">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="update-application-title"/></caption>
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="update-application-title"/></label>
|
||||
|
||||
<label data-l10n-id="update-application-description"/>
|
||||
<hbox align="center">
|
||||
|
|
@ -581,7 +581,7 @@
|
|||
|
||||
<!-- Performance -->
|
||||
<groupbox id="performanceGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="performance-title"/></caption>
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="performance-title"/></label>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="useRecommendedPerformanceSettings"
|
||||
|
|
@ -627,7 +627,7 @@
|
|||
|
||||
<!-- Browsing -->
|
||||
<groupbox id="browsingGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="browsing-title"/></caption>
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="browsing-title"/></label>
|
||||
|
||||
<checkbox id="useAutoScroll"
|
||||
data-l10n-id="browsing-use-autoscroll"
|
||||
|
|
@ -666,7 +666,7 @@
|
|||
|
||||
<!-- Network Settings-->
|
||||
<groupbox id="connectionGroup" data-category="paneGeneral" hidden="true">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="network-settings-title"/></caption>
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="network-settings-title"/></label>
|
||||
|
||||
<hbox align="center">
|
||||
<hbox align="center" flex="1">
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ function scrollAndHighlight(subcategory) {
|
|||
*/
|
||||
function getClosestDisplayedHeader(element) {
|
||||
let header = element.closest("groupbox");
|
||||
let searchHeader = header.querySelector("caption.search-header");
|
||||
let searchHeader = header.querySelector(".search-header");
|
||||
if (searchHeader && searchHeader.hidden &&
|
||||
header.previousSibling.classList.contains("subcategory")) {
|
||||
header = header.previousSibling;
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
|
||||
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
role="document"
|
||||
data-l10n-id="pref-page"
|
||||
data-l10n-attrs="title">
|
||||
|
||||
|
|
|
|||
|
|
@ -18,9 +18,7 @@
|
|||
|
||||
<!-- Tracking / Content Blocking -->
|
||||
<groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" aria-describedby="contentBlockingDescription">
|
||||
<caption>
|
||||
<label id="contentBlockingHeader" data-l10n-id="content-blocking-header"/>
|
||||
</caption>
|
||||
<label id="contentBlockingHeader"><html:h2 data-l10n-id="content-blocking-header"/></label>
|
||||
<vbox data-subcategory="trackingprotection">
|
||||
<hbox align="start">
|
||||
<image id="trackingProtectionShield"/>
|
||||
|
|
@ -205,7 +203,7 @@
|
|||
|
||||
<!-- Site Data -->
|
||||
<groupbox id="siteDataGroup" data-category="panePrivacy" hidden="true" aria-describedby="totalSiteDataSize">
|
||||
<caption><label data-l10n-id="sitedata-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="sitedata-header"/></label>
|
||||
|
||||
<hbox data-subcategory="sitedata" align="baseline">
|
||||
<vbox flex="1">
|
||||
|
|
@ -268,7 +266,7 @@
|
|||
|
||||
<!-- Passwords -->
|
||||
<groupbox id="passwordsGroup" orient="vertical" data-category="panePrivacy" hidden="true">
|
||||
<caption><label data-l10n-id="logins-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="logins-header"/></label>
|
||||
|
||||
<vbox id="passwordSettings">
|
||||
<hbox id="savePasswordsBox">
|
||||
|
|
@ -322,7 +320,7 @@
|
|||
|
||||
<!-- History -->
|
||||
<groupbox id="historyGroup" data-category="panePrivacy" hidden="true">
|
||||
<caption><label data-l10n-id="history-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="history-header"/></label>
|
||||
<hbox align="center">
|
||||
<label id="historyModeLabel"
|
||||
control="historyMode"
|
||||
|
|
@ -423,7 +421,7 @@
|
|||
<groupbox id="locationBarGroup"
|
||||
data-category="panePrivacy"
|
||||
hidden="true">
|
||||
<caption><label data-l10n-id="addressbar-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="addressbar-header"/></label>
|
||||
<label id="locationBarSuggestionLabel" data-l10n-id="addressbar-suggest"/>
|
||||
<checkbox id="historySuggestion" data-l10n-id="addressbar-locbar-history-option"
|
||||
preference="browser.urlbar.suggest.history"/>
|
||||
|
|
@ -443,8 +441,8 @@
|
|||
</hbox>
|
||||
|
||||
<!-- Permissions -->
|
||||
<groupbox id="permissionsGroup" data-category="panePrivacy" hidden="true" data-subcategory="permissions" aria-labelledby="permissionsGroupLabel">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="permissions-header" id="permissionsGroupLabel"/></caption>
|
||||
<groupbox id="permissionsGroup" data-category="panePrivacy" hidden="true" data-subcategory="permissions">
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="permissions-header"/></label>
|
||||
|
||||
<grid>
|
||||
<columns>
|
||||
|
|
@ -673,8 +671,8 @@
|
|||
<label class="header-name" flex="1" data-l10n-id="collection-header"/>
|
||||
</hbox>
|
||||
|
||||
<groupbox id="dataCollectionGroup" data-category="panePrivacy" hidden="true" aria-labelledby="dataCollectionGroupLabel">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="collection-header" id="dataCollectionGroupLabel"/></caption>
|
||||
<groupbox id="dataCollectionGroup" data-category="panePrivacy" hidden="true">
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="collection-header"/></label>
|
||||
|
||||
<description>
|
||||
<label class="tail-with-learn-more" data-l10n-id="collection-description"/>
|
||||
|
|
@ -745,7 +743,7 @@
|
|||
|
||||
<!-- addons, forgery (phishing) UI Security -->
|
||||
<groupbox id="browsingProtectionGroup" data-category="panePrivacy" hidden="true">
|
||||
<caption><label data-l10n-id="security-browsing-protection"/></caption>
|
||||
<label><html:h2 data-l10n-id="security-browsing-protection"/></label>
|
||||
<hbox align = "center">
|
||||
<checkbox id="enableSafeBrowsing"
|
||||
data-l10n-id="security-enable-safe-browsing"
|
||||
|
|
@ -763,7 +761,7 @@
|
|||
|
||||
<!-- Certificates -->
|
||||
<groupbox id="certSelection" data-category="panePrivacy" hidden="true">
|
||||
<caption><label data-l10n-id="certs-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="certs-header"/></label>
|
||||
<description id="CertSelectionDesc" control="certSelection" data-l10n-id="certs-personal-label"/>
|
||||
|
||||
<!--
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
</hbox>
|
||||
|
||||
<groupbox id="searchbarGroup" data-category="paneSearch">
|
||||
<caption><label id="searchbarLabel" data-l10n-id="search-bar-header" /></caption>
|
||||
<radiogroup id="searchBarVisibleGroup" aria-labelledby="searchbarLabel" preference="browser.search.widget.inNavBar">
|
||||
<label control="searchBarVisibleGroup"><html:h2 data-l10n-id="search-bar-header"/></label>
|
||||
<radiogroup id="searchBarVisibleGroup" preference="browser.search.widget.inNavBar">
|
||||
<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"/>
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
<!-- Default Search Engine -->
|
||||
<groupbox id="defaultEngineGroup" data-category="paneSearch">
|
||||
<caption><label data-l10n-id="search-engine-default-header" /></caption>
|
||||
<label><html:h2 data-l10n-id="search-engine-default-header" /></label>
|
||||
<description data-l10n-id="search-engine-default-desc" />
|
||||
|
||||
<hbox id="browserDefaultSearchExtensionContent"
|
||||
|
|
@ -52,7 +52,7 @@
|
|||
</groupbox>
|
||||
|
||||
<groupbox id="oneClickSearchProvidersGroup" data-category="paneSearch">
|
||||
<caption><label data-l10n-id="search-one-click-header" /></caption>
|
||||
<label><html:h2 data-l10n-id="search-one-click-header" /></label>
|
||||
<description data-l10n-id="search-one-click-desc" />
|
||||
|
||||
<tree id="engineList" flex="1" rows="8" hidecolumnpicker="true" editable="true"
|
||||
|
|
|
|||
|
|
@ -308,7 +308,8 @@ var gSyncPane = {
|
|||
if (state.displayName) {
|
||||
fxaLoginStatus.setAttribute("hasName", true);
|
||||
displayNameLabel.hidden = false;
|
||||
displayNameLabel.textContent = state.displayName;
|
||||
document.getElementById("fxaDisplayNameHeading").textContent =
|
||||
state.displayName;
|
||||
} else {
|
||||
fxaLoginStatus.removeAttribute("hasName");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<groupbox id="noFxaAccount">
|
||||
<hbox>
|
||||
<vbox flex="1">
|
||||
<caption><label id="noFxaCaption" data-l10n-id="sync-signedout-caption"/></caption>
|
||||
<label id="noFxaCaption"><html:h2 data-l10n-id="sync-signedout-caption"/></label>
|
||||
<description id="noFxaDescription" flex="1" data-l10n-id="sync-signedout-description"/>
|
||||
</vbox>
|
||||
<vbox>
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<vbox flex="1">
|
||||
<hbox align="center" flex="1">
|
||||
<hbox align="center" flex="1">
|
||||
<caption><label id="signedOutAccountBoxTitle" data-l10n-id="sync-signedout-account-title"/></caption>
|
||||
<label id="signedOutAccountBoxTitle"><html:h2 data-l10n-id="sync-signedout-account-title"/></label>
|
||||
</hbox>
|
||||
<button id="noFxaSignIn"
|
||||
class="accessory-button"
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<hbox>
|
||||
<vbox id="fxaContentWrapper" flex="1">
|
||||
<groupbox id="fxaGroup">
|
||||
<caption class="search-header" hidden="true"><label data-l10n-id="pane-sync-title"/></caption>
|
||||
<label class="search-header" hidden="true"><html:h2 data-l10n-id="pane-sync-title"/></label>
|
||||
|
||||
<deck id="fxaLoginStatus" flex="1">
|
||||
|
||||
|
|
@ -83,7 +83,9 @@
|
|||
data-l10n-id="sync-profile-picture"/>
|
||||
<vbox flex="1" pack="center">
|
||||
<hbox flex="1" align="baseline">
|
||||
<caption><label id="fxaDisplayName" hidden="true"/></caption>
|
||||
<label id="fxaDisplayName" hidden="true">
|
||||
<html:h2 id="fxaDisplayNameHeading"/>
|
||||
</label>
|
||||
<label id="fxaEmailAddress" flex="1" crop="end"/>
|
||||
<button id="fxaUnlinkButton"
|
||||
class="accessory-button"
|
||||
|
|
@ -139,7 +141,7 @@
|
|||
</deck>
|
||||
</groupbox>
|
||||
<groupbox id="syncOptions">
|
||||
<caption><label data-l10n-id="sync-signedin-settings-header"/></caption>
|
||||
<label><html:h2 data-l10n-id="sync-signedin-settings-header"/></label>
|
||||
<description data-l10n-id="sync-signedin-settings-desc"/>
|
||||
<hbox id="fxaSyncEngines">
|
||||
<vbox flex="1">
|
||||
|
|
@ -169,9 +171,7 @@
|
|||
</vbox>
|
||||
</hbox>
|
||||
<groupbox>
|
||||
<caption>
|
||||
<label control="fxaSyncComputerName" data-l10n-id="sync-device-name-header"/>
|
||||
</caption>
|
||||
<label control="fxaSyncComputerName"><html:h2 data-l10n-id="sync-device-name-header"/></label>
|
||||
<hbox id="fxaDeviceName">
|
||||
<textbox id="fxaSyncComputerName" flex="1" disabled="true"/>
|
||||
<button id="fxaChangeDeviceName"
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
|
||||
<dialog id="SanitizeDialog" type="child"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
xmlns:html="http://www.w3.org/1999/xhtml"
|
||||
buttons="accept,cancel,help"
|
||||
persist="lastSelected screenX screenY"
|
||||
role="dialog"
|
||||
|
|
@ -38,7 +39,7 @@
|
|||
<description data-l10n-id="clear-data-settings-label"></description>
|
||||
|
||||
<groupbox>
|
||||
<caption><label data-l10n-id="history-section-label"></label></caption>
|
||||
<label><html:h2 data-l10n-id="history-section-label"/></label>
|
||||
<grid flex="1">
|
||||
<columns>
|
||||
<column data-l10n-id="sanitize-prefs-style" data-l10n-attrs="style"/>
|
||||
|
|
@ -65,7 +66,7 @@
|
|||
</grid>
|
||||
</groupbox>
|
||||
<groupbox>
|
||||
<caption><label data-l10n-id="data-section-label"></label></caption>
|
||||
<label><html:h2 data-l10n-id="data-section-label"/></label>
|
||||
<grid flex="1">
|
||||
<columns>
|
||||
<column data-l10n-id="sanitize-prefs-style" data-l10n-attrs="style"/>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@ const {
|
|||
this.log = null;
|
||||
FormAutofill.defineLazyLogGetter(this, EXPORTED_SYMBOLS[0]);
|
||||
|
||||
const HTML_NS = "http://www.w3.org/1999/xhtml";
|
||||
|
||||
function FormAutofillPreferences() {
|
||||
this.bundle = Services.strings.createBundle(BUNDLE_URI);
|
||||
}
|
||||
|
|
@ -70,8 +72,8 @@ FormAutofillPreferences.prototype = {
|
|||
createPreferenceGroup(document) {
|
||||
let learnMoreURL = Services.urlFormatter.formatURLPref("app.support.baseURL") + "autofill-card-address";
|
||||
let formAutofillFragment = document.createDocumentFragment();
|
||||
let formAutofillGroupBoxCaption = document.createXULElement("caption");
|
||||
let formAutofillGroupBoxCaptionLabel = document.createXULElement("label");
|
||||
let formAutofillGroupBoxLabel = document.createXULElement("label");
|
||||
let formAutofillGroupBoxLabelHeading = document.createElementNS(HTML_NS, "h2");
|
||||
let formAutofillGroupBoxDescription = document.createXULElement("description");
|
||||
let formAutofillGroup = document.createXULElement("vbox");
|
||||
let addressAutofill = document.createXULElement("hbox");
|
||||
|
|
@ -91,7 +93,7 @@ FormAutofillPreferences.prototype = {
|
|||
addressAutofill.id = "addressAutofill";
|
||||
addressAutofillLearnMore.id = "addressAutofillLearnMore";
|
||||
|
||||
formAutofillGroupBoxCaptionLabel.textContent = this.bundle.GetStringFromName("autofillHeader");
|
||||
formAutofillGroupBoxLabelHeading.textContent = this.bundle.GetStringFromName("autofillHeader");
|
||||
formAutofillGroupBoxDescription.textContent =
|
||||
this.bundle.formatStringFromName("autofillDescription",
|
||||
[FormAutofillUtils.brandBundle.GetStringFromName("brandShortName")],
|
||||
|
|
@ -119,8 +121,8 @@ FormAutofillPreferences.prototype = {
|
|||
addressAutofillCheckboxGroup.align = "center";
|
||||
addressAutofillCheckboxGroup.flex = 1;
|
||||
|
||||
formAutofillGroupBoxCaption.appendChild(formAutofillGroupBoxCaptionLabel);
|
||||
formAutofillFragment.appendChild(formAutofillGroupBoxCaption);
|
||||
formAutofillGroupBoxLabel.appendChild(formAutofillGroupBoxLabelHeading);
|
||||
formAutofillFragment.appendChild(formAutofillGroupBoxLabel);
|
||||
formAutofillFragment.appendChild(formAutofillGroupBoxDescription);
|
||||
formAutofillFragment.appendChild(formAutofillGroup);
|
||||
formAutofillGroup.appendChild(addressAutofill);
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ groupbox[data-category] {
|
|||
margin: 0 0 32px;
|
||||
}
|
||||
|
||||
caption {
|
||||
html|h2 {
|
||||
margin: 16px 0 4px;
|
||||
font-size: 1.14em;
|
||||
font-weight: 600;
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
.header-name {
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@ master-password-warning = Please make sure you remember the Master Password you
|
|||
remove-password =
|
||||
.title = Remove Master Password
|
||||
remove-info =
|
||||
.label = You must enter your current password to proceed:
|
||||
.value = You must enter your current password to proceed:
|
||||
remove-warning1 = Your Master Password is used to protect sensitive information like site passwords.
|
||||
remove-warning2 = If you remove your Master Password your information will not be protected if your computer is compromised.
|
||||
remove-password-old-password =
|
||||
.label = Current password:
|
||||
.value = Current password:
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<separator class="thin"/>
|
||||
|
||||
<groupbox>
|
||||
<caption data-l10n-id="remove-info"/>
|
||||
<label data-l10n-id="remove-info"/>
|
||||
|
||||
<hbox align="center">
|
||||
<label control="password" data-l10n-id="remove-password-old-password"/>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче