From 09dd4d3192073ba9ecc7feb8a5dfcd213affd525 Mon Sep 17 00:00:00 2001 From: Kohei Yoshino Date: Mon, 24 Sep 2018 17:27:12 -0400 Subject: Bug 1493500 - Remove all trailing whitespaces from all files --- .../en/default/bug/create/comment-finance.txt.tmpl | 4 +- .../en/default/bug/create/comment-mozlist.txt.tmpl | 2 +- .../en/default/bug/create/create-doc.html.tmpl | 4 +- .../en/default/bug/create/create-finance.html.tmpl | 4 +- .../en/default/bug/create/create-mozlist.html.tmpl | 4 +- .../bug/create/create-recoverykey.html.tmpl | 40 ++++---- .../default/bug/create/create-trademark.html.tmpl | 62 ++++++------ .../template/en/default/email/bugmail.html.tmpl | 2 +- .../en/default/hook/bug/field-help-end.none.tmpl | 20 ++-- .../en/default/hook/bug/show-header-end.html.tmpl | 2 +- .../pages/release_tracking_report.html.tmpl | 2 +- .../en/default/pages/upgrade-3.6.html.tmpl | 16 ++-- .../en/default/pages/user_activity.html.tmpl | 2 +- extensions/BMO/web/js/release_tracking_report.js | 2 +- extensions/BMO/web/js/sorttable.js | 52 +++++------ extensions/BMO/web/js/swag.js | 18 ++-- extensions/BugModal/web/new_bug.js | 4 +- .../default/hook/global/reason-descs-end.none.tmpl | 2 +- .../hook/global/setting-descs-settings.none.tmpl | 4 +- .../hook/global/user-error-errors.html.tmpl | 2 +- .../template/en/default/pages/example.html.tmpl | 4 +- .../hook/admin/flag-type/edit-rows.html.tmpl | 2 +- extensions/InlineHistory/web/inline-history.js | 2 +- .../prefs/saved-searches-saved-row.html.tmpl | 2 +- .../en/default/admin/params/oldbugmove.html.tmpl | 6 +- .../hook/bug/edit-after_comment_textarea.html.tmpl | 2 +- .../default/hook/bug/format_comment-type.txt.tmpl | 2 +- .../hook/global/user-error-errors.html.tmpl | 2 +- .../hook/list/edit-multiple-after_groups.html.tmpl | 2 +- .../OrangeFactor/web/js/LICENSE.processing.js | 4 +- .../OrangeFactor/web/js/LICENSE.sparklines.js | 4 +- extensions/OrangeFactor/web/js/orange_factor.js | 2 +- extensions/OrangeFactor/web/js/sparklines.min.js | 2 +- extensions/Persona/TODO | 8 +- extensions/Profanivore/README | 14 +-- .../bug/create/comment-remo-budget.txt.tmpl | 6 +- .../default/bug/create/comment-remo-swag.txt.tmpl | 8 +- .../hook/global/user-error-errors.html.tmpl | 2 +- .../pages/comment-remo-form-payment.txt.tmpl | 6 +- .../en/default/pages/remo-form-payment.html.tmpl | 2 +- extensions/REMO/web/js/form_validate.js | 2 +- extensions/REMO/web/js/swag.js | 18 ++-- .../account/email/encryption-required.txt.tmpl | 2 +- .../en/default/account/prefs/securemail.html.tmpl | 8 +- .../hook/account/prefs/prefs-tabs.html.tmpl | 2 +- .../hook/admin/groups/create-field.html.tmpl | 6 +- .../default/hook/admin/groups/edit-field.html.tmpl | 2 +- .../hook/admin/users/userdata-end.html.tmpl | 2 +- .../hook/global/user-error-errors.html.tmpl | 6 +- .../en/default/pages/securemail/help.html.tmpl | 14 +-- .../hook/global/messages-messages.html.tmpl | 2 +- extensions/Splinter/web/splinter.js | 104 ++++++++++----------- .../account/prefs/email-relationships.html.tmpl | 2 +- .../hook/admin/products/edit-common-rows.html.tmpl | 6 +- .../hook/admin/products/updated-changes.html.tmpl | 2 +- .../admin/sanitycheck/messages-statuses.html.tmpl | 2 +- .../admin/users/confirm-delete-warn_safe.html.tmpl | 2 +- .../hook/bug/edit-after_importance.html.tmpl | 4 +- .../default/hook/bug/format_comment-type.txt.tmpl | 2 +- .../hook/bug/process/header-title.html.tmpl | 2 +- .../hook/bug/process/results-title.html.tmpl | 2 +- .../en/default/hook/bug/show-header-end.html.tmpl | 2 +- .../hook/global/code-error-errors.html.tmpl | 2 +- .../default/hook/global/field-descs-end.none.tmpl | 2 +- .../default/hook/global/reason-descs-end.none.tmpl | 4 +- .../hook/global/user-error-errors.html.tmpl | 2 +- .../search/form-after_freetext_fields.html.tmpl | 2 +- .../search-report-select-rep_fields.html.tmpl | 2 +- .../template/en/default/pages/voting.html.tmpl | 22 ++--- 69 files changed, 280 insertions(+), 280 deletions(-) (limited to 'extensions') diff --git a/extensions/BMO/template/en/default/bug/create/comment-finance.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-finance.txt.tmpl index f0427b4c5..c55ea1d96 100644 --- a/extensions/BMO/template/en/default/bug/create/comment-finance.txt.tmpl +++ b/extensions/BMO/template/en/default/bug/create/comment-finance.txt.tmpl @@ -14,10 +14,10 @@ Summary: [% cgi.param('short_desc') %] Priority to your Team: [% cgi.param('team_priority') %] Timeframe for Signature: [% cgi.param('signature_time') %] -Name of Other Party: +Name of Other Party: [%+ cgi.param('other_party') %] -Business Objective: +Business Objective: [%+ cgi.param('business_obj') %] What is this purchase?: diff --git a/extensions/BMO/template/en/default/bug/create/comment-mozlist.txt.tmpl b/extensions/BMO/template/en/default/bug/create/comment-mozlist.txt.tmpl index c62461d42..7c14ec95f 100644 --- a/extensions/BMO/template/en/default/bug/create/comment-mozlist.txt.tmpl +++ b/extensions/BMO/template/en/default/bug/create/comment-mozlist.txt.tmpl @@ -24,7 +24,7 @@ # 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 %] List Name: [% cgi.param("listName") %] diff --git a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl index becbb2b56..9ff4ef2e3 100644 --- a/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl +++ b/extensions/BMO/template/en/default/bug/create/create-doc.html.tmpl @@ -106,10 +106,10 @@ function validateAndSubmit() {
to your HTML Add class="sortable" to any table you'd like to make sortable Click on the headers to sort - + Thanks to many, many people for contributions and suggestions. Licenced as X11: http://www.kryogenix.org/code/browser/licence.html This basically means: do what you want with it. @@ -25,20 +25,20 @@ sorttable = { arguments.callee.done = true; // kill the timer if (_timer) clearInterval(_timer); - + if (!document.createElement || !document.getElementsByTagName) return; - + sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/; - + forEach(document.getElementsByTagName('table'), function(table) { if (table.className.search(/\bsortable\b/) != -1) { sorttable.makeSortable(table); } }); - + }, - /* + /* * Prepares the table so that it can be sorted * */ @@ -53,9 +53,9 @@ sorttable = { } // Safari doesn't support table.tHead, sigh if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0]; - + //if (table.tHead.rows.length != 1) return; // can't cope with two header rows - + // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as // "total" rows, for example). This is B&R, since what you're supposed // to do is put them in a tfoot. So, if there are sortbottom rows, @@ -106,7 +106,7 @@ sorttable = { table.sorttable_rows = table_rows; table.sorttable_body_size = body_size; table.sorttable_bodies = bodies; - + // work through each column and calculate its type @@ -185,7 +185,7 @@ sorttable = { _check_already_sorted: function(cell) { if (cell.className.search(/\bsorttable_sorted\b/) != -1) { - // if we're already sorted by this column, just + // if we're already sorted by this column, just // reverse the table, which is quicker sorttable.reverse_table(cell); @@ -194,7 +194,7 @@ sorttable = { } if (cell.className.search(/\bsorttable_sorted_reverse\b/) != -1) { - // if we're already sorted by this column in reverse, just + // if we're already sorted by this column in reverse, just // re-reverse the table, which is quicker sorttable.reverse_table(cell); @@ -271,7 +271,7 @@ sorttable = { return; - // First, remove sorttable_sorted classes from the other header + // First, remove sorttable_sorted classes from the other header // that is currently sorted and its marker (the simbol indicating // that its sorted. sorttable._remove_sorted_classes(this.table.tHead); @@ -285,7 +285,7 @@ sorttable = { sorttable._mark_column_as_sorted(this, '▼', 0); sorttable.sort_table(this); - + }, sort_table: function(cell) { @@ -312,7 +312,7 @@ sorttable = { body_size = cell.table.sorttable_body_size; body_index = 0; - for (var j=0; j #%] [% PROCESS global/header.html.tmpl - title = "Example Page" + title = "Example Page" %]

