Bug 1274712 - Add Tracking Protection info to DNT settings. r=past draft
authorJohann Hofmann <jhofmann@mozilla.com>
Mon, 30 May 2016 12:37:31 +0200
changeset 373174 bbe43290f24af1670e0edc869d1bcd7014625ed5
parent 373173 427e26d44d9c6d1136e70d69edfe75bafa2e2c4d
child 522341 f6523f438e5cd29d2caf1730a772824b5160145c
push id19697
push usermail@johann-hofmann.com
push dateTue, 31 May 2016 10:10:56 +0000
reviewerspast
bugs1274712
milestone49.0a1
Bug 1274712 - Add Tracking Protection info to DNT settings. r=past MozReview-Commit-ID: GKOedxVsUrG
browser/components/preferences/donottrack.xul
browser/locales/en-US/chrome/browser/preferences/donottrack.dtd
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/donottrack.xul
+++ b/browser/components/preferences/donottrack.xul
@@ -2,34 +2,42 @@
 
 <!-- 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/. -->
 
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
 
-<!DOCTYPE prefwindow SYSTEM "chrome://browser/locale/preferences/donottrack.dtd" >
+<!DOCTYPE prefwindow [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+<!ENTITY % doNotTrackDTD SYSTEM "chrome://browser/locale/preferences/donottrack.dtd">
+%brandDTD;
+%doNotTrackDTD;
+]>
 
 <prefwindow id="DoNotTrackDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             xmlns:html="http://www.w3.org/1999/xhtml"
             title="&window.title;"
             style="width: &window.width;; height: &window.height;;"
             dlgbuttons="accept,cancel">
   <prefpane>
     <preferences>
       <preference id="privacy.donottrackheader.enabled"
                   name="privacy.donottrackheader.enabled"
                   type="bool"/>
     </preferences>
     <hbox align="center" pack="start">
       <!-- Work around focus ring not showing properly. -->
       <spacer style="width: 1em;"/>
-      <checkbox label="&doNotTrackCheckbox.label;"
+      <checkbox label="&doNotTrackCheckbox2.label;"
                 accesskey="&doNotTrackCheckbox.accesskey;"
                 preference="privacy.donottrackheader.enabled"/>
-      <label class="text-link doNotTrackLearnMore"
+    </hbox>
+    <description flex="1" class="doNotTrackLearnMore">
+      &doNotTrackTPInfo.description;
+      <label class="text-link"
              value="&doNotTrackLearnMore.label;"
              href="https://www.mozilla.org/dnt"/>
-    </hbox>
+    </description>
   </prefpane>
 </prefwindow>
--- a/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/donottrack.dtd
@@ -1,12 +1,13 @@
 <!-- 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/. -->
 
 <!ENTITY window.title                 "Do Not Track">
-<!ENTITY window.width                 "40em">
-<!ENTITY window.height                "8em">
+<!ENTITY window.width                 "50em">
+<!ENTITY window.height                "10em">
 
-<!ENTITY doNotTrackCheckbox.label     "Use Do Not Track">
-<!ENTITY doNotTrackCheckbox.accesskey "U">
+<!ENTITY doNotTrackCheckbox2.label    "Always apply Do Not Track">
+<!ENTITY doNotTrackCheckbox.accesskey "A">
 
+<!ENTITY doNotTrackTPInfo.description "&brandShortName; will send a signal that you don’t want to be tracked whenever Tracking Protection is on.">
 <!ENTITY doNotTrackLearnMore.label    "Learn More">
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -217,24 +217,34 @@ treecol {
 }
 
 .actionsMenu > menupopup > menuitem > .menu-iconic-left {
   margin-inline-end: 8px !important;
 }
 
 /* Privacy pane */
 
-.doNotTrackLearnMore,
 #trackingProtectionPBMLearnMore,
 #trackingProtectionLearnMore {
   margin-inline-start: 1.5em !important;
   margin-top: 0;
   font-weight: normal;
 }
 
+.doNotTrackLearnMore {
+  margin-inline-start: calc(1em + 30px);
+  margin-bottom: 1em;
+  font-weight: normal;
+}
+
+.doNotTrackLearnMore > label {
+  font-size: 1em !important;
+  margin-left: 0;
+}
+
 /* Collapse the non-active vboxes in decks to use only the height the
    active vbox needs */
 #historyPane:not([selectedIndex="1"]) > #historyDontRememberPane,
 #historyPane:not([selectedIndex="2"]) > #historyCustomPane,
 #weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount,
 #weavePrefsDeck:not([selectedIndex="2"]) > #needsUpdate,
 #weavePrefsDeck:not([selectedIndex="3"]) > #noFxaAccount,
 #weavePrefsDeck:not([selectedIndex="4"]) > #hasFxaAccount,