diff options
author | Sebastin Santy <sebastinssanty@gmail.com> | 2016-10-20 14:20:14 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2016-10-28 23:20:27 +0200 |
commit | 8de8d611eb6d9b872f6c2ff3b0a09d9c62dfe7f3 (patch) | |
tree | 38dece87bf072b99821b6c8450204d60bd4cdc16 | |
parent | ad6aa9fa0b82043ed4f2ff25081cef22434d9a0d (diff) | |
download | bugzilla-8de8d611eb6d9b872f6c2ff3b0a09d9c62dfe7f3.tar.gz bugzilla-8de8d611eb6d9b872f6c2ff3b0a09d9c62dfe7f3.tar.xz |
Bug 1308942 - Need to remove two fields on Remo swag request form
-rw-r--r-- | extensions/REMO/template/en/default/bug/create/comment-remo-swag.txt.tmpl | 10 | ||||
-rw-r--r-- | extensions/REMO/template/en/default/bug/create/create-remo-swag.html.tmpl | 47 |
2 files changed, 7 insertions, 50 deletions
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 <gerv@gerv.net> + # Sebastin Santy <sebastinssanty@gmail.com> #%] [%# 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() { </td> </tr> -<tr class="odd"> - <td> - <strong>Is this event being hosted by a<br>Firefox Student Ambassador(s)?: - <span style="color: red;" title="Required">*</span></strong> - </td> - <td> - <select id="ambassador_hosted" name="ambassador_hosted"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </td> -</tr> - -<tr class="even"> - <td> - <strong>Is the main audience of this event<br>Firefox Student Ambassadors?: - <span style="color: red;" title="Required">*</span></strong> - </td> - <td> - <select id="ambassador_audience" name="ambassador_audience"> - <option value="">Select One</option> - <option value="Yes">Yes</option> - <option value="No">No</option> - </select> - </td> -</tr> <tr class="odd"> <td><!--spacer--> </td> @@ -277,23 +248,13 @@ function validateAndSubmit() { </tr> <tr class="odd"> - <td><strong>Roll-Up Banners:</strong></td> - <td><input type="checkbox" id="rollupbanners" name="rollupbanners" value="1"></td> -</tr> - -<tr class="even"> - <td><strong>Horizontal Banner:</strong></td> - <td><input type="checkbox" id="horizontalbanner" name="horizontalbanner" value="1"></td> -</tr> - -<tr class="odd"> - <td><strong>Booth Cloth:</strong></td> - <td><input type="checkbox" id="boothcloth" name="boothcloth" value="1"></td> + <td><strong>Silicone Wristband:</strong></td> + <td><input type="checkbox" id="wristband" name="wristband" value="1"></td> </tr> <tr class="even"> - <td><strong>Pens:</strong></td> - <td><input type="checkbox" id="pens" name="pens" value="1"></td> + <td><strong>Firefox Tattoos:</strong></td> + <td><input type="checkbox" id="tattoos" name="tattoos" value="1"></td> </tr> <tr class="odd"> |