From 0a81fcfd59871fdf30e1dddcc8af6d223e815f8b Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 6 Dec 2008 23:05:39 +0000 Subject: [PATCH] Better layout. Copyright notes. Mailto links. --- admin/company_preferences.php | 13 +++++++-- admin/users.php | 6 ++-- inventory/manage/locations.php | 16 +++++++++-- purchasing/manage/suppliers.php | 46 +++++++++++++++++++++++------- sales/manage/customer_branches.php | 18 +++++++++--- sales/manage/customers.php | 37 ++++++++++++++++-------- sales/manage/sales_people.php | 19 +++++++++--- 7 files changed, 118 insertions(+), 37 deletions(-) diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 6804b549..96efb030 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security =10; $path_to_root=".."; include($path_to_root . "/includes/session.inc"); @@ -131,7 +140,7 @@ textarea_row(_("Address:"), 'postal_address', $_POST['postal_address'], 35, 5); text_row_ex(_("Telephone Number:"), 'phone', 25, 55); text_row_ex(_("Facsimile Number:"), 'fax', 25); -text_row_ex(_("Email Address:"), 'email', 25, 55); +text_row_ex("" . _("E-mail Address:") . "", 'email', 25, 55); label_row(_("Company Logo:"), $_POST['coy_logo']); label_row(_("New Company Logo (.jpg)") . ":", ""); diff --git a/admin/users.php b/admin/users.php index d99edc62..941129fb 100644 --- a/admin/users.php +++ b/admin/users.php @@ -125,7 +125,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["user_id"]); label_cell($myrow["real_name"]); label_cell($myrow["phone"]); - label_cell($myrow["email"]); + label_cell("" . $myrow["email"]. ""); label_cell($last_visit_date, "nowrap"); label_cell($security_headings[$myrow["full_access"]]); edit_button_cell("Edit".$myrow["user_id"], _("Edit")); @@ -146,6 +146,8 @@ echo '
'; start_form(); start_table($table_style2); + +$_POST['email'] = ""; if ($selected_id != '') { if ($Mode == 'Edit') { @@ -188,7 +190,7 @@ text_row_ex(_("Full Name").":", 'real_name', 50); text_row_ex(_("Telephone No.:"), 'phone', 30); -text_row_ex(_("Email Address:"), 'email', 50); +text_row_ex("" . _("Email Address:") . "", 'email', 50); security_headings_list_row(_("Access Level:"), 'Access', null); diff --git a/inventory/manage/locations.php b/inventory/manage/locations.php index 4b6d291c..873e6bba 100644 --- a/inventory/manage/locations.php +++ b/inventory/manage/locations.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 11; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -127,7 +136,7 @@ while ($myrow = db_fetch_row($result)) label_cell($myrow[0]); label_cell($myrow[1]); edit_button_cell("Edit".$myrow[0], _("Edit")); - edit_button_cell("Delete".$myrow[0], _("Delete")); + delete_button_cell("Delete".$myrow[0], _("Delete")); end_row(); } //END WHILE LIST LOOP @@ -143,6 +152,7 @@ start_form(); start_table($table_style2); +$_POST['email'] = ""; if ($selected_id != -1) { //editing an existing Location @@ -174,7 +184,7 @@ textarea_row(_("Address:"), 'delivery_address', null, 35, 5); text_row_ex(_("Telephone No:"), 'phone', 30, 30); text_row_ex(_("Facsimile No:"), 'fax', 30, 30); -text_row_ex(_("Email:"), 'email', 30, 30); +text_row_ex("" . _("E-mail:") . "", 'email', 30); end_table(1); submit_add_or_update_center($selected_id == -1, '', true); diff --git a/purchasing/manage/suppliers.php b/purchasing/manage/suppliers.php index 6a9f3c13..ecf97311 100644 --- a/purchasing/manage/suppliers.php +++ b/purchasing/manage/suppliers.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security=5; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -157,10 +166,11 @@ else hidden('supplier_id', get_post('supplier_id')); } -//start_table("class='tablestyle2'", 0, 3); -start_table("class='tablestyle'", 3); +br(); +start_table("$table_style2 width=65%", 5); +echo ""; // outer table -table_section_title(_("Supplier")); +echo ""; if (!$new_supplier) { @@ -204,17 +214,30 @@ else $_POST['payment_discount_account'] = $company_record['pyt_discount_act']; } +table_section_title(_("Name and Contact")); + text_row(_("Supplier Name:"), 'supp_name', null, 42, 40); -textarea_row(_("Postal ddress:"), 'address', null, 35, 5); +text_row(_("Contact:"), 'contact', null, 42, 40); + +text_row(_("Phone Number:"), 'phone', null, 42, 40); +text_row(_("Fax Number:"), 'fax', null, 42, 40); + +text_row("" . _("E-mail:") . "", 'email', null, 35, 55); + +table_section_title(_("Addresses")); +textarea_row(_("Mailing Address:"), 'address', null, 35, 5); textarea_row(_("Physical Address:"), 'supp_address', null, 35, 5); -text_row(_("Phone:"), 'phone', null, 42, 40); -text_row(_("Fax:"), 'fax', null, 42, 40); + +echo "
"; + +echo ""; // outer table + +echo""; + +table_section_title(_("Purchasing")); text_row(_("GSTNo:"), 'gst_no', null, 42, 40); -text_row(_("Email:"), 'email', null, 42, 40); -text_row(_("Contact:"), 'contact', null, 42, 40); text_row(_("Bank Name/Account:"), 'bank_account', null, 42, 40); amount_row(_("Credit Limit:"), 'credit_limit', null); -// Sherifoz 23.09.03 currency can't be changed if editing if (!$new_supplier) { label_row(_("Supplier's Currency:"), $_POST['curr_code']); @@ -251,7 +274,10 @@ if ($dim < 1) if ($dim < 2) hidden('dimension2_id', 0); +end_table(); + end_table(1); + div_start('controls'); if (!$new_supplier) { diff --git a/sales/manage/customer_branches.php b/sales/manage/customer_branches.php index a9345a0f..5b4ea585 100644 --- a/sales/manage/customer_branches.php +++ b/sales/manage/customer_branches.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -205,7 +214,7 @@ if ($num_branches) if (count($_SESSION['Context'])) edit_button_cell("Select".$myrow["branch_code"], _("Select")); edit_button_cell("Edit".$myrow["branch_code"], _("Edit")); - edit_button_cell("Delete".$myrow["branch_code"], _("Delete")); + delete_button_cell("Delete".$myrow["branch_code"], _("Delete")); end_row(); } end_table(); @@ -215,12 +224,13 @@ else display_note(_("The selected customer does not have any branches. Please create at least one branch.")); echo "
"; -start_table("$table_style2 width=60%", 5); +start_table("$table_style2 width=70%", 5); echo "
"; // outer table echo ""; +$_POST['email'] = ""; if ($selected_id != -1) { if ($Mode == 'Edit') { @@ -291,7 +301,7 @@ text_row(_("Contact Person:"), 'contact_name', null, 35, 40); text_row(_("Phone Number:"), 'phone', null, 20, 20); text_row(_("Fax Number:"), 'fax', null, 20, 20); -text_row("" . _("E-mail:") . "", 'email', null, 35, 55); +text_row("" . _("E-mail:") . "", 'email', null, 35, 55); table_section_title(_("Sales")); diff --git a/sales/manage/customers.php b/sales/manage/customers.php index 6eff2117..415aa584 100644 --- a/sales/manage/customers.php +++ b/sales/manage/customers.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; @@ -189,11 +198,11 @@ else hidden('customer_id'); } -start_table($table_style2, 7, 6); +br(); +start_table($table_style2, 5); echo "
"; // outer table - -start_table("class='tablestyle_noborder'"); +echo ""; if ($new_customer) { @@ -231,10 +240,12 @@ else $_POST['credit_limit'] = price_format($myrow["credit_limit"]); } +table_section_title(_("Name and Address")); + text_row(_("Customer Name:"), 'CustName', $_POST['CustName'], 40, 40); textarea_row(_("Address:"), 'address', $_POST['address'], 35, 5); -text_row(_("Email:"), 'email', null, 40, 40); +text_row("" . _("E-mail:") . "", 'email', null, 40, 40); text_row(_("GSTNo:"), 'tax_id', null, 40, 40); @@ -252,9 +263,17 @@ end_table(); echo "
"; // outer table -start_table("class='tablestyle_noborder'"); +echo""; + +table_section_title(_("Sales")); sales_types_list_row(_("Sales Type/Price List:"), 'sales_type', $_POST['sales_type']); +percent_row(_("Discount Percent:"), 'discount', $_POST['discount']); +percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']); +amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']); + +payment_terms_list_row(_("Payment Terms:"), 'payment_terms', $_POST['payment_terms']); +credit_status_list_row(_("Credit Status:"), 'credit_status', $_POST['credit_status']); $dim = get_company_pref('use_dimension'); if ($dim >= 1) dimensions_list_row(_("Dimension")." 1:", 'dimension_id', $_POST['dimension_id'], true, " ", false, 1); @@ -265,12 +284,6 @@ if ($dim < 1) if ($dim < 2) hidden('dimension2_id', 0); -percent_row(_("Discount Percent:"), 'discount', $_POST['discount']); -percent_row(_("Prompt Payment Discount Percent:"), 'pymt_discount', $_POST['pymt_discount']); -amount_row(_("Credit Limit:"), 'credit_limit', $_POST['credit_limit']); - -payment_terms_list_row(_("Payment Terms:"), 'payment_terms', $_POST['payment_terms']); -credit_status_list_row(_("Credit Status:"), 'credit_status', $_POST['credit_status']); if (!$new_customer) { start_row(); echo ''; diff --git a/sales/manage/sales_people.php b/sales/manage/sales_people.php index a6072ff8..6002f7d4 100644 --- a/sales/manage/sales_people.php +++ b/sales/manage/sales_people.php @@ -1,5 +1,14 @@ . +***********************************************************************/ $page_security = 3; $path_to_root="../.."; include($path_to_root . "/includes/session.inc"); @@ -118,12 +127,12 @@ while ($myrow = db_fetch($result)) label_cell($myrow["salesman_name"]); label_cell($myrow["salesman_phone"]); label_cell($myrow["salesman_fax"]); - label_cell($myrow["salesman_email"]); + label_cell("" . $myrow["salesman_email"]. ""); label_cell(percent_format($myrow["provision"])." %", "nowrap align=right"); amount_cell($myrow["break_pt"]); label_cell(percent_format($myrow["provision2"])." %", "nowrap align=right"); edit_button_cell("Edit".$myrow["salesman_code"], _("Edit")); - edit_button_cell("Delete".$myrow["salesman_code"], _("Delete")); + delete_button_cell("Delete".$myrow["salesman_code"], _("Delete")); end_row(); } //END WHILE LIST LOOP @@ -136,6 +145,8 @@ echo '
'; start_form(); + +$_POST['salesman_email'] = ""; if ($selected_id != -1) { if ($Mode == 'Edit') { @@ -165,7 +176,7 @@ start_table("$table_style2 width=60%"); text_row_ex(_("Sales person name:"), 'salesman_name', 30); text_row_ex(_("Telephone number:"), 'salesman_phone', 20); text_row_ex(_("Fax number:"), 'salesman_fax', 20); -text_row_ex(_("Email:"), 'salesman_email', 40); +text_row_ex("" . _("E-mail:") . "", 'salesman_email', 40); percent_row(_("Provision").':', 'provision'); amount_row(_("Break Pt.:"), 'break_pt'); percent_row(_("Provision")." 2:", 'provision2'); -- 2.30.2
'._('Customer branches').':