From eef7e9ecd87d142c38a286f2e176265fe23b410e Mon Sep 17 00:00:00 2001 From: vKham Date: Thu, 22 Dec 2011 19:45:23 +0000 Subject: [PATCH] // fix table extensible --- admin-dev/themes/default/admin.css | 8 +++++--- controllers/admin/AdminCartsController.php | 4 ++-- controllers/admin/AdminGroupsController.php | 3 +-- controllers/admin/AdminImagesController.php | 2 +- controllers/admin/AdminLogsController.php | 4 ++-- controllers/admin/AdminOrdersController.php | 2 +- controllers/admin/AdminProfilesController.php | 2 +- controllers/admin/AdminSpecificPriceRuleController.php | 3 +-- controllers/admin/AdminStoresController.php | 2 +- css/admin.css | 5 +++++ 10 files changed, 20 insertions(+), 15 deletions(-) diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index da25e6dfb..f1cf34dff 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -115,7 +115,9 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} .table a:hover{text-decoration:none} .table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px; background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC); - background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;} + background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent; + font-size:13px; text-align:left;} +.table tr th.right { text-align:center;} .table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;} .table tr:hover td{background:#fff1b5} .table tr.filter:hover td{background:#F1F9FF} @@ -161,8 +163,8 @@ a.module_toggle_all{color: #268CCD;} /*toolbarBox*/ .toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;} .toolbarBox .pageTitle { margin-left:10px; line-height:48px} -.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 48px; margin: 0; padding: 0;} -.toolbarBox ul.cc_button {float:right;margin:0;padding:0;} +.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0;} +.toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;} .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;} .toolbarBox a.toolbar_btn { border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;} .toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;} diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 9cfcf4a95..631d47be2 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -79,14 +79,14 @@ class AdminCartsControllerCore extends AdminController ), 'date_add' => array( 'title' => $this->l('Date'), - 'width' => 120, + 'width' => 150, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add' ), 'id_guest' => array( 'title' => $this->l('Online'), - 'width' => 25, + 'width' => 40, 'align' => 'center', 'type' => 'bool', 'filter_key' => 'id_guest', diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 0182e89e4..161d1a21a 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -57,7 +57,6 @@ class AdminGroupsControllerCore extends AdminController ), 'name' => array( 'title' => $this->l('Name'), - 'width' => 80, 'filter_key' => 'b!name' ), 'reduction' => array( @@ -81,7 +80,7 @@ class AdminGroupsControllerCore extends AdminController ), 'date_add' => array( 'title' => $this->l('Creation date'), - 'width' => 60, + 'width' => 150, 'type' => 'date', 'align' => 'right' ) diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php index 1cbd8d2b8..eccffb05d 100644 --- a/controllers/admin/AdminImagesController.php +++ b/controllers/admin/AdminImagesController.php @@ -41,7 +41,7 @@ class AdminImagesControllerCore extends AdminController $this->fieldsDisplay = array( 'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), - 'name' => array('title' => $this->l('Name'), 'width' => 140, 'size' => 16), + 'name' => array('title' => $this->l('Name'), 'size' => 16), 'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5), 'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5) ); diff --git a/controllers/admin/AdminLogsController.php b/controllers/admin/AdminLogsController.php index f564a9571..262019a89 100644 --- a/controllers/admin/AdminLogsController.php +++ b/controllers/admin/AdminLogsController.php @@ -40,11 +40,11 @@ class AdminLogsControllerCore extends AdminController $this->fieldsDisplay = array( 'id_log' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25), 'severity' => array('title' => $this->l('Severity (1-4)'), 'align' => 'center', 'width' => 50), - 'message' => array('title' => $this->l('Message'), 'width' => 377), + 'message' => array('title' => $this->l('Message')), 'object_type' => array('title' => $this->l('Object type'), 'width' => 75), 'object_id' => array('title' => $this->l('Object ID'), 'width' => 50), 'error_code' => array('title' => $this->l('Error code'), 'width' => 75, 'prefix' => '0x'), - 'date_add' => array('title' => $this->l('Date'), 'width' => 35, 'align' => 'right', 'type' => 'datetime') + 'date_add' => array('title' => $this->l('Date'), 'width' => 150, 'align' => 'right', 'type' => 'datetime') ); $this->options = array( diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index 16615b231..cfa9e39d1 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -69,7 +69,7 @@ class AdminOrdersControllerCore extends AdminController 'total_paid_tax_incl' => array('title' => $this->l('Total'), 'width' => 70, 'align' => 'right', 'prefix' => '', 'suffix' => '', 'type' => 'price', 'currency' => true), 'payment' => array('title' => $this->l('Payment'), 'width' => 100), 'osname' => array('title' => $this->l('Status'), 'color' => 'color', 'width' => 230, 'type' => 'select', 'list' => $statesArray, 'filter_key' => 'os!id_order_state', 'filter_type' => 'int'), - 'date_add' => array('title' => $this->l('Date'), 'width' => 120, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), + 'date_add' => array('title' => $this->l('Date'), 'width' => 150, 'align' => 'right', 'type' => 'datetime', 'filter_key' => 'a!date_add'), 'id_pdf' => array('title' => $this->l('PDF'), 'width' => 35, 'align' => 'center', 'callback' => 'printPDFIcons', 'orderby' => false, 'search' => false, 'remove_onclick' => true)); $this->shopLinkType = 'shop'; diff --git a/controllers/admin/AdminProfilesController.php b/controllers/admin/AdminProfilesController.php index a6169a5e9..3def4a77d 100644 --- a/controllers/admin/AdminProfilesController.php +++ b/controllers/admin/AdminProfilesController.php @@ -48,7 +48,7 @@ class AdminProfilesControllerCore extends AdminController 'align' => 'center', 'width' => 25 ), - 'name' => array('title' => $this->l('Name'), 'width' => 200) + 'name' => array('title' => $this->l('Name')) ); $this->identifier = 'id_profile'; diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php index 1bd5e313f..78e34ca35 100755 --- a/controllers/admin/AdminSpecificPriceRuleController.php +++ b/controllers/admin/AdminSpecificPriceRuleController.php @@ -57,8 +57,7 @@ class AdminSpecificPriceRuleController extends AdminController 'width' => 200 ), 'shop_name' => array( - 'title' => $this->l('Shop'), - 'width' => 300 + 'title' => $this->l('Shop') ), 'currency_name' => array( 'title' => $this->l('Currency'), diff --git a/controllers/admin/AdminStoresController.php b/controllers/admin/AdminStoresController.php index ced00f156..b4438adcc 100644 --- a/controllers/admin/AdminStoresController.php +++ b/controllers/admin/AdminStoresController.php @@ -65,7 +65,7 @@ class AdminStoresControllerCore extends AdminController 'name' => array('title' => $this->l('Name'), 'width' => 120, 'filter_key' => 'a!name'), 'phone' => array('title' => $this->l('Phone'), 'width' => 70), 'fax' => array('title' => $this->l('Fax'), 'width' => 70), - 'active' => array('title' => $this->l('Enabled'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false) + 'active' => array('title' => $this->l('Enabled'), 'width' => 70, 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false) ); $this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?'))); diff --git a/css/admin.css b/css/admin.css index 3a57d06f7..0571cb855 100644 --- a/css/admin.css +++ b/css/admin.css @@ -816,6 +816,11 @@ tr.deleted td { .hint p { color: #00529B; } + +.hint .addImageDescription { + font-weight:bold; + font-size:16px; +} div.hint { position: relative; }