diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 80e72e65cf..d48a4735a0 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1100,7 +1100,7 @@ $class = 'databox filters'; false, false, '', - 'fullwidth' + '' ); } else { html_print_input_text( @@ -1113,7 +1113,7 @@ $class = 'databox filters'; false, false, '', - 'fullwidth' + '' ); } ?> @@ -1160,7 +1160,7 @@ $class = 'databox filters'; @@ -1276,13 +1276,13 @@ $class = 'databox filters'; 'label', $label, '', - 50, + 80, 255, true, false, false, '', - 'fullwidth' + '' ); ?> @@ -3920,21 +3920,25 @@ print_SLA_list('100%', $action, $idItem); print_General_list('100%', $action, $idItem, $type); echo '
'; if ($action == 'new') { - html_print_submit_button( + $actionButtons = html_print_submit_button( __('Create item'), 'create_item', false, - 'class="sub wand"' + ['icon' => 'next'], + true ); } else { - html_print_submit_button( + $actionButtons = html_print_submit_button( __('Update item'), 'edit_item', false, - 'class="sub upd"' + ['icon' => 'next'], + true ); } +html_print_action_buttons($actionButtons, ['type' => 'form_action']); + echo '
'; echo ''; @@ -3980,7 +3984,7 @@ function print_SLA_list($width, $action, $idItem=null) $idItem ); ?> - +
@@ -4496,7 +4500,7 @@ function print_General_list($width, $action, $idItem=null, $type='general') include_once $config['homedir'].'/include/functions_html.php'; ?> - +
diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index ae2d92bfbc..71190bbe99 100755 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -204,7 +204,7 @@ $urlFilter = '&agent_filter='.$agentFilter.'&module_filter='.$moduleFilter.'&typ if (!defined('METACONSOLE')) { $table = new stdClass(); $table->width = '100%'; - $table->class = 'databox filters'; + $table->class = 'databox filters mrgn_btn_0'; $table->data[0][0] = __('Agents'); $table->data[0][0] .= html_print_select($agents, 'agent_filter', $agentFilter, '', __('All'), 0, true); $table->data[0][1] = __('Modules'); @@ -349,7 +349,7 @@ $table->style[0] = 'text-align: right;'; if ($items) { - $table->width = '98%'; + $table->width = '100%'; if (defined('METACONSOLE')) { $table->width = '100%'; $table->class = 'databox data'; @@ -687,7 +687,7 @@ if (defined('METACONSOLE')) { echo "
"; html_print_input_hidden('ids_items_to_delete', ''); - html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px"'); + html_print_submit_button(__('Delete'), 'delete_btn', false, 'class="sub delete right mrgn_btn_15px mrgn_right_20px"'); echo '
'; echo ''; } diff --git a/pandora_console/godmode/reporting/reporting_builder.main.php b/pandora_console/godmode/reporting/reporting_builder.main.php index 177c84d68d..e52634a065 100755 --- a/pandora_console/godmode/reporting/reporting_builder.main.php +++ b/pandora_console/godmode/reporting/reporting_builder.main.php @@ -41,22 +41,22 @@ $groups = users_get_groups(); switch ($action) { default: case 'new': - $actionButtonHtml = html_print_submit_button( + $actionButtons = html_print_submit_button( __('Save'), 'add', false, - 'class="sub wand"', + [ 'icon' => 'next' ], true ); $hiddenFieldAction = 'save'; break; case 'update': case 'edit': - $actionButtonHtml = html_print_submit_button( + $actionButtons = html_print_submit_button( __('Update'), 'edit', false, - 'class="sub upd"', + [ 'icon' => 'next' ], true ); $hiddenFieldAction = 'update'; @@ -191,22 +191,9 @@ if ($enterpriseEnable) { } $table->data['interactive_report'][0] = __('Non interactive report'); - $table->data['interactive_report'][1] = __('Yes'); - $table->data['interactive_report'][1] .= '   '; - $table->data['interactive_report'][1] .= html_print_radio_button( + $table->data['interactive_report'][1] .= html_print_checkbox_switch( 'non_interactive', 1, - '', - $non_interactive_check, - true - ); - $table->data['interactive_report'][1] .= '  '; - $table->data['interactive_report'][1] .= __('No'); - $table->data['interactive_report'][1] .= '   '; - $table->data['interactive_report'][1] .= html_print_radio_button( - 'non_interactive', - 0, - '', $non_interactive_check, true ); @@ -215,8 +202,8 @@ if ($enterpriseEnable) { $table->data['description'][0] = __('Description'); $table->data['description'][1] = html_print_textarea( 'description', - 5, - 15, + 2, + 80, $description, '', true @@ -244,7 +231,7 @@ echo ''; html_print_table($table); echo '
'; -echo $actionButtonHtml; +html_print_action_buttons($actionButtons, ['type' => 'form_action']); html_print_input_hidden('action', $hiddenFieldAction); html_print_input_hidden('id_report', $idReport); echo '
'; diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index fb55ed5593..7a044f273f 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -2150,7 +2150,7 @@ function html_print_extended_select_for_time( 'class' => $uniq_name.'_toggler '.$class.' invert_filter', 'alt' => __('Custom'), 'title' => __('Custom'), - 'style' => 'width: 18px; margin-bottom: -5px; margin-left: 10px'.$style_icon, + 'style' => 'width: 18px; margin-bottom: -5px; margin-left: 10px; padding-top: 10px;'.$style_icon, ], false, false, @@ -2162,7 +2162,7 @@ function html_print_extended_select_for_time( echo ''; - echo '
'; + echo '
'; html_print_input_text($uniq_name.'_text', $selected, '', $size, 255, false, $readonly, false, '', $class); html_print_input_hidden($name, $selected, false, $uniq_name); @@ -2178,7 +2178,7 @@ function html_print_extended_select_for_time( false, $class, $readonly, - 'padding: 0px 5px; height: 42px; margin: -6px 0 0 6px; width: 140px;'.$select_style, + ' margin-left: 5px; width: 140px;'.$select_style, false, false, false, @@ -2196,7 +2196,7 @@ function html_print_extended_select_for_time( 'class' => $uniq_name.'_toggler invert_filter', 'alt' => __('List'), 'title' => __('List'), - 'style' => 'width: 18px;margin-bottom: -5px;'.$style_icon, + 'style' => 'width: 18px;margin-bottom: -5px; padding-top: 10px;'.$style_icon, ] ).''; echo '
'; diff --git a/pandora_console/include/functions_reports.php b/pandora_console/include/functions_reports.php index 0d39f5b916..41356e9455 100755 --- a/pandora_console/include/functions_reports.php +++ b/pandora_console/include/functions_reports.php @@ -1059,7 +1059,7 @@ function get_table_custom_macros_report($data) $table = new StdClass(); $table->data = []; $table->width = '100%'; - $table->class = 'databox data fullwidth'; + $table->class = 'info_table'; $table->id = 'table-macros-definition'; $table->rowclass = []; diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index b97b828979..684f92e9a7 100755 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -5841,6 +5841,15 @@ function ui_print_agent_autocomplete_input($parameters) .attr("style", "background-image: url(\'"+image+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'"); } + $(document).ready(function () { + $("#'.$input_id.'").focusout(function (e) { + setTimeout(() => { + let iconImage = "'.$icon_image.'"; + $("#'.$input_id.'").attr("style", "background-image: url(\'"+iconImage+"\'); background-repeat: no-repeat; background-position: 97% center; background-size: 20px; '.$inputStyles.'"); + }, 100); + }); + }); + function set_functions_change_autocomplete_'.$input_name.'() { var cache_'.$input_name.' = {}; diff --git a/pandora_console/include/javascript/pandora.js b/pandora_console/include/javascript/pandora.js index 03c7308faf..661ed78545 100644 --- a/pandora_console/include/javascript/pandora.js +++ b/pandora_console/include/javascript/pandora.js @@ -894,7 +894,7 @@ function post_process_select_events(name) { function period_select_init(name, allow_zero) { // Manual mode is hidden by default $("#" + name + "_manual").css("display", "none"); - $("#" + name + "_default").css("display", "inline"); + $("#" + name + "_default").css("display", "flex"); // If the text input is empty, we put on it 5 minutes by default if ($("#text-" + name + "_text").val() == "") { $("#text-" + name + "_text").val(300); @@ -907,7 +907,7 @@ function period_select_init(name, allow_zero) { } } else if ($("#text-" + name + "_text").val() == 0 && allow_zero == 1) { $("#" + name + "_units option:last").prop("selected", false); - $("#" + name + "_manual").css("display", "inline"); + $("#" + name + "_manual").css("display", "flex"); $("#" + name + "_default").css("display", "none"); } } @@ -996,13 +996,13 @@ function selectFirst(name) { */ function toggleBoth(name) { if ($("#" + name + "_default").css("display") == "none") { - $("#" + name + "_default").css("display", "inline"); + $("#" + name + "_default").css("display", "flex"); } else { $("#" + name + "_default").css("display", "none"); } if ($("#" + name + "_manual").css("display") == "none") { - $("#" + name + "_manual").css("display", "inline"); + $("#" + name + "_manual").css("display", "flex"); } else { $("#" + name + "_manual").css("display", "none"); } 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/js/jquery-ui_custom.css b/pandora_console/include/styles/js/jquery-ui_custom.css index b0c0fce92e..d9adde2a0f 100644 --- a/pandora_console/include/styles/js/jquery-ui_custom.css +++ b/pandora_console/include/styles/js/jquery-ui_custom.css @@ -144,6 +144,7 @@ .ui_tpicker_second, .ui-slider-handle { border: 1px solid #aaaaaa; + background-color: #dadada !important; } .ui-timepicker-div dd { margin: 0px 15px 0px 15px; @@ -219,6 +220,23 @@ a.ui-button:active, border-bottom: 4px solid #82b92e; } +.ui-priority-secondary:hover { + content: ""; + position: absolute; + bottom: -5px; + width: 100%; + border-bottom: 5px solid #82b92e; +} + +.ui-priority-primary:hover { + content: ""; + position: absolute; + right: 5px; + bottom: -5px; + width: 100%; + border-bottom: 5px solid #82b92e; +} + .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css index 5ed8d43ef9..561ce60853 100644 --- a/pandora_console/include/styles/pandora.css +++ b/pandora_console/include/styles/pandora.css @@ -6511,7 +6511,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; @@ -6519,7 +6519,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; @@ -10599,7 +10599,6 @@ tr.bring_next_field { vertical-align: middle; text-align: left; min-width: 150px !important; - z-index: 60; } .select2-container .select2-selection--single, @@ -11277,3 +11276,17 @@ form#satellite_conf_edit > fieldset.full-column { background-size: 24px; background-image: url("../../images/enable.svg"); } + +.orientation-report { + margin-right: 10px; +} + +#textarea_header_tbl, +#textarea_firstpage_tbl, +#textarea_footer_tbl { + width: 80% !important; +} + +div[role="dialog"] { + z-index: 1115; +} 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 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;