Skip to content

Commit

Permalink
Bug 1610741 - DoH setting UI r=kershaw,settings-reviewers,Gijs,pbz,flod
Browse files Browse the repository at this point in the history
Project plan: https://docs.google.com/document/d/12IGABt1eXI276qHduXXbVZqRFrhLN7Ad3gKEgxz81sE
Copy deck: https://docs.google.com/document/d/130UTox8bQbybjYIwvltR4qBg2hWjsGhuNUHypLwUAEQ
Figma: https://www.figma.com/file/qE8FEIOv2Q0pm8e1euItd1/DoH-UI-Improvements?node-id=15%3A3479&t=8tJjft2zfvDJcV2N-0


This change adds a DNS over HTTPS section to about:preferences#privacy
The UI is intended to have the same style as the Enhanced Tracking Protection
choices.
The old DoH UI is going to be removed in a followup patch.

Differential Revision: https://phabricator.services.mozilla.com/D172966
  • Loading branch information
valenting committed Apr 5, 2023
1 parent 701a533 commit 09201d8
Show file tree
Hide file tree
Showing 8 changed files with 594 additions and 39 deletions.
186 changes: 179 additions & 7 deletions browser/components/preferences/privacy.inc.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</hbox>

<!-- Tracking / Content Blocking -->
<groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" aria-describedby="contentBlockingDescription">
<groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" aria-describedby="contentBlockingDescription" class="highlighting-group">
<label id="contentBlockingHeader"><html:h2 data-l10n-id="content-blocking-enhanced-tracking-protection"/></label>
<vbox data-subcategory="trackingprotection">
<hbox align="start">
Expand Down Expand Up @@ -57,7 +57,7 @@
<radiogroup id="contentBlockingCategoryRadio"
preference="browser.contentblocking.category"
aria-labelledby="trackingProtectionMenuDesc">
<vbox id="contentBlockingOptionStandard" class="content-blocking-category info-box-container">
<vbox id="contentBlockingOptionStandard" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="standardRadio"
value="standard"
Expand All @@ -71,7 +71,7 @@
</hbox>
<vbox class="indent">
<description data-l10n-id="content-blocking-etp-standard-desc"></description>
<vbox class="content-blocking-extra-information">
<vbox class="privacy-extra-information">
<label class="content-blocking-extra-blocking-desc" data-l10n-id="content-blocking-etp-blocking-desc"/>
<vbox class="indent">
<hbox class="extra-information-label social-media-option" hidden="true">
Expand Down Expand Up @@ -138,7 +138,7 @@
</vbox>
</vbox>
</vbox>
<vbox id="contentBlockingOptionStrict" class="content-blocking-category info-box-container">
<vbox id="contentBlockingOptionStrict" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="strictRadio"
value="strict"
Expand All @@ -152,7 +152,7 @@
</hbox>
<vbox class="indent">
<label data-l10n-id="content-blocking-etp-strict-desc"></label>
<vbox class="content-blocking-extra-information">
<vbox class="privacy-extra-information">
<label class="content-blocking-extra-blocking-desc" data-l10n-id="content-blocking-etp-blocking-desc"/>
<vbox class="indent">
<hbox class="extra-information-label social-media-option" hidden="true">
Expand Down Expand Up @@ -221,7 +221,7 @@
</vbox>
</vbox>
</vbox>
<vbox id="contentBlockingOptionCustom" class="content-blocking-category info-box-container">
<vbox id="contentBlockingOptionCustom" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="customRadio"
value="custom"
Expand All @@ -235,7 +235,7 @@
</hbox>
<vbox class="indent">
<description id="contentBlockingCustomDesc" data-l10n-id="content-blocking-etp-custom-desc"></description>
<vbox class="content-blocking-extra-information">
<vbox class="privacy-extra-information">
<hbox class="reject-trackers-ui custom-option">
<checkbox id="contentBlockingBlockCookiesCheckbox"
class="content-blocking-checkbox" flex="1"
Expand Down Expand Up @@ -1185,4 +1185,176 @@
</hbox>
</groupbox>

<!-- DoH -->
<hbox id="DoHCategory"
class="subcategory"
hidden="true"
data-category="panePrivacy">
<html:h1 data-l10n-id="preferences-doh-header"/>
</hbox>

