From a8dcebe392d2b98380387be66d457d70d26d830c Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Tue, 14 May 2013 13:11:19 -0400
Subject: Bug 841559 - Project Kickoff Form: Simplify finance question
 regrading budget

---
 .../create/comment-moz-project-review-finance.txt.tmpl    |  7 ++-----
 .../bug/create/create-moz-project-review.html.tmpl        | 15 ++-------------
 2 files changed, 4 insertions(+), 18 deletions(-)

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

diff --git a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl
index 99691c287..60823019c 100644
--- a/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl
+++ b/extensions/MozProjectReview/template/en/default/bug/create/comment-moz-project-review-finance.txt.tmpl
@@ -14,11 +14,8 @@
 Finance Questions:
 
 Vendor: [% cgi.param('finance_purchase_vendor') %]
-Is this line item in budget?: [% cgi.param('finance_purchase_inbudget') %]
-[% IF cgi.param('finance_purchase_inbudget') == 'No' %]
-Not In Budget Why:
-[%+ cgi.param('finance_purchase_notinbudget_why') %]
-[% END %]
+Is this line item in budget?:
+[%+ cgi.param('finance_purchase_inbudget') %]
 What is the purchase for?:
 [%+ cgi.param('finance_purchase_what') %]
 Why is the purchase needed?:
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 653058bc2..1764ade6e 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
@@ -645,19 +645,8 @@
     <div id="finance_purchase_inbudget_row" class="field_row">
       <span class="field_label required">Is this line item in budget?:</span>
       <span class="field_data">
-        <select name="finance_purchase_inbudget" id="finance_purchase_inbudget">
-          <option value="">Select One</option>
-          <option value="Yes">Yes</option>
-          <option value="No">No</option>
-        </select>
-      </span>
-    </div>
-
-    <div id="finance_purchase_notinbudget_why_row" class="field_row bz_default_hidden">
-      <span class="field_label required">Not In Budget Why:</span>
-      <span class="field_data">
-        <em>Please include additional description for this out of budget line item</em><br>
-        <textarea name="finance_purchase_notinbudget_why" id="finance_purchase_notinbudget_why" rows="10" cols="80"></textarea>
+        <div class="field_description">If not, please explain purchase need and why not in budget.</div>
+        <textarea name="finance_purchase_inbudget" id="finance_purchase_inbudget" rows="10" cols="80"></textarea>
       </span>
     </div>
 
-- 
cgit v1.2.3-24-g4f1b