From 36bdc20658a16688e4e52b81aa46ef2b70a9103d Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Thu, 18 Oct 2012 00:44:39 -0400 Subject: Bug 795980 - Changes in budget request form --- .../bug/create/comment-remo-budget.txt.tmpl | 15 +- .../bug/create/create-remo-budget.html.tmpl | 199 +++++++++++---------- .../bug/create/created-remo-budget.html.tmpl | 27 +++ 3 files changed, 136 insertions(+), 105 deletions(-) create mode 100644 extensions/REMO/template/en/default/bug/create/created-remo-budget.html.tmpl (limited to 'extensions/REMO/template/en') diff --git a/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl index d60f2fdde..2ac4d9caa 100644 --- a/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl +++ b/extensions/REMO/template/en/default/bug/create/comment-remo-budget.txt.tmpl @@ -33,6 +33,9 @@ Requester info: Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] Profile page: [% cgi.param('profilepage') %] Event page: [% cgi.param('eventpage') %] +Mentor Email: [% cgi.param('mentoremail') %] +Paypal Account: [% cgi.param('paypal') %] +Country You Reside: [% cgi.param('country') %] Advance payment needed: [% IF cgi.param('advancepayment') %]Yes[% ELSE %]No[% END %] Budget breakdown: @@ -48,17 +51,5 @@ Service 5: [% cgi.param('service5') %] Cost: [% cgi.param('cost5') %] Additional costs: (add comment box) [% cgi.param('costadditional') %] -Success measurement: - -How will the event help push the Mozilla project forward? -[%+ cgi.param('successmeasure') %] - -Metric 1: [% cgi.param('metric1') %] Success scenario: [% cgi.param('success1') %] -Metric 2: [% cgi.param('metric2') %] Success scenario: [% cgi.param('success2') %] -Metric 3: [% cgi.param('metric3') %] Success scenario: [% cgi.param('success3') %] - -Additional information: -[%+ cgi.param('successadditional') %] - [%+ cgi.param("comment") IF cgi.param("comment") %] diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl index 0264b23c9..29d257f89 100644 --- a/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl +++ b/extensions/REMO/template/en/default/bug/create/create-remo-budget.html.tmpl @@ -1,22 +1,9 @@ -[%# 1.0@bugzilla.org %] -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Mozilla Corporation. - # Portions created by Mozilla are Copyright (C) 2008 Mozilla - # Corporation. All Rights Reserved. - # - # Contributor(s): Reed Loden - # David Tran + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [% PROCESS global/variables.none.tmpl %] @@ -51,10 +38,10 @@ function validateAndSubmit() { if(!isFilledOut('lastname')) alert_text += "Please enter your last name\n"; if(!isFilledOut('profilepage')) alert_text += "Please enter a Mozilla Reps profile page.\n"; if(!isFilledOut('eventpage')) alert_text += "Please enter a event page address.\n"; - if(!isFilledOut('successmeasure')) alert_text += "Please enter how you will measure the success of the event.\n"; + if(!isFilledOut('mentoremail')) alert_text += "Please enter a valid Bugzilla email for mentor.\n"; + if(!isFilledOut('country')) alert_text += "Please enter a valid value for country.\n"; if(!isFilledOut('budgettotal')) alert_text += "Please enter the total budget for the event.\n"; if(!isFilledOut('service1') || !isFilledOut('cost1')) alert_text += "Please enter at least one service and cost value.\n"; - if(!isFilledOut('metric1') || !isFilledOut('success1')) alert_text += "Please enter at least one metric and success scenario.\n"; //Everything required is filled out..try to submit the form! if(alert_text == '') { @@ -67,12 +54,11 @@ function validateAndSubmit() { } function togglePaymentInfo (e) { - var div = document.getElementById('paymentinfo'); if (e.checked == true) { - div.style.display = 'block'; + YAHOO.util.Dom.removeClass('paymentinfo','bz_default_hidden'); } else { - div.style.display = 'none'; + YAHOO.util.Dom.addClass('paymentinfo','bz_default_hidden'); } } @@ -80,10 +66,20 @@ function togglePaymentInfo (e) {

Mozilla Reps - Budget Request Form

+

+ If your request is Community IT related please file it + here. +

+ +

+ * - Required Fields +

+
+ @@ -98,23 +94,21 @@ function togglePaymentInfo (e) { - + - + - + - + + + + + + + + + + + + + + + @@ -137,20 +158,23 @@ function togglePaymentInfo (e) { - + + + + + @@ -159,82 +183,65 @@ function togglePaymentInfo (e) { + + + + + + + + + + + + + - - - + + @@ -249,8 +256,14 @@ function togglePaymentInfo (e) { +

+ Budget requests received less than 3 weeks before the targeted launch date of the + event/activity in question will automatically be rejected (exceptions can be made + but only with council approval). This 3-week “buffer” guarantees that each budget + request undergoes the same thorough selection process. +

+

- * - Required field
Thanks for contacting us.

diff --git a/extensions/REMO/template/en/default/bug/create/created-remo-budget.html.tmpl b/extensions/REMO/template/en/default/bug/create/created-remo-budget.html.tmpl new file mode 100644 index 000000000..9d9a1ffdc --- /dev/null +++ b/extensions/REMO/template/en/default/bug/create/created-remo-budget.html.tmpl @@ -0,0 +1,27 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% PROCESS global/variables.none.tmpl %] + +[% PROCESS global/header.html.tmpl + title = "Mozilla Reps Budget Request Form" +%] + +

Thank you!

+ +

+ Your budget request has been successfully submitted. Please make sure to + follow-up with your mentor so (s)he can verify your request. CC him/her + on the bug if needed. +

+ +

+ Reference: #[% id FILTER html %] +

+ +[% PROCESS global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b
First Name: *First Name:
Last Name: *Last Name:
- Mozilla Reps Profile Page: * - Mozilla Reps Profile Page: @@ -122,14 +116,41 @@ function togglePaymentInfo (e) {
- Event Page: * - Event Page:
Bugzilla Email of Your Mentor: + [% INCLUDE global/userselect.html.tmpl + id => "mentoremail" + name => "mentoremail" + value => "" + size => 40 + %] +
Paypal Account Email: +
+ + * Currently, you CANNOT make payments using other online payment services. +
Country You Reside: + +
 
- Is advance payment needed? + Is advance payment needed? - +
+ Please send an email to William at mozilla.com with all the information below:
+
+ Payment information:
+ Bank name:
+ Bank address:
+ IBAN:
+ Swift code/BIC:
+ Additional bank details (if necessary):
 
Budget Request:
Total amount requested in $USD: + +
Costs per service:
- Budget breakdown:
- Total amount requested in $USD: * -
- Costs per service: - + - + - - - + + + - - - + + + - - - + + + - - - + + +
Service 1: *Service 1: Cost 1: *Cost 1:
Service 2:Cost 2:Service 2:Cost 2:
Service 3:Cost 3:Service 3:Cost 3:
Service 4:Cost 4:Service 4:Cost 4:
Service 5:Cost 5:Service 5:Cost 5:
- Additional costs:
-
  
Additional costs:
- Success measurement:
- How will the event help push the Mozilla project forward? - *
- - - - - - - - - - - - - - -
Metric 1: * - Success scenario: * -
Metric 2: - Success scenario: -
Metric 3: - Success scenario: -
- Additional information:
- +