Rerun, due to errors.

diff --git a/applications/dimensions.php b/applications/dimensions.php
index 3df00fd7a850634935ae00a3284ef8ed03c31ccf..7442c33ca680f241b68987b302aeba30648fc7d2 100644 (file)
--- 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 12d31c47ddd686d1268a3179055b45d8e17a43ad..963ca65027f7f4df783470fe144abcbd6d68434b 100644 (file)
--- 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 81528f1c67ae6f2b015af70378e600ff6ea74df5..b560ac91ceb89747a154747ead65561e24d84a4e 100644 (file)
--- 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 950cd6a4ee86f8f63fe34ff08fd27ad4c999ebc7..5952e7f267fdc58425a7d3d57975776e0143a3c2 100644 (file)
--- 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))