1 files changed, 26 insertions, 7 deletions

diff --git a/template/en/default/bug/show-header.html.tmpl b/template/en/default/bug/show-header.html.tmpl
index a1eebe017..583708492 100644
--- a/template/en/default/bug/show-header.html.tmpl
+++ b/template/en/default/bug/show-header.html.tmpl
@@ -13,21 +13,36 @@
   # be overridden by the calling templates.
   #%]
 
+[% filtered_alias = bug.alias.join(', ') FILTER html %]
 [% filtered_desc = bug.short_desc FILTER html %]
-[% subheader = filtered_desc %]
 [% filtered_timestamp = bug.delta_ts FILTER time %]
-[% title = "$terms.Bug $bug.bug_id – $filtered_desc" %]
+
+[% subheader = filtered_desc %]
+[% title = "$bug.bug_id – " %]
+[% IF bug.alias.size %]
+  [% title = title _ "($filtered_alias) " %]
+[% END %]
+[% title = title _ filtered_desc %]
+[% generate_api_token = 1 %]
 [% yui = ['autocomplete', 'calendar'] %]
+[% yui.push('container') IF user.can_tag_comments %]
 [% javascript_urls = [ "js/util.js", "js/field.js" ] %]
+[% javascript_urls.push("js/bug.js") IF user.id  %]
+[% javascript_urls.push('js/comment-tagging.js')
+     IF user.id && Param('comment_taggers_group') %]
 [% IF bug.defined %]
   [% header = "$terms.Bug $bug.bug_id" %]
   [% header_addl_info = "Last modified: $filtered_timestamp" %]
-  [% unfiltered_title = "$terms.Bug $bug.bug_id – $bug.short_desc" %]
+  [% unfiltered_title = "$bug.bug_id – " %]
+  [% IF bug.alias.size %]
+    [% unfiltered_title = unfiltered_title _ "(" _ bug.alias.join(', ') _ ") " %]
+  [% 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 %]";
       }
@@ -39,12 +54,16 @@
     }
     YAHOO.util.Event.onDOMReady(function() {
       initDirtyFieldTracking();
+
+      [% IF user.id AND user.is_involved_in_bug(bug) %]
+        YAHOO.bugzilla.bugUserLastVisit.update([% bug.bug_id FILTER none %]);
+      [% END %]
     });
     [% javascript FILTER none %]
   [% END %]
 [% END %]
-[% style_urls = [ "skins/standard/show_bug.css" ] %]
-[% doc_section = "bug_page.html" %]
+[% style_urls = ['skins/standard/bug.css'] %]
+[% doc_section = "using/understanding.html" %]
 [% bodyclasses = ['bz_bug',
                   "bz_status_$bug.bug_status",
                   "bz_product_$bug.product",