To activate, set $show_menu_category_icons = 1, in config.php

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b5dc90dd9d51e2e9e5be8232c03316486707a8ae..babeba9a01bd749ffc605d3e7ab15bbb80a2d906 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -21,7 +21,9 @@ $ -> Affected files
 
 27-Dec-2010 Joe Hunt
 ! Prepared for category icons in applications/application.php for themes
-$ /applications/application.php
+  To activate, set $show_menu_category_icons = 1, in config.php
+$ /config.default.php
+  /applications/application.php
   /applications/customers.php
   /applications/dimensions.php
   /applications/generalledger.php
@@ -29,9 +31,33 @@ $ /applications/application.php
   /applications/manufacturing.php
   /applications/setup.php
   /applications/supplier.php
-  /themes/aqua/renderer.php (commented member for the future)
-  /themes/cool/renderer.php (commented member for the future)
-  /themes/default/renderer.php (commented member for the future)
+  /themes/aqua/renderer.php
+  /themes/aqua/images/menu_entry.png (new file)
+  /themes/aqua/images/menu_inquiry.png (new file)
+  /themes/aqua/images/menu_maintenance.png (new file)
+  /themes/aqua/images/menu_report.png (new file)
+  /themes/aqua/images/menu_settings.png (new file)
+  /themes/aqua/images/menu_system.png (new file)
+  /themes/aqua/images/menu_transaction.png (new file)
+  /themes/aqua/images/menu_update.png (new file)
+  /themes/cool/renderer.php
+  /themes/cool/images/menu_entry.png (new file)
+  /themes/cool/images/menu_inquiry.png (new file)
+  /themes/cool/images/menu_maintenance.png (new file)
+  /themes/cool/images/menu_report.png (new file)
+  /themes/cool/images/menu_settings.png (new file)
+  /themes/cool/images/menu_system.png (new file)
+  /themes/cool/images/menu_transaction.png (new file)
+  /themes/cool/images/menu_update.png (new file)
+  /themes/default/renderer.php
+  /themes/default/images/menu_entry.png (new file)
+  /themes/default/images/menu_inquiry.png (new file)
+  /themes/default/images/menu_maintenance.png (new file)
+  /themes/default/images/menu_report.png (new file)
+  /themes/default/images/menu_settings.png (new file)
+  /themes/default/images/menu_system.png (new file)
+  /themes/default/images/menu_transaction.png (new file)
+  /themes/default/images/menu_update.png (new file)
   
 27-Dec-2010 Janusz Dobrowolski
 + Option for allowing negative prices for dummy/service items [0000343]

diff --git a/config.default.php b/config.default.php
index 7c7389ea4c0342afae2a38959670cf6453cc1bde..6705918f5be30bc876144d02a1c1065832b66c27 100644 (file)
--- a/config.default.php
+++ b/config.default.php
@@ -146,9 +146,12 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
 
        $config_allocation_settled_allowance = 0.005;
 
-       /* Alow negative prices for dummy/service items. To be moved to GL db settings */
+       /* Allow negative prices for dummy/service items. To be moved to GL db settings */
        $allow_negative_prices = 1;
 
+       /* Show menu category icons in core themes */
+       $show_menu_category_icons = 0;
+       
        // Internal configurable variables
        //-----------------------------------------------------------------------------------
 

diff --git a/themes/aqua/images/menu_entry.png b/themes/aqua/images/menu_entry.png
new file mode 100644 (file)
index 0000000..4c3efdd
Binary files /dev/null and b/themes/aqua/images/menu_entry.png differ

diff --git a/themes/aqua/images/menu_inquiry.png b/themes/aqua/images/menu_inquiry.png
new file mode 100644 (file)
index 0000000..ab94046
Binary files /dev/null and b/themes/aqua/images/menu_inquiry.png differ

diff --git a/themes/aqua/images/menu_maintenance.png b/themes/aqua/images/menu_maintenance.png
new file mode 100644 (file)
index 0000000..188e1c1
Binary files /dev/null and b/themes/aqua/images/menu_maintenance.png differ

diff --git a/themes/aqua/images/menu_report.png b/themes/aqua/images/menu_report.png
new file mode 100644 (file)
index 0000000..d1d9e7c
Binary files /dev/null and b/themes/aqua/images/menu_report.png differ

diff --git a/themes/aqua/images/menu_settings.png b/themes/aqua/images/menu_settings.png
new file mode 100644 (file)
index 0000000..24588a3
Binary files /dev/null and b/themes/aqua/images/menu_settings.png differ

diff --git a/themes/aqua/images/menu_system.png b/themes/aqua/images/menu_system.png
new file mode 100644 (file)
index 0000000..9460dfc
Binary files /dev/null and b/themes/aqua/images/menu_system.png differ

diff --git a/themes/aqua/images/menu_transaction.png b/themes/aqua/images/menu_transaction.png
new file mode 100644 (file)
index 0000000..6cf6443
Binary files /dev/null and b/themes/aqua/images/menu_transaction.png differ