<groupbox id="dohBox" data-category="panePrivacy" data-subcategory="doh" hidden="true" class="highlighting-group">
<label class="search-header" searchkeywords="doh trr" hidden="true"><html:h2 data-l10n-id="preferences-doh-header"/></label>
<vbox flex="1">
<html:span id="dohDescription" class="tail-with-learn-more" data-l10n-id="preferences-doh-description"></html:span>
<html:a is="moz-support-link"
id="dohLearnMore"
class="learnMore"
support-page="firefox-dns-over-https"
/>
</vbox>
<vbox id="dohStatusSection" class="privacy-detailedoption info-box-container">
<label id="dohStatus"/>
<label id="dohResolver"/>
<label id="dohSteeringStatus" data-l10n-id="preferences-doh-steering-status" hidden="true"/>
</vbox>
<vbox>
<label><html:h2 id="dohGroupMessage" data-l10n-id="preferences-doh-group-message"/></label>
<vbox id="dohCategories">
<radiogroup id="dohCategoryRadioGroup"
preference="network.trr.mode" aria-labelledby="dohGroupMessage">
<vbox id="dohOptionDefault" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="dohDefaultRadio"
value="0"
data-l10n-id="preferences-doh-setting-default"
flex="1"/>
<button id="dohDefaultArrow"
is="highlightable-button"
class="arrowhead doh-expand-section"
data-l10n-id="preferences-doh-expand-section"
aria-expanded="false"/>
</hbox>
<vbox class="indent">
<label data-l10n-id="preferences-doh-default-desc"></label>
<vbox class="privacy-extra-information">
<vbox class="indent">
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-default-detailed-desc-1"/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-default-detailed-desc-2"/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label tail-with-learn-more" data-l10n-id="preferences-doh-default-detailed-desc-3"/>
<html:a is="moz-support-link"
id="default-desc-3-learn-more"
class="learnMore"
support-page="firefox-dns-over-https"
/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-default-detailed-desc-4"/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label tail-with-learn-more" data-l10n-id="preferences-doh-default-detailed-desc-5"/>
<html:a is="moz-support-link"
id="default-desc-5-learn-more"
class="learnMore"
support-page="firefox-dns-over-https"
/>
</hbox>
</vbox>
<hbox id="dohWarningBox1" class="extra-information-label" hidden="true">
<checkbox id="dohWarnCheckbox1"
flex="1"
data-l10n-id="preferences-doh-checkbox-warn"
preference="network.trr.display_fallback_warning"/>
</hbox>
</vbox>
</vbox>
</vbox>
<vbox id="dohOptionEnabled" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="dohEnabledRadio"
value="2"
data-l10n-id="preferences-doh-setting-enabled"
flex="1"/>
<button id="dohEnabledArrow"
is="highlightable-button"
class="arrowhead doh-expand-section"
data-l10n-id="preferences-doh-expand-section"
aria-expanded="false"/>
</hbox>
<vbox class="indent">
<label data-l10n-id="preferences-doh-enabled-desc"></label>
<vbox class="privacy-extra-information">
<vbox class="indent">
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-enabled-detailed-desc-1"/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-enabled-detailed-desc-2"/>
</hbox>
</vbox>
<hbox id="dohWarningBox2" class="extra-information-label" hidden="true">
<checkbox id="dohWarnCheckbox2"
flex="1"
data-l10n-id="preferences-doh-checkbox-warn"
preference="network.trr.display_fallback_warning"/>
</hbox>
<vbox class="extra-information-label">
<label data-l10n-id="preferences-doh-select-resolver"/>
<menulist id="dohEnabledResolverChoices"
sizetopopup="none">
</menulist>
<html:input id="dohEnabledInputField" type="text" style="flex: 1;"
preference="network.trr.custom_uri" hidden="true"/>
</vbox>
</vbox>
</vbox>
</vbox>
<vbox id="dohOptionStrict" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="dohStrictRadio"
value="3"
data-l10n-id="preferences-doh-setting-strict"
flex="1"/>
<button id="dohStrictArrow"
is="highlightable-button"
class="arrowhead doh-expand-section"
data-l10n-id="preferences-doh-expand-section"
aria-expanded="false"/>
</hbox>
<vbox class="indent">
<label data-l10n-id="preferences-doh-strict-desc"></label>
<vbox class="privacy-extra-information">
<vbox class="indent">
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-strict-detailed-desc-1"/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-strict-detailed-desc-2"/>
</hbox>
<hbox class="extra-information-label">
<label class="doh-label" data-l10n-id="preferences-doh-strict-detailed-desc-3"/>
</hbox>
</vbox>
<vbox class="extra-information-label">
<label data-l10n-id="preferences-doh-select-resolver"/>
<menulist id="dohStrictResolverChoices"
sizetopopup="none">
</menulist>
<html:input id="dohStrictInputField" type="text" style="flex: 1;"
preference="network.trr.custom_uri" hidden="true"/>
</vbox>
</vbox>
</vbox>
</vbox>
<vbox id="dohOptionOff" class="privacy-detailedoption info-box-container">
<hbox>
<radio id="dohOffRadio"
value="5"
data-l10n-id="preferences-doh-setting-off"
flex="1"/>
</hbox>
<vbox class="indent">
<label data-l10n-id="preferences-doh-off-desc"></label>
</vbox>
</vbox>
</radiogroup>
</vbox>
</vbox>
</groupbox>

</html:template>
Loading

0 comments on commit 09201d8

Please sign in to comment.