Bug 853022 - Remove "Ideas" from feedback app. r=mfinkle

This commit is contained in:
Margaret Leibovic 2013-03-21 14:01:02 -07:00
parent e50647fad7
commit 60b22ab8a6
2 changed files with 12 additions and 53 deletions

View File

@ -30,12 +30,9 @@
<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>
@ -66,15 +63,6 @@
</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">
@ -83,14 +71,6 @@
</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;
@ -156,7 +136,7 @@
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;
}
@ -171,24 +151,18 @@
let data = new FormData();
data.append("description", descriptionElement.value);
data.append("_type", 2);
if (section == "sad") {
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);

View File

@ -12,7 +12,6 @@
<!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. -->
@ -52,19 +51,5 @@
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">