From b534f6d89893f6cef960adc1198ece4389c5f6ff Mon Sep 17 00:00:00 2001
From: Chris Morgan <cmorgan@alum.wpi.edu>
Date: Thu, 19 Apr 2007 01:20:55 +0000
Subject: [PATCH] Use html_tr_hightlight_clickable() in menu.php add() to make
 linkable rows of menus clickable. Provides visual feedback of which entry is
 active and enables users to click anywhere in the menu row, not just on the
 url.

---
 include/menu.php          | 18 +++++++++++-------
 include/sidebar_login.php | 19 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/include/menu.php b/include/menu.php
index 81608f9..caa7918 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -37,20 +37,24 @@ class htmlmenu {
     }
 
     /* add a table row */
-    function add($name, $url = null)
+    function add($sName, $shUrl = null, $sAlign = "left")
     {
-        if($url)
+        if($shUrl)
         {
-            echo "  <tr class=sideMenu><td width='100%'><span class=menuItem>&nbsp;<a href='$url' class=menuItem>$name</a></span></td></tr>\n";
-        } else 
+            // we have a valid url, make the entire table row clickable and provide some highlighting
+            // for visual feedback
+            html_tr_highlight_clickable($shUrl, "sideMenu", "#e0e6ff", "#ffffff");
+            echo "<td width='100%' align=$sAlign><span class=MenuItem>&nbsp;<u>$sName</u></span></td>";
+            echo "</tr>\n";
+        } else
         {
-            echo "  <tr class=sideMenu><td width='100%'><span class=menuItem>&nbsp;$name</span></td></tr>\n";
+            echo "  <tr class=sideMenu><td width='100%' align=$sAlign><span class=menuItem>&nbsp;$sName</span></td></tr>\n";
         }
     }
 
-    function addmisc($stuff, $align = "left")
+    function addmisc($sStuff, $sAlign = "left")
     {
-        echo " <tr class=sideMenu><td width='100%' align=$align><span class=menuItem>&nbsp;$stuff</span></td></tr>\n";
+        echo " <tr class=sideMenu><td width='100%' align=$sAlign><span class=menuItem>&nbsp;$sStuff</span></td></tr>\n";
     }
 
     function done($form = null)
diff --git a/include/sidebar_login.php b/include/sidebar_login.php
index 7c50b0e..87d7e71 100644
--- a/include/sidebar_login.php
+++ b/include/sidebar_login.php
@@ -37,8 +37,9 @@ function global_sidebar_login() {
         $iAppsRejected = application::objectGetEntriesCount(true, true) +
                          version::objectGetEntriesCount(true, true);
         if($iAppsRejected && !$_SESSION['current']->hasPriv("admin"))
-            $g->addmisc("<a href='".BASE."appsubmit.php?'>Review Rejected Apps ".
-            "($iAppsRejected)</a>", "center");
+        {
+          $g->add("Review Rejected Apps ($iAppsRejected)", BASE."appsubmit.php", "center");
+        }
 
         $aMonitored = Monitor::getVersionsMonitored($_SESSION['current']);
         if($aMonitored)
@@ -47,7 +48,10 @@ function global_sidebar_login() {
             $g->addmisc("You monitor:\n");
 
             while(list($i, list($iAppId, $iVersionId)) = each($aMonitored))
-                $g->addmisc(version::fullNameLink($iVersionId),"center");
+            {
+              $oVersion = new version($iVersionId);
+              $g->add(version::fullName($iVersionId), $oVersion->objectMakeUrl(), "center");
+            }
         }
 
         /* Display a link to the user's queued items,
@@ -55,17 +59,16 @@ function global_sidebar_login() {
         if(!$_SESSION['current']->hasPriv("admin"))
         {
             $g->addmisc("");
-            $g->addmisc("<a href=\"".BASE."queueditems.php\">Your queued items</a>");
+            $g->add("Your queued items", BASE."queueditems.php");
         }
 
-    }
-    else
+    } else
     {
         $g->add("Log in", BASE."account.php?sCmd=login");
         $g->add("Register", BASE."account.php?sCmd=new");
     }
-    
-    $g->done();   
+
+    $g->done();
 
 }
 ?>