From 05c2232daa2135eca7be5c8c97764fe8d41dd95a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Tue, 21 Feb 2023 17:07:03 +0100 Subject: [PATCH 1/4] Modals dashboard view fix --- pandora_console/include/javascript/pandora_dashboards.js | 1 - pandora_console/include/styles/pandora.css | 5 ++++- pandora_console/views/dashboard/list.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js index 02b8e47c08..d8bd2af733 100644 --- a/pandora_console/include/javascript/pandora_dashboards.js +++ b/pandora_console/include/javascript/pandora_dashboards.js @@ -412,7 +412,6 @@ function initialiceLayout(data) { widgetId: widgetId }, width: size.width, - maxHeight: size.height, minHeight: size.height }, onsubmit: { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 54d271ff5a..b6b23b4eff 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10591,7 +10591,7 @@ tr.bring_next_field { vertical-align: middle; text-align: left; min-width: 150px !important; - z-index: 60; + z-index: 1115; } .select2-container .select2-selection--single, @@ -11268,3 +11268,6 @@ form#satellite_conf_edit > fieldset.full-column { background-size: 24px; background-image: url("../../images/enable.svg"); } +div[role="dialog"] { + z-index: 1115; +} diff --git a/pandora_console/views/dashboard/list.php b/pandora_console/views/dashboard/list.php index 46b1cd68cc..b67fd88beb 100644 --- a/pandora_console/views/dashboard/list.php +++ b/pandora_console/views/dashboard/list.php @@ -217,7 +217,7 @@ if ($writeDashboards === 1) { $text = __('Create a new dashboard'); // Button for display modal options dashboard. - $output = ' $text, @@ -236,7 +236,7 @@ if ($writeDashboards === 1) { 'class="sub next"', true ); - $output .= ''; + $output .= ''; echo $output; From fe0bfbe9d6e243c93ee52c259487d20d5c4b0141 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 22 Feb 2023 08:08:11 +0100 Subject: [PATCH 2/4] Close mesage image fix --- pandora_console/include/functions_ui.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 9b3060d1f8..b97b828979 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -343,7 +343,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t [ 'href' => 'javascript: close_info_box(\''.$id.'\')', 'content' => html_print_image( - 'images/svg/fail.svg', + 'images/close@svg.svg', true, false, false, From 28d964651fa51d0ae05463ec4ca7c832273f4350 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 22 Feb 2023 08:12:45 +0100 Subject: [PATCH 3/4] Modal report issue change email input style --- pandora_console/include/styles/pandora.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b6b23b4eff..b154462933 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -6503,7 +6503,7 @@ form#modal_form_feedback label { font-size: 10pt; } -form#modal_form_feedback input[type="email"] { +/*form#modal_form_feedback input[type="email"] { background-color: transparent; border: none; border-radius: 0; @@ -6511,7 +6511,7 @@ form#modal_form_feedback input[type="email"] { padding: 0px 0px 2px 0px; box-sizing: border-box; margin-bottom: 4px; -} +}*/ form#modal_form_feedback ul.wizard li { padding-bottom: 10px; From 4d5891cd02a69a37c4a485d271d22986bcbfbd2c Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 22 Feb 2023 08:56:37 +0100 Subject: [PATCH 4/4] Select2 z-index for dialogs --- pandora_console/include/styles/pandora.css | 1 - pandora_console/include/styles/select2.min.css | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index b154462933..20c0884d93 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -10591,7 +10591,6 @@ tr.bring_next_field { vertical-align: middle; text-align: left; min-width: 150px !important; - z-index: 1115; } .select2-container .select2-selection--single, diff --git a/pandora_console/include/styles/select2.min.css b/pandora_console/include/styles/select2.min.css index ba24d67270..5e0b002480 100644 --- a/pandora_console/include/styles/select2.min.css +++ b/pandora_console/include/styles/select2.min.css @@ -71,7 +71,7 @@ position: absolute; left: -100000px; width: 100%; - z-index: 999; + z-index: 1115; } .select2-results { display: block; @@ -265,8 +265,8 @@ cursor: default; float: left; margin-right: 3px; - margin-top: 2px; - height: 17px; + margin-top: 2px; + height: 17px; padding: 0 5px; } .select2-container--default