From: Joe Hunt Date: Fri, 10 Sep 2010 08:47:06 +0000 (+0000) Subject: Layout improvements X-Git-Tag: v2.4.2~19^2~627 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=7fd6f0b781ed41d099f352ebdc2bbc0ee46750c6;p=fa-stable.git Layout improvements --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3fc9747f..e09b4252 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,13 @@ Legend: ! -> Note $ -> Affected files +10-Sep-2010 Joe Hunt +! Layout improvements +$ /gl/inquiry/gl_account_inquiry.php + /includes/ui/contacts_view.inc + /includes/ui/ui_view.inc + /manufacturing/manage/bom_edit.php + 09-Sep-2010 Janusz Dobrowolski # Missing focus on sales entry page $ /sales/includes/ui/sales_order_ui.inc diff --git a/gl/inquiry/gl_account_inquiry.php b/gl/inquiry/gl_account_inquiry.php index 8d414a54..6c66b08d 100644 --- a/gl/inquiry/gl_account_inquiry.php +++ b/gl/inquiry/gl_account_inquiry.php @@ -79,8 +79,8 @@ function gl_inquiry_controls() if ($dim > 1) dimensions_list_cells(_("Dimension")." 2:", 'Dimension2', null, true, " ", false, 2); - small_amount_cells(_("Amount min:"), 'amount_min', null); - small_amount_cells(_("Amount max:"), 'amount_max', null); + small_amount_cells(_("Amount min:"), 'amount_min', null, " "); + small_amount_cells(_("Amount max:"), 'amount_max', null, " "); submit_cells('Show',_("Show"),'','', 'default'); end_row(); end_table(); @@ -159,7 +159,7 @@ function show_results() $bfw = get_gl_balance_from_to($begin, $_POST['TransFromDate'], $_POST["account"], $_POST['Dimension'], $_POST['Dimension2']); start_row("class='inquirybg'"); label_cell(""._("Opening Balance")." - ".$_POST['TransFromDate']."", "colspan=$colspan"); - display_debit_or_credit_cells($bfw); + display_debit_or_credit_cells($bfw, true); label_cell(""); label_cell(""); end_row(); @@ -208,7 +208,7 @@ function show_results() if ($show_balances) { start_row("class='inquirybg'"); label_cell("" . _("Ending Balance") ." - ".$_POST['TransToDate']. "", "colspan=$colspan"); - display_debit_or_credit_cells($running_total); + display_debit_or_credit_cells($running_total, true); label_cell(""); label_cell(""); end_row(); diff --git a/includes/ui/contacts_view.inc b/includes/ui/contacts_view.inc index 9ad82aec..c2ff889d 100644 --- a/includes/ui/contacts_view.inc +++ b/includes/ui/contacts_view.inc @@ -73,7 +73,7 @@ class contacts extends simple_crud { { br(); - start_outer_table(TABLESTYLE, "width=80%"); + start_outer_table(TABLESTYLE); table_section(1); table_section_title(_("Contact data")); @@ -94,6 +94,7 @@ class contacts extends simple_crud { email_row(_("E-mail:"), 'email', @$this->data['email'], 35, 55); table_section(2); + table_section_title(" "); textarea_row(_("Address:"), 'address', @$this->data['address'], 30, 4); languages_list_row( _("Document Language:"), 'lang', @$this->data['lang'], _("Customer default")); diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index a798586e..0bc4ac06 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -368,18 +368,18 @@ function view_stock_status_cell($stock_id, $description=null) //-------------------------------------------------------------------------------------- -function display_debit_or_credit_cells($value) +function display_debit_or_credit_cells($value, $bold=false) { $value = round2($value, user_price_dec()); if ($value >= 0) { - amount_cell($value); + amount_cell($value, $bold); label_cell(""); } elseif ($value < 0) { label_cell(""); - amount_cell(abs($value)); + amount_cell(abs($value), $bold); } } diff --git a/manufacturing/manage/bom_edit.php b/manufacturing/manage/bom_edit.php index 1593ee28..9734dfa4 100644 --- a/manufacturing/manage/bom_edit.php +++ b/manufacturing/manage/bom_edit.php @@ -166,7 +166,9 @@ start_form(); start_form(false, true); start_table(TABLESTYLE_NOBORDER); -stock_manufactured_items_list_row(_("Select a manufacturable item:"), 'stock_id', null, false, true); +start_row(); +stock_manufactured_items_list_cells(_("Select a manufacturable item:"), 'stock_id', null, false, true); +end_row(); if (list_updated('stock_id')) $Ajax->activate('_page_body'); end_table(); @@ -206,7 +208,7 @@ start_form(); else { start_row(); - label_cell(_("Component:")); + label_cell(_("Component:"), "class='label'"); echo ""; echo stock_component_items_list('component', $selected_parent, null, false, true);