From 8de8d611eb6d9b872f6c2ff3b0a09d9c62dfe7f3 Mon Sep 17 00:00:00 2001 From: Sebastin Santy Date: Thu, 20 Oct 2016 17:50:14 +0530 Subject: Bug 1308942 - Need to remove two fields on Remo swag request form --- .../default/bug/create/comment-remo-swag.txt.tmpl | 10 ++--- .../default/bug/create/create-remo-swag.html.tmpl | 47 ++-------------------- 2 files changed, 7 insertions(+), 50 deletions(-) (limited to 'extensions/REMO/template/en/default/bug') 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 ef7419dc9..2d4bb6215 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 @@ -16,6 +16,7 @@ # Rights Reserved. # # Contributor(s): Gervase Markham + # Sebastin Santy #%] [%# INTERFACE: # This template has no interface. @@ -36,8 +37,6 @@ 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: @@ -63,11 +62,8 @@ Stickers: [% IF cgi.param('stickers') %]Yes[% ELSE %]No[% END %] Buttons: [% IF cgi.param('buttons') %]Yes[% ELSE %]No[% END %] Lanyards: [% IF cgi.param('lanyards') %]Yes[% ELSE %]No[% END %] T-shirts: [% IF cgi.param('tshirts') %]Yes[% ELSE %]No[% END %] -Roll-up banners: [% IF cgi.param('rollupbanners') %]Yes[% ELSE %]No[% END %] -Horizontal banner: [% IF cgi.param('horizontalbanner') %]Yes[% ELSE %]No[% END %] -Booth cloth: [% IF cgi.param('boothcloth') %]Yes[% ELSE %]No[% END %] -Pens: [% IF cgi.param('pens') %]Yes[% ELSE %]No[% END %] +Silicone Wristband: [% IF cgi.param('wristband') %]Yes[% ELSE %]No[% END %] +Firefox Tattoos: [% IF cgi.param('tattoos') %]Yes[% ELSE %]No[% END %] Other: [% IF cgi.param('otherswag') %][% cgi.param('otherswag') %][% ELSE %]No[% END %] [%+ cgi.param("comment") IF cgi.param("comment") %] - 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 9cec10f38..0e2637cf3 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 @@ -44,8 +44,6 @@ 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"; @@ -138,33 +136,6 @@ function validateAndSubmit() { - - - Is this event being hosted by a
Firefox Student Ambassador(s)?: - * - - - - - - - - - Is the main audience of this event
Firefox Student Ambassadors?: - * - - - - -   @@ -277,23 +248,13 @@ function validateAndSubmit() { - Roll-Up Banners: - - - - - Horizontal Banner: - - - - - Booth Cloth: - + Silicone Wristband: + - Pens: - + Firefox Tattoos: + -- cgit v1.2.3-24-g4f1b