From b956923926de6b7eecf57510cf86857354cac1b3 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 22 Nov 2008 10:42:08 +0000 Subject: [PATCH] Preparing for Graphic Links final.Optimized. --- CHANGELOG.txt | 26 +++++++++++++++++++ admin/create_coy.php | 7 +++-- admin/inst_lang.php | 7 +++-- admin/inst_module.php | 7 +++-- config.php | 3 ++- dimensions/inquiry/search_dimensions.php | 13 ++++++++-- includes/ui/db_pager_view.inc | 14 +++++++++- includes/ui/ui_controls.inc | 15 +++++++---- includes/ui/ui_view.inc | 16 ++++++------ lang/installed_languages.inc | 2 +- manufacturing/search_work_orders.php | 13 ++++++++-- .../allocations/supplier_allocation_main.php | 13 ++++++++-- purchasing/inquiry/po_search.php | 17 +++++++++--- purchasing/inquiry/po_search_completed.php | 13 ++++++++-- .../inquiry/supplier_allocation_inquiry.php | 13 ++++++++-- reporting/includes/reporting.inc | 4 +-- .../allocations/customer_allocation_main.php | 14 +++++++--- sales/inquiry/customer_allocation_inquiry.php | 13 ++++++++-- sales/inquiry/customer_inquiry.php | 17 +++++++++--- sales/inquiry/sales_deliveries_view.php | 17 +++++++++--- sales/inquiry/sales_orders_view.php | 21 ++++++++++----- 21 files changed, 202 insertions(+), 63 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2f466e1e..f98177f1 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,32 @@ Legend: ! -> Note $ -> Affected files +22-Nov-2008 Joe Hunt ++ Preparing for Graphic Links final.Optimized. +$ config.php + /admin/create_coy.php + /admin/inst_lang.php + /admin/inst_module.php + /dimensions/inquiry/search_dimensions.php + /includes/ui/ui_controls.inc + /includes/ui/ui_view.inc + /includes/db_pager_view.inc + /manufacturing/search_work_orders.php + /purchasing/inquiry/po_search.php + /purchasing/inquiry/po_search_completed.php + /purchasing/inquiry/supplier_allocation_inquiry.php + /purchasing/allocations/supplier_allocation_main.php + /reporting/includes/reporting.inc + /sales/allocations/customer_allocation_main.php + /sales/inquiry/customer_allocation_inquiry.php + /sales/inquiry/customer_inquiry.php + /sales/inquiry/sales_orders_view.php + /sales/inquiry/sales_deliveries_view.php + /themes/default/images/receive.gif (new file) + /themes/aquat/images/receive.gif (new file) + /themes/cool/images/receive.gif (new file) + + 21-Nov-2008 Joe Hunt + Preparing for Graphic Links instead of Text Links (user display option, default) (new field in 0_users, graphic_links) diff --git a/admin/create_coy.php b/admin/create_coy.php index cdcb971e..dc420a16 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -1,6 +1,6 @@ \n"; - $delete = "\n"; + $edit = set_icon(ICON_EDIT, $edit); + $delete = set_icon(ICON_DELETE, $delete); } label_cell("$edit"); label_cell( $i == $coyno ? '' : diff --git a/admin/inst_lang.php b/admin/inst_lang.php index 4233418f..aa259f92 100644 --- a/admin/inst_lang.php +++ b/admin/inst_lang.php @@ -1,6 +1,6 @@ \n"; - $delete = "\n"; + $edit = set_icon(ICON_EDIT, $edit); + $delete = set_icon(ICON_DELETE, $delete); } label_cell("$edit"); label_cell($conn[$i]['code'] == $lang ? '' : diff --git a/admin/inst_module.php b/admin/inst_module.php index 4b505734..f3c5ec63 100644 --- a/admin/inst_module.php +++ b/admin/inst_module.php @@ -1,6 +1,6 @@ \n"; - $delete = "\n"; + $edit = set_icon(ICON_EDIT, $edit); + $delete = set_icon(ICON_DELETE, $delete); } label_cell("$edit"); label_cell("$delete"); diff --git a/config.php b/config.php index 29d13bc4..b44956fd 100644 --- a/config.php +++ b/config.php @@ -1,6 +1,6 @@ . +***********************************************************************/ $page_security = 2; $path_to_root="../.."; @@ -116,7 +125,7 @@ function edit_link($row) { return $row["closed"] ? '' : pager_link(_("Edit"), - "/dimensions/dimension_entry.php?trans_no=" . $row["id"]); + "/dimensions/dimension_entry.php?trans_no=" . $row["id"], ICON_EDIT); } $sql = "SELECT dim.id, diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc index d4490241..f4824fb1 100644 --- a/includes/ui/db_pager_view.inc +++ b/includes/ui/db_pager_view.inc @@ -1,10 +1,22 @@ . +***********************************************************************/ //-------------------------------------------------------------------------------------------------- -function pager_link($link_text, $url) +function pager_link($link_text, $url, $icon=false) { global $path_to_root; $link = access_string($link_text); + if (user_graphic_links() && $icon) + $link[0] = set_icon($icon, $link[0]); $href = $path_to_root . $url; return "" . $link[0] . ""; diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index 4fbdb984..46744ae8 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -1,6 +1,6 @@ \n"; +} + function button($name, $value, $title=false, $icon=false) { // php silently changes dots,spaces,'[' and characters 128-159 // to underscore in POST names, to maintain compatibility with register_globals if (user_graphic_links() && $icon) { - global $path_to_root; + if ($value == _("Delete")) // Helper during implementation + $icon = ICON_DELETE; echo "