summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunil Joshi <joshi_sunil@in.com>2013-12-22 16:26:57 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2013-12-22 16:26:57 +0100
commit8fd4de3639d393feb37a1744d9a91e1a25119c5d (patch)
tree2725e748925cc6865bcd2fb13204b6eb6841288e
parentec4862650f2da6ef3b0cdcb1ca135a64879c6b31 (diff)
downloadbugzilla-8fd4de3639d393feb37a1744d9a91e1a25119c5d.tar.gz
bugzilla-8fd4de3639d393feb37a1744d9a91e1a25119c5d.tar.xz
Bug 918013: Add Bugzilla messaging system in quips page
r=LpSolit a=justdave
-rwxr-xr-xquips.cgi3
-rw-r--r--template/en/default/global/messages.html.tmpl24
-rw-r--r--template/en/default/list/quips.html.tmpl24
3 files changed, 27 insertions, 24 deletions
diff --git a/quips.cgi b/quips.cgi
index 6ded45091..03fd49548 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -75,6 +75,7 @@ if ($action eq "add") {
undef, ($user->id, $comment, $approved));
$vars->{'added_quip'} = $comment;
+ $vars->{'message'} = 'quips_added';
}
if ($action eq 'approve') {
@@ -115,6 +116,7 @@ if ($action eq 'approve') {
join(",", @unapproved) . ")") if($#unapproved > -1);
$vars->{ 'approved' } = \@approved;
$vars->{ 'unapproved' } = \@unapproved;
+ $vars->{'message'} = 'quips_approved_unapproved';
}
if ($action eq "delete") {
@@ -130,6 +132,7 @@ if ($action eq "delete") {
"SELECT quip FROM quips WHERE quipid = ?",
undef, $quipid);
$dbh->do("DELETE FROM quips WHERE quipid = ?", undef, $quipid);
+ $vars->{'message'} = 'quips_deleted';
}
print $cgi->header();
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.