From 656ffe75cc487d3ba98fc49e8082853d2dcc7df2 Mon Sep 17 00:00:00 2001
From: "robert%accettura.com"
 <robert%accettura.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 3 May 2005 21:27:01 +0000
Subject: [PATCH] Bug #281717 This is the code half of this (other half is
 policy).  Adding a privacy link under the report wizardpage so users can view
 privacy any time they want, make clear email isn't required.  p=me
 r=mconnor@steelgryphon.com a=asa

git-svn-id: svn://10.0.0.236/trunk@173016 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../reporter/locales/en-US/chrome/reportWizard.dtd   |  7 ++++++-
 .../reporter/resources/content/prefs/reporter.js     |  3 ++-
 .../resources/content/reporter/reportWizard.js       |  8 ++++++--
 .../resources/content/reporter/reportWizard.xul      |  8 ++++++++
 .../resources/skin/classic/reporter/reportWizard.css | 12 ++++++++++++
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd b/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd
index d39bf673a24..5861456deb3 100644
--- a/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd
+++ b/mozilla/extensions/reporter/locales/en-US/chrome/reportWizard.dtd
@@ -31,7 +31,12 @@
 <!ENTITY reportForm.gecko.title                     "Gecko:">
 <!ENTITY reportForm.useragent.title                 "Useragent:">
 <!ENTITY reportForm.language.title                  "Language:">
-<!ENTITY reportForm.email.title                     "Email:">
+
+<!--  Make sure this has "(Optional)" at the end.  This is important for the user to know -->
+<!ENTITY reportForm.email.title                     "Email (Optional):">
+
+<!ENTITY reportForm.privacyPolicy.title             "Privacy Policy">
+<!ENTITY reportForm.privacyPolicy.tooltip           "View Privacy Policy">
 
 <!ENTITY reportResults.showDetail.title             "Show Details">
 
diff --git a/mozilla/extensions/reporter/resources/content/prefs/reporter.js b/mozilla/extensions/reporter/resources/content/prefs/reporter.js
index 3a0a4037a5b..a160e67883f 100644
--- a/mozilla/extensions/reporter/resources/content/prefs/reporter.js
+++ b/mozilla/extensions/reporter/resources/content/prefs/reporter.js
@@ -1,3 +1,4 @@
-pref("extensions.reporter.privacyURL", "http://reporter-test.mozilla.org/privacy/?plain");
+// Make sure there are trailing slashes!
+pref("extensions.reporter.privacyURL", "http://reporter-test.mozilla.org/privacy/");
 pref("extensions.reporter.serviceURL", "http://reporter-test.mozilla.org/service/");
 
diff --git a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
index 6bf96988db3..18a874ec27b 100644
--- a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
+++ b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.js
@@ -85,6 +85,10 @@ function getCharPref(prefname, aDefault) {
   }
 }
 
+function openPrivacyPolicy() {
+  var url = getCharPref("privacyURL", "http://reporter-test.mozilla.org/privacy/");
+  openDialog("chrome://browser/content/browser.xul", "_blank", "chrome,all,dialog=no", url, null, null);
+}
 
 function initPrivacyNotice() {
   var reportWizard = document.getElementById('reportWizard');
@@ -97,8 +101,8 @@ function initPrivacyNotice() {
     document.getElementById("dontShowPrivacyStatement").setAttribute("checked", "true");
 
     // Load Privacy Policy
-    var privacyURL = getCharPref("privacyURL", "http://reporter-test.mozilla.org/privacy/?plain");
-    document.getElementById("privacyStatement").setAttribute("src", privacyURL);
+    var privacyURL = getCharPref("privacyURL", "http://reporter-test.mozilla.org/privacy/");
+    document.getElementById("privacyStatement").setAttribute("src", privacyURL+"?plain");
   }
 }
 
diff --git a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul
index 220eec88ba0..eed947082ab 100644
--- a/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul
+++ b/mozilla/extensions/reporter/resources/content/reporter/reportWizard.xul
@@ -107,6 +107,14 @@
           <label control="email" value="&reportForm.email.title;"/>
           <textbox id="email" size="60" class="noborder"/>
         </row>
+        <row>
+          <spacer/>
+          <label id="privacyPolicy"
+                 onclick="openPrivacyPolicy();"
+                 onkeypress="if (event.keyCode == event.DOM_VK_ENTER || event.keyCode == event.DOM_VK_RETURN) openPrivacyPolicy();"
+                 value="&reportForm.privacyPolicy.title;"
+                 tooltiptext="&reportForm.privacyPolicy.tooltip;"/>
+        </row>
       </rows>
     </grid>
   </wizardpage>
diff --git a/mozilla/extensions/reporter/resources/skin/classic/reporter/reportWizard.css b/mozilla/extensions/reporter/resources/skin/classic/reporter/reportWizard.css
index 64eb749abff..96082946c21 100644
--- a/mozilla/extensions/reporter/resources/skin/classic/reporter/reportWizard.css
+++ b/mozilla/extensions/reporter/resources/skin/classic/reporter/reportWizard.css
@@ -50,3 +50,15 @@
 .hide {
   display: none;
 }
+
+#privacyPolicy {
+  color: #0000FF;
+  text-decoration: underline !important;
+  cursor: pointer;
+  text-align: right;
+  -moz-user-focus: normal;
+}
+
+#privacyPolicy:focus {
+  outline: 1px dotted invert ! important;
+}