diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-09 21:56:56 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-09 21:56:56 +0100 |
| commit | 5bb3d3fb55bc19823a55c0e48322021a5c556394 (patch) | |
| tree | 41b8a33080ead49f6632f4c8c5c71c017f9df757 /template | |
| parent | 0c449e2d96804f6e48d3812b42ccf407fbbeb747 (diff) | |
| parent | ed87a68c9fa5c099c79f45bb6f3ab95e42f14002 (diff) | |
| download | bugzilla-5bb3d3fb55bc19823a55c0e48322021a5c556394.tar.gz bugzilla-5bb3d3fb55bc19823a55c0e48322021a5c556394.tar.xz | |
merge with bugzilla/4.2
Diffstat (limited to 'template')
| -rw-r--r-- | template/en/default/account/prefs/prefs.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/bug/show-multiple.html.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/global/code-error.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/user-error.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/pages/release-notes.html.tmpl | 4 |
5 files changed, 16 insertions, 7 deletions
diff --git a/template/en/default/account/prefs/prefs.html.tmpl b/template/en/default/account/prefs/prefs.html.tmpl index 2e7d98c07..2e8b561de 100644 --- a/template/en/default/account/prefs/prefs.html.tmpl +++ b/template/en/default/account/prefs/prefs.html.tmpl @@ -40,8 +40,9 @@ title = "User Preferences" subheader = filtered_login style_urls = ['skins/standard/admin.css'] - javascript_urls = ['js/util.js'] + javascript_urls = ['js/util.js', 'js/field.js'] doc_section = "userpreferences.html" + yui = ['autocomplete'] %] [% tabs = [{ name => "settings", label => "General Preferences", diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index 03ce294c5..7b9c201e6 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -173,6 +173,18 @@ </tr> [% END %] + [% IF bug.see_also.size %] + <tr> + <th>[% field_descs.see_also FILTER html %]:</th> + <td colspan="3"> + [% FOREACH see_also = bug.see_also %] + <a href="[% see_also.name FILTER html %]">[% see_also.name FILTER html %]</a> + [% "<br>" IF not loop.last() %] + [% END %] + </td> + </tr> + [% END %] + [% IF Param("usestatuswhiteboard") %] [% PROCESS row cell = "status_whiteboard" fullrow = 1 %] [% END %] diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl index 70a345984..5dce16976 100644 --- a/template/en/default/global/code-error.html.tmpl +++ b/template/en/default/global/code-error.html.tmpl @@ -46,7 +46,7 @@ A legal address must contain exactly one '@', and at least one '.' after the @. [% ELSE %] - [%+ Param('emailregexpdesc') %] + [%+ Param('emailregexpdesc') FILTER html_light %] [% END %] It must also not contain any of these special characters: <tt>\ ( ) & < > , ; : " [ ]</tt>, or any whitespace. diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 295f7328f..6521150bc 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -849,7 +849,7 @@ A legal address must contain exactly one '@', and at least one '.' after the @. [% ELSE %] - [%+ Param('emailregexpdesc') %] + [%+ Param('emailregexpdesc') FILTER html_light %] [% END %] It must also not contain any of these special characters: <tt>\ ( ) & < > , ; : " [ ]</tt>, or any whitespace. diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index 819b22e2d..41396f5ac 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -338,10 +338,6 @@ [%- terms.Bug %] 584742</a>: When viewing [% terms.abug %], WebKit-based browsers can automatically reset a field's selected value when the field has disabled values.</li> - <li><a href="https://bugzilla.mozilla.org/show_bug.cgi?id=706753"> - [%- terms.Bug %] 706753</a>: Automatic [% terms.bug %] detection and - user auto-completion do not work with JSON::RPC 1.x due to a backwards - incompatible change. You should install JSON::RPC 0.96 instead.</li> </ul> |