diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 5c01d3383..299f96678 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -125,9 +125,9 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3} font-size:13px; text-align:left; color:#333;} .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} -.table tr td:hover table tr td{background:none} +.table tr.row_hover:hover td{background:#fff1b5} +.table tr.row_hover.filter:hover td{background:#F1F9FF} +.table tr td.row_hover:hover table tr td{background:none} .table tr.action_details td{background:#FAFAFA;} .table tr.alt_row.action_details td{background:#E8E8E8;} .table tr td.empty{border-bottom:none;background:white!important} diff --git a/admin-dev/themes/default/template/helper/list/list_content.tpl b/admin-dev/themes/default/template/helper/list/list_content.tpl index 2f686b398..98e40a89f 100644 --- a/admin-dev/themes/default/template/helper/list/list_content.tpl +++ b/admin-dev/themes/default/template/helper/list/list_content.tpl @@ -28,7 +28,7 @@ {foreach $list AS $index => $tr} diff --git a/admin-dev/themes/default/template/helper/list/list_header.tpl b/admin-dev/themes/default/template/helper/list/list_header.tpl index cc68edb9f..089c9d540 100644 --- a/admin-dev/themes/default/template/helper/list/list_header.tpl +++ b/admin-dev/themes/default/template/helper/list/list_header.tpl @@ -166,7 +166,7 @@ {/if} {if !$simple_header} - + {if $has_bulk_actions} -- diff --git a/classes/AdminController.php b/classes/AdminController.php index b0fc38207..c55b6d4bb 100644 --- a/classes/AdminController.php +++ b/classes/AdminController.php @@ -226,15 +226,17 @@ class AdminControllerCore extends Controller protected $noLink; protected $specificConfirmDelete; protected $colorOnBackground; + /** @var bool If true, activates color on hover */ + protected $row_hover = true; /** @string Action to perform : 'edit', 'view', 'add', ... */ protected $action; protected $display; protected $_includeContainer = true; public $tpl_folder; - + protected $bo_theme; - + /** @var bool Redirect or not ater a creation */ protected $_redirect = true; @@ -1575,6 +1577,7 @@ class AdminControllerCore extends Controller $helper->default_form_language = $this->default_form_language; $helper->allow_employee_form_lang = $this->allow_employee_form_lang; $helper->multiple_fieldsets = $this->multiple_fieldsets; + $helper->row_hover = $this->row_hover; // For each action, try to add the corresponding skip elements list $helper->list_skip_actions = $this->list_skip_actions; diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php index 980635f57..a5e7d8d71 100644 --- a/classes/helper/HelperList.php +++ b/classes/helper/HelperList.php @@ -97,6 +97,9 @@ class HelperListCore extends Helper public $specificConfirmDelete; public $colorOnBackground; + /** @var bool If true, activates color on hover */ + public $row_hover = true; + protected $identifiersDnd = array( 'id_product' => 'id_product', 'id_category' => 'id_category_to_move', @@ -335,6 +338,7 @@ class HelperListCore extends Helper 'has_actions' => !empty($this->actions), 'has_bulk_actions' => !empty($this->bulk_actions), 'list_skip_actions' => $this->list_skip_actions, + 'row_hover' => $this->row_hover, ))); return $this->content_tpl->fetch(); } @@ -620,6 +624,7 @@ class HelperListCore extends Helper 'table_dnd' => isset($table_dnd) ? $table_dnd : null, 'name' => isset($name) ? $name : null, 'name_id' => isset($name_id) ? $name_id : null, + 'row_hover' => $this->row_hover, ))); return $this->header_tpl->fetch();