r511: Added ability to disable status colouring on bug listing pages

diff --git a/admin/user.php b/admin/user.php
index d1f28adf613fa83c3cf9c5028861951ee1366f98..589e273d1809088b3f8ef50b9096203bad342079 100644 (file)
--- a/admin/user.php
+++ b/admin/user.php
@@ -70,7 +70,7 @@ if ($_POST['do'] == 'insert')
        
        $db->query("
                INSERT INTO " . TABLE_PREFIX . "user
-                       (email, displayname, password, salt, authkey, showemail, languageid, usergroupid, timezone)
+                       (email, displayname, password, salt, authkey, showemail, showcolours, languageid, usergroupid, timezone)
                VALUES
                        ('" . $bugsys->in['email'] . "',
                        '" . $bugsys->in['displayname'] . "',
@@ -78,6 +78,7 @@ if ($_POST['do'] == 'insert')
                        '$salt',
                        '" . $funct->rand() . "',
                        " . intval($bugsys->in['showemail']) . ",
+                       " . intval($bugsys->in['showcolours']) . ",
                        " . intval($bugsys->in['languageid']) . ",
                        " . intval($bugsys->in['usergroupid']) . ",
                        " . intval($bugsys->in['timezone']) . "
@@ -101,6 +102,7 @@ if ($_POST['do'] == 'update')
                UPDATE " . TABLE_PREFIX . "user
                SET displayname = '" . $bugsys->in['displayname'] . "',
                        email = '" . $bugsys->in['email'] . "',
+                       showcolours = " . intval($bugsys->in['showcolours']) . ",
                        usergroupid = " . intval($bugsys->in['usergroupid']) . ",
                        languageid = " . intval($bugsys->in['languageid']) . ",
                        timezone = " . intval($bugsys->in['timezone']) . ($bugsys->in['password'] ? ",
@@ -151,6 +153,7 @@ if ($_REQUEST['do'] == 'edit' OR $_REQUEST['do'] == 'add')
        $admin->row_list($lang->string('Usergroup'), 'usergroupid');
        
        $admin->row_yesno($lang->string('Show Email Publicly'), 'showemail', $user['showemail']);
+       $admin->row_yesno($lang->string('Show Status Colours on Bug Listings'), 'showcolours', $user['showcolours']);
        
        foreach ($bugsys->datastore['language'] AS $language)
        {

diff --git a/docs/schema_changes.sql b/docs/schema_changes.sql
index 387f27d752b79d9270435b138ec303452c729cab..714b06eb93202016832966cde1d096ca742df128 100644 (file)
--- a/docs/schema_changes.sql
+++ b/docs/schema_changes.sql
@@ -52,4 +52,6 @@ ALTER TABLE `language` ADD `filename` VARCHAR(255) NOT NULL AFTER `direction`;
 
 ALTER TABLE `history` DROP `language`;
 
-ALTER TABLE `history` DROP `arguments`;
\ No newline at end of file
+ALTER TABLE `history` DROP `arguments`;
+
+ALTER TABLE `user` ADD `showcolours` INT(2) UNSIGNED NOT NULL AFTER `showemail`;
\ No newline at end of file

diff --git a/docs/todo.txt b/docs/todo.txt
index 649dc1db0e5861033da2b34232744a4e12bcb8b4..c69b0dc685c6ec704444a3a714dd23ebf52e3dbb 100755 (executable)
--- a/docs/todo.txt
+++ b/docs/todo.txt
@@ -6,7 +6,6 @@ SVN: $Id$
 BUGTRACK 1.0
 
 - Add per-product-usergroup permission settings
-- Ability to disable status colouring on listing pages
 
 ###############################################################################
 BUGTRACK 1.1

diff --git a/includes/init.php b/includes/init.php
index 8bd56da4f068f00e2f51df0a6722ea1a2b51e30b..3d834de23ac4946f6426ee27ba331e906bc2246d 100755 (executable)
--- a/includes/init.php
+++ b/includes/init.php
@@ -103,6 +103,7 @@ if (!$userinfo)
                'userid' => 0,
                'email' => '',
                'displayname' => '',
+               'showcolours' => 1,
                'permissions' => $bugsys->datastore['usergroup'][1]['permissions'],
                'displaytitle' => $bugsys->datastore['usergroup'][1]['displaytitle'],
                'mdisplayname' => $bugsys->datastore['usergroup'][1]['opentag'] . '' . $bugsys->datastore['usergroup'][1]['closetag']

diff --git a/index.php b/index.php
index e8daf65114befc238a2910a6c989fdd87916b109..c53e49ce521a82454066432575befa1b4ea1e971 100644 (file)
--- a/index.php
+++ b/index.php
@@ -52,7 +52,8 @@ $bugs_fetch = $db->query("
 
 while ($bug = $db->fetch_array($bugs_fetch))
 {
-       $bug['bgcolour'] = $bugsys->datastore['status']["$bug[status]"]['color'];
+       $funct->exec_swap_bg($stylevar['alt_colour'], '');
+       $bug['bgcolour'] = ($bugsys->userinfo['showcolours'] ? $bugsys->datastore['status']["$bug[status]"]['color'] : $funct->bgcolour);
        $bug['product'] = $bugsys->datastore['product']["$bug[productid]"]['title'];
        $bug['version'] = $bugsys->datastore['version']["$bug[versionid]"]['version'];
        $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status'];

diff --git a/register.php b/register.php
index 40932fc7f04bdb3dea29b4409fe2ea8fd381f9c6..ee039be7ca5eb7434ab288a6ff8b92f5894f1867 100755 (executable)
--- a/register.php
+++ b/register.php
@@ -113,7 +113,7 @@ if ($_POST['do'] == 'insert')
        
        $db->query("
                INSERT INTO " . TABLE_PREFIX . "user
-                       (email, displayname, password, salt, authkey, showemail, languageid, usergroupid)
+                       (email, displayname, password, salt, authkey, showemail, showcolours, languageid, usergroupid)
                VALUES
                        ('" . $bugsys->in['email'] . "',
                        '" . $bugsys->in['displayname'] . "',
@@ -121,6 +121,7 @@ if ($_POST['do'] == 'insert')
                        '$salt',
                        '" . $funct->rand() . "',
                        " . intval($bugsys->in['showemail']) . ",
+                       1,
                        " . intval($bugsys->in['languageid']) . ",
                        $usergroupid
                )"

diff --git a/search.php b/search.php
index a2fbacd2994e0317a22340d54e519990a4e2146b..bab1bf6f4ad0b5fd2909baa285f21a880de7f216 100644 (file)
--- a/search.php
+++ b/search.php
@@ -389,7 +389,8 @@ if ($_REQUEST['do'] == 'results')
        
        foreach ($results AS $bug)
        {
-               $bug['bgcolour'] = $bugsys->datastore['status']["$bug[status]"]['color'];
+               $funct->exec_swap_bg($stylevar['alt_colour'], '');
+               $bug['bgcolour'] = ($bugsys->userinfo['showcolours'] ? $bugsys->datastore['status']["$bug[status]"]['color'] : $funct->bgcolour);
                $bug['product'] = $bugsys->datastore['product']["$bug[productid]"]['title'];
                $bug['version'] = $bugsys->datastore['version']["$bug[versionid]"]['version'];
                $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status'];

diff --git a/templates/stylevars.txt b/templates/stylevars.txt
index 9f020000c6e9bcb073075591fff4aa517ffb4225..533d4dd1af9777abfe2afa61d733b01cab619619 100644 (file)
--- a/templates/stylevars.txt
+++ b/templates/stylevars.txt
@@ -37,6 +37,9 @@ padding: 2;
 normal-width: 100%;
 alternate-width: 45%;
 
+/* alternate background colour used when status colours aren't displayed */
+alt-colour: #BFCCCF;
+
 /*=====================================================================*\
 || ###################################################################
 || # $HeadURL$

diff --git a/templates/trackerhome_bits.tpl b/templates/trackerhome_bits.tpl
index afdc9d131dcef338d66ce6d1c83d965b8d95f5cd..b98357f289510b84ef9448f606cb60fcc8d182a1 100644 (file)
--- a/templates/trackerhome_bits.tpl
+++ b/templates/trackerhome_bits.tpl
@@ -1,6 +1,6 @@
 
 <!-- bug $bug[bugid] -->
-<tr style="background-color: $bug[bgcolour]<if condition="$bug['hidden']">; font-style: italic</if>">
+<tr<if condition="$bug[bgcolour] OR $bug[hidden]"> style="<if condition="$bug[bgcolour]">background-color: $bug[bgcolour]</if><if condition="$bug['hidden']">; font-style: italic</if>"</if>>
        <td>$bug[bugid]</td>
        <td>
                <div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>

diff --git a/templates/userctrl.tpl b/templates/userctrl.tpl
index a56ba946695fc324a14988a9f5f5b2fd5f41ea94..1c317811061f48d75cb9ca890417f9b4553dae4f 100644 (file)
--- a/templates/userctrl.tpl
+++ b/templates/userctrl.tpl
@@ -36,6 +36,12 @@ $header
                                <input type="radio" name="showemail" value="0"<if condition="!$userinfo['showemail']"> checked="checked"</if> /> No
                        </fieldset>
                        
+                       <fieldset>
+                               <legend>{@"Show Status Colours on Bug Listings"}</legend>
+                               <input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> Yes
+                               <input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> No
+                       </fieldset>
+                       
                        <fieldset>
                                <legend>{@"Language"}</legend>
                                <select name="languageid">$langselect</select>

diff --git a/userctrl.php b/userctrl.php
index 205943b948819af1581207bc365c43c5137a9e3c..8a5c507ca3bf6cf41d2fac53fa24224078254403 100644 (file)
--- a/userctrl.php
+++ b/userctrl.php
@@ -112,6 +112,7 @@ if ($_POST['do'] == 'update')
        // copy fields
        $userinfo['displayname'] = $bugsys->in['displayname'];
        $userinfo['showemail'] = $bugsys->in['showemail'];
+       $userinfo['showcolours'] = $bugsys->in['showcolours'];
        $userinfo['languageid'] = $bugsys->in['languageid'];
        $userinfo['timezone'] = $bugsys->in['timezone'];
        
@@ -133,6 +134,7 @@ if ($_POST['do'] == 'update')
                        UPDATE " . TABLE_PREFIX . "user
                        SET displayname = '" . $bugsys->in['displayname'] . "',
                                showemail = " . intval($bugsys->in['showemail']) . ",
+                               showcolours = " . intval($bugsys->in['showcolours']) . ",
                                languageid = " . intval($bugsys->in['languageid']) . ",
                                timezone = " . intval($bugsys->in['timezone']) . ($email ? "
                                email = '" . $bugsys->in['email'] . "'" : '') . ($password ? "