Bug 853022 - Remove "Ideas" from feedback app. r=mfinkle, a=bajaj
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Thu, 21 Mar 2013 14:01:02 -0700
changeset 132474 caf6ea63dc25f39140fd6746693944c64922c835
parent 132473 08781b8fa2b767b981b748991e71c278d4da99d3
child 132475 569a5ca67a5678868fe7000dffb2b56ed8e37cd6
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, bajaj
bugs853022
milestone21.0a2
Bug 853022 - Remove "Ideas" from feedback app. r=mfinkle, a=bajaj
mobile/android/chrome/content/aboutFeedback.xhtml
mobile/android/locales/en-US/chrome/aboutFeedback.dtd
--- a/mobile/android/chrome/content/aboutFeedback.xhtml
+++ b/mobile/android/chrome/content/aboutFeedback.xhtml
@@ -25,22 +25,19 @@
 <body dir="&locale.dir;" onload="init();" onunload="uninit();">
 
   <section id="intro" active="true">
     <h1 class="header">&intro.header;</h1>
     <div class="message">&intro.message;</div>
     <div class="link-box" onclick="switchSection('happy');">
       <a>&intro.happyLink;</a>
     </div>
-    <div class="link-box" onclick="switchSection('sad');">
+    <div class="link-box-bottom" onclick="switchSection('sad');">
       <a>&intro.sadLink;</a>
     </div>
-    <div class="link-box-bottom" onclick="switchSection('idea');">
-      <a>&intro.ideaLink;</a>
-    </div>
     <div id="sumo-message" class="fine-print">&support.pre;<a id="sumo-link">&support.link;</a>&support.post;</div>
   </section>
 
   <section id="happy">
     <h1 class="header">&happy.header;</h1>
     <div class="message-box">
       <div class="message">&happy.message;</div>
       <div class="fine-print">&happy.finePrint;</div>
@@ -61,41 +58,24 @@
       <textarea class="description" placeholder="&sad.placeholder;" rows="8" required="true"/>
       <div class="message">&sad.lastSite;</div>
       <input id="last-url" type="url" placeholder="&sad.urlPlaceholder;"/>
       <div class="fine-print">&feedback.privacy;</div>
       <input class="send-feedback" type="submit" value="&feedback.send;"/>
     </form>
   </section>
 
-  <section id="idea">
-    <form onsubmit="sendFeedback(event);">
-      <div class="message">&idea.message;</div>
-      <textarea class="description" placeholder="&idea.placeholder;" rows="8" required="true"/>
-      <div class="fine-print">&feedback.privacy;</div>
-      <input class="send-feedback" type="submit" value="&feedback.send;"/>
-    </form>
-  </section>
-
   <section id="thanks-sad">
     <h1 class="header">&sad.thanksHeader;</h1>
     <div class="message-box-bottom">
       <div class="message">&sad.thanksMessageTop;</div>
       <div class="message">&sad.thanksMessageBottom;</div>
     </div>
   </section>
 
