From 41fe61cdd28100b9344cdbec4cd29ed80bfab159 Mon Sep 17 00:00:00 2001 From: Dave Lawrence Date: Tue, 18 Feb 2014 04:10:25 +0000 Subject: Bug 963195 - Need field added on gear/budget request form to designate if this is a Firefox Student Ambassador event --- .../bug/create/comment-remo-budget.txt.tmpl | 2 ++ .../default/bug/create/comment-remo-swag.txt.tmpl | 2 ++ .../bug/create/create-remo-budget.html.tmpl | 28 +++++++++++++++++++ .../default/bug/create/create-remo-swag.html.tmpl | 32 +++++++++++++++++++++- 4 files changed, 63 insertions(+), 1 deletion(-) 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 2ac4d9caa..40b08331b 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,8 @@ 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') %] Mentor Email: [% cgi.param('mentoremail') %] Paypal Account: [% cgi.param('paypal') %] Country You Reside: [% cgi.param('country') %] diff --git a/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl b/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl index dba982310..ef7419dc9 100644 --- a/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl +++ b/extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl @@ -36,6 +36,8 @@ Profile page: [% cgi.param('profilepage') %] Event name: [% cgi.param('eventname') %] Event page: [% cgi.param('eventpage') %] Estimated attendance: [% cgi.param('attendance') %] +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') %] Shipping details: 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 f616b6ba2..6e393612c 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 @@ -41,6 +41,8 @@ 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('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"; @@ -134,6 +136,32 @@ function validateAndSubmit() { + + + Is this event being hosted by a
Firefox Student Ambassador(s)?: + + + + + + + + + Is the main audience of this event
Firefox Student Ambassadors?: + + + + + + [% terms.Bugzilla %] Email of Your Mentor: diff --git a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl index e618be726..076faef24 100644 --- a/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl +++ b/extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl @@ -43,6 +43,8 @@ function validateAndSubmit() { if(!isFilledOut('eventname')) alert_text += "Please enter your event name\n"; if(!isFilledOut('eventpage')) alert_text += "Please enter the event page.\n"; if(!isFilledOut('attendance')) alert_text += "Please enter the estimated attendance.\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('shiptofirstname')) alert_text += "Please enter the shipping first name\n"; if(!isFilledOut('shiptolastname')) alert_text += "Please enter the shipping last name\n"; if(!isFilledOut('shiptoaddress1')) alert_text += "Please enter the ship to address\n"; @@ -130,7 +132,35 @@ function validateAndSubmit() { - + + + + Is this event being hosted by a
Firefox Student Ambassador(s)?: + * + + + + + + + + + Is the main audience of this event
Firefox Student Ambassadors?: + * + + + + +   -- cgit v1.2.3-24-g4f1b