diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 4c97f071f5..c72aa9d77d 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -583,7 +583,7 @@ function initialiceLayout(data) { success: function(data) { $("#modal-add-widget").empty(); $("#modal-add-widget").append(data); - $("a.pagination").click(function() { + $("a.pandora_pagination").click(function() { var offset = $(this) .attr("href") .split("=") diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css index 3387797c6c..dd93f85bba 100644 --- a/pandora_console/include/styles/dashboards.css +++ b/pandora_console/include/styles/dashboards.css @@ -28,6 +28,10 @@ ul.mn { justify-content: center; } +#menu_tab { + margin: 0px; +} + #menu_tab li.nomn.tab_operation img, #menu_tab li.nomn.tab_godmode img, #menu_tab li.nomn_high.tab_operation img, @@ -111,8 +115,6 @@ h1 { } .grid-stack-item .grid-stack-item-content .header-widget { - background-color: black; - color: #fff; display: flex; flex-direction: row; align-items: center; diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 02f14314ab..3f6b2ea450 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10639,12 +10639,14 @@ table tr td:first-child { input[type="color"] { background: transparent; - padding: 0 10px; - width: 50px; box-sizing: initial; - border: 2px solid #14524f; - box-shadow: 0px 3px 6px #c7c7c7; - border-radius: 16px; + height: 25px; + width: 50px; + padding: 0px; + margin: 0px; + border: 0px; + border-radius: 0px; + box-shadow: none; } span.ColorPickerDivSample { diff --git a/pandora_console/views/dashboard/cell.php b/pandora_console/views/dashboard/cell.php index a7da170e7f..dea56fa485 100644 --- a/pandora_console/views/dashboard/cell.php +++ b/pandora_console/views/dashboard/cell.php @@ -49,7 +49,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) { if ((int) $cellData['id_widget'] !== 0) { $output .= ''; $output .= html_print_image( - 'images/input_cog_white.png', + 'images/configuration@svg.svg', true, [ 'width' => '16px', @@ -61,7 +61,7 @@ if ($manageDashboards !== 0 || $writeDashboards !== 0) { $output .= ''; $output .= html_print_image( - 'images/input_delete_white.png', + 'images/delete.svg', true, [ 'width' => '16px', diff --git a/pandora_console/views/dashboard/header.php b/pandora_console/views/dashboard/header.php index 9eac0b1b00..257b71b96f 100644 --- a/pandora_console/views/dashboard/header.php +++ b/pandora_console/views/dashboard/header.php @@ -273,22 +273,20 @@ if (isset($config['public_dashboard']) === true } if ($publicLink === false) { - if ((bool) is_metaconsole() === true) { - ui_meta_print_header( - __('Dashboards').' ยป '.__('List'), - false, - $buttons - ); - } else { - ui_print_page_header( - $dashboardName, - '', - false, - '', - false, - $buttons - ); - } + ui_print_standard_header( + $dashboardName, + '', + false, + '', + true, + $buttons, + [ + [ + 'link' => '', + 'label' => __('Dashboard'), + ], + ] + ); } else { $output = '
'; foreach ($buttons as $key => $value) { diff --git a/pandora_console/views/dashboard/widget.php b/pandora_console/views/dashboard/widget.php index 5ef43ca805..9c9fca6c83 100644 --- a/pandora_console/views/dashboard/widget.php +++ b/pandora_console/views/dashboard/widget.php @@ -36,7 +36,10 @@ if ((int) $cellData['id_widget'] !== 0 || $widgetId !== 0) { 'add-widget-'.$cellData['id'], false, '', - 'class="sub cog add-widget"', + [ + 'icon' => 'cog', + 'mode' => 'secondary mini', + ], true );