From 2cc30c4cf799041a110f4023e4a3bbc80c384f75 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Tue, 9 Apr 2013 15:13:46 +0800
Subject: Bug 859313: minimise "Lock wait timeout exceeded" errors in
 TagNewUser

---
 .../en/default/hook/bug/comments-comment_banner.html.tmpl     | 11 -----------
 .../template/en/default/hook/bug/comments-user.html.tmpl      |  5 ++---
 .../template/en/default/hook/bug/show-header-end.html.tmpl    |  9 +++++++++
 3 files changed, 11 insertions(+), 14 deletions(-)
 delete mode 100644 extensions/TagNewUsers/template/en/default/hook/bug/comments-comment_banner.html.tmpl
 create mode 100644 extensions/TagNewUsers/template/en/default/hook/bug/show-header-end.html.tmpl

(limited to 'extensions/TagNewUsers/template/en')

diff --git a/extensions/TagNewUsers/template/en/default/hook/bug/comments-comment_banner.html.tmpl b/extensions/TagNewUsers/template/en/default/hook/bug/comments-comment_banner.html.tmpl
deleted file mode 100644
index 396f9c35a..000000000
--- a/extensions/TagNewUsers/template/en/default/hook/bug/comments-comment_banner.html.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-[%# This Source Code Form is subject to the terms of the Mozilla Public
-  # License, v. 2.0. If a copy of the MPL was not distributed with this
-  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-  #
-  # This Source Code Form is "Incompatible With Secondary Licenses", as
-  # defined by the Mozilla Public License, v. 2.0.
-  #%]
-
-<link
- href="[% 'extensions/TagNewUsers/web/style.css' FILTER mtime FILTER html %]"
- rel="stylesheet" type="text/css" >
diff --git a/extensions/TagNewUsers/template/en/default/hook/bug/comments-user.html.tmpl b/extensions/TagNewUsers/template/en/default/hook/bug/comments-user.html.tmpl
index 3ee9a3757..81cfc776a 100644
--- a/extensions/TagNewUsers/template/en/default/hook/bug/comments-user.html.tmpl
+++ b/extensions/TagNewUsers/template/en/default/hook/bug/comments-user.html.tmpl
@@ -6,10 +6,9 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
+[% RETURN UNLESS user.in_group('canconfirm') %]
 [% IF comment.author.is_new %]
-<span
-  class="new_user"
-  title="
+<span class="new_user" title="
 [%- comment.author.comment_count FILTER html %] comment[% "s" IF comment.author.comment_count != 1 -%]
 , created [%
 IF comment.author.creation_age == 0 %]today[%
diff --git a/extensions/TagNewUsers/template/en/default/hook/bug/show-header-end.html.tmpl b/extensions/TagNewUsers/template/en/default/hook/bug/show-header-end.html.tmpl
new file mode 100644
index 000000000..bff73e963
--- /dev/null
+++ b/extensions/TagNewUsers/template/en/default/hook/bug/show-header-end.html.tmpl
@@ -0,0 +1,9 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+
+[% style_urls.push('extensions/TagNewUsers/web/style.css') IF user.in_group('canconfirm') %]
-- 
cgit v1.2.3-24-g4f1b