From befdcc8f9a30f55e91227bac0ee1813a661002b3 Mon Sep 17 00:00:00 2001
From: David Lawrence <dlawrence@mozilla.com>
Date: Tue, 4 Oct 2011 18:43:47 -0400
Subject: more porting work

---
 .../default/hook/global/header-additional_header.html.tmpl   |  2 +-
 .../template/en/default/hook/global/header-start.html.tmpl   | 12 +++++++++++-
 .../user-error.html.tmpl/auth_failure/permissions.html.tmpl  |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'extensions/BMO/template/en/default/hook/global')

diff --git a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
index 0277f3e7e..05276d5f7 100644
--- a/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/header-additional_header.html.tmpl
@@ -21,7 +21,7 @@
 
 <link rel="shortcut icon" href="extensions/BMO/web/images/bugzilla.png">
 [% IF bug %]
-<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id %]">
+<link id="shorturl" rev="canonical" href="https://bugzil.la/[% bug.bug_id FILTER uri %]">
 [% END %]
 
 <style type="text/css">
diff --git a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
index 3c2f90e19..9c96ebffa 100644
--- a/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/header-start.html.tmpl
@@ -1,3 +1,13 @@
+[% IF !javascript_urls %]
+  [% javascript_urls = [] %]
+[% END %]
+
 [% IF template.name == 'list/list.html.tmpl' %]
   [% javascript_urls.push('extensions/BMO/web/js/sorttable.js') %]
-[% END %]
\ No newline at end of file
+[% END %]
+
+[% IF user.in_group('editusers') || user.bless_groups.size > 0 %]
+  [% yui.push('container', 'menu') %]
+  [% style_urls.push('js/yui/assets/skins/sam/menu.css') %]
+  [% javascript_urls.push('extensions/BMO/web/js/edituser_menu.js') %]
+[% END %]
diff --git a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
index 5f6ca946a..346e02373 100644
--- a/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/user-error.html.tmpl/auth_failure/permissions.html.tmpl
@@ -22,7 +22,7 @@
 
 [% IF (group == "canconfirm" OR group == "editbugs") AND !reason %]
   <p>
-    If you are attempting to confirm an unconfirmed bug or edit the fields of a bug,
+    If you are attempting to confirm an unconfirmed [% terms.bug %] or edit the fields of a [% terms.bug %],
     <a href="http://www.gerv.net/hacking/before-you-mail-gerv.html#bugzilla-permissions">find
     out how to get the necessary permissions</a>.
   </p>
-- 
cgit v1.2.3-24-g4f1b