From b061ce481380dfd01f85ea84ef700eb7589433e3 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 5 Dec 2012 00:20:54 +0800
Subject: Bug 817157: Project Kickoff Form: Change "Current Goal" to drop down
 list

---
 .../bug/create/comment-moz-project-review.txt.tmpl |  4 ++-
 .../bug/create/create-moz-project-review.html.tmpl | 31 +++++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'extensions/MozProjectReview/template/en')

diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl
index 16bdcb568..66ab024fe 100644
--- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl
+++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review.txt.tmpl
@@ -18,7 +18,9 @@ Description:
 Additional Information:
 [%+ cgi.param('additional') %]
 Urgency: [% cgi.param('urgency') %]
-Current Goal: [% cgi.param('goal') %]
+Key Initiative: [% cgi.param('key_initiative') == 'Other'
+                   ? cgi.param('key_initiative_other')
+                   : cgi.param('key_initiative') %]
 Release Date: [% cgi.param('release_date') %]
 Project Status: [% cgi.param('project_status') %]
 Mozilla Data: [% cgi.param('mozilla_data') %]
diff --git a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
index 2db1f225f..a84bbe743 100644
--- a/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
+++ b/extensions/MozProjectReview/template/en/default/bug/create/create-moz-project-review.html.tmpl
@@ -104,11 +104,34 @@
       </span>
     </div>
 
-    <div id="goal_row" class="field_row">
-      <span class="field_label">Current Goal:</span>
+    <div id="key_initiative_row" class="field_row">
+      <span class="field_label required">Key Initiative:</span>
       <span class="field_data">
-        <div class="field_description">Does it support a current Mozilla goal (if so, which one)?</div>
-        <input type="text" name="goal" id="goal" size="60">
+        <div class="field_description">Which key initiative does this support?</div>
+        <select name="key_initiative" id="key_initiative"
+                onchange="MPR.toggleVisibleById(this,'Other','key_initiative_other_row');">
+          <option value="">Select One</option>
+          <option value="Firefox Desktop">Firefox Desktop</option>
+          <option value="Firefox Mobile">Firefox Mobile</option>
+          <option value="Firefox OS">Firefox OS</option>
+          <option value="Firefox Platform">Firefox Platform</option>
+          <option value="Marketplace / Apps">Marketplace / Apps</option>
+          <option value="Services: Persona">Services: Persona</option>
+          <option value="Services: WebRTC">Services: WebRTC</option>
+          <option value="Services: UP">Services: UP</option>
+          <option value="Services: Social API">Services: Social API</option>
+          <option value="Labs / Research / H3">Labs / Research / H3</option>
+          <option value="Product Support">Product Support</option>
+          <option value="Corp Support">Corp Support</option>
+          <option value="Other">Other</option>
+        </select>
+      </span>
+    </div>
+
+    <div id="key_initiative_other_row" class="field_row bz_default_hidden">
+      <span class="field_label">&nbsp;</span>
+      <span class="field_data">
+        <input type="text" name="key_initiative_other" id="key_initiative_other" size="60">
       </span>
     </div>
 
-- 
cgit v1.2.3-24-g4f1b