From 8fd4de3639d393feb37a1744d9a91e1a25119c5d Mon Sep 17 00:00:00 2001
From: Sunil Joshi <joshi_sunil@in.com>
Date: Sun, 22 Dec 2013 16:26:57 +0100
Subject: Bug 918013: Add Bugzilla messaging system in quips page r=LpSolit
 a=justdave

---
 template/en/default/global/messages.html.tmpl | 24 ++++++++++++++++++++++++
 template/en/default/list/quips.html.tmpl      | 24 ------------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'template')

diff --git a/template/en/default/global/messages.html.tmpl b/template/en/default/global/messages.html.tmpl
index 59614c5a5..b8e2c7906 100644
--- a/template/en/default/global/messages.html.tmpl
+++ b/template/en/default/global/messages.html.tmpl
@@ -798,6 +798,30 @@
     or you don't have access to it. The following is a list of the
     products you can choose from.
 
+  [% ELSIF message_tag == "quips_added" %]
+    Your quip <em>[% added_quip FILTER html %]</em> has been added.
+    [% IF Param("quip_list_entry_control") == "moderated" AND
+          !user.in_group('bz_quip_moderators') %]
+      It will be used as soon as it gets approved.
+    [% END %]
+
+  [% ELSIF message_tag == "quips_deleted" %]
+    The quip <em>[% deleted_quip FILTER html %]</em> has been deleted.
+
+  [% ELSIF message_tag == "quips_approved_unapproved" %]
+    [% IF approved.size == 1 %]
+      One quip
+    [% ELSE %]
+      [% approved.size %] quips
+    [% END %]
+    approved and
+    [% IF unapproved.size == 1 %]
+      one quip
+    [% ELSE %]
+      [%+ unapproved.size %] quips
+    [% END %]
+    unapproved.
+
   [% ELSIF message_tag == "report_created" %]
     OK, you have a new saved report named <em>[% reportname FILTER html %]</em>.
 
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index 31e766a9b..99e376dae 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -19,30 +19,6 @@
            header = "Add your own clever headline"
  %]
 
-[% IF added_quip %]
-  <p>
-    <font color="red">
-      Your quip '<tt>[% added_quip FILTER html %]</tt>' has been added.
-      [% IF Param("quip_list_entry_control") == "moderated" AND !user.in_group('bz_quip_moderators') %]
-        It will be used as soon as it gets approved.
-      [% END %]
-    </font>
-  </p>
-[% END %]
-
-[% IF deleted_quip %]
-  <p>
-    <font color="red">
-      The quip '<tt>[% deleted_quip FILTER html %]</tt>' has been deleted.
-    </font>
-  </p>
-[% END %]
-
-[% IF approved or unapproved %]
-  <p>[% approved.size %] quips approved and [% unapproved.size %] quips unapproved</p>
-[% END %]
-
-
 <p>
   [% terms.Bugzilla %] will pick a random quip for the headline on each 
   [% terms.bug %] list.
-- 
cgit v1.2.3-24-g4f1b