diff --git a/themes/aqua/images/menu_update.png b/themes/aqua/images/menu_update.png
new file mode 100644 (file)
index 0000000..58f19c6
Binary files /dev/null and b/themes/aqua/images/menu_update.png differ

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 963ca65027f7f4df783470fe144abcbd6d68434b..2734ad08f644bbb5efa908346c47f95f91648042 100644 (file)
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -13,11 +13,12 @@
        {
                function get_icon($category)
                {
-                       global  $path_to_root;
-                       
-                       // uncomment this line if you want to use the pre-defined categories.
-                       //$img = $category == '' ? 'right.gif' : $category.'.png';
-                       $img = 'right.gif';
+                       global  $path_to_root, $show_menu_category_icons;
+;
+                       if ($show_menu_category_icons)
+                               $img = $category == '' ? 'right.gif' : $category.'.png';
+                       else    
+                               $img = 'right.gif';
                        return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 

diff --git a/themes/cool/images/menu_entry.png b/themes/cool/images/menu_entry.png
new file mode 100644 (file)
index 0000000..4c3efdd
Binary files /dev/null and b/themes/cool/images/menu_entry.png differ

diff --git a/themes/cool/images/menu_inquiry.png b/themes/cool/images/menu_inquiry.png
new file mode 100644 (file)
index 0000000..ab94046
Binary files /dev/null and b/themes/cool/images/menu_inquiry.png differ

diff --git a/themes/cool/images/menu_maintenance.png b/themes/cool/images/menu_maintenance.png
new file mode 100644 (file)
index 0000000..188e1c1
Binary files /dev/null and b/themes/cool/images/menu_maintenance.png differ

diff --git a/themes/cool/images/menu_report.png b/themes/cool/images/menu_report.png
new file mode 100644 (file)
index 0000000..d1d9e7c
Binary files /dev/null and b/themes/cool/images/menu_report.png differ

diff --git a/themes/cool/images/menu_settings.png b/themes/cool/images/menu_settings.png
new file mode 100644 (file)
index 0000000..24588a3
Binary files /dev/null and b/themes/cool/images/menu_settings.png differ

diff --git a/themes/cool/images/menu_system.png b/themes/cool/images/menu_system.png
new file mode 100644 (file)
index 0000000..9460dfc
Binary files /dev/null and b/themes/cool/images/menu_system.png differ

diff --git a/themes/cool/images/menu_transaction.png b/themes/cool/images/menu_transaction.png
new file mode 100644 (file)
index 0000000..6cf6443
Binary files /dev/null and b/themes/cool/images/menu_transaction.png differ

diff --git a/themes/cool/images/menu_update.png b/themes/cool/images/menu_update.png
new file mode 100644 (file)
index 0000000..58f19c6
Binary files /dev/null and b/themes/cool/images/menu_update.png differ

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index b560ac91ceb89747a154747ead65561e24d84a4e..d9d286b265809f3ed0f95ea91f4775d79af529b5 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/renderer.php
@@ -13,11 +13,12 @@
        {
                function get_icon($category)
                {
-                       global  $path_to_root;
-                       
-                       // uncomment this line if you want to use the pre-defined categories.
-                       //$img = $category == '' ? 'right.gif' : $category.'.png';
-                       $img = 'right.gif';
+                       global  $path_to_root, $show_menu_category_icons;
+;
+                       if ($show_menu_category_icons)
+                               $img = $category == '' ? 'right.gif' : $category.'.png';
+                       else    
+                               $img = 'right.gif';
                        return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }
 

diff --git a/themes/default/images/menu_entry.png b/themes/default/images/menu_entry.png
new file mode 100644 (file)
index 0000000..4c3efdd
Binary files /dev/null and b/themes/default/images/menu_entry.png differ

diff --git a/themes/default/images/menu_inquiry.png b/themes/default/images/menu_inquiry.png
new file mode 100644 (file)
index 0000000..ab94046
Binary files /dev/null and b/themes/default/images/menu_inquiry.png differ

diff --git a/themes/default/images/menu_maintenance.png b/themes/default/images/menu_maintenance.png
new file mode 100644 (file)
index 0000000..188e1c1
Binary files /dev/null and b/themes/default/images/menu_maintenance.png differ

diff --git a/themes/default/images/menu_report.png b/themes/default/images/menu_report.png
new file mode 100644 (file)
index 0000000..d1d9e7c
Binary files /dev/null and b/themes/default/images/menu_report.png differ

diff --git a/themes/default/images/menu_settings.png b/themes/default/images/menu_settings.png
new file mode 100644 (file)
index 0000000..24588a3
Binary files /dev/null and b/themes/default/images/menu_settings.png differ

diff --git a/themes/default/images/menu_system.png b/themes/default/images/menu_system.png
new file mode 100644 (file)
index 0000000..9460dfc
Binary files /dev/null and b/themes/default/images/menu_system.png differ

diff --git a/themes/default/images/menu_transaction.png b/themes/default/images/menu_transaction.png
new file mode 100644 (file)
index 0000000..6cf6443
Binary files /dev/null and b/themes/default/images/menu_transaction.png differ

diff --git a/themes/default/images/menu_update.png b/themes/default/images/menu_update.png
new file mode 100644 (file)
index 0000000..58f19c6
Binary files /dev/null and b/themes/default/images/menu_update.png differ

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 5952e7f267fdc58425a7d3d57975776e0143a3c2..6df2553f8bec5352239ef03c4690a956af193d6f 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -13,11 +13,12 @@
        {
                function get_icon($category)
                {
-                       global  $path_to_root;
-                       
-                       // uncomment this line if you want to use the pre-defined categories.
-                       //$img = $category == '' ? 'right.gif' : $category.'.png';
-                       $img = 'right.gif';
+                       global  $path_to_root, $show_menu_category_icons;
+;
+                       if ($show_menu_category_icons)
+                               $img = $category == '' ? 'right.gif' : $category.'.png';
+                       else    
+                               $img = 'right.gif';
                        return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
                }