diff options
Diffstat (limited to 'chrome/browser/resources/options/browser_options.html')
-rw-r--r-- | chrome/browser/resources/options/browser_options.html | 242 |
1 files changed, 100 insertions, 142 deletions
diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index 387ccee..6c5e16e 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -60,12 +60,10 @@ <input type="checkbox" pref="browser.show_home_button" metric="Options_Homepage_HomeButton"> - <span> - <span i18n-content="homePageShowHomeButton"></span> - <span class="controlled-setting-indicator" - pref="browser.show_home_button"></span> - </span> + <span i18n-content="homePageShowHomeButton"></span> </label> + <span class="controlled-setting-indicator" + pref="browser.show_home_button"></span> </div> <div id="change-home-page-section" hidden> <div id="change-home-page-section-container" guest-visibility="disabled"> @@ -83,12 +81,11 @@ <input type="checkbox" pref="bookmark_bar.show_on_all_tabs" metric="Options_ShowBookmarksBar"> - <span> - <span i18n-content="toolbarShowBookmarksBar"></span> - <span class="controlled-setting-indicator" - pref="bookmark_bar.show_on_all_tabs"></span> - </span> + <span i18n-content="toolbarShowBookmarksBar"></span> </label> + <span class="controlled-setting-indicator" + pref="bookmark_bar.show_on_all_tabs"> + </span> </div> <if expr="is_posix and not chromeos and not is_macosx"> <div class="checkbox"><label> @@ -294,36 +291,32 @@ <input id="alternateErrorPagesEnabled" pref="alternate_error_pages.enabled" metric="Options_LinkDoctorCheckbox" type="checkbox"> - <span> - <span i18n-content="linkDoctorPref"></span> - <span class="controlled-setting-indicator" - pref="alternate_error_pages.enabled"></span> - </span> + <span i18n-content="linkDoctorPref"></span> </label> + <span class="controlled-setting-indicator" + pref="alternate_error_pages.enabled"> + </span> </div> <div class="checkbox controlled-setting-with-label" guest-visibility="disabled"> <label> <input pref="search.suggest_enabled" metric="Options_UseSuggestCheckbox" type="checkbox"> - <span> - <span i18n-content="suggestPref"></span> - <span class="controlled-setting-indicator" - pref="search.suggest_enabled"></span> - </span> + <span i18n-content="suggestPref"></span> </label> + <span class="controlled-setting-indicator" + pref="search.suggest_enabled"> + </span> </div> <div class="checkbox" guest-visibility="disabled"> <span class="controlled-setting-with-label"> <label> <input id="networkPredictionOptions" metric="Options_DnsPrefetchCheckbox" type="checkbox"> - <span> - <span i18n-content="networkPredictionEnabledDescription"></span> - <span class="controlled-setting-indicator" - pref="net.network_prediction_options"></span> - </span> + <span i18n-content="networkPredictionEnabledDescription"></span> </label> + <span class="controlled-setting-indicator" + pref="net.network_prediction_options"></span> </span> </div> <div class="checkbox controlled-setting-with-label"> @@ -332,23 +325,21 @@ metric="Options_SafeBrowsingExtendedReportingCheckbox" pref="safebrowsing.extended_reporting_enabled" type="checkbox"> - <span> - <span i18n-content="safeBrowsingEnableExtendedReporting"></span> - <span class="controlled-setting-indicator" - pref="safebrowsing.extended_reporting_enabled"></span> - </span> + <span i18n-content="safeBrowsingEnableExtendedReporting"></span> </label> + <span class="controlled-setting-indicator" + pref="safebrowsing.extended_reporting_enabled"> + </span> </div> <div class="checkbox controlled-setting-with-label"> <label> <input pref="safebrowsing.enabled" metric="Options_SafeBrowsingCheckbox" type="checkbox"> - <span> - <span i18n-content="safeBrowsingEnableProtection"></span> - <span class="controlled-setting-indicator" - pref="safebrowsing.enabled"></span> - </span> + <span i18n-content="safeBrowsingEnableProtection"></span> </label> + <span class="controlled-setting-indicator" + pref="safebrowsing.enabled"> + </span> </div> <if expr="_google_chrome"> <div class="checkbox controlled-setting-with-label"> @@ -356,13 +347,12 @@ <input id="spelling-enabled-control" type="checkbox" metric="Options_SpellingServiceCheckbox" pref="spellcheck.use_spelling_service" dialog-pref> - <span> - <span i18n-content="spellingPref"></span> - <span id="spelling-enabled-indicator" - class="controlled-setting-indicator" - pref="spellcheck.use_spelling_service" dialog-pref> - </span> + <span i18n-content="spellingPref"></span> </label> + <span id="spelling-enabled-indicator" + class="controlled-setting-indicator" + pref="spellcheck.use_spelling_service" dialog-pref> + </span> </div> <div id="metricsReportingSetting" class="checkbox controlled-setting-with-label"> @@ -370,23 +360,20 @@ <label> <input id="metricsReportingEnabled" pref="cros.metrics.reportingEnabled" type="checkbox"> - <span> - <span i18n-content="enableLogging"></span> - <span class="controlled-setting-indicator" - pref="cros.metrics.reportingEnabled"></span> - </span> + <span i18n-content="enableLogging"></span> </label> + <span class="controlled-setting-indicator" + pref="cros.metrics.reportingEnabled"></span> </if> <if expr="not chromeos"> <label> <input id="metricsReportingEnabled" pref="user_experience_metrics.reporting_enabled" type="checkbox"> - <span> - <span i18n-content="enableLogging"></span> - <span class="controlled-setting-indicator" - pref="user_experience_metrics.reporting_enabled"></span> - </span> + <span i18n-content="enableLogging"> </label> + <span class="controlled-setting-indicator" + pref="user_experience_metrics.reporting_enabled"> + </span> <span id="metrics-reporting-reset-restart"> <!-- Text filled by JavaScript --> <span></span><button class= @@ -407,16 +394,14 @@ <label> <input id="content-protection-attestation-enabled" type="checkbox" pref="cros.device.attestation_for_content_protection_enabled"> - <span> - <span i18n-content="enableContentProtectionAttestation"></span> - <span class="controlled-setting-indicator" - pref="cros.device.attestation_for_content_protection_enabled"> - </span> - </span> + <span i18n-content="enableContentProtectionAttestation"></span> </label> <a target="_blank" i18n-content="learnMore" i18n-values="href:contentProtectionAttestationLearnMoreURL"> </a> + <span class="controlled-setting-indicator" + pref="cros.device.attestation_for_content_protection_enabled"> + </span> </div> </if> <div id="hotword-search" hidden> @@ -424,12 +409,11 @@ <label> <input id="hotword-search-enable" pref="hotword.search_enabled_2" metric="Options_HotwordCheckbox" type="checkbox" dialog-pref> - <span> - <span i18n-values=".innerHTML:hotwordSearchEnable"></span> - <span id="hotword-search-setting-indicator" - pref="hotword.search_enabled_2" dialog-pref></span> - </span> + <span i18n-values=".innerHTML:hotwordSearchEnable"></span> </label> + <span id="hotword-search-setting-indicator" + pref="hotword.search_enabled_2" dialog-pref> + </span> </div> </div> </div> @@ -468,10 +452,8 @@ <label> <input id="autofill-enabled" pref="autofill.enabled" metric="Options_FormAutofill" type="checkbox"> - <span> - <span i18n-content="autofillEnabled"></span> - <span class="controlled-setting-indicator" pref="autofill.enabled"> - </span> + <span i18n-content="autofillEnabled"></span> + <span class="controlled-setting-indicator" pref="autofill.enabled"> </span> </label> <button id="autofill-settings" class="link-button" @@ -483,10 +465,9 @@ <input id="password-manager-enabled" pref="profile.password_manager_enabled" metric="Options_PasswordManager" type="checkbox"> - <span> - <span i18n-content="passwordManagerEnabled"></span> - <span class="controlled-setting-indicator" - pref="profile.password_manager_enabled"></span> + <span i18n-content="passwordManagerEnabled"></span> + <span class="controlled-setting-indicator" + pref="profile.password_manager_enabled"></span> </span> </label> <button id="manage-passwords" class="link-button" @@ -501,7 +482,7 @@ <h3 i18n-content="easyUnlockSectionTitle"></h3> <!-- Options shown when the user has not set up Easy Unlock --> <div id='easy-unlock-setup' hidden> - <div class="settings-row"> + <div class="controlled-setting-with-label"> <span i18n-content="easyUnlockSetupIntro"></span> <a target="_blank" i18n-content="learnMore" i18n-values="href:easyUnlockLearnMoreURL"></a> @@ -511,7 +492,7 @@ </div> <!-- Options shown when the user has set up Easy Unlock --> <div id='easy-unlock-enable' hidden> - <div class="settings-row"> + <div class="controlled-setting-with-label"> <span i18n-content="easyUnlockDescription"></span> <a target="_blank" i18n-content="learnMore" i18n-values="href:easyUnlockLearnMoreURL"></a> @@ -592,12 +573,10 @@ <label> <input pref="translate.enabled" metric="Options_Translate" type="checkbox"> - <span> - <span i18n-content="translateEnableTranslate"></span> - <span class="controlled-setting-indicator" pref="translate.enabled"> - </span> - </span> + <span i18n-content="translateEnableTranslate"></span> </label> + <span class="controlled-setting-indicator" pref="translate.enabled"> + </span> <button id="manage-languages" class="link-button" i18n-content="manageLanguages"></button> </div> @@ -625,12 +604,10 @@ <input type="checkbox" pref="download.prompt_for_download" metric="Options_AskForSaveLocation"> - <span> - <span i18n-content="downloadLocationAskForSaveLocation"></span> - <span class="controlled-setting-indicator" - pref="download.prompt_for_download"></span> - </span> + <span i18n-content="downloadLocationAskForSaveLocation"></span> </label> + <span class="controlled-setting-indicator" + pref="download.prompt_for_download"></span> </div> <if expr="chromeos"> <div class="checkbox controlled-setting-with-label" @@ -639,12 +616,10 @@ <input type="checkbox" pref="gdata.disabled" metric="Options_DisableGData"> - <span> - <span i18n-content="disableGData"></span> - <span class="controlled-setting-indicator" pref="gdata.disabled"> - </span> - </span> + <span i18n-content="disableGData"></span> </label> + <span class="controlled-setting-indicator" pref="gdata.disabled"> + </span> </div> </if> <div id="auto-open-file-types-section" hidden> @@ -682,19 +657,17 @@ i18n-content="cloudPrintDevicesPageButton"> </button> - <div class="settings-row checkbox controlled-setting-with-label" + <div class="checkbox controlled-setting-with-label" i18n-values=".hidden: cloudPrintHideNotificationsCheckbox"> <label> <input id="local-discovery-notifications-enabled" pref="local_discovery.notifications_enabled" type="checkbox" metric="LocalDiscoveryNotificationsDisabled_Settings"> - <span> - <span i18n-content="cloudPrintEnableNotificationsLabel"></span> - <span class="controlled-setting-indicator" - pref="local_discovery.notifications_enabled"></span> - </span> + <span i18n-content="cloudPrintEnableNotificationsLabel"></span> </label> + <span class="controlled-setting-indicator" + pref="local_discovery.notifications_enabled"></span> </div> </section> </if> @@ -715,12 +688,10 @@ <input pref="settings.a11y.enable_menu" type="checkbox" metric="Options_AccessibilitySystemMenu"> - <span> - <span i18n-content="accessibilityAlwaysShowMenu"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.enable_menu"></span> - </span> + <span i18n-content="accessibilityAlwaysShowMenu"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.enable_menu"></span> </div> </div> <div class="option-name"> @@ -729,12 +700,10 @@ <input pref="settings.a11y.large_cursor_enabled" type="checkbox" metric="Options_AccessibilityLargeMouseCursor"> - <span> - <span i18n-content="accessibilityLargeCursor"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.large_cursor_enabled"></span> - </span> + <span i18n-content="accessibilityLargeCursor"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.large_cursor_enabled"></span> </div> </div> <div class="option-name"> @@ -743,12 +712,11 @@ <input id="accessibility-high-contrast-check" pref="settings.a11y.high_contrast_enabled" type="checkbox" metric="Options_AccessibilityHighContrastMode"> - <span> - <span i18n-content="accessibilityHighContrast"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.high_contrast_enabled"></span> - </span> + <span i18n-content="accessibilityHighContrast"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.high_contrast_enabled"> + </span> </div> </div> <div id="accessibility-sticky-keys" class="option-name"> @@ -757,12 +725,11 @@ <input id="accessibility-sticky-keys-check" pref="settings.a11y.sticky_keys_enabled" type="checkbox" metric="Options_AccessibilityStickyKeys"> - <span> - <span i18n-content="accessibilityStickyKeys"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.sticky_keys_enabled"></span> - </span> + <span i18n-content="accessibilityStickyKeys"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.sticky_keys_enabled"></span> + </span> </div> </div> <div class="option-name"> @@ -771,12 +738,11 @@ <input id="accessibility-spoken-feedback-check" pref="settings.accessibility" type="checkbox" metric="Options_AccessibilitySpokenFeedback"> - <span> - <span i18n-content="accessibilitySpokenFeedback"></span> - <span class="controlled-setting-indicator" - pref="settings.accessibility"></span> - </span> + <span i18n-content="accessibilitySpokenFeedback"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.accessibility"> + </span> <div id="accessibility-settings" hidden> <button id="accessibility-settings-button" i18n-content="accessibilitySettings"></button> @@ -785,24 +751,21 @@ </div> <div class="option-name"> <div class="checkbox controlled-setting-with-label"> - <label> <input pref="settings.a11y.screen_magnifier" type="checkbox" metric="Options_AccessibilityScreenMagnifier"> - <span> - <span i18n-content="accessibilityScreenMagnifier"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.screen_magnifier"></span> - </span> + <span i18n-content="accessibilityScreenMagnifier"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.screen_magnifier"></span> </div> </div> <div class="option-name" id="accessibility-tap-dragging"> <div class="checkbox"> <label> <input id="accessibility-tap-dragging-check" - pref="settings.touchpad.enable_tap_dragging" type="checkbox" - metric="Options_AccessibilityTapDragging"> + pref="settings.touchpad.enable_tap_dragging" type="checkbox" + metric="Options_AccessibilityTapDragging"> <span i18n-content="accessibilityTapDragging"></span> </label> </div> @@ -812,14 +775,12 @@ <label> <input id="accessibility-autoclick-check" pref="settings.a11y.autoclick" type="checkbox"> - <span> - <span i18n-content="accessibilityAutoclick"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.autoclick"></span> - </span> + <span i18n-content="accessibilityAutoclick"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.autoclick"></span> </div> - <div> + <div class="checkbox"> <!-- No whitespace between elements. --> <input type="checkbox" class="spacer-checkbox"><span id="accessibility-autoclick-label" @@ -848,12 +809,11 @@ <label> <input pref="settings.a11y.virtual_keyboard" type="checkbox" metric="Options_AccessibilityOnScreenKeyboard"> - <span> - <span i18n-content="accessibilityVirtualKeyboard"></span> - <span class="controlled-setting-indicator" - pref="settings.a11y.virtual_keyboard"></span> - </span> + <span i18n-content="accessibilityVirtualKeyboard"></span> </label> + <span class="controlled-setting-indicator" + pref="settings.a11y.virtual_keyboard"> + </span> </div> </div> </section> @@ -878,12 +838,10 @@ <label> <input pref="background_mode.enabled" type="checkbox"> - <span> - <span i18n-content="backgroundModeCheckbox"></span> - <span class="controlled-setting-indicator" - pref="background_mode.enabled"></span> - </span> + <span i18n-content="backgroundModeCheckbox"></span> </label> + <span class="controlled-setting-indicator" + pref="background_mode.enabled"></span> </div> </if> <div class="checkbox controlled-setting-with-label"> |