Here's what you passed me:

diff --git a/extensions/FlagDefaultRequestee/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl b/extensions/FlagDefaultRequestee/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl index edefca370..9e8b09c38 100644 --- a/extensions/FlagDefaultRequestee/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl +++ b/extensions/FlagDefaultRequestee/template/en/default/hook/admin/flag-type/edit-rows.html.tmpl @@ -11,7 +11,7 @@ If flag is specifically requestable, this user will be entered in the requestee field by default unless the user changes it.
- [% INCLUDE global/userselect.html.tmpl + [% INCLUDE global/userselect.html.tmpl name => 'default_requestee' id => 'default_requestee' value => type.default_requestee.login diff --git a/extensions/InlineHistory/web/inline-history.js b/extensions/InlineHistory/web/inline-history.js index 6b223461e..37f1fec7c 100644 --- a/extensions/InlineHistory/web/inline-history.js +++ b/extensions/InlineHistory/web/inline-history.js @@ -339,7 +339,7 @@ var inline_history = { && flagItem[3] == flagName + flagValue && flagItem[4] == setterIdentity ) { - flagLabel.innerHTML = + flagLabel.innerHTML = '' + flagName + ''; break; } diff --git a/extensions/MyDashboard/template/en/default/hook/account/prefs/saved-searches-saved-row.html.tmpl b/extensions/MyDashboard/template/en/default/hook/account/prefs/saved-searches-saved-row.html.tmpl index cd6a36705..ccc54c42a 100644 --- a/extensions/MyDashboard/template/en/default/hook/account/prefs/saved-searches-saved-row.html.tmpl +++ b/extensions/MyDashboard/template/en/default/hook/account/prefs/saved-searches-saved-row.html.tmpl @@ -7,7 +7,7 @@ #%] - + "move-to-url" => "The URL of the database we allow some of our $terms.bugs to" _ " be moved to.", - "move-to-address" => + "move-to-address" => "To move ${terms.bugs}, an email is sent to the target database." _ " This is the email address that that database uses to listen" _ " for incoming ${terms.bugs}.", - movers => + movers => "A list of people with permission to move $terms.bugs ", } %] diff --git a/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl b/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl index 0a7a4fa27..d55213400 100644 --- a/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl @@ -21,7 +21,7 @@ [% IF oldbugmove_user_is_mover(user) AND bug.resolution != 'MOVED' %]

[% END %] diff --git a/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl b/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl index 1ce8e369d..069e55628 100644 --- a/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/bug/format_comment-type.txt.tmpl @@ -24,6 +24,6 @@ [%+ terms.Bug %] moved to [% Param("move-to-url") %]. If the move succeeded, [% comment.extra_data FILTER email %] will receive a mail containing the number of the new [% terms.bug %] in the other database. -If all went well, please paste in a link to the new [% terms.bug %]. +If all went well, please paste in a link to the new [% terms.bug %]. Otherwise, reopen this [% terms.bug %]. [% END %] diff --git a/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl index 935117780..e6f8284ba 100644 --- a/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/global/user-error-errors.html.tmpl @@ -23,7 +23,7 @@ delete the [%+ display_value("resolution", "MOVED") FILTER html %] resolution. [% ELSIF error == "oldbugmove_no_manual_move" %] - You cannot set the resolution of [% terms.abug %] to + You cannot set the resolution of [% terms.abug %] to [%+ display_value("resolution", "MOVED") FILTER html %] without moving the [% terms.bug %]. [% END %] diff --git a/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl b/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl index 10e6f73b3..a34392577 100644 --- a/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl +++ b/extensions/OldBugMove/template/en/default/hook/list/edit-multiple-after_groups.html.tmpl @@ -22,7 +22,7 @@ [% IF oldbugmove_user_is_mover(user) %]

[% END %] diff --git a/extensions/OrangeFactor/web/js/LICENSE.processing.js b/extensions/OrangeFactor/web/js/LICENSE.processing.js index 404e5d5eb..9070bddea 100644 --- a/extensions/OrangeFactor/web/js/LICENSE.processing.js +++ b/extensions/OrangeFactor/web/js/LICENSE.processing.js @@ -5,7 +5,7 @@ copyright holders. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -13,7 +13,7 @@ the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE diff --git a/extensions/OrangeFactor/web/js/LICENSE.sparklines.js b/extensions/OrangeFactor/web/js/LICENSE.sparklines.js index 73aaca832..7c922a477 100644 --- a/extensions/OrangeFactor/web/js/LICENSE.sparklines.js +++ b/extensions/OrangeFactor/web/js/LICENSE.sparklines.js @@ -3,7 +3,7 @@ Copyright (C) 2008 Will Larson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: @@ -11,7 +11,7 @@ the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE diff --git a/extensions/OrangeFactor/web/js/orange_factor.js b/extensions/OrangeFactor/web/js/orange_factor.js index 78fbb5eb3..e9383901e 100644 --- a/extensions/OrangeFactor/web/js/orange_factor.js +++ b/extensions/OrangeFactor/web/js/orange_factor.js @@ -3,7 +3,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. * * This Source Code Form is "Incompatible With Secondary Licenses", as - * defined by the Mozilla Public License, v. 2.0. + * defined by the Mozilla Public License, v. 2.0. */ $(function() { diff --git a/extensions/OrangeFactor/web/js/sparklines.min.js b/extensions/OrangeFactor/web/js/sparklines.min.js index f1043c55e..a5fed6326 100644 --- a/extensions/OrangeFactor/web/js/sparklines.min.js +++ b/extensions/OrangeFactor/web/js/sparklines.min.js @@ -1,4 +1,4 @@ -/* Sparklines.js - Will Larson (http://lethain.com) +/* Sparklines.js - Will Larson (http://lethain.com) * This code is distributed under the MIT license. * See LICENSE.sparklines.js * More information: https://github.com/lethain/sparklines.js diff --git a/extensions/Persona/TODO b/extensions/Persona/TODO index ac94a3c42..cb9e15d2f 100644 --- a/extensions/Persona/TODO +++ b/extensions/Persona/TODO @@ -5,10 +5,10 @@ ToDo: * Fix Bugzilla::Auth::Login::Stack to allow failure part way down the chain (currently, it seems that both CGI and BrowserID have to be last in order to report login failures correctly.) - -* JS inclusions noticeably slow page load. Do we want a local copy of - browserid.js? Do the browserid folks object to that? How can we get good - performance? How can we avoid including it in every logged-in page? Can we + +* JS inclusions noticeably slow page load. Do we want a local copy of + browserid.js? Do the browserid folks object to that? How can we get good + performance? How can we avoid including it in every logged-in page? Can we do demand loading onclick, and/or load-on-reveal? * Fix -8px margin-bottom hack in login-small-additional_methods.html.tmpl diff --git a/extensions/Profanivore/README b/extensions/Profanivore/README index 5ccab103f..86d46a2a3 100644 --- a/extensions/Profanivore/README +++ b/extensions/Profanivore/README @@ -1,14 +1,14 @@ -Profanivore 'eats' English profanities in comments, leaving behind instead a -trail of droppings ('****'). It finds its food using a standard library Perl -regexp. The profanity is only eaten where the comment was written by a user -who does not have the global 'editbugs' privilege. The digestion happens at +Profanivore 'eats' English profanities in comments, leaving behind instead a +trail of droppings ('****'). It finds its food using a standard library Perl +regexp. The profanity is only eaten where the comment was written by a user +who does not have the global 'editbugs' privilege. The digestion happens at display time, so the comment in the database is unaltered. -However, it does not eat profanities when showing people their own comments; -the aim here is to prevent people immediately noticing they are being +However, it does not eat profanities when showing people their own comments; +the aim here is to prevent people immediately noticing they are being censored, and getting 'creative'. -The purpose of Profanivore is to make it a little harder for trolls to +The purpose of Profanivore is to make it a little harder for trolls to vandalise public Bugzilla installations. It does not currently affect fields other than comments. 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 @@
Payment information:
Bank name:
- Bank address:
+ Bank address:
IBAN:
Swift code/BIC:
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')); - + } diff --git a/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl b/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl index 55b716864..872cea30c 100644 --- a/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl +++ b/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl @@ -12,7 +12,7 @@ preferences. [% IF bug_id || email_type == 'whine' %] In order to receive the full text of similar mails in the future, please -go to: +go to: [%+ urlbase %]userprefs.cgi?tab=securemail and provide a key or certificate. diff --git a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl index db595a23f..ffe182de8 100644 --- a/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl +++ b/extensions/SecureMail/template/en/default/account/prefs/securemail.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander @@ -23,9 +23,9 @@ [% END %] -

Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has -deemed 'secure'. This means emails containing information about those [% terms.bugs %] -will only be sent encrypted. Enter your PGP/GPG public key or +

Some [% terms.bugs %] in this [% terms.Bugzilla %] are in groups the administrator has +deemed 'secure'. This means emails containing information about those [% terms.bugs %] +will only be sent encrypted. Enter your PGP/GPG public key or SMIME certificate here to receive full update emails for such [% terms.bugs %].

If you are a member of a secure group, or if you enter a key here, your password reset email will also be sent to you encrypted. If you are a member of a secure group and do not enter a key, you will not be able to reset your password without the assistance of an administrator.

diff --git a/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl b/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl index 70a40e592..1662e28af 100644 --- a/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/account/prefs/prefs-tabs.html.tmpl @@ -17,7 +17,7 @@ # All Rights Reserved. # # Contributor(s): Max Kanat-Alexander - # Gervase Markham + # Gervase Markham #%] [% tabs = tabs.import([{ diff --git a/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl index 27c644d02..a3d5069cc 100644 --- a/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/admin/groups/create-field.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander @@ -21,5 +21,5 @@ - - + + diff --git a/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl index 253fed29e..7aaf35d7d 100644 --- a/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/admin/groups/edit-field.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander diff --git a/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl b/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl index e5e299ef9..cf0ec3e03 100644 --- a/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/admin/users/userdata-end.html.tmpl @@ -14,7 +14,7 @@ [% otheruser.public_key ? "Yes" : "No" %] - + Member of Secure Mail Group: diff --git a/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl index 46b093674..507874fe4 100644 --- a/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/SecureMail/template/en/default/hook/global/user-error-errors.html.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is the Mozilla Corporation. - # Portions created by the Initial Developer are Copyright (C) 2008 the + # Portions created by the Initial Developer are Copyright (C) 2008 the # Initial Developer. All Rights Reserved. # # Contributor(s): Max Kanat-Alexander @@ -20,8 +20,8 @@ [% IF error == "securemail_invalid_key" %] [% title = "Invalid Public Key" %] We were unable to read the public key that you entered. Make sure - that you are entering either an ASCII-armored PGP/GPG public key, - including the "BEGIN PGP PUBLIC KEY BLOCK" and "END PGP PUBLIC KEY BLOCK" + that you are entering either an ASCII-armored PGP/GPG public key, + including the "BEGIN PGP PUBLIC KEY BLOCK" and "END PGP PUBLIC KEY BLOCK" lines, or a PEM format (Base64-encoded X.509) S/MIME key, including the BEGIN CERTIFICATE and END CERTIFICATE lines.

[% errstr FILTER html %] [% END %] diff --git a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl index 928c7f1d4..378d007f0 100644 --- a/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl +++ b/extensions/SecureMail/template/en/default/pages/securemail/help.html.tmpl @@ -24,8 +24,8 @@ title = "SecureMail Help" %] -[% terms.Bugzilla %] considers certain groups as "secure". If a [% terms.bug %] is in one of those groups, [% terms.Bugzilla %] will not send unencrypted -email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either +[% terms.Bugzilla %] considers certain groups as "secure". If a [% terms.bug %] is in one of those groups, [% terms.Bugzilla %] will not send unencrypted +email about it. To receive encrypted email rather than just a "something changed" placeholder, you must provide either a S/MIME or a GPG/PGP key on the SecureMail preferences tab.

In addition, if you have uploaded a S/MIME or GPG/PGP key using the @@ -36,9 +36,9 @@ be required to decrypt it to view the reset instructions. S/MIME Keys must be in PEM format - i.e. Base64-encoded text, with the first line containing BEGIN CERTIFICATE.

-

S/MIME certificates can be obtained from a number of providers. -Once you have it, export it from your browser as a .p12 file and import it into your mail client. -You'll need to provide a password when you export - pick a strong one, +

S/MIME certificates can be obtained from a number of providers. +Once you have it, export it from your browser as a .p12 file and import it into your mail client. +You'll need to provide a password when you export - pick a strong one, and then back up the .p12 file somewhere safe.

Import on Thunderbird as follows:

@@ -81,7 +81,7 @@ Then, you need to convert it to a .pem file. Here are two possible ways to do th

Open the .pem file in a text editor. You can recognise the public key because -it starts "BEGIN CERTIFICATE" and ends "END CERTIFICATE" and +it starts "BEGIN CERTIFICATE" and ends "END CERTIFICATE" and has an appropriate friendly name (e.g. "StartCom Free Certificate Member's StartCom Ltd. ID").

Paste the contents of the .pem file into the SecureMail text field in [% terms.Bugzilla %].

@@ -117,7 +117,7 @@ You’ll have to answer several questions:

gpg --armor --output pubkey.txt --export 'Your Name'

-

Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %]. +

Paste the contents of pubkey.txt into the SecureMail text field in [% terms.Bugzilla %].

  • Configure your email client to use your associated private key to decrypt the encrypted emails. For Thunderbird, you need the Enigmail extension.

    diff --git a/extensions/SiteMapIndex/template/en/default/hook/global/messages-messages.html.tmpl b/extensions/SiteMapIndex/template/en/default/hook/global/messages-messages.html.tmpl index 0d0e9fd74..1e2b1788b 100644 --- a/extensions/SiteMapIndex/template/en/default/hook/global/messages-messages.html.tmpl +++ b/extensions/SiteMapIndex/template/en/default/hook/global/messages-messages.html.tmpl @@ -30,7 +30,7 @@ [% ELSIF message_tag == "sitemap_no_urlbase" %] You have not yet set the "urlbase" parameter. We cannot update - search engines and inform them about your sitemap without a + search engines and inform them about your sitemap without a urlbase. Please set the "urlbase" parameter and re-run checksetup.pl. diff --git a/extensions/Splinter/web/splinter.js b/extensions/Splinter/web/splinter.js index 277a7ff86..8fde9998a 100644 --- a/extensions/Splinter/web/splinter.js +++ b/extensions/Splinter/web/splinter.js @@ -116,7 +116,7 @@ Splinter.Bug = { } } else { tzoffset = parseInt(m[8], 10); - } + } var unadjustedDate = new Date(Date.UTC(m[1], m[2] - 1, m[3], m[4], m[5])); @@ -129,7 +129,7 @@ Splinter.Bug = { return new Date(unadjustedDate.getTime() - sign * adjustmentHours * 3600000 - sign * adjustmentMinutes * 60000); - }, + }, _formatWho : function(name, email) { if (name && email) { @@ -207,14 +207,14 @@ Splinter.Dialog.prototype = { draggable: false, close: false, hideaftersubmit: true, - constraintoviewport: true + constraintoviewport: true }); this.dialog.setHeader(prompt); }, addButton : function (label, callback, isdefault) { - this.buttons.push({ text : label, - handler : function () { this.hide(); callback(); }, + this.buttons.push({ text : label, + handler : function () { this.hide(); callback(); }, isDefault : isdefault }); this.dialog.cfg.queueProperty("buttons", this.buttons); }, @@ -325,13 +325,13 @@ Splinter.Patch.Hunk.prototype = { lines[j][2] |= Splinter.Patch.CHANGED; } } - + currentStart = -1; currentOldCount = 0; currentNewCount = 0; } } - + var i; for (i = 0; i < rawlines.length; i++) { var line = rawlines[i]; @@ -363,7 +363,7 @@ Splinter.Patch.Hunk.prototype = { } currentNewCount++; } - } + } // git mail-formatted patches end with --\n like a signature // This is troublesome since it looks like a subtraction at the end @@ -398,7 +398,7 @@ Splinter.Patch.Hunk.prototype = { if (line[1] != null) { newLine++; } - } + } } }; @@ -436,22 +436,22 @@ Splinter.Patch.File.prototype = { } if ((oldLine != null && oldLine < hunk.oldStart + hunk.oldCount) || - (newLine != null && newLine < hunk.newStart + hunk.newCount)) + (newLine != null && newLine < hunk.newStart + hunk.newCount)) { var location = -1; hunk.iterate(function(loc, oldl, oldText, newl, newText, flags) { if ((oldLine == null || oldl == oldLine) && - (newLine == null || newl == newLine)) + (newLine == null || newl == newLine)) { location = loc; } }); - + if (location != -1) { return location; } } - } + } throw "Bad oldLine,newLine: " + oldLine + "," + newLine; }, @@ -645,7 +645,7 @@ Splinter.Patch.Patch.prototype = { } else { status = Splinter.Patch.CHANGED; } - } + } this.files.push(new Splinter.Patch.File(filename, status, extra, hunks)); @@ -785,7 +785,7 @@ Splinter.Review.File.prototype = { var i; for (i = 0; i < this.comments.length; i++) { if (this.comments[i].location == location && - this.comments[i].type == type) + this.comments[i].type == type) { return this.comments[i]; } @@ -857,19 +857,19 @@ Splinter.Review.File.prototype = { addNewLine(newLine); unchangedLines++; } else { - if ((comment.type == Splinter.Patch.REMOVED - || comment.type == Splinter.Patch.CHANGED) - && oldText != null) + if ((comment.type == Splinter.Patch.REMOVED + || comment.type == Splinter.Patch.CHANGED) + && oldText != null) { - patchLines.push('> -' + oldText + + patchLines.push('> -' + oldText + Splinter.Review._noNewLine(flags, Splinter.Patch.OLD_NONEWLINE)); addOldLine(oldLine); } - if ((comment.type == Splinter.Patch.ADDED - || comment.type == Splinter.Patch.CHANGED) - && newText != null) + if ((comment.type == Splinter.Patch.ADDED + || comment.type == Splinter.Patch.CHANGED) + && newText != null) { - patchLines.push('> +' + newText + + patchLines.push('> +' + newText + Splinter.Review._noNewLine(flags, Splinter.Patch.NEW_NONEWLINE)); addNewLine(newLine); } @@ -1092,7 +1092,7 @@ Splinter.Review.Review.prototype = { } if ((oldStart == null || oldLine == oldStart + oldCount) && - (newStart == null || newLine == newStart + newCount)) + (newStart == null || newLine == newStart + newCount)) { commentText = rawlines.slice(i + 1).join("\n"); break; @@ -1175,7 +1175,7 @@ Splinter.Review.Review.prototype = { str += file.toString(); } } - + return str; } }; @@ -1276,8 +1276,8 @@ Splinter.ReviewStorage.LocalReviewStorage.prototype = { saveDraft : function(bug, attachment, review, extraProps) { var propertyName = this._reviewPropertyName(bug, attachment); - if (!extraProps) { - extraProps = {}; + if (!extraProps) { + extraProps = {}; } extraProps.isDraft = true; this._updateOrCreateReviewInfo(bug, attachment, extraProps); @@ -1307,7 +1307,7 @@ Splinter.UPDATE_ATTACHMENT_SUCCESS = /\s*Changes\s+Submitted/; Splinter.LINE_RE = /(?!$)([^\r\n]*)(?:\r\n|\r|\n|$)/g; Splinter.displayError = function (msg) { - var el = new Element(document.createElement('p')); + var el = new Element(document.createElement('p')); el.appendChild(document.createTextNode(msg)); Dom.get('error').appendChild(Dom.get(el)); Dom.setStyle('error', 'display', 'block'); @@ -1318,7 +1318,7 @@ Splinter.publishReview = function () { Splinter.theReview.setIntro(Dom.get('myComment').value); if (Splinter.reviewStorage) { - Splinter.reviewStorage.draftPublished(Splinter.theBug, + Splinter.reviewStorage.draftPublished(Splinter.theBug, Splinter.theAttachment); } @@ -1346,13 +1346,13 @@ Splinter.publishReview = function () { // This is a "magic string" used to identify review comments if (Splinter.theReview.toString()) { var comment = "Review of attachment " + Splinter.theAttachment.id + ":\n" + - "-----------------------------------------------------------------\n\n" + + "-----------------------------------------------------------------\n\n" + Splinter.theReview.toString(); publish_review.value = comment; } - if (Splinter.theAttachment.status - && Dom.get('attachmentStatus').value != Splinter.theAttachment.status) + if (Splinter.theAttachment.status + && Dom.get('attachmentStatus').value != Splinter.theAttachment.status) { publish_attach_status.value = Dom.get('attachmentStatus').value; } @@ -1367,7 +1367,7 @@ Splinter.doDiscardReview = function () { Dom.get('myComment').value = ''; Dom.setStyle('emptyCommentNotice', 'display', 'block'); - + var i; for (i = 0; i < Splinter.theReview.files.length; i++) { while (Splinter.theReview.files[i].comments.length > 0) { @@ -1481,7 +1481,7 @@ Splinter.saveDraft = function () { filesReviewed[file.filename] = true; } } - Splinter.reviewStorage.saveDraft(Splinter.theBug, Splinter.theAttachment, Splinter.theReview, + Splinter.reviewStorage.saveDraft(Splinter.theBug, Splinter.theAttachment, Splinter.theReview, { 'filesReviewed' : filesReviewed }); draftSaved = true; } else { @@ -1614,7 +1614,7 @@ Splinter.addCommentDisplay = function (commentArea, comment) { Dom.addClass(reviewer, 'reviewer'); reviewer.appendChild(document.createTextNode(review.who)); reviewer.appendTo(reviewInfo); - + var reviewDate = new Element(document.createElement('div')); Dom.addClass(reviewDate, 'review-date'); reviewDate.appendChild(document.createTextNode(Splinter.Utils.formatDate(review.date))); @@ -1693,7 +1693,7 @@ Splinter.insertCommentEditor = function (commentArea, file, location, type) { var separatorClass = Splinter.getSeparatorClass(type); var nodes = Dom.getElementsByClassName('reviewer-0', 'div', commentArea); - var i; + var i; for (i = 0; i < nodes.length; i++) { if (separatorClass && Dom.hasClass(nodes[i], separatorClass)) { nodes[i].parentNode.removeChild(nodes[i]); @@ -1714,7 +1714,7 @@ Splinter.insertCommentEditor = function (commentArea, file, location, type) { Dom.setAttribute(commentEditor, 'id', 'commentEditor'); Dom.addClass(commentEditor, typeClass); commentEditor.appendTo(commentArea); - + var commentEditorInner = new Element(document.createElement('div')); Dom.setAttribute(commentEditorInner, 'id', 'commentEditorInner'); commentEditorInner.appendTo(commentEditor); @@ -1728,7 +1728,7 @@ Splinter.insertCommentEditor = function (commentArea, file, location, type) { Dom.setAttribute(commentTextArea, 'tabindex', 1); commentTextArea.appendChild(document.createTextNode(previousText)); commentTextArea.appendTo(commentTextFrame); - Event.addListener('commentTextArea', 'keydown', function (e) { + Event.addListener('commentTextArea', 'keydown', function (e) { if (e.which == 13 && e.ctrlKey) { Splinter.saveComment(); } else if (e.which == 27) { @@ -2213,7 +2213,7 @@ Splinter.addNavigationLink = function (identifier, title, callback, selected) { var navigationDiv = Dom.get('navigation'); if (Dom.getChildren(navigationDiv).length > 0) { navigationDiv.appendChild(document.createTextNode(' | ')); - } + } var navigationLink = new Element(document.createElement('a')); Dom.addClass(navigationLink, 'navigation-link'); @@ -2224,13 +2224,13 @@ Splinter.addNavigationLink = function (identifier, title, callback, selected) { navigationLink.appendTo(navigationDiv); // FIXME: Find out why I need to use an id here instead of just passing - // navigationLink to Event.addListener() + // navigationLink to Event.addListener() Event.addListener('switch-' + encodeURIComponent(identifier), 'click', function () { if (!Dom.hasClass(this, 'navigation-link-selected')) { callback(); } }); - + if (selected) { Dom.addClass(navigationLink, 'navigation-link-selected'); } @@ -2241,7 +2241,7 @@ Splinter.addNavigationLink = function (identifier, title, callback, selected) { Splinter.showOverview = function () { Splinter.selectNavigationLink('__OVERVIEW__'); Dom.setStyle('overview', 'display', 'block'); - Dom.getElementsByClassName('file', 'div', '', function (node) { + Dom.getElementsByClassName('file', 'div', '', function (node) { Dom.setStyle(node, 'display', 'none'); }); if (!Splinter.readOnly) @@ -2358,7 +2358,7 @@ Splinter.start = function () { Dom.setAttribute(haveDraftNotice, 'id', 'haveDraftNotice'); haveDraftNotice.appendChild(document.createTextNode('Draft')); haveDraftNotice.appendTo(navigation); - + var clear = new Element(document.createElement('div')); Dom.addClass(clear, 'clear'); clear.appendTo(navigation); @@ -2409,7 +2409,7 @@ Splinter.start = function () { reviewIntro.appendTo(reviewerBox); Dom.setStyle('oldReviews', 'display', 'block'); - + Splinter.appendReviewComments(review, reviewerBox); } } @@ -2424,7 +2424,7 @@ Splinter.start = function () { Dom.setStyle('restored', 'display', 'block'); for (i = 0; i < storedReviews.length; i++) { if (storedReviews[i].bugId == Splinter.theBug.id && - storedReviews[i].attachmentId == Splinter.theAttachment.id) + storedReviews[i].attachmentId == Splinter.theAttachment.id) { Splinter.replaceText(Dom.get("restoredLastModified"), Splinter.Utils.formatDate(new Date(storedReviews[i].modificationTime))); // Restore file reviewed checkboxes @@ -2625,7 +2625,7 @@ Splinter.showChooseAttachment = function () { responseType: YAHOO.util.DataSource.TYPE_JSARRAY, responseSchema: { fields:["id","description","date", "extra"] } }; - + var columnDefs = [ { key: "id", label: "ID", formatter: attachLink }, { key: "description", label: "Description", formatter: attachDesc }, @@ -2635,7 +2635,7 @@ Splinter.showChooseAttachment = function () { var dataSource = new YAHOO.util.LocalDataSource(attachData, dsConfig); var dataTable = new YAHOO.widget.DataTable("chooseAttachmentTable", columnDefs, dataSource); - + Dom.setStyle('chooseAttachment', 'display', 'block'); }; @@ -2651,7 +2651,7 @@ Splinter.quickHelpToggle = function () { quickHelpContent.style.display = 'none'; quickHelpShow.style.display = 'block'; } -}; +}; Splinter.init = function () { Splinter.showNote(); @@ -2674,7 +2674,7 @@ Splinter.init = function () { if (Splinter.attachmentId) { Splinter.theAttachment = Splinter.theBug.getAttachment(Splinter.attachmentId); - + if (Splinter.theAttachment == null) { Splinter.displayError("Attachment " + Splinter.attachmentId + " is not an attachment to bug " + Splinter.theBug.id); } @@ -2704,8 +2704,8 @@ Splinter.init = function () { Dom.setStyle('attachInfo', 'display', 'block'); Dom.setStyle('quickHelpShow', 'display', 'block'); - - document.title = "Patch Review of Attachment " + Splinter.theAttachment.id + + + document.title = "Patch Review of Attachment " + Splinter.theAttachment.id + " for Bug " + Splinter.theBug.id; Splinter.thePatch = new Splinter.Patch.Patch(Splinter.theAttachment.data); @@ -2715,4 +2715,4 @@ Splinter.init = function () { } }; -YAHOO.util.Event.addListener(window, 'load', Splinter.init); +YAHOO.util.Event.addListener(window, 'load', Splinter.init); diff --git a/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl b/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl index 0bd81eae1..4c2609609 100644 --- a/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl +++ b/extensions/Voting/template/en/default/hook/account/prefs/email-relationships.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl index fde6434de..8fa43734b 100644 --- a/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl +++ b/extensions/Voting/template/en/default/hook/admin/products/edit-common-rows.html.tmpl @@ -14,16 +14,16 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] -[% DEFAULT +[% DEFAULT product.maxvotesperbug = constants.DEFAULT_VOTES_PER_BUG product.votesperuser = 0 product.votestoconfirm = 0 %] - + <tr> <th align="right">Maximum votes per person:</th> <td><input size="5" maxlength="5" name="votesperuser" id="votesperuser" diff --git a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl index 15fb1efe0..01005d776 100644 --- a/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl +++ b/extensions/Voting/template/en/default/hook/admin/products/updated-changes.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl b/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl index bbf0350a1..ad475a76b 100644 --- a/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl +++ b/extensions/Voting/template/en/default/hook/admin/sanitycheck/messages-statuses.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl b/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl index a753e3a66..5a9d315c2 100644 --- a/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl +++ b/extensions/Voting/template/en/default/hook/admin/users/confirm-delete-warn_safe.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl b/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl index b57a5cb27..e502c1e3a 100644 --- a/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl +++ b/extensions/Voting/template/en/default/hook/bug/edit-after_importance.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] [% IF bug.product_obj.votesperuser %] @@ -23,7 +23,7 @@ with <a href="page.cgi?id=voting/bug.html&bug_id= [%- bug.id FILTER uri %]"> - [%- bug.votes FILTER html %] + [%- bug.votes FILTER html %] [% IF bug.votes == 1 %] vote [% ELSE %] diff --git a/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl b/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl index ebba6fcab..59c8eeedc 100644 --- a/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl +++ b/extensions/Voting/template/en/default/hook/bug/format_comment-type.txt.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl b/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl index a4530653b..b4dd16e90 100644 --- a/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl +++ b/extensions/Voting/template/en/default/hook/bug/process/header-title.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl b/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl index ae0d465dc..fd8a4cadd 100644 --- a/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl +++ b/extensions/Voting/template/en/default/hook/bug/process/results-title.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl b/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl index 2e2c2d995..55d3bf468 100644 --- a/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl +++ b/extensions/Voting/template/en/default/hook/bug/show-header-end.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl b/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl index 50e915941..7763f15d8 100644 --- a/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl +++ b/extensions/Voting/template/en/default/hook/global/code-error-errors.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl b/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl index 1becab4da..ba43380f0 100644 --- a/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl +++ b/extensions/Voting/template/en/default/hook/global/field-descs-end.none.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl b/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl index 3a1f5a189..9aedcd50c 100644 --- a/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl +++ b/extensions/Voting/template/en/default/hook/global/reason-descs-end.none.tmpl @@ -14,10 +14,10 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] [% reason_descs.${constants.REL_VOTER} = "You voted for the ${terms.bug}." %] -[% watch_reason_descs.${constants.REL_VOTER} = +[% watch_reason_descs.${constants.REL_VOTER} = "You are watching a voter for the ${terms.bug}." %] diff --git a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl index c2ff70728..057aa1d79 100644 --- a/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl +++ b/extensions/Voting/template/en/default/hook/global/user-error-errors.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl b/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl index dca1dba00..b91c14dfe 100644 --- a/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl +++ b/extensions/Voting/template/en/default/hook/search/form-after_freetext_fields.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl b/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl index ca74f6d2d..c58db3800 100644 --- a/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl +++ b/extensions/Voting/template/en/default/hook/search/search-report-select-rep_fields.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2010 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/extensions/Voting/template/en/default/pages/voting.html.tmpl b/extensions/Voting/template/en/default/pages/voting.html.tmpl index 99026c0d5..5165d32c8 100644 --- a/extensions/Voting/template/en/default/pages/voting.html.tmpl +++ b/extensions/Voting/template/en/default/pages/voting.html.tmpl @@ -22,19 +22,19 @@ [% PROCESS global/variables.none.tmpl %] [% INCLUDE global/header.html.tmpl title = "Voting" %] -<p>[% terms.Bugzilla %] has a "voting" feature. Each product allows users to -have a certain number of votes. (Some products may not allow any, which means -you can't vote on things in those products at all.) With your vote, you -indicate which [% terms.bugs %] you think are the most important and -would like to see fixed. Note that voting is nowhere near as effective +<p>[% terms.Bugzilla %] has a "voting" feature. Each product allows users to +have a certain number of votes. (Some products may not allow any, which means +you can't vote on things in those products at all.) With your vote, you +indicate which [% terms.bugs %] you think are the most important and +would like to see fixed. Note that voting is nowhere near as effective as providing a fix yourself.</p> <p>Depending on how the administrator has configured the relevant product, you may be able to vote for the same [% terms.bug %] more than once. -Remember that you have a limited number of votes. When weighted voting -is allowed and a limited number of votes are available to you, you will -have to decide whether you want to distribute your votes among a large -number of [% terms.bugs %] indicating your minimal interest or focus on +Remember that you have a limited number of votes. When weighted voting +is allowed and a limited number of votes are available to you, you will +have to decide whether you want to distribute your votes among a large +number of [% terms.bugs %] indicating your minimal interest or focus on a few [% terms.bugs %] indicating your strong support for them. </p> @@ -55,8 +55,8 @@ a few [% terms.bugs %] indicating your strong support for them. fields. (If no such link appears, then voting may not be allowed in this [% terms.bug %]'s product.)</li> - <li>Indicate how many votes you want to give this [% terms.bug %]. This page - also displays how many votes you've given to other [% terms.bugs %], so you + <li>Indicate how many votes you want to give this [% terms.bug %]. This page + also displays how many votes you've given to other [% terms.bugs %], so you may rebalance your votes as necessary.</li> </ul> -- cgit v1.2.3-24-g4f1b