diff options
Diffstat (limited to 'template/en/default/global')
| -rw-r--r-- | template/en/default/global/choose-classification.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/global/choose-product.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/global/confirm-user-match.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 66 | ||||
| -rw-r--r-- | template/en/default/global/reason-descs.none.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/select-menu.html.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 18 | ||||
| -rw-r--r-- | template/en/default/global/user.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/value-descs.js.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/value-descs.none.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/variables.none.tmpl | 8 |
12 files changed, 82 insertions, 56 deletions
diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl index fbac48479..b3007a172 100644 --- a/template/en/default/global/choose-classification.html.tmpl +++ b/template/en/default/global/choose-classification.html.tmpl @@ -32,7 +32,7 @@ <tr> <th align="right"> <a href="[% target FILTER uri %]?classification=__all - [% IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] + [% IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] [%- IF format %]&format=[% format FILTER uri %][% END %]"> All</a>: </th> @@ -47,7 +47,7 @@ <tr> <th align="right"> <a href="[% target FILTER uri %]?classification=[% class.name FILTER uri -%] - [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] + [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] [%- IF format %]&format=[% format FILTER uri %][% END %]"> [% class.name FILTER html %]</a>: </th> diff --git a/template/en/default/global/choose-product.html.tmpl b/template/en/default/global/choose-product.html.tmpl index ae00bf503..8cd23a910 100644 --- a/template/en/default/global/choose-product.html.tmpl +++ b/template/en/default/global/choose-product.html.tmpl @@ -56,7 +56,7 @@ <tr> <th align="right" valign="top"> <a href="[% target %]?product=[% p.name FILTER uri -%] - [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] + [%- IF cloned_bug_id %]&cloned_bug_id=[% cloned_bug_id FILTER uri %][% END -%] [%- IF format %]&format=[% format FILTER uri %][% END %]"> [% p.name FILTER html FILTER no_break %]</a>: </th> diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index b37e7ca7b..8aaf10127 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -315,7 +315,7 @@ [% ELSIF error == "jobqueue_status_error" %] An error occurred while checking the job queue status. Try again at a - later time. + later time. [% ELSIF error == "ldap_bind_failed" %] Failed to bind to the LDAP server. The error message was: @@ -514,13 +514,15 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] -[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] - [% error_message FILTER none %] - [% ELSE %] - [% error_message FILTER txt %] +[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %] + [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] + [% RETURN %] [% END %] - [% RETURN %] [% END %] [% UNLESS header_done %] diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl index b74dd5ded..71d0dbacb 100644 --- a/template/en/default/global/confirm-user-match.html.tmpl +++ b/template/en/default/global/confirm-user-match.html.tmpl @@ -60,7 +60,7 @@ [% USE Bugzilla %] - <form method="post" + <form method="post" [% IF script -%] action="[% script %]" [%- END -%] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index 9db9a1404..5db263981 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -98,7 +98,6 @@ <meta charset="UTF-8"> [% END %] [% USE Bugzilla %] - <base href="[% urlbase FILTER html %]"> [% IF Bugzilla.cgi.should_block_referrer %] <meta name="referrer" content="origin"> @@ -107,6 +106,10 @@ [% END %] [%- js_BUGZILLA = { + user => { + # TODO: Move all properties form bug_modal/header.html.tmpl + login => user.login, + }, param => { maxattachmentsize => Param('maxattachmentsize'), maxusermatches => Param('maxusermatches'), @@ -242,6 +245,40 @@ #%] <div id="wrapper"> + +<aside id="message-container" role="complementary"> + <noscript> + <div class="noscript"> + <div class="inner"> + <p>Please enable JavaScript in your browser to use all the features on this site.</p> + </div> + </div> + </noscript> + [% IF Bugzilla.request_cache.mfa_warning + AND user.mfa_required_date + AND NOT Bugzilla.request_cache.on_mfa_page %] + <div class="warning"> + <div class="inner"> + <p> + Please <a href="userprefs.cgi?tab=mfa">enable two-factor authentication</a> + [% IF Param('mfa_group_grace_period') %] + before <i>[% user.mfa_required_date FILTER time %]</i>. + [% ELSE %] + now. + [% END %] + </p> + </div> + </div> + [% END %] + [% IF Param('announcehtml') %] + <div class="announcement"> + <div class="inner"> + [% Param('announcehtml') FILTER none %] + </div> + </div> + [% END %] +</aside> + <header id="header" role="banner"> <div class="inner"> <h1 id="header-title" class="title"><a href="./" title="Go to home page">[% terms.Bugzilla %]</a></h1> @@ -342,12 +379,10 @@ <li role="presentation"> <a href="userprefs.cgi" role="menuitem" tabindex="-1">Preferences</a> </li> - [% IF user.authorizer.can_logout %] - <li role="separator"></li> - <li role="presentation"> - <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a> - </li> - [% END %] + <li role="separator"></li> + <li role="presentation"> + <a href="index.cgi?logout=1" role="menuitem" tabindex="-1">Log out</a> + </li> [% IF sudoer %] <li role="presentation"> <a href="relogin.cgi?action=end-sudo" role="menuitem" tabindex="-1">End sudo session impersonating [% user.login FILTER html %]</a> @@ -369,19 +404,6 @@ </div> </header> [%# header %] -[% IF Bugzilla.request_cache.mfa_warning - AND user.mfa_required_date - AND NOT Bugzilla.request_cache.on_mfa_page %] - <aside id="mfa-warning"> - Please <a href="userprefs.cgi?tab=mfa">enable two-factor authentication</a> - [% IF Param('mfa_group_grace_period') %] - before <i>[% user.mfa_required_date FILTER time %]</i>. - [% ELSE %] - now. - [% END %] - </aside> -[% END %] - <main id="bugzilla-body" tabindex="-1"> <div id="main-inner"> @@ -392,10 +414,6 @@ <h2>[% header FILTER none %]</h2> [% END %] -[% IF Param('announcehtml') %] -[% Param('announcehtml') FILTER none %] -[% END %] - [% IF message %] <div id="message">[% message %]</div> [% END %] diff --git a/template/en/default/global/reason-descs.none.tmpl b/template/en/default/global/reason-descs.none.tmpl index 426085f0d..b79a5bbb4 100644 --- a/template/en/default/global/reason-descs.none.tmpl +++ b/template/en/default/global/reason-descs.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/template/en/default/global/select-menu.html.tmpl b/template/en/default/global/select-menu.html.tmpl index f8d4d68e2..64d8b9a46 100644 --- a/template/en/default/global/select-menu.html.tmpl +++ b/template/en/default/global/select-menu.html.tmpl @@ -24,25 +24,25 @@ # multiple: boolean; whether or not the menu is multi-select # # size: integer; the number of items to display at once - # + # # options: array or hash; the items with which to populate the array. # If a hash is passed, the hash keys become the names displayed # to the user while the hash values become the value of the item. - # + # # default: string; the item selected in the menu by default. - # + # # onchange: code; JavaScript to be run when the user changes the value # selected in the menu. #%] - -[%# Get the scalar representation of the options reference, + +[%# Get the scalar representation of the options reference, # which looks like "ARRAY(0xA352BA3F)" or "HASH(0xA352BA3F)", # so we can figure out whether it is a reference to an array # or a hash. #%] [% options_type = BLOCK %][% options %][% END %] -<select name="[% name FILTER html %]" +<select name="[% name FILTER html %]" [% IF onchange %]onchange="[% onchange FILTER html %]"[% END %] [% IF multiple %] multiple [% END %] [% IF size %] size="[% size %]" [% END %]> @@ -55,7 +55,7 @@ [% END %] [% ELSIF options_type.search("HASH") %] [% FOREACH option = options %] - <option value="[% option.value FILTER html %]" + <option value="[% option.value FILTER html %]" [% " selected" IF option.value == default %]> [% option.key FILTER html %] </option> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index c6efb5649..53de6a420 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -1037,6 +1037,10 @@ [% title = "Invalid Authentication Method" %] API key authentication is required. + [% ELSIF error == "invalid_params" %] + [% title = "Invalid Params" %] + API method received invalid params: [% type_error FILTER html %] + [% ELSIF error == "bug_id_does_not_exist" %] [% title = BLOCK %]Invalid [% terms.Bug %] ID[% END %] [% terms.Bug %] [%= bug_id FILTER html %] does not exist. @@ -1982,13 +1986,15 @@ [%# We only want HTML error messages for ERROR_MODE_WEBPAGE %] [% USE Bugzilla %] -[% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] - [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] - [% error_message FILTER none %] - [% ELSE %] - [% error_message FILTER txt %] +[% IF Bugzilla.usage_mode != constants.USAGE_MODE_MOJO %] + [% IF Bugzilla.error_mode != constants.ERROR_MODE_WEBPAGE %] + [% IF Bugzilla.usage_mode == constants.USAGE_MODE_BROWSER %] + [% error_message FILTER none %] + [% ELSE %] + [% error_message FILTER txt %] + [% END %] + [% RETURN %] [% END %] - [% RETURN %] [% END %] [% UNLESS header_done %] diff --git a/template/en/default/global/user.html.tmpl b/template/en/default/global/user.html.tmpl index 876d12805..2750ce8f7 100644 --- a/template/en/default/global/user.html.tmpl +++ b/template/en/default/global/user.html.tmpl @@ -14,7 +14,7 @@ # Portions created by the Initial Developer are Copyright (C) 2007 # the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Daniel Brooks <db48x@db48x.net> # Max Kanat-Alexander <mkanat@bugzilla.org> #%] diff --git a/template/en/default/global/value-descs.js.tmpl b/template/en/default/global/value-descs.js.tmpl index b0fb1d4d2..e0e40da04 100644 --- a/template/en/default/global/value-descs.js.tmpl +++ b/template/en/default/global/value-descs.js.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/template/en/default/global/value-descs.none.tmpl b/template/en/default/global/value-descs.none.tmpl index 56c90ac35..5bcfc3f15 100644 --- a/template/en/default/global/value-descs.none.tmpl +++ b/template/en/default/global/value-descs.none.tmpl @@ -11,7 +11,7 @@ # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is BugzillaSource, Inc. - # Portions created by the Initial Developer are Copyright (C) 2011 + # Portions created by the Initial Developer are Copyright (C) 2011 # the Initial Developer. All Rights Reserved. # # Contributor(s): diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl index 93002efa3..c57dac890 100644 --- a/template/en/default/global/variables.none.tmpl +++ b/template/en/default/global/variables.none.tmpl @@ -18,13 +18,13 @@ # Contributor(s): #%] -[%# This is a list of terms that may be changed to "brand" the Bugzilla +[%# This is a list of terms that may be changed to "brand" the Bugzilla # instance (for example, referring to "bugs" as "issues".) When used, these - # strings are used in several different types of content, and are not - # protected with Template-Toolkit FILTERs. Consequently, no special + # strings are used in several different types of content, and are not + # protected with Template-Toolkit FILTERs. Consequently, no special # characters are allowed. # - # Remember to PROCESS rather than INCLUDE this template. + # Remember to PROCESS rather than INCLUDE this template. #%] [% terms = { |