diff options
Diffstat (limited to 'extensions/REMO')
7 files changed, 22 insertions, 22 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 c5f18ef76..0531aeb2f 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 @@ -24,13 +24,13 @@ # 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 info: -Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] +Requester: [% cgi.param('firstname') %] [%+ cgi.param('lastname') %] Profile page: [% cgi.param('profilepage') %] Event page: [% cgi.param('eventpage') %] Funtional Goals: @@ -45,7 +45,7 @@ Paypal Account: [% cgi.param('paypal') %] Country You Reside: [% cgi.param('country') %] Advance payment needed: [% IF cgi.param('advancepayment') %]Yes[% ELSE %]No[% END %] -Budget breakdown: +Budget breakdown: Total amount requested in $USD: [% cgi.param('budgettotal') %] Costs per service: 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 2d4bb6215..c4187558d 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 @@ -25,11 +25,11 @@ # 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 info: +Requester info: First name: [% cgi.param('firstname') %] Last name: [% cgi.param('lastname') %] @@ -54,9 +54,9 @@ Phone: [% cgi.param("shiptophone") %] [%+ IF cgi.param("shiptoidrut") %]Custom reference: [% cgi.param("shiptoidrut") %][% END %] Addition information for delivery person: -[%+ cgi.param('shipadditional') %] +[%+ cgi.param('shipadditional') %] -Swag requested: +Swag requested: Stickers: [% IF cgi.param('stickers') %]Yes[% ELSE %]No[% END %] Buttons: [% IF cgi.param('buttons') %]Yes[% ELSE %]No[% END %] diff --git a/extensions/REMO/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/REMO/template/en/default/hook/global/user-error-errors.html.tmpl index e13fba024..329670bdf 100644 --- a/extensions/REMO/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/REMO/template/en/default/hook/global/user-error-errors.html.tmpl @@ -24,7 +24,7 @@ You can only attach budget payment information to [% terms.bugs %] under the product 'Mozilla Reps' and component 'Budget Requests'. -[% ELSIF error == "remo_payment_bug_edit_denied" %] +[% ELSIF error == "remo_payment_bug_edit_denied" %] [% title = "Mozilla Reps Payment Bug Edit Denied" %] You do not have permission to edit [% terms.bug %] '[% bug_id FILTER html %]'. diff --git a/extensions/REMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl b/extensions/REMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl index 95c0af6e8..b9a5f02d1 100644 --- a/extensions/REMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl +++ b/extensions/REMO/template/en/default/pages/comment-remo-form-payment.txt.tmpl @@ -26,9 +26,9 @@ Mozilla Reps Payment Request Requester info: -First name: [% cgi.param('firstname') %] -Last name: [% cgi.param('lastname') %] -Wiki user profile: [% cgi.param('wikiprofile') %] +First name: [% cgi.param('firstname') %] +Last name: [% cgi.param('lastname') %] +Wiki user profile: [% cgi.param('wikiprofile') %] Event wiki page: [% cgi.param('wikipage') %] Budget request [% terms.bug %]: [% cgi.param('bug_id') %] Have you already received payment for this event? [% IF cgi.param('receivedpayment') %]Yes[% ELSE %]No[% END %] diff --git a/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl b/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl index 1e1889089..0f594e9ae 100644 --- a/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl +++ b/extensions/REMO/template/en/default/pages/remo-form-payment.html.tmpl @@ -92,7 +92,7 @@ <br> Payment information:<br> Bank name:<br> - Bank address: <br> + Bank address: <br> IBAN:<br> Swift code/BIC:<br> Additional bank details (if necessary): diff --git a/extensions/REMO/web/js/form_validate.js b/extensions/REMO/web/js/form_validate.js index 6c8fa6f07..3e1ae60f6 100644 --- a/extensions/REMO/web/js/form_validate.js +++ b/extensions/REMO/web/js/form_validate.js @@ -1,7 +1,7 @@ /** * Some Form Validation and Interaction **/ -//Makes sure that there is an '@' in the address with a '.' +//Makes sure that there is an '@' in the address with a '.' //somewhere after it (and at least one character in between them function isValidEmail(email) { diff --git a/extensions/REMO/web/js/swag.js b/extensions/REMO/web/js/swag.js index 3b69bbab8..1c7281108 100644 --- a/extensions/REMO/web/js/swag.js +++ b/extensions/REMO/web/js/swag.js @@ -24,37 +24,37 @@ function getTotal(item_array) { return total; } -function calculateTotalSwag() { - document.getElementById('Totalswag').value = +function calculateTotalSwag() { + document.getElementById('Totalswag').value = getTotal( new Array('Lanyards', 'Stickers', 'Bracelets', 'Tattoos', 'Buttons', 'Posters')); - + } -function calculateTotalMensShirts() { - document.getElementById('mens_total').value = +function calculateTotalMensShirts() { + document.getElementById('mens_total').value = getTotal( new Array('mens_s', 'mens_m', 'mens_l', 'mens_xl', 'mens_xxl', 'mens_xxxl')); - + } -function calculateTotalWomensShirts() { - document.getElementById('womens_total').value = +function calculateTotalWomensShirts() { + document.getElementById('womens_total').value = getTotal( new Array('womens_s', 'womens_m', 'womens_l', 'womens_xl', 'womens_xxl', 'womens_xxxl')); - + } |