From db4da42f930c53a87c07dd02e7318905c937c2ed Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 28 Dec 2010 00:00:55 +0000
Subject: [PATCH] Rerun, due to errors.

---
 applications/dimensions.php |  2 +-
 themes/aqua/renderer.php    | 11 ++++++-----
 themes/cool/renderer.php    | 11 ++++++-----
 themes/default/renderer.php | 12 ++++++------
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/applications/dimensions.php b/applications/dimensions.php
index 3df00fd..7442c33 100644
--- a/applications/dimensions.php
+++ b/applications/dimensions.php
@@ -22,7 +22,7 @@ class dimensions_app extends application
 			$this->add_lapp_function(0, _("Dimension &Entry"),
 				"dimensions/dimension_entry.php?", 'SA_DIMENSION', MENU_ENTRY);
 			$this->add_lapp_function(0, _("&Outstanding Dimensions"),
-				"dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW', MENU_TRANSACTIONS);
+				"dimensions/inquiry/search_dimensions.php?outstanding_only=1", 'SA_DIMTRANSVIEW', MENU_TRANSACTION);
 
 			$this->add_module(_("Inquiries and Reports"));
 			$this->add_lapp_function(1, _("Dimension &Inquiry"),
diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 12d31c4..963ca65 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -11,15 +11,15 @@
 ***********************************************************************/
 	class renderer
 	{
-		/* Uncomment this member if you want to use the category icons defined in /applications/applications.php
 		function get_icon($category)
 		{
 			global  $path_to_root;
-
-			$img = $category == '' ? 'right.gif' : $category.'.png';
+			
+			// uncomment this line if you want to use the pre-defined categories.
+			//$img = $category == '' ? 'right.gif' : $category.'.png';
+			$img = 'right.gif';
 			return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
 		}
-		*/
 
 		function wa_header()
 		{
@@ -141,7 +141,6 @@
 			
 			$selected_app = $waapp->get_selected_application();
 
-			$img = "<img src='$path_to_root/themes/aqua/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
 			foreach ($selected_app->modules as $module)
 			{
 				// image
@@ -156,6 +155,7 @@
 
 				foreach ($module->lappfunctions as $appfunction)
 				{
+					$img = $this->get_icon($appfunction->category);
 					if ($appfunction->label == "")
 						echo "&nbsp;<br>";
 					elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
@@ -175,6 +175,7 @@
 					echo "<td width='50%' class='menu_group_items'>";
 					foreach ($module->rappfunctions as $appfunction)
 					{
+						$img = $this->get_icon($appfunction->category);
 						if ($appfunction->label == "")
 							echo "&nbsp;<br>";
 						elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index 81528f1..b560ac9 100644
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -11,15 +11,15 @@
 ***********************************************************************/
 	class renderer
 	{
-		/* Uncomment this member if you want to use the category icons defined in /applications/applications.php
 		function get_icon($category)
 		{
 			global  $path_to_root;
-
-			$img = $category == '' ? 'right.gif' : $category.'.png';
+			
+			// uncomment this line if you want to use the pre-defined categories.
+			//$img = $category == '' ? 'right.gif' : $category.'.png';
+			$img = 'right.gif';
 			return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
 		}
-		*/
 
 		function wa_header()
 		{
@@ -140,7 +140,6 @@
 			global $path_to_root;
 			$selected_app = $waapp->get_selected_application();
 
-			$img = "<img src='$path_to_root/themes/cool/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
 			foreach ($selected_app->modules as $module)
 			{
 				// image
@@ -155,6 +154,7 @@
 
 				foreach ($module->lappfunctions as $appfunction)
 				{
+					$img = $this->get_icon($appfunction->category);
 					if ($appfunction->label == "")
 						echo "&nbsp;<br>";
 					elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
@@ -174,6 +174,7 @@
 					echo "<td width='50%' class='menu_group_items'>";
 					foreach ($module->rappfunctions as $appfunction)
 					{
+						$img = $this->get_icon($appfunction->category);
 						if ($appfunction->label == "")
 							echo "&nbsp;<br>";
 						elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 950cd6a..5952e7f 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -11,19 +11,18 @@
 ***********************************************************************/
 	class renderer
 	{
-		/* Uncomment this member if you want to use the category icons defined in /applications/applications.php
 		function get_icon($category)
 		{
 			global  $path_to_root;
-
-			$img = $category == '' ? 'right.gif' : $category.'.png';
+			
+			// uncomment this line if you want to use the pre-defined categories.
+			//$img = $category == '' ? 'right.gif' : $category.'.png';
+			$img = 'right.gif';
 			return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
 		}
-		*/
 
 		function wa_header()
 		{
-//			add_js_ufile("themes/default/renderer.js");
 			page(_($help_context = "Main Menu"), false, true);
 		}
 
@@ -141,7 +140,6 @@
 
 			$selected_app = $waapp->get_selected_application();
 
-			$img = "<img src='$path_to_root/themes/default/images/right.gif' style='vertical-align:middle;' width='17' height='17' border='0'>&nbsp;&nbsp;";
 			foreach ($selected_app->modules as $module)
 			{
 				// image
@@ -156,6 +154,7 @@
 
 				foreach ($module->lappfunctions as $appfunction)
 				{
+					$img = $this->get_icon($appfunction->category);
 					if ($appfunction->label == "")
 						echo "&nbsp;<br>";
 					elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
@@ -175,6 +174,7 @@
 					echo "<td width='50%' class='menu_group_items'>";
 					foreach ($module->rappfunctions as $appfunction)
 					{
+						$img = $this->get_icon($appfunction->category);
 						if ($appfunction->label == "")
 							echo "&nbsp;<br>";
 						elseif ($_SESSION["wa_current_user"]->can_access_page($appfunction->access)) 
-- 
2.30.2