From a9a05ae6835803e4f9ef7cbf310c763fabd8d730 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 20 Feb 2013 16:53:35 +0800 Subject: Bug 825666: Update gear request bug form --- .../en/default/bug/create/comment-swag.txt.tmpl | 80 +- .../en/default/bug/create/create-swag.html.tmpl | 807 +++++++++++++++++---- 2 files changed, 709 insertions(+), 178 deletions(-) (limited to 'extensions/BMO') diff --git a/extensions/BMO/template/en/default/bug/create/comment-swag.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-swag.txt.tmpl index 0ec7687d4..920d392da 100644 --- a/extensions/BMO/template/en/default/bug/create/comment-swag.txt.tmpl +++ b/extensions/BMO/template/en/default/bug/create/comment-swag.txt.tmpl @@ -1,48 +1,50 @@ -[%# 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 Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] -[%# INTERFACE: - # This template has no interface. - # - # Form variables from a bug submission (i.e. the fields on a template from - # enter_bug.cgi) can be access via Bugzilla.cgi.param. It can be used to - # pull out various custom fields and format an initial Description entry - # from them. - #%] + [% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] -Requester: [% cgi.param('firstname') %] [% cgi.param('lastname') %] -Email: [% cgi.param('email') %] +[% cgi = Bugzilla.cgi +%] +[% PROCESS global/variables.none.tmpl +%] +:: Gear Requested + + Purpose of Gear: [% cgi.param("purpose") %] [%+ cgi.param("purpose_other") %] + Date Required: [% cgi.param("date_required") || "-" %] + +[%+ cgi.param("items") %] + +:: Requester + + Name: [% cgi.param('firstname') %] [% cgi.param('lastname') %] + Email: [% cgi.param('email') %] + Mozilla Space: [% cgi.param('mozspace') || "-" %] + Team/Department: [% cgi.param('teamcode') %] -Additional Swag: [% cgi.param("additional") %] +:: Recipient -Ship to: -[%+ cgi.param("shiptofirstname") +%] [%+ cgi.param("shiptolastname") +%] -[%+ cgi.param("shiptoaddress") +%] -[%+ cgi.param("shiptoaddress2") +%] -[%+ cgi.param("shiptocity") +%] [%+ cgi.param("shiptostate") +%] [%+ cgi.param("shiptopcode") +%] -[%+ cgi.param("shiptocountry") %] +[% IF cgi.param("purpose") == "Mozillian Recognition" %] +This [% terms.bug %] needs recipient shipping information: [% cgi.param("recognition_shipping") ? "Yes" : "No" %] +This [% terms.bug %] needs recipient size information: [% cgi.param("recognition_sizing") ? "Yes" : "No" %] +[% END %] -Phone: [% cgi.param("shiptophone") %] -[%+ IF cgi.param("shiptoidrut") %]Personal ID/RUT: [% cgi.param("shiptoidrut") %][% END %] + Name: [%+ cgi.param("shiptofirstname") +%] [%+ cgi.param("shiptolastname") +%] + Email: [%+ cgi.param("shiptoemail") +%] +[% IF cgi.param("shiptoaddress1") %] + Address: + [%+ cgi.param("shiptoaddress1") +%] + [%+ cgi.param("shiptoaddress2") +%] + [%+ cgi.param("shiptocity") +%] [%+ cgi.param("shiptostate") +%] [%+ cgi.param("shiptopostcode") +%] + [%+ cgi.param("shiptocountry") %] + Phone: [% cgi.param("shiptophone") %] + Personal ID/RUT: [% cgi.param("shiptoidrut") || "-" %] +[% END %] -Additional comments: +[% IF cgi.param("comment") %] +:: Comments -[%+ cgi.param("comment") IF cgi.param("comment") %] +[%+ cgi.param("comment") %] +[% END %] diff --git a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl index 58eb39d5f..3772120a0 100644 --- a/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-swag.html.tmpl @@ -1,222 +1,751 @@ -[%# 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 %] -[% PROCESS global/header.html.tmpl - title = "Swag Request Form" - javascript_urls = [ 'extensions/BMO/web/js/swag.js', - 'extensions/BMO/web/js/form_validate.js', - 'js/field.js' ] - yui = [ 'autocomplete' ] +[% +items = [ + { id => '', name => 'splendidest gear', }, + { id => '#157454S', name => 'very splendid package, men, s' }, + { id => '#157454M', name => 'very splendid package, men, m' }, + { id => '#157454L', name => 'very splendid package, men, l' }, + { id => '#157454X', name => 'very splendid package, men, xl' }, + { id => '#157452S', name => 'very splendid package, women, s' }, + { id => '#157452M', name => 'very splendid package, women, m' }, + { id => '#157452L', name => 'very splendid package, women, l' }, + { id => '#157452X', name => 'very splendid package, women, xl' }, + { id => '#157451S', name => 'most splendid package, s' }, + { id => '#157451M', name => 'most splendid package, m ' }, + { id => '#157451L', name => 'most splendid package, l' }, + { id => '#157451X', name => 'most splendid package, xl' }, + { id => '#155415S', name => 'sweatshirt, s' }, + { id => '#155415M', name => 'sweatshirt, m' }, + { id => '#155415L', name => 'sweatshirt, l' }, + { id => '#155415X', name => 'sweatshirt, xl' }, + { id => '#1554152', name => 'sweatshirt, 2x' }, + { id => '#155749', name => 'rickshaw messenger bag' }, + { id => '#155752', name => 'moleskine notebook (black)' }, + { id => '', name => 'splendider gear', }, + { id => '#155341S', name => 'unisex t, poppy, s' }, + { id => '#155341M', name => 'unisex t, poppy, m' }, + { id => '#155341L', name => 'unisex t, poppy, l' }, + { id => '#155341X', name => 'unisex t, poppy, xl' }, + { id => '#1553412', name => 'unisex t, poppy, 2x' }, + { id => '#155344S', name => 'ladies t, poppy, s' }, + { id => '#155344M', name => 'ladies t, poppy, m' }, + { id => '#155344L', name => 'ladies t, poppy, l' }, + { id => '#155342S', name => 'unisex t, navy, s' }, + { id => '#155342M', name => 'unisex t, navy, m' }, + { id => '#155342L', name => 'unisex t, navy, l' }, + { id => '#155342X', name => 'unisex t, navy, xl' }, + { id => '#1553422', name => 'unisex t, navy, 2x' }, + { id => '#1553423', name => 'unisex t, navy, 3x' }, + { id => '#155413S', name => 'ladies t, navy, s' }, + { id => '#155413M', name => 'ladies t, navy, m' }, + { id => '#155413L', name => 'ladies t, navy, l' }, + { id => '#155413X', name => 'ladies t, navy, xl' }, + { id => '#155343M', name => 'unisex t, lapis, m' }, + { id => '#155343L', name => 'unisex t, lapis, l' }, + { id => '#155343X', name => 'unisex t, lapis, xl' }, + { id => '#155414S', name => 'ladies t, lapis, s' }, + { id => '#155414M', name => 'ladies t, lapis, m' }, + { id => '#155414L', name => 'ladies t, lapis, l' }, + { id => '#155339', name => 'black cap w/tote' }, + { id => '#155340', name => 'beanie' }, + { id => '#155751', name => 'drawstring tote' }, + { id => '#155758', name => 'glossy finish ceramic mug' }, + { id => '', name => 'splendid gear', }, + { id => '#155755', name => 'vertical laminated badge' }, + { id => '#155754', name => 'lanyard w/bulldog clip' }, + { id => '#155756', name => 'silicone wristband' }, + { id => '#155753', name => '3" round stickers (single)' }, + { id => '#155757', name => 'mozilla tattoos (pkg 50)' }, +] %] -
Swag Request Form
- -

Swag Request: Please use this form to file a request for swag.

- -
    -
  1. You first need submit a Event Request Form. You'll be asked for the [% terms.bug %] number below.
    2. -
  2. Complete and submit request below.
    3. -
  3. Your request will be reviewed by the appropriate person in the Engagement team.
    4. -
  4. Your swag request will be reviewed and if approved shipped to you from - one of our two fulfillment houses. Please note that swag is expensive and - products change over time - we are happy to send you a small quantity of swag - to use at your event!
    5. -
- -

These requests will only be visible to the person who submitted the request, -any persons designated in the CC line, and authorized members of the Mozilla -Engagement team.

- - +function addGear() { + var quantity = parseInt(Dom.get('quantity').value, 10); + var id = Dom.get('add_gear').value; + if (!quantity || !id) return; + needed[id] += quantity; + showGear(); +} + +function removeGear(id) { + if (!id) return; + needed[id] = 0; + showGear(); +} + +function showGear() { + var html = ''; + var text = ''; + var count = 0; + for (var i = 0, l = gear.length; i < l; i++) { + var item = gear[i]; + var id = item.id; + if (!id) continue; + if (!needed[id]) continue; + count += needed[id]; + html += '' + + '' + + '' + + '' + + ''; + text += needed[id] + ' x ' + id + ' ' + item.name + "\n"; + } + if (!count) + html += ''; + html += '
' + needed[id] + ' x ' + YAHOO.lang.escapeHTML(item.name) + '
No gear selected.
'; + Dom.get('gear_container').innerHTML = html; + Dom.get('items').value = text; +} + +[% END %] + +[% PROCESS global/header.html.tmpl + title = "Mozilla Gear" + style = inline_style + javascript = inline_javascript + javascript_urls = [ 'extensions/BMO/web/js/form_validate.js', + 'js/field.js', 'js/util.js' ] + yui = [ 'autocomplete', 'calendar' ] +%] + +

Mozilla Gear

+ +

+ Want gear? Here's what to do: +

+
    +
  • + Follow the steps below and click Submit Request. +
    • +
  • + Requests are reviewed every Monday. If approved, we'll let you know. Then + your order will either be filled from your Mozilla space for pick-up or + sent to our gear partner, Staples, for processing and shipment. If it can't + be approved, we'll email you with details (or possibly ask for more + information). +
    • +
+ +

+ Check the gear + wiki for more information about gear, including approved uses and the + list of available gear. +

+ +

+ Gear requests for Rep-driven events and campaigns should continue to be + submitted through their existing process. +

+ + + + + + + + + + + - - - - - - - - - - - + -
+ + + + + + - - + - - - + + + + + + + - + - - + - + + + + - + + - - + + + + + + + + + + + + - + - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + - - - - + + + + + + + + + + + + + + + + + -
 
Tell Us What You Want
First Name: * - + Purpose of Gear +
Last Name: * - + +
Purpose Text + +
  + +
+ +
Email Address: *Date Required - + + +
CC: - [% INCLUDE global/userselect.html.tmpl - id => "cc" - name => "cc" - value => cc - size => 50 - multiple => 5 - %] + Gear Needed + + + View the current inventory, then add your selection(s):
+ + + + +
+ +
  
Tell Us About You
 First Name
[% terms.Bug %] number assigned to previously-   
submitted Event Request Form: *		Last Name
Email Address
My Mozilla Space + + (if applicable) +
+ + +
Specific swag needed?Team + Department Code - +


Ship to:		 
First name:Tell Us Where To Send It
Last name: + Please be aware that shipping can cost as much as, if not more than, your + item. And, items shipped internationally incur customs fees that can be + 100%+ the cost of the package. When possible, requests will be filled from + gear at your Mozilla space. +
AddressFirst Name
Address 2Last Name
CityEmail Address
StateAddress
CountryAddress 2
Postal CodeCity
TelephoneState
Personal ID/RUT
(if your country requires this)		Country
Postal Code


Recipient Telephone - + + (include country code if outside of the US)
Personal ID/RUT + + (if your country requires this) +
 
Tell Us Anything Else
Additional Comments
-
- + +   + + + +   + + + + +

- * - Required field
- Thanks for contacting us. - You will be notified by email of any progress made in resolving your request. + * Required Field

+

+ Requests will only be visible to the person who submitted it, authorized + members of the Mozilla Engagement team, and our Staples Customer Service rep. + We do this to help protect the personal identifying information in this [% terms.bugs %]. +

+ + + [% PROCESS global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b