-  <section id="thanks-idea">
-    <h1 class="header">&idea.thanksHeader;</h1>
-    <div class="message-box-bottom">
-      <div class="message">&idea.thanksMessageTop;</div>
-      <div class="message">&idea.thanksMessageBottom;</div>
-    </div>
-  </section>
-
   <script type="application/javascript;version=1.8"><![CDATA[
     let Cc = Components.classes;
     let Ci = Components.interfaces;
     let Cu = Components.utils;
 
     Cu.import("resource://gre/modules/Services.jsm");
 
     function dump(a) {
@@ -151,49 +131,43 @@
 
     function sendFeedback(aEvent) {
       // Prevent the page from reloading.
       aEvent.preventDefault();
 
       let section = history.state.section;
 
       // Sanity check.
-      if (section != "sad" && section != "idea") {
+      if (section != "sad") {
         Cu.reportError("Trying to send feedback from an invalid section: " + section);
         return;
       }
 
       let sectionElement = document.getElementById(section);
       let descriptionElement = sectionElement.querySelector(".description");
 
       // Bail if the description value isn't valid. HTML5 form validation will take care
       // of showing an error message for us.
       if (!descriptionElement.validity.valid)
         return;
 
       let data = new FormData();
       data.append("description", descriptionElement.value);
-
-      if (section == "sad") {
-        data.append("_type", 2);
+      data.append("_type", 2);
 
-        let urlElement = document.getElementById("last-url");
-        // Bail if the URL value isn't valid. HTML5 form validation will take care
-        // of showing an error message for us.
-        if (!urlElement.validity.valid)
-          return;
+      let urlElement = document.getElementById("last-url");
+      // Bail if the URL value isn't valid. HTML5 form validation will take care
+      // of showing an error message for us.
+      if (!urlElement.validity.valid)
+        return;
 
-        // Only send a URL string if the user provided one.
-        if (urlElement.value) {
-          data.append("add_url", true);
-          data.append("url", urlElement.value);
-        }
-      } else {
-        // Otherwise we're in the "idea" section.
-        data.append("_type", 3);        
+      // Only send a URL string if the user provided one.
+      if (urlElement.value) {
+        data.append("add_url", true);
+        data.append("url", urlElement.value);
       }
 
       let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
       data.append("device", sysInfo.get("device"));
       data.append("manufacturer", sysInfo.get("manufacturer"));
 
       let req = new XMLHttpRequest();
       req.addEventListener("error", function() {
--- a/mobile/android/locales/en-US/chrome/aboutFeedback.dtd
+++ b/mobile/android/locales/en-US/chrome/aboutFeedback.dtd
@@ -7,17 +7,16 @@
      your language and/or locale. More detailed notes below. -->
 
 <!ENTITY pageTitle                 "&brandShortName; Feedback">
 
 <!ENTITY intro.header              "Have a minute?">
 <!ENTITY intro.message             "Tell us what you think about &brandShortName; for Android so far.">
 <!ENTITY intro.happyLink           "I love it">
 <!ENTITY intro.sadLink             "I ran into some problems">
-<!ENTITY intro.ideaLink            "I have an idea">
 
 <!-- LOCALIZATION NOTE (support.pre): Include a trailing space as needed. -->
 <!-- LOCALIZATION NOTE (support.link): Avoid leading/trailing spaces, this text is a link. -->
 <!-- LOCALIZATION NOTE (support.post): Include a starting space as needed. -->
 <!ENTITY support.pre               "If you need help or have a problem with &brandShortName;, please visit ">
 <!ENTITY support.link              "&brandShortName; Support">
 <!ENTITY support.post              ".">
 
@@ -47,24 +46,10 @@
      and that it doesn't just go to some automated system that looks for keywords, or something like that. -->
 <!ENTITY sad.thanksMessageTop      "We're always working to make &brandShortName; better. Rest assured that real people will look at your feedback and do their very best to resolve your issue.">
 
 <!-- LOCALIZATION NOTE (sad.thanksMessageBottom): We're suggesting that there will be consequences for the people working
      on Firefox if they don't resolve the user's problem, like "or if they don't fix it, we'll fire them." If this doesn't
      work in your language, you can change it to something like "no matter what" or just remove it entirely. -->
 <!ENTITY sad.thanksMessageBottom   "Or else.">
 
-<!-- LOCALIZATION NOTE (idea.message): In English, "please share your thoughts" could mean that we're asking the user to
-     tell us any thoughts or ideas they have about anything, so we're jokingly telling them not to use the space below
-     to tell us anything they're thinking about. -->
-<!ENTITY idea.message              "We love hearing your ideas! Please share your thoughts below. (Just the ones about &brandShortName;, please.)">
-<!ENTITY idea.placeholder          "Enter your idea here">
-<!ENTITY idea.thanksHeader         "Thanks!">
-
-<!ENTITY idea.thanksMessageTop     "We appreciate you taking the time to share your thoughts. We're always working to make &brandShortName; better and contributions like yours can lead to great things.">
-
-<!-- LOCALIZATION NOTE (idea.thanksMessageBottom): "high five" — This is a celebratory or congratulatory gesture.
-     It could also be a handshake, a pat on the back, a thumbs up or something similar. The idea is that it's
-     something physical, which is why they can't see it.-->
-<!ENTITY idea.thanksMessageBottom  "You can't see it, but we're giving you a high five right now.">
-
 <!ENTITY feedback.privacy          "For your privacy, please don't include any personally identifiable information in your feedback.">
 <!ENTITY feedback.send             "Send Feedback">