From: Joe Hunt Date: Tue, 16 Feb 2010 12:25:33 +0000 (+0000) Subject: CSS style is now implemented in all FA. X-Git-Tag: 2.3-final~967 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=953b3605810699962454b624e19bd0779b17e7f7;p=fa-stable.git CSS style is now implemented in all FA. New label style for the themes. Better layout in supp inv/credit A lot of code clean up. New password_row and file_row/cells. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 391f887d..6dfeff67 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,36 @@ Legend: ! -> Note $ -> Affected files +! CSS style is now implemented in all FA. +! New label style for the themes. Better layout in supp inv/credit +! A lot of code clean up. New password_row and file_row/cells. +# Several minor bugs during final CSS implementaion +$ config.default.php + /access/login.php + /admin/attachments.php + /admin/change_current_user_password.php + /admin/company_preferences.php + /admin/create_coy.php + /admin/gl_setup.php + /admin/inst_lang.php + /admin/inst_module.php + /admin/users.php + /includes/ui/ui_controls.inc + /includes/ui/ui_input.inc + /includes/ui/ui_lists.inc + /inventory/manage/items.php + /purchasing/supplier_credit.php + /purchasing/supplier_invoice.php + /purchasing/includes/ui/po_ui.inc + /purchasing/includes/ui/invoice_ui.inc + /reporting/includes/reports_classes.inc + /sales/includes/ui/sales_order_ui.inc + /sales/view/view_sales_order.php + /themes/default/default.css + /themes/aqua/default.css + /themes/cool/default.css + + 11-Feb-2010 Janusz Dobrowolski # Better check for language session var. $ /includes/session.inc diff --git a/access/login.php b/access/login.php index 210d61d4..0c77bc80 100644 --- a/access/login.php +++ b/access/login.php @@ -66,7 +66,7 @@ function set_fullmode() { div_start('_page_body'); br();br(); start_form(false, false, $_SESSION['timeout']['uri'], "loginform"); - start_table("class='login' $table_style2"); + start_table("class='login'"); start_row(); echo ""; if (!$login_timeout) { // FA logo @@ -86,9 +86,9 @@ function set_fullmode() { $password = $allow_demo_mode ? "password":""; - echo ""._("Password")."\n"; + password_row(_("Password:"), 'password', $password); - if ($login_timeout) { + if ($login_timeout) { hidden('company_login_name', $_SESSION["wa_current_user"]->company); } else { if (isset($_SESSION['wa_current_user']->company)) diff --git a/admin/attachments.php b/admin/attachments.php index dafa3e02..4d75a508 100644 --- a/admin/attachments.php +++ b/admin/attachments.php @@ -248,9 +248,7 @@ if ($selected_id != -1) else text_row_ex(_("Transaction #").':', 'trans_no', 10); text_row_ex(_("Description").':', 'description', 40); -start_row(); -label_cells(_("Attached File") . ":", ""); -end_row(); +file_row(_("Attached File") . ":", 'filename', 'filename'); end_table(1); if (isset($_POST['filterType'])) diff --git a/admin/change_current_user_password.php b/admin/change_current_user_password.php index bb7c9cb0..29112d03 100644 --- a/admin/change_current_user_password.php +++ b/admin/change_current_user_password.php @@ -75,15 +75,8 @@ label_row(_("User login:"), $myrow['user_id']); $_POST['password'] = ""; $_POST['passwordConfirm'] = ""; -start_row(); -label_cell(_("Password:")); -label_cell(""); -end_row(); - -start_row(); -label_cell(_("Repeat password:")); -label_cell(""); -end_row(); +password_row(_("Password:"), 'password', $_POST['password']); +password_row(_("Repeat password:"), 'passwordConfirm', $_POST['passwordConfirm']); table_section_title(_("Enter your new password in the fields.")); diff --git a/admin/company_preferences.php b/admin/company_preferences.php index 3ee19edb..9cf0a3a4 100644 --- a/admin/company_preferences.php +++ b/admin/company_preferences.php @@ -179,7 +179,7 @@ text_row_ex(_("Tax Periods:"), 'tax_prd', 10, 10, '', null, null, _('Months.')); text_row_ex(_("Tax Last Period:"), 'tax_last', 10, 10, '', null, null, _('Months back.')); label_row(_("Company Logo:"), $_POST['coy_logo']); -label_row(_("New Company Logo (.jpg)") . ":", ""); +file_row(_("New Company Logo (.jpg)") . ":", 'pic', 'pic'); check_row(_("Delete Company Logo:"), 'del_coy_logo', $_POST['del_coy_logo']); number_list_row(_("Use Dimensions:"), 'use_dimension', null, 0, 2); diff --git a/admin/create_coy.php b/admin/create_coy.php index 423701ae..c3bfe489 100644 --- a/admin/create_coy.php +++ b/admin/create_coy.php @@ -346,10 +346,7 @@ function display_company_edit($selected_id) label_row(_("Table Pref"), $_POST['tbpref']); yesno_list_row(_("Default"), 'def', null, "", "", false); - start_row(); - label_cell(_("Database Script")); - label_cell(""); - end_row(); + file_row(_("Database Script"), "uploadfile"); text_row_ex(_("New script Admin Password"), 'admpassword', 20); diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 5208ab10..68ea6480 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -194,7 +194,7 @@ gl_all_accounts_list_row(_("Purchase Discount Account:"), 'pyt_discount_act', $_ table_section_title(_("Inventory")); check_row(_("Allow Negative Inventory:"), 'allow_negative_stock', null); -label_row(null, _("Warning: Checking this will result in adjusted values in General Ledger"), "", "class='stockmankofg' colspan=2"); +label_row(null, _("Warning: This may cause a delay in GL postings"), "", "class='stockmankofg' colspan=2"); table_section_title(_("Items Defaults")); gl_all_accounts_list_row(_("Sales Account:"), 'default_inv_sales_act', $_POST['default_inv_sales_act']); diff --git a/admin/inst_lang.php b/admin/inst_lang.php index 77fb8d09..ee44fdf4 100644 --- a/admin/inst_lang.php +++ b/admin/inst_lang.php @@ -218,8 +218,8 @@ function display_language_edit($selected_id) yesno_list_row(_("Right To Left"), 'rtl', null, "", "", false); yesno_list_row(_("Default Language"), 'dflt', null, "", "", false); - label_row(_("Language File") . " (PO)", ""); - label_row(_("Language File") . " (MO)", ""); + file_row(_("Language File") . " (PO)", 'uploadfile'); + file_row(_("Language File") . " (MO)", 'uploadfile2'); end_table(0); display_note(_("Select your language files from your local harddisk."), 0, 1); diff --git a/admin/inst_module.php b/admin/inst_module.php index c465a551..d8b00450 100644 --- a/admin/inst_module.php +++ b/admin/inst_module.php @@ -301,9 +301,9 @@ function display_ext_edit($selected_id) record_status_list_row(_("Default status"), 'active'); - label_row(_("Module File"), ""); - label_row(_("Access Levels Extensions"), ""); - label_row(_("SQL File"), ""); + file_row(_("Module File"), 'uploadfile'); + file_row(_("Access Levels Extensions"), 'uploadfile3'); + file_row(_("SQL File"), 'uploadfile2'); end_table(0); display_note(_("Select your module PHP file from your local harddisk."), 0, 1); diff --git a/admin/users.php b/admin/users.php index 52058b29..6bf694bc 100644 --- a/admin/users.php +++ b/admin/users.php @@ -190,10 +190,7 @@ else $_POST['pos'] = user_pos(); } $_POST['password'] = ""; -start_row(); -label_cell(_("Password:")); -label_cell(""); -end_row(); +password_row(_("Password:"), 'password', $_POST['password']); if ($selected_id != -1) { diff --git a/config.default.php b/config.default.php index 983d5d66..6babd21a 100644 --- a/config.default.php +++ b/config.default.php @@ -119,10 +119,8 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ /* Default border and spacing for tables */ /* Should be moved to CSS */ - if (!isset($_SESSION['bordercolor'])) - $_SESSION['bordercolor'] = "#8cacbb"; - $table_style = "cellpadding=3 border=1 bordercolor='".$_SESSION['bordercolor']."' class='tablestyle'"; - $table_style2 = "cellpadding=3 border=1 bordercolor='#cccccc' class='tablestyle2'"; + $table_style = "class='tablestyle'"; + $table_style2 = "class='tablestyle2'"; /* Accounts Payable */ /* System check to see if quantity charged on purchase invoices exceeds the quantity received. diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index e809042e..a6140df5 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -70,9 +70,10 @@ function table_section($number=1, $width=false) { echo "\n"; $width = ($width ? "width=$width" : ""); - echo "\n"; // outer table + //echo "\n"; // outer table + echo "\n"; // outer table } - echo "\n"; + echo "
\n"; } function end_outer_table($breaks=0, $close_table=true) diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc index b27f5fde..13d39e63 100644 --- a/includes/ui/ui_input.inc +++ b/includes/ui/ui_input.inc @@ -356,8 +356,8 @@ function check_cells($label, $name, $value=null, $submit_on_change=false, $title function check_row($label, $name, $value=null, $submit_on_change=false, $title=false) { - echo ""; - echo check_cells($label, $name, $value, $submit_on_change, $title); + echo ""; + echo check_cells(NULL, $name, $value, $submit_on_change, $title); echo "\n"; } @@ -439,6 +439,11 @@ function label_cells($label, $value, $params="", $params2="", $id='') function label_row($label, $value, $params="", $params2="", $leftfill=0, $id='') { echo ""; + if ($params == "") + { + echo ""; + $label = null; + } label_cells($label, $value, $params, $params2, $id); if ($leftfill!=0) echo ""; @@ -503,9 +508,8 @@ function text_cells_ex($label, $name, $size, $max=null, $init=null, $title=null, function text_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="") { - echo ""; - - text_cells($label, $name, $value, $size, $max, $title, $params, $post_label); + echo ""; + text_cells(null, $name, $value, $size, $max, $title, $params, $post_label); echo "\n"; } @@ -514,9 +518,8 @@ function text_row($label, $name, $value, $size, $max, $title=null, $params="", $ function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null, $params=null, $post_label=null) { - echo ""; - - text_cells_ex($label, $name, $size, $max, $value, $title, $params, $post_label); + echo ""; + text_cells_ex(null, $name, $size, $max, $value, $title, $params, $post_label); echo "\n"; } @@ -614,12 +617,34 @@ function date_cells($label, $name, $title = null, $check=null, $inc_days=0, function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_months=0, $inc_years=0, $params=null, $submit_on_change=false) { - echo ""; - date_cells($label, $name, $title, $check, $inc_days, $inc_months, + echo ""; + date_cells(null, $name, $title, $check, $inc_days, $inc_months, $inc_years, $params, $submit_on_change); echo "\n"; } +//----------------------------------------------------------------------------------- +function password_row($label, $name, $value) +{ + echo ""; + label_cell(""); + echo "\n"; +} + +//----------------------------------------------------------------------------------- +function file_cells($label, $name, $id="") +{ + if ($id != "") + $id = "id='$id'"; + label_cells($label, ""); +} +function file_row($label, $name, $id = "") +{ + echo ""; + file_cells(null, $name, $id); + echo "\n"; +} + //----------------------------------------------------------------------------------- function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit_on_change=false) @@ -631,8 +656,8 @@ function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit function ref_row($label, $name, $title=null, $init=null, $submit_on_change=false) { - echo ""; - ref_cells($label, $name, $title, $init, null, $submit_on_change); + echo ""; + ref_cells(null, $name, $title, $init, null, $submit_on_change); echo "\n"; } @@ -663,8 +688,11 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu $_POST[$name] = ''; } if ($label != null) + { + if ($params == null) + $params = "class='label'"; label_cell($label, $params); - + } if (!isset($max)) $max = $size; @@ -780,8 +808,8 @@ function textarea_cells($label, $name, $value, $cols, $rows, $title = null, $par function textarea_row($label, $name, $value, $cols, $rows, $title=null, $params="") { - echo ""; - textarea_cells($label, $name, $value, $cols, $rows, $title, $params); + echo ""; + textarea_cells(null, $name, $value, $cols, $rows, $title, $params); echo "\n"; } diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index d84b0d9d..7465381c 100644 --- a/includes/ui/ui_lists.inc +++ b/includes/ui/ui_lists.inc @@ -413,7 +413,7 @@ function supplier_list_cells($label, $name, $selected_id=null, $all_option=false function supplier_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false, $all=false, $editkey = false) { - echo "\n"; @@ -463,7 +463,7 @@ function customer_list_cells($label, $name, $selected_id=null, $all_option=false function customer_list_row($label, $name, $selected_id=null, $all_option = false, $submit_on_change=false, $show_inactive=false, $editkey = false) { - echo "\n\n"; @@ -509,8 +509,8 @@ function customer_branches_list_cells($label,$customer_id, $name, $selected_id=n function customer_branches_list_row($label, $customer_id, $name, $selected_id=null, $all_option = true, $enabled=true, $submit_on_change=false, $editkey = false) { - echo ""; - customer_branches_list_cells($label, $customer_id, $name, $selected_id, + echo ""; + customer_branches_list_cells(null, $customer_id, $name, $selected_id, $all_option, $enabled, $submit_on_change, $editkey); echo ""; } @@ -542,8 +542,8 @@ function locations_list_cells($label, $name, $selected_id=null, $all_option=fals function locations_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { - echo ""; - locations_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); + echo ""; + locations_list_cells(null, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; } @@ -574,8 +574,8 @@ function currencies_list_cells($label, $name, $selected_id=null, $submit_on_chan function currencies_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - currencies_list_cells($label, $name, $selected_id, $submit_on_change); + echo ""; + currencies_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; } @@ -615,8 +615,8 @@ function fiscalyears_list_cells($label, $name, $selected_id=null) function fiscalyears_list_row($label, $name, $selected_id=null) { - echo "\n"; - fiscalyears_list_cells($label, $name, $selected_id); + echo ""; + fiscalyears_list_cells(null, $name, $selected_id); echo "\n"; } //------------------------------------------------------------------------------------ @@ -655,8 +655,8 @@ function dimensions_list_cells($label, $name, $selected_id=null, $no_option=fals function dimensions_list_row($label, $name, $selected_id=null, $no_option=false, $showname=null, $showclosed=false, $showtype=0, $submit_on_change=false) { - echo "\n"; - dimensions_list_cells($label, $name, $selected_id, $no_option, $showname, + echo ""; + dimensions_list_cells(null, $name, $selected_id, $no_option, $showname, $showclosed, $showtype, $submit_on_change); echo "\n"; } @@ -773,7 +773,7 @@ function sales_local_items_list_row($label, $name, $selected_id=null, $all_optio { echo ""; if ($label != null) - echo "\n"; + echo "\n"; echo "\n"; - stock_manufactured_items_list_cells($label, $name, $selected_id, $all_option, $submit_on_change); + echo ""; + stock_manufactured_items_list_cells(null, $name, $selected_id, $all_option, $submit_on_change); echo "\n"; } //------------------------------------------------------------------------------------ @@ -863,8 +863,8 @@ function stock_purchasable_items_list_cells($label, $name, $selected_id=null, function stock_purchasable_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false, $editkey=false) { - echo "\n"; - stock_purchasable_items_list_cells($label, $name, $selected_id=null, + echo ""; + stock_purchasable_items_list_cells(null, $name, $selected_id=null, $all_option, $submit_on_change, $editkey); echo "\n"; } @@ -877,7 +877,7 @@ function stock_item_types_list_row($label, $name, $selected_id=null, $enabled=tr echo ""; if ($label != null) - echo "\n"; + echo "\n"; echo ""; if ($label != null) - echo "\n"; + echo "\n"; echo "\n"; - tax_types_list_cells($label, $name, $selected_id, $none_option, $submit_on_change); + echo ""; + tax_types_list_cells(null, $name, $selected_id, $none_option, $submit_on_change); echo "\n"; } @@ -964,8 +964,8 @@ function tax_groups_list_cells($label, $name, $selected_id=null, $none_option=fa function tax_groups_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) { - echo "\n"; - tax_groups_list_cells($label, $name, $selected_id, $none_option, $submit_on_change); + echo ""; + tax_groups_list_cells(null, $name, $selected_id, $none_option, $submit_on_change); echo "\n"; } @@ -988,8 +988,8 @@ function item_tax_types_list_cells($label, $name, $selected_id=null) function item_tax_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - item_tax_types_list_cells($label, $name, $selected_id); + echo ""; + item_tax_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1013,8 +1013,8 @@ function shippers_list_cells($label, $name, $selected_id=null) function shippers_list_row($label, $name, $selected_id=null) { - echo "\n"; - shippers_list_cells($label, $name, $selected_id); + echo ""; + shippers_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1040,8 +1040,8 @@ function sales_persons_list_cells($label, $name, $selected_id=null, $spec_opt=fa function sales_persons_list_row($label, $name, $selected_id=null, $spec_opt=false) { - echo "\n"; - sales_persons_list_cells($label, $name, $selected_id, $spec_opt); + echo ""; + sales_persons_list_cells(null, $name, $selected_id, $spec_opt); echo "\n"; } @@ -1064,8 +1064,8 @@ function sales_areas_list_cells($label, $name, $selected_id=null) function sales_areas_list_row($label, $name, $selected_id=null) { - echo "\n"; - sales_areas_list_cells($label, $name, $selected_id); + echo ""; + sales_areas_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1091,8 +1091,8 @@ function sales_groups_list_cells($label, $name, $selected_id=null, $special_opti function sales_groups_list_row($label, $name, $selected_id=null, $special_option=false) { - echo "\n"; - sales_groups_list_cells($label, $name, $selected_id, $special_option); + echo ""; + sales_groups_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1126,8 +1126,8 @@ function templates_list_cells($label, $name, $selected_id=null, $special_option= function templates_list_row($label, $name, $selected_id=null, $special_option=false) { - echo "\n"; - templates_list_cells($label, $name, $selected_id, $special_option); + echo ""; + templates_list_cells(null, $name, $selected_id, $special_option); echo "\n"; } @@ -1150,8 +1150,8 @@ function workorders_list_cells($label, $name, $selected_id=null) function workorders_list_row($label, $name, $selected_id=null) { - echo "\n"; - workorders_list_cells($label, $name, $selected_id); + echo ""; + workorders_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1174,8 +1174,8 @@ function payment_terms_list_cells($label, $name, $selected_id=null) function payment_terms_list_row($label, $name, $selected_id=null) { - echo "\n"; - payment_terms_list_cells($label, $name, $selected_id); + echo ""; + payment_terms_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1198,8 +1198,8 @@ function credit_status_list_cells($label, $name, $selected_id=null) function credit_status_list_row($label, $name, $selected_id=null) { - echo "\n"; - credit_status_list_cells($label, $name, $selected_id); + echo ""; + credit_status_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1229,8 +1229,8 @@ function sales_types_list_cells($label, $name, $selected_id=null, $submit_on_cha function sales_types_list_row($label, $name, $selected_id=null, $submit_on_change=false, $special_option=false) { - echo "\n"; - sales_types_list_cells($label, $name, $selected_id, $submit_on_change, $special_option); + echo ""; + sales_types_list_cells(null, $name, $selected_id, $submit_on_change, $special_option); echo "\n"; } @@ -1253,8 +1253,8 @@ function movement_types_list_cells($label, $name, $selected_id=null) function movement_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - movement_types_list_cells($label, $name, $selected_id); + echo ""; + movement_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1321,8 +1321,8 @@ function workcenter_list_cells($label, $name, $selected_id=null, $all_option=fal function workcenter_list_row($label, $name, $selected_id=null, $all_option=false) { - echo "\n"; - workcenter_list_cells($label, $name, $selected_id, $all_option); + echo ""; + workcenter_list_cells(null, $name, $selected_id, $all_option); echo "\n"; } @@ -1352,8 +1352,8 @@ function bank_accounts_list_cells($label, $name, $selected_id=null, $submit_on_c function bank_accounts_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - bank_accounts_list_cells($label, $name, $selected_id, $submit_on_change); + echo ""; + bank_accounts_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; } //----------------------------------------------------------------------------------------------- @@ -1365,7 +1365,7 @@ function cash_accounts_list_row($label, $name, $selected_id=null, $submit_on_cha WHERE ".TB_PREF."bank_accounts.account_type=3"; if ($label != null) - echo "\n"; + echo "\n"; echo "'; if ($label != null) - echo "\n"; + echo "\n"; echo "\n"; + echo "\n"; echo "\n"; @@ -1433,8 +1433,8 @@ function class_list_cells($label, $name, $selected_id=null, $submit_on_change=fa function class_list_row($label, $name, $selected_id=null, $submit_on_change=false) { - echo "\n"; - class_list_cells($label, $name, $selected_id, $submit_on_change); + echo ""; + class_list_cells(null, $name, $selected_id, $submit_on_change); echo "\n"; } @@ -1462,8 +1462,8 @@ function stock_categories_list_cells($label, $name, $selected_id=null, $spec_opt function stock_categories_list_row($label, $name, $selected_id=null, $spec_opt=false, $submit_on_change=false) { - echo "\n"; - stock_categories_list_cells($label, $name, $selected_id, $spec_opt, $submit_on_change); + echo ""; + stock_categories_list_cells(null, $name, $selected_id, $spec_opt, $submit_on_change); echo "\n"; } @@ -1496,8 +1496,8 @@ function gl_account_types_list_cells($label, $name, $selected_id=null, $all_opti function gl_account_types_list_row($label, $name, $selected_id=null, $all_option=false, $all_option_numeric=false) { - echo "\n"; - gl_account_types_list_cells($label, $name, $selected_id, $all_option, + echo ""; + gl_account_types_list_cells(null, $name, $selected_id, $all_option, $all_option_numeric); echo "\n"; } @@ -1557,8 +1557,8 @@ function gl_all_accounts_list_cells($label, $name, $selected_id=null, function gl_all_accounts_list_row($label, $name, $selected_id=null, $skip_bank_accounts=false, $cells=false, $all_option=false) { - echo "\n"; - gl_all_accounts_list_cells($label, $name, $selected_id, + echo ""; + gl_all_accounts_list_cells(null, $name, $selected_id, $skip_bank_accounts, $cells, $all_option); echo "\n"; } @@ -1586,8 +1586,8 @@ function yesno_list_cells($label, $name, $selected_id=null, $name_yes="", $name_ function yesno_list_row($label, $name, $selected_id=null, $name_yes="", $name_no="", $submit_on_change=false) { - echo "\n"; - yesno_list_cells($label, $name, $selected_id, $name_yes, $name_no, $submit_on_change); + echo ""; + yesno_list_cells(null, $name, $selected_id, $name_yes, $name_no, $submit_on_change); echo "\n"; } @@ -1615,8 +1615,8 @@ function languages_list_cells($label, $name, $selected_id=null) function languages_list_row($label, $name, $selected_id=null) { - echo "\n"; - languages_list_cells($label, $name, $selected_id); + echo ""; + languages_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1640,8 +1640,8 @@ function bank_account_types_list_cells($label, $name, $selected_id=null) function bank_account_types_list_row($label, $name, $selected_id=null) { - echo "\n"; - bank_account_types_list_cells($label, $name, $selected_id); + echo ""; + bank_account_types_list_cells(null, $name, $selected_id); echo "\n"; } @@ -1671,8 +1671,8 @@ function payment_person_types_list_cells($label, $name, $selected_id=null, $rela function payment_person_types_list_row($label, $name, $selected_id=null, $related=null) { - echo "\n"; - payment_person_types_list_cells($label, $name, $selected_id, $related); + echo ""; + payment_person_types_list_cells(null, $name, $selected_id, $related); echo "\n"; } @@ -1688,7 +1688,7 @@ function wo_types_list($name, $selected_id=null) function wo_types_list_row($label, $name, $selected_id=null) { - echo "\n"; } @@ -1699,7 +1699,7 @@ function dateformats_list_row($label, $name, $value=null) { global $dateformats; - echo "\n\n\n"; } @@ -1708,7 +1708,7 @@ function dateseps_list_row($label, $name, $value=null) { global $dateseps; - echo "\n\n\n"; } @@ -1717,7 +1717,7 @@ function thoseps_list_row($label, $name, $value=null) { global $thoseps; - echo "\n\n\n"; } @@ -1726,7 +1726,7 @@ function decseps_list_row($label, $name, $value=null) { global $decseps; - echo "\n\n\n"; } @@ -1747,7 +1747,7 @@ function themes_list_row($label, $name, $value=null) } ksort($themes); - echo "\n\n\n"; } @@ -1760,7 +1760,7 @@ function pagesizes_list_row($label, $name, $value=null) foreach ($pagesizes as $pz) $items[$pz] = $pz; - echo "\n\n\n"; } @@ -1790,8 +1790,8 @@ function systypes_list_cells($label, $name, $value=null, $submit_on_change=false function systypes_list_row($label, $name, $value=null, $submit_on_change=false) { - echo "\n"; - systypes_list_cells($label, $name, $value, false, $submit_on_change); + echo ""; + systypes_list_cells(null, $name, $value, false, $submit_on_change); echo "\n"; } @@ -1870,8 +1870,8 @@ function policy_list_cells($label, $name, $selected=null) function policy_list_row($label, $name, $selected=null) { - echo "\n"; - policy_list_cells($label, $name, $selected); + echo ""; + policy_list_cells(null, $name, $selected); echo "\n"; } @@ -1889,8 +1889,8 @@ function credit_type_list_cells($label, $name, $selected=null, $submit_on_change function credit_type_list_row($label, $name, $selected=null, $submit_on_change=false) { - echo "\n"; - credit_type_list_cells($label, $name, $selected, $submit_on_change); + echo ""; + credit_type_list_cells(null, $name, $selected, $submit_on_change); echo "\n"; } @@ -1916,8 +1916,8 @@ function number_list_cells($label, $name, $selected, $from, $to, $no_option=fals function number_list_row($label, $name, $selected, $from, $to, $no_option=false) { - echo "\n"; - echo number_list_cells($label, $name, $selected, $from, $to, $no_option); + echo ""; + echo number_list_cells(null, $name, $selected, $from, $to, $no_option); echo "\n"; } @@ -1934,7 +1934,7 @@ function print_profiles_list_row($label, $name, $selected_id=null, $spec_opt=fal echo ""; if ($label != null) - echo "\n"; + echo "\n"; echo ""; } function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false) { - echo "\n"; - quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change); + echo ""; + quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change); echo "\n"; } @@ -2003,7 +2004,7 @@ function quick_actions_list_row($label, $name, $selected_id=null, $submit_on_cha { global $quick_actions; - echo ""; - security_roles_list_cells($label, $name, $selected_id, $new_item, $submit_on_change, $show_inactive); + echo ""; + security_roles_list_cells(null, $name, $selected_id, $new_item, $submit_on_change, $show_inactive); echo "\n"; } @@ -2090,7 +2091,7 @@ function tab_list_row($label, $name, $selected_id=null, $all = false) } } echo "\n"; - echo "\n"; } @@ -2132,8 +2133,8 @@ function tag_list_cells($label, $name, $height, $type, $mult=false, $all=false, function tag_list_row($label, $name, $height, $type, $mult=false, $all=false, $spec_opt = false) { - echo "\n"; - tag_list_cells($label, $name, $height, $type, $mult, $all, $spec_opt); + echo ""; + tag_list_cells(null, $name, $height, $type, $mult, $all, $spec_opt); echo "\n"; } diff --git a/inventory/manage/items.php b/inventory/manage/items.php index cef96238..add74834 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -419,7 +419,7 @@ else table_section_title(_("Other")); // Add image upload for New Item - by Joe -label_row(_("Image File (.jpg)") . ":", ""); +file_row(_("Image File (.jpg)") . ":", 'pic', 'pic'); // Add Image upload for New Item - by Joe $stock_img_link = ""; $check_remove_image = false; diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc index baf2ceb5..bc03ee82 100644 --- a/purchasing/includes/ui/invoice_ui.inc +++ b/purchasing/includes/ui/invoice_ui.inc @@ -55,13 +55,13 @@ function copy_to_trans(&$supp_trans) function invoice_header(&$supp_trans) { - global $Ajax, $table_style, $Refs; + global $Ajax, $table_style2, $Refs; // if vars have been lost, recopy if (!isset($_POST['tran_date'])) copy_from_trans($supp_trans); - start_outer_table("$table_style width=98%", 5); + start_outer_table("width=95% $table_style2"); table_section(1); @@ -141,19 +141,21 @@ function invoice_totals(&$supp_trans) copy_to_trans($supp_trans); - start_table("$table_style width=95%"); - label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "align=right", "align=right"); + $dim = get_company_pref('use_dimension'); + $colspan = ($dim == 2 ? 7 : ($dim == 1 ? 6 : 5)); + start_table("$table_style width=95%"); + label_row(_("Sub-total:"), price_format( $supp_trans->ov_amount), "colspan=$colspan align=right", "align=right"); $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id); - $tax_total = display_edit_tax_items($taxes, 1, 0); // tax_included==0 (we are the company) + $tax_total = display_edit_tax_items($taxes, $colspan, 0); // tax_included==0 (we are the company) $display_total = price_format($supp_trans->ov_amount + $tax_total); if ($supp_trans->is_invoice) - label_row(_("Invoice Total:"), $display_total, "align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'"); + label_row(_("Invoice Total:"), $display_total, "colspan=$colspan align=right style='font-weight:bold;'", "align=right style='font-weight:bold;'"); else label_row(_("Credit Note Total"), - $display_total, "align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'"); + $display_total, "colspan=$colspan align=right style='font-weight:bold;color:red;'", "nowrap align=right style='font-weight:bold;color:red;'"); end_table(1); start_table($table_style2); @@ -164,7 +166,7 @@ function invoice_totals(&$supp_trans) //-------------------------------------------------------------------------------------------------- function display_gl_controls(&$supp_trans, $k) { - global $table_style; + global $table_style, $table_style2; $accs = get_supplier_accounts($supp_trans->supplier_id); $_POST['gl_code'] = $accs['purchase_account']; @@ -197,20 +199,18 @@ function display_gl_controls(&$supp_trans, $k) function display_gl_items(&$supp_trans, $mode=0) { - global $table_style, $path_to_root, $Ajax; + global $table_style, $table_style2, $path_to_root, $Ajax; // if displaying in form, and no items, exit if (($mode == 2 || $mode == 3) && count($supp_trans->gl_codes) == 0) return 0; - start_outer_table("width=95%"); - if ($supp_trans->is_invoice) $heading = _("GL Items for this Invoice"); else $heading = _("GL Items for this Credit Note"); - start_outer_table("width=100%"); + start_outer_table("$table_style width=95%"); if ($mode == 1) { @@ -239,10 +239,8 @@ function display_gl_items(&$supp_trans, $mode=0) end_outer_table(0, false); - vertical_space(); // ouer table - div_start('gl_items'); - start_table("$table_style width=100%"); + start_table("$table_style width=95%"); $dim = get_company_pref('use_dimension'); if ($dim == 2) @@ -310,10 +308,9 @@ function display_gl_items(&$supp_trans, $mode=0) label_row(_("Total"), price_format($total_gl_value), "colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1)); - end_table(); + end_table(1); div_end(); - end_outer_table(0, false); // outertable return $total_gl_value; } @@ -417,7 +414,7 @@ function display_grn_items(&$supp_trans, $mode=0) if (($mode == 2 || $mode == 3) && count($supp_trans->grn_items) == 0) return 0; - start_outer_table("width=95%"); + start_outer_table("style='border:1px solid #cccccc;' width=95%"); $heading2 = ""; if ($mode == 1) @@ -439,8 +436,6 @@ function display_grn_items(&$supp_trans, $mode=0) $heading = _("Received Items Credited on this Note"); } - start_outer_table("width=100%"); - display_heading($heading); if ($mode == 1) @@ -456,7 +451,6 @@ function display_grn_items(&$supp_trans, $mode=0) if ($heading2 != "") { - //br(); display_note($heading2, 0, 0, "class='overduefg'"); } echo ""; + end_row(); } + end_table(1); div_end(); - end_outer_table(0, false); // outertable return $total_grn_value; } diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc index 830f483f..6a2dab20 100644 --- a/purchasing/includes/ui/po_ui.inc +++ b/purchasing/includes/ui/po_ui.inc @@ -116,11 +116,7 @@ function display_po_header(&$order) } text_row(_("Supplier's Reference:"), 'Requisition', null, 16, 15); - - echo ""; - echo ""; + locations_list_row(_("Receive Into:"), 'StkLocation', null, false, true); table_section(3); @@ -225,8 +221,8 @@ function display_po_items(&$order, $editable=true) function display_po_summary(&$po, $is_self=false, $editable=false) { - global $table_style2; - start_table("$table_style2 width=90%"); + global $table_style; + start_table("$table_style width=90%"); start_row(); label_cells(_("Reference"), $po->reference, "class='tableheader2'"); diff --git a/purchasing/supplier_credit.php b/purchasing/supplier_credit.php index 1a8d63e9..ff2fa175 100644 --- a/purchasing/supplier_credit.php +++ b/purchasing/supplier_credit.php @@ -318,8 +318,6 @@ invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') display_error('No supplier found for entered search text'); else { - start_outer_table("$table_style2 width=98%", 5); - $total_grn_value = display_grn_items($_SESSION['supp_trans'], 1); $total_gl_value = display_gl_items($_SESSION['supp_trans'], 1); @@ -327,8 +325,6 @@ else { div_start('inv_tot'); invoice_totals($_SESSION['supp_trans']); div_end(); - - end_outer_table(0, false); } if ($id != -1) diff --git a/purchasing/supplier_invoice.php b/purchasing/supplier_invoice.php index bd8f0763..13402c62 100644 --- a/purchasing/supplier_invoice.php +++ b/purchasing/supplier_invoice.php @@ -383,8 +383,6 @@ invoice_header($_SESSION['supp_trans']); if ($_POST['supplier_id']=='') display_error('No supplier found for entered search text'); else { - start_outer_table("$table_style2 width=98%", 5); - display_grn_items($_SESSION['supp_trans'], 1); display_gl_items($_SESSION['supp_trans'], 1); @@ -393,7 +391,6 @@ else { invoice_totals($_SESSION['supp_trans']); div_end(); - end_outer_table(0, false); } //----------------------------------------------------------------------------------------- diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc index 9cb78d87..c6c4cf88 100644 --- a/reporting/includes/reports_classes.inc +++ b/reporting/includes/reports_classes.inc @@ -32,7 +32,7 @@ class BoxReports function getDisplay($class=null) { - global $table_style2, $comp_path, $path_to_root, $pdf_debug, $Ajax; + global $table_style, $comp_path, $path_to_root, $pdf_debug, $Ajax; $temp = array_values($this->ar_classes); @@ -99,7 +99,7 @@ class BoxReports } "; - $st .= "
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label"; + echo "
$label"; echo supplier_list($name, $selected_id, $all_option, $submit_on_change, $all, $editkey); echo "
$label"; + echo "
$label"; echo customer_list($name, $selected_id, $all_option, $submit_on_change, $show_inactive, $editkey); echo "
$label
$label
$label
$label
$label
$label$label"; echo sales_items_list($name, $selected_id, $all_option, $submit_on_change, 'local', array('cells'=>false)); @@ -801,8 +801,8 @@ function stock_manufactured_items_list_cells($label, $name, $selected_id=null, function stock_manufactured_items_list_row($label, $name, $selected_id=null, $all_option=false, $submit_on_change=false) { - echo "
$label
$label
$label$label"; echo array_selector($name, $selected_id, $stock_types, @@ -892,7 +892,7 @@ function stock_units_list_row($label, $name, $value=null, $enabled=true) $result = get_all_item_units(); echo "
$label$label"; while($unit = db_fetch($result)) @@ -931,8 +931,8 @@ function tax_types_list_cells($label, $name, $selected_id=null, $none_option=fal function tax_types_list_row($label, $name, $selected_id=null, $none_option=false, $submit_on_change=false) { - echo "
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label
$label"; echo combo_input($name, $selected_id, $sql, 'id', 'bank_account_name', array( @@ -1384,7 +1384,7 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub default_focus($name); echo '
$label$label"; echo combo_input($name, $selected_id, $sql, 'id', 'pos_name', @@ -1403,7 +1403,7 @@ function pos_list_row($label, $name, $selected_id=null, $spec_option=false, $sub function sale_payment_list_cells($label, $name, $selected_id=null, $submit_on_change=false) { if ($label != null) - echo "$label$label"; echo yesno_list($name, $selected_id, _('Cash'), _('Delayed'), $submit_on_change); echo "
$label
$label
$label
$label
$label
$label
$label
$label
$label\n"; + echo "
$label\n"; echo wo_types_list($name, $selected_id); echo "
$label"; + echo "
$label"; echo array_selector( $name, $value, $dateformats ); echo "
$label"; + echo "
$label"; echo array_selector( $name, $value, $dateseps ); echo "
$label"; + echo "
$label"; echo array_selector( $name, $value, $thoseps ); echo "
$label"; + echo "
$label"; echo array_selector( $name, $value, $decseps ); echo "
$label"; + echo "
$label"; echo array_selector( $name, $value, $themes ); echo "
$label"; + echo "
$label"; echo array_selector( $name, $value, $items ); echo "
$label
$label
$label
$label
$label$label"; echo array_selector($name, $selected_id, $profiles, @@ -1986,15 +1986,16 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false) { - echo "$label\n"; + if ($label != null) + echo "$label\n"; echo quick_entries_list($name, $selected_id, $type, $submit_on_change); echo "
$label
$label"; + echo "
$label"; echo array_selector($name, $selected_id, $quick_actions, array( 'select_submit'=> $submit_on_change @@ -2015,7 +2016,7 @@ function quick_entry_types_list_row($label, $name, $selected_id=null, $submit_on { global $quick_entry_types; - echo "
$label"; + echo "
$label"; echo array_selector($name, $selected_id, $quick_entry_types, array( 'select_submit'=> $submit_on_change @@ -2031,7 +2032,7 @@ function class_types_list_row($label, $name, $selected_id=null, $submit_on_chang { global $class_types; - echo "
$label"; + echo "
$label"; echo array_selector($name, $selected_id, $class_types, array( 'select_submit'=> $submit_on_change @@ -2070,8 +2071,8 @@ function security_roles_list_cells($label, $name, $selected_id=null, $new_item=f function security_roles_list_row($label, $name, $selected_id=null, $new_item=false, $submit_on_change=false, $show_inactive = false) { - echo "
$label
$label\n"; + echo "$label\n"; echo array_selector($name, $selected_id, $tabs); echo "
$label
"; @@ -466,7 +460,7 @@ function display_grn_items(&$supp_trans, $mode=0) end_outer_table(0, false); div_start('grn_items'); - start_table("$table_style width=100%"); + start_table("$table_style width=95%"); if ($mode == 1) { $th = array(_("Delivery"), _("Sequence #"), _("P.O."), _("Item"), _("Description"), @@ -543,20 +537,23 @@ function display_grn_items(&$supp_trans, $mode=0) $colspan = 5; label_row(_("Total"), price_format($total_grn_value), "colspan=$colspan align=right", "nowrap align=right"); - end_table(); if (!$ret) { + start_row(); + echo ""; if ($supp_trans->is_invoice) - display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 1); + display_note(_("There are no outstanding items received from this supplier that have not been invoiced by them."), 0, 0); else { display_note(_("There are no received items for the selected supplier that have been invoiced.")); - display_note(_("Credits can only be applied to invoiced items."), 0, 1); + display_note(_("Credits can only be applied to invoiced items."), 0, 0); } + echo "
" . _("Receive Into:") . ""; - echo locations_list('StkLocation', null, false, true); - echo "
"; + $st .= "
"; $st .= ""; $st .= ""; $st .= ""; diff --git a/sales/includes/ui/sales_order_ui.inc b/sales/includes/ui/sales_order_ui.inc index 028ca8b7..de12daf9 100644 --- a/sales/includes/ui/sales_order_ui.inc +++ b/sales/includes/ui/sales_order_ui.inc @@ -226,9 +226,7 @@ function display_order_summary($title, &$order, $editable_items=false) label_cell('', 'colspan=2'); end_row(); $display_sub_total = price_format($total + input_num('freight_cost')); - label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right", 2); - $taxes = $order->get_taxes(input_num('freight_cost')); $tax_total = display_edit_tax_items($taxes, $colspan, $order->tax_included, 2); @@ -253,9 +251,9 @@ function display_order_summary($title, &$order, $editable_items=false) function display_order_header(&$order, $editable, $date_text, $display_tax_group=false) { - global $table_style, $Ajax, $SysPrefs; + global $table_style2, $Ajax, $SysPrefs; - start_outer_table("width=80% $table_style"); + start_outer_table("width=80% $table_style2"); table_section(1); @@ -359,7 +357,7 @@ function display_order_header(&$order, $editable, $date_text, $display_tax_group } } - ref_cells(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); + ref_row(_("Reference").':', 'ref', _('Reference number unique for this document type'), null, ''); if (!is_company_currency($order->customer_currency)) { diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php index ebf60096..c8a212e3 100644 --- a/sales/view/view_sales_order.php +++ b/sales/view/view_sales_order.php @@ -116,7 +116,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE) } - label_row(null, price_format($delivery_total), "", "colspan=4 align=right"); + label_row(null, price_format($delivery_total), " ", "colspan=4 align=right"); end_table(); echo "
$st_classes$st_reports$st_params"; @@ -149,7 +149,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE) } - label_row(null, price_format($invoices_total), "", "colspan=4 align=right"); + label_row(null, price_format($invoices_total), " ", "colspan=4 align=right"); end_table(); @@ -182,7 +182,7 @@ if ($_GET['trans_type'] != ST_SALESQUOTE) } label_row(null, "" . price_format(-$credits_total) . "", - "", "colspan=4 align=right"); + " ", "colspan=4 align=right"); end_table(); diff --git a/themes/aqua/default.css b/themes/aqua/default.css index 81f43f23..b41ad16e 100644 --- a/themes/aqua/default.css +++ b/themes/aqua/default.css @@ -24,10 +24,6 @@ body { padding: 0; } -#loginscreen { - background: #f5f5f5; -} - tr, td, th { font-size: 11px; line-height: 19px; @@ -99,13 +95,6 @@ button img, span { vertical-align: middle; } -.login { - width: 350px; - border-left: 12px solid #367cb5; - border-collapse: collapse; - background-color: #eeeeee; -} - .callout_main { font-family: Verdana, Arial, Helvetica; border: none; @@ -374,17 +363,54 @@ div.tabs a:hover { color: red; } -.tablestyle { +table.tablestyle { border-collapse: collapse; + border: 1px solid #8cacbb; } - -.tablestyle2 { +table.tablestyle td { + border-collapse: collapse; + border: 1px solid #8cacbb; +} +table.tablestyle2 { + border-collapse: collapse; + border: 1px solid #cccccc; +} +table.tablestyle2 td { + border-collapse: collapse; + border: 1px solid #cccccc; +} +table.tablestyle_inner { border-collapse: collapse; + border: 1px solid #f9f9f9; +} +table.tablestyle_inner td { + border-collapse: collapse; + border: 1px solid #f9f9f9; } .tablestyle_noborder { padding: 3px; } +.label { + background-color: #efefef; + color: black; +} + +#loginscreen { + background: #f5f5f5; +} + +.login { + width: 350px; + border-left: 12px solid #367cb5; + border-collapse: collapse; + background-color: #eeeeee; +} +.login td { + border-collapse: collapse; + border: 1px solid #cccccc; +} + .amount { font-family: Verdana, Arial, Helvetica; font-size: 11px; @@ -432,6 +458,10 @@ button.navibutton { background-color: #d5cea7; } +.navibar tr td { + border: none; +} + .listsubmit { display: none; } diff --git a/themes/cool/default.css b/themes/cool/default.css index 8d58709c..d48d1aa3 100644 --- a/themes/cool/default.css +++ b/themes/cool/default.css @@ -2,8 +2,8 @@ | cool | | default.css | |---------------------------------------------------| | For use with: | -| FrontAccounting | -| http://FrontAccounting.com/ | +| FrontAccounting | +| http://FrontAccounting.com/ | | by Joe Hunt Consulting | |---------------------------------------------------| | Developer: | @@ -24,10 +24,6 @@ body { padding: 0; } -#loginscreen { - background: #f5f5f5; -} - tr, td, th { font-size: 11px; line-height: 19px; @@ -99,13 +95,6 @@ button img, span { vertical-align: middle; } -.login { - width: 350px; - border-left: 12px solid #367cb5; - border-collapse: collapse; - background-color: #eeeeee; -} - .callout_main { font-family: Verdana, Arial, Helvetica; border: none; @@ -378,17 +367,54 @@ div.tabs a:hover { color: red; } -.tablestyle { +table.tablestyle { border-collapse: collapse; + border: 1px solid #8cacbb; } - -.tablestyle2 { +table.tablestyle td { + border-collapse: collapse; + border: 1px solid #8cacbb; +} +table.tablestyle2 { + border-collapse: collapse; + border: 1px solid #cccccc; +} +table.tablestyle2 td { + border-collapse: collapse; + border: 1px solid #cccccc; +} +table.tablestyle_inner { border-collapse: collapse; + border: 1px solid #eff9f9; +} +table.tablestyle_inner td { + border-collapse: collapse; + border: 1px solid #eff9f9; } .tablestyle_noborder { padding: 3px; } +.label { + background-color: #e4ecec; + color: black; +} + +#loginscreen { + background: #f5f5f5; +} + +.login { + width: 350px; + border-left: 12px solid #367cb5; + border-collapse: collapse; + background-color: #eeeeee; +} +.login td { + border-collapse: collapse; + border: 1px solid #cccccc; +} + .amount { font-family: Verdana, Arial, Helvetica; font-size: 11px; @@ -436,6 +462,9 @@ button.navibutton { background-color: #788da1; } +.navibar tr td { + border: none; +} .listsubmit { display: none; diff --git a/themes/default/default.css b/themes/default/default.css index d03e3618..2e261acc 100644 --- a/themes/default/default.css +++ b/themes/default/default.css @@ -24,10 +24,6 @@ body { padding: 0; } -#loginscreen { - background: #f5f5f5; -} - tr, td, th { font-size: 11px; line-height: 19px; @@ -99,13 +95,6 @@ button img, span { vertical-align: middle; } -.login { - width: 350px; - border-left: 12px solid #367cb5; - border-collapse: collapse; - background-color: #eeeeee; -} - .callout_main { font-family: Verdana, Arial, Helvetica; border: none; @@ -277,10 +266,6 @@ div.tabs a:hover { text-align: left; } -.tableseparator { - border-left: 1px solid #444466; -} - .titletext { font-weight: bold; font-size: 13px; @@ -373,17 +358,54 @@ div.tabs a:hover { color: red; } -.tablestyle { +table.tablestyle { border-collapse: collapse; + border: 1px solid #8cacbb; } - -.tablestyle2 { +table.tablestyle td { + border-collapse: collapse; + border: 1px solid #8cacbb; +} +table.tablestyle2 { + border-collapse: collapse; + border: 1px solid #cccccc; +} +table.tablestyle2 td { + border-collapse: collapse; + border: 1px solid #cccccc; +} +table.tablestyle_inner { + border-collapse: collapse; + border: 1px solid #f9f9f9; +} +table.tablestyle_inner td { border-collapse: collapse; + border: 1px solid #f9f9f9; } .tablestyle_noborder { padding: 3px; } +.label { + background-color: #efefef; + color: black; +} + +#loginscreen { + background: #f5f5f5; +} + +.login { + width: 350px; + border-left: 12px solid #367cb5; + border-collapse: collapse; + background-color: #eeeeee; +} +.login td { + border-collapse: collapse; + border: 1px solid #cccccc; +} + .amount { font-family: Verdana, Arial, Helvetica; font-size: 11px; @@ -427,11 +449,14 @@ button.navibutton { .navibar { padding: 0 3px; color: #000; - border: 1px solid #8cacbb; border-collapse: collapse; background-color: #dee7ec; } +.navibar tr td { + border: none; +} + .listsubmit { display: none; }