summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-11-30 16:53:02 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-11-30 16:53:02 +0100
commitd83a1c136214a5663a09987c48d66f9a527e7798 (patch)
tree4ffebb3ab48d2f0fef2e3c4e464f786941305bf4
parent0309b1599d3444db3a3d29c3c3f3dfcab7fc4c89 (diff)
downloadbugzilla-d83a1c136214a5663a09987c48d66f9a527e7798.tar.gz
bugzilla-d83a1c136214a5663a09987c48d66f9a527e7798.tar.xz
Bug 816266 - Bug alias should be present in bug's <title>
r=glob
-rw-r--r--extensions/BMO/template/en/default/hook/bug/show-header-end.html.tmpl6
-rw-r--r--template/en/default/bug/show-header.html.tmpl16
2 files changed, 17 insertions, 5 deletions
diff --git a/extensions/BMO/template/en/default/hook/bug/show-header-end.html.tmpl b/extensions/BMO/template/en/default/hook/bug/show-header-end.html.tmpl
index e903b811d..5ab189045 100644
--- a/extensions/BMO/template/en/default/hook/bug/show-header-end.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/show-header-end.html.tmpl
@@ -8,7 +8,11 @@
[% style_urls.push('extensions/BMO/web/styles/edit_bug.css') %]
[% javascript_urls.push('extensions/BMO/web/js/edit_bug.js') %]
-[% title = "$bug.bug_id &ndash; $filtered_desc" %]
+[% title = "$bug.bug_id &ndash; " %]
+[% IF bug.alias != '' %]
+ [% title = title _ "($bug.alias) " %]
+[% END %]
+[% title = title _ filtered_desc %]
[% javascript = javascript _
"document.title = document.title.replace(/^" _ terms.Bug _ " /, '');"
%]
diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index 40f35ba7c..ee1ecf6d2 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -31,18 +31,26 @@
[% filtered_desc = bug.short_desc FILTER html %]
[% subheader = filtered_desc %]
[% filtered_timestamp = bug.delta_ts FILTER time %]
-[% title = "$terms.Bug $bug.bug_id &ndash; $filtered_desc" %]
+[% title = "$terms.Bug $bug.bug_id &ndash; " %]
+[% IF bug.alias != '' %]
+ [% title = title _ "($bug.alias) " %]
+[% END %]
+[% title = title _ filtered_desc %]
[% header = "$terms.Bug&nbsp;$bug.bug_id" %]
[% header_addl_info = "Last modified: $filtered_timestamp" %]
[% yui = ['autocomplete', 'calendar'] %]
[% javascript_urls = [ "js/util.js", "js/field.js" ] %]
[% IF bug.defined %]
- [% unfiltered_title = "$terms.Bug $bug.bug_id – $bug.short_desc" %]
+ [% unfiltered_title = "$terms.Bug $bug.bug_id – " %]
+ [% IF bug.alias != '' %]
+ [% unfiltered_title = unfiltered_title _ "($bug.alias) " %]
+ [% END %]
+ [% unfiltered_title = unfiltered_title _ bug.short_desc %]
[% javascript = BLOCK %]
if (history && history.replaceState) {
if(!document.location.href.match(/show_bug\.cgi/)) {
- history.replaceState( null,
- "[% unfiltered_title FILTER js %]",
+ history.replaceState( null,
+ "[% unfiltered_title FILTER js %]",
"show_bug.cgi?id=[% bug.bug_id FILTER js %]" );
document.title = "[% unfiltered_title FILTER js %]";
}