From ab5067bb0995cce2afe51803b5f005cc9f994416 Mon Sep 17 00:00:00 2001
From: "travis%sedsystems.ca" <>
Date: Fri, 11 Mar 2005 00:21:33 +0000
Subject: Bug 41972 : Per-user pref to turn quips off Patch by Shane H. W.
 Travis <travis@sedsystems.ca>  r=mkanat  a=justdave

---
 template/en/default/global/setting-descs.none.tmpl | 1 +
 template/en/default/global/user-error.html.tmpl    | 4 ----
 template/en/default/list/list.html.tmpl            | 2 +-
 template/en/default/list/quips.html.tmpl           | 8 ++++----
 4 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/global/setting-descs.none.tmpl b/template/en/default/global/setting-descs.none.tmpl
index 26bed57a7..9e7ac9596 100644
--- a/template/en/default/global/setting-descs.none.tmpl
+++ b/template/en/default/global/setting-descs.none.tmpl
@@ -20,6 +20,7 @@
 [% PROCESS global/variables.none.tmpl %]
 
 [% setting_descs = { 
+                      "display_quips"  => "Show a quip at the top of each bug list",
                       "off"            => "Off",
                       "on"             => "On"
                    } 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 2d992dfce..0821fbcd3 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -917,10 +917,6 @@
     [% title = "Query Name Too Long" %]
     The name of the query must be less than 64 characters long.
 
-  [% ELSIF error == "quips_disabled" %]
-    [% title = "Quips Disabled" %]
-    Quips are disabled.
-
   [% ELSIF error == "reassign_to_empty" %]
     [% title = "Illegal Reassignment" %]
     To reassign [% terms.abug %], you must provide an address for
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 919c9b21c..e0a5a2b93 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -57,7 +57,7 @@
     <p>[% query FILTER html %]</p>
   [% END %]
 
-  [% IF Param('enablequips') != 'off' %]
+  [% IF user.settings.display_quips.value == 'on' %]
     [% DEFAULT quip = "$terms.Bugzilla would like to put a random quip here, but no one has entered any." %]
     <a href="quips.cgi"><i>[% quip FILTER html %]</i></a>
   [% END %]
diff --git a/template/en/default/list/quips.html.tmpl b/template/en/default/list/quips.html.tmpl
index f5f22edd1..c43822aa1 100644
--- a/template/en/default/list/quips.html.tmpl
+++ b/template/en/default/list/quips.html.tmpl
@@ -37,7 +37,7 @@
   <p>
     <font color="red">
       Your quip '<tt>[% added_quip FILTER html %]</tt>' has been added.
-      [% IF Param("enablequips") == "approved" AND !user.groups.admin %]
+      [% IF Param("quip_list_entry_control") == "moderated" AND !user.groups.admin %]
         It will be used as soon as it gets approved.
       [% END %]
     </font>
@@ -60,7 +60,7 @@
   [% terms.Bugzilla %] will pick a random quip for the headline on each [% terms.bug %] list, and
   you can extend the quip list. Type in something clever or funny or boring
   (but not obscene or offensive, please) and bonk on the button.
-  [% IF Param("enablequips") == "approved" AND !user.groups.admin %]
+  [% IF Param("quip_list_entry_control") == "moderated" AND !user.groups.admin %]
     Note that your quip has to be approved before it is used.
   [% END %]
 </p>
@@ -88,8 +88,8 @@
     <h2>Edit existing quips:</h2>
     <p>
       <strong>Note:</strong> Only approved quips will be shown.
-      If enablequips is set to <q>on</q>, entered quips are automatically
-      approved.
+      If the parameter 'quip_list_entry_control' is set to <q>open</q>, 
+      entered quips are automatically approved.
     </p>
     <form name="editform" method="post" action="quips.cgi">
       <input type="hidden" name="action" value="approve">
-- 
cgit v1.2.3-24-g4f1b