From 203cb22b21be03197d78e027f17bd7ab20419471 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Fri, 22 Jan 2016 16:15:32 +0000 Subject: Bug 1240575 - Update form.reps.budget --- .../bug/create/comment-remo-budget.txt.tmpl | 22 +++-- .../bug/create/create-remo-budget.html.tmpl | 99 +++++++++++++++------- 2 files changed, 84 insertions(+), 37 deletions(-) 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 40b08331b..c5f18ef76 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,8 +33,13 @@ Requester info: Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] Profile page: [% cgi.param('profilepage') %] Event page: [% cgi.param('eventpage') %] -Event hosted by a Firefox Student Ambassador(s)?: [% cgi.param('ambassador_hosted') %] -Main audience of the event are Firefox Student Ambassadors: [% cgi.param('ambassador_audience') %] +Funtional Goals: +[%+ cgi.param('functional_goals') %] +Event Goals: +[%+ cgi.param('event_goals') %] +Why is budget needed: +[%+ cgi.param('budget_reason') %] +Agenda Link: [% cgi.param('agenda_link') %] Mentor Email: [% cgi.param('mentoremail') %] Paypal Account: [% cgi.param('paypal') %] Country You Reside: [% cgi.param('country') %] @@ -44,14 +49,15 @@ Budget breakdown: Total amount requested in $USD: [% cgi.param('budgettotal') %] Costs per service: -Service 1: [% cgi.param('service1') %] Cost: [% cgi.param('cost1') %] -Service 2: [% cgi.param('service2') %] Cost: [% cgi.param('cost2') %] -Service 3: [% cgi.param('service3') %] Cost: [% cgi.param('cost3') %] -Service 4: [% cgi.param('service4') %] Cost: [% cgi.param('cost4') %] -Service 5: [% cgi.param('service5') %] Cost: [% cgi.param('cost5') %] +Service 1: [% cgi.param('service1') %] Cost: [% cgi.param('cost1') %] Optional: [% cgi.param('service1_optional') ? 'YES' : 'NO' %] +Service 2: [% cgi.param('service2') %] Cost: [% cgi.param('cost2') %] Optional: [% cgi.param('service2_optional') ? 'YES' : 'NO' %] +Service 3: [% cgi.param('service3') %] Cost: [% cgi.param('cost3') %] Optional: [% cgi.param('service3_optional') ? 'YES' : 'NO' %] +Service 4: [% cgi.param('service4') %] Cost: [% cgi.param('cost4') %] Optional: [% cgi.param('service4_optional') ? 'YES' : 'NO' %] +Service 5: [% cgi.param('service5') %] Cost: [% cgi.param('cost5') %] Optional: [% cgi.param('service5_optional') ? 'YES' : 'NO' %] + Additional costs: (add comment box) -[% cgi.param('costadditional') %] +[%+ cgi.param('costadditional') %] [%+ 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 873ca9503..f1453c356 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 @@ -42,8 +42,10 @@ function validateAndSubmit() { if(!isFilledOut('profilepage')) alert_text += "Please enter a Mozilla Reps profile page.\n"; if(!isFilledOut('eventpage')) alert_text += "Please enter an event page address.\n"; if(!isFilledOut('cf_due_date')) alert_text += "Please enter an event date.\n"; - if(!isFilledOut('ambassador_hosted')) alert_text += "Please select whether this event is hosted by ambassadors.\n"; - if(!isFilledOut('ambassador_audience')) alert_text += "Please select whether this event's main audience is ambassadors.\n"; + if(!isFilledOut('functional_goals')) alert_text += "Please list functional goals the event will be supporting.\n"; + if(!isFilledOut('event_goals')) alert_text += "Please list event goals and how it will be measured.\n"; + if(!isFilledOut('budget_reason')) alert_text += "Please enter a reason the budget is needed.\n"; + if(!isFilledOut('agenda_link')) alert_text += "Please enter a link to the agenda describing what you are doing.\n"; if(!isFilledOut('mentoremail')) alert_text += "Please enter a valid [% terms.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"; @@ -62,8 +64,11 @@ function validateAndSubmit() {

Mozilla Reps - Budget Request Form

+

IMPORTANT: Please make sure you read and comply with the Budget SOP + before filling this form. Requests not following the procedure will be automatically rejected.

+

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

@@ -107,7 +112,7 @@ function validateAndSubmit() { Mozilla Reps Profile Page: - @@ -115,7 +120,7 @@ function validateAndSubmit() { Event Page: - @@ -139,27 +144,43 @@ function validateAndSubmit() { - Is this event being hosted by a
Firefox Student Ambassador(s)?: + Which functional area goals is this supporting and how? - + - Is the main audience of this event
Firefox Student Ambassadors?: + What are the event/initiative goals? What's success?
+ How are you going to measure it? - + + + + + + + Why this budget is needed for the success of the
initiative/event? + + + + + + + + + Link to the detailed agenda describing what are you
+ doing (activities to support the goals and schedule) + + + @@ -217,41 +238,59 @@ function validateAndSubmit() { - Costs per service: + + Costs per service: + + + + Please identify which costs are optional for the success of the event by checking Optional. + - + + + + + + + + + - + - + + - + - + + - + - + + - + - + + - +
Service 1:ServiceCostOptional
 1: Cost 1:
Service 2:2: Cost 2:
Service 3:3: Cost 3:
Service 4:4: Cost 4:
Service 5:5: Cost 5:
@@ -263,7 +302,9 @@ function validateAndSubmit() { - +
+ Use the breakdown template doc + and attach/link it from this [% terms.bug %] in order to identify all individual costs and who is this budget covering. -- cgit v1.2.3-24-g4f1b