From: Joe Hunt Date: Tue, 28 Dec 2010 15:07:05 +0000 (+0000) Subject: To activate, set $show_menu_category_icons = 1, in config.php X-Git-Tag: 2.3-final~844 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=0b555ffc638a7ff241472348d7121301645b47a9;p=fa-stable.git To activate, set $show_menu_category_icons = 1, in config.php --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b5dc90dd..babeba9a 100644 --- 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 7c7389ea..6705918f 100644 --- 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 index 00000000..4c3efdd6 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 index 00000000..ab940462 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 index 00000000..188e1c12 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 index 00000000..d1d9e7c1 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 index 00000000..24588a3a 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 index 00000000..9460dfc7 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 index 00000000..6cf6443a 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 index 00000000..58f19c68 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 963ca650..2734ad08 100644 --- 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 "  "; } diff --git a/themes/cool/images/menu_entry.png b/themes/cool/images/menu_entry.png new file mode 100644 index 00000000..4c3efdd6 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 index 00000000..ab940462 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 index 00000000..188e1c12 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 index 00000000..d1d9e7c1 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 index 00000000..24588a3a 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 index 00000000..9460dfc7 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 index 00000000..6cf6443a 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 index 00000000..58f19c68 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 b560ac91..d9d286b2 100644 --- 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 "  "; } diff --git a/themes/default/images/menu_entry.png b/themes/default/images/menu_entry.png new file mode 100644 index 00000000..4c3efdd6 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 index 00000000..ab940462 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 index 00000000..188e1c12 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 index 00000000..d1d9e7c1 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 index 00000000..24588a3a 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 index 00000000..9460dfc7 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 index 00000000..6cf6443a 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 index 00000000..58f19c68 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 5952e7f2..6df2553f 100644 --- 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 "  "; }