tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-7317-11690-problema-grave-consolas-visuales-modo-legacy-activado' into 'develop' 

fixeed visual error vc legacy mode

See merge request artica/pandorafms!4036
This commit is contained in:
vgilc 2021-04-20 07:30:11 +00:00
parent 20fe99ef29 4655668ca4
commit 55677850a6
4 changed files with 80 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/visual_console_builder.editor.php
View File

@ -85,7 +85,7 @@ visual_map_editor_print_item_palette($visualConsole['id'], $background);
if (!defined('METACONSOLE')) {
echo '<div id="frame_view" class="frame_view_meta">';
} else {
echo '<div id="frame_view" class="frame_view_node">';
echo '<div id="frame_view" class="frame_view_node mrgn_top_meta_35px">';
}
echo '<div id="background" class="" style="top:0px;

7
pandora_console/include/functions_html.php
View File

@ -718,7 +718,8 @@ function html_print_select(
$select_all=false,
$simple_multiple_options=false,
$required=false,
$truncate_size=false
$truncate_size=false,
$select2_enable=true
) {
$output = "\n";
@ -890,7 +891,7 @@ function html_print_select(
$select2 = 'select2_dark.min';
}
if ($multiple === false) {
if ($multiple === false && $select2_enable === true) {
if (is_ajax()) {
$output .= '<script src="';
$output .= ui_get_full_url(
@ -5400,4 +5401,4 @@ function html_print_select_search(
} else {
echo $output;
}
}
}

80
pandora_console/include/functions_visual_map_editor.php
View File

@ -336,7 +336,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
'icon',
'group_item',
];
$form_items['preview_row']['html'] = '<td align="left" colspan="2" class="right">'.'<div id="preview" class="right"></div></td>';
$form_items['preview_row']['html'] = '<td align="left" colspan="2">'.'<div id="preview" class="right"></div></td>';
$form_items['background_color'] = [];
$form_items['background_color']['items'] = [
@ -358,6 +358,18 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
'white',
true,
false,
false,
'',
false,
'',
false,
false,
false,
'',
false,
false,
false,
false,
false
).'</td>';
@ -510,7 +522,29 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
$form_items['event_max_time_row'] = [];
$form_items['event_max_time_row']['items'] = ['auto_sla_graph'];
$form_items['event_max_time_row']['html'] = '<td align="left">'.__('Max. Time').'</td>
<td align="left">'.html_print_select($event_times, 'event_max_time_row', '', '', 0, 86400, true, false, false).'</td>';
<td align="left">'.html_print_select(
$event_times,
'event_max_time_row',
'',
'',
0,
86400,
true,
false,
false,
'',
false,
'',
false,
false,
false,
'',
false,
false,
false,
false,
false
).'</td>';
$form_items['type_graph'] = [];
$form_items['type_graph']['items'] = [
@ -530,6 +564,18 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
'area',
true,
false,
false,
'',
false,
'',
false,
false,
false,
'',
false,
false,
false,
false,
false
).'</td>';
@ -800,7 +846,29 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
$form_items['bars_graph_type'] = [];
$form_items['bars_graph_type']['items'] = ['bars_graph'];
$form_items['bars_graph_type']['html'] = '<td align="left">'.__('Type').'</td>
<td align="left">'.html_print_select($bars_graph_types, 'bars_graph_type', 'vertical', '', '', '', true).'</td>';
<td align="left">'.html_print_select(
$bars_graph_types,
'bars_graph_type',
'vertical',
'',
'',
'',
true,
false,
true,
'',
false,
'',
false,
false,
false,
'',
false,
false,
false,
false,
false
).'</td>';
// Insert and modify before the buttons to create or update.
if (enterprise_installed()) {
@ -809,11 +877,11 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
$form_items['button_update_row'] = [];
$form_items['button_update_row']['items'] = ['datos'];
$form_items['button_update_row']['html'] = '<td align="left" colspan="2" class="right">'.html_print_button(__('Cancel'), 'cancel_button', false, 'cancel_button_palette_callback();', 'class="sub cancel"', true).'<span ="margin-right:10px;">&nbsp</span>'.html_print_button(__('Update'), 'update_button', false, 'update_button_palette_callback();', 'class="sub upd"', true).'</td>';
$form_items['button_update_row']['html'] = '<td align="left" colspan="2" style="text-align: right;">'.html_print_button(__('Cancel'), 'cancel_button', false, 'cancel_button_palette_callback();', 'class="sub cancel"', true).'<span ="margin-right:10px;">&nbsp</span>'.html_print_button(__('Update'), 'update_button', false, 'update_button_palette_callback();', 'class="sub upd"', true).'</td>';
$form_items['button_create_row'] = [];
$form_items['button_create_row']['items'] = ['datos'];
$form_items['button_create_row']['html'] = '<td align="left" colspan="2" class="right">'.html_print_button(__('Cancel'), 'cancel_button', false, 'cancel_button_palette_callback();', 'class="sub cancel"', true).'<span ="margin-right:10px;">&nbsp</span>'.html_print_button(__('Create'), 'create_button', false, 'create_button_palette_callback();', 'class="sub wand"', true).'</td>';
$form_items['button_create_row']['html'] = '<td align="left" colspan="2" style="text-align: right;">'.html_print_button(__('Cancel'), 'cancel_button', false, 'cancel_button_palette_callback();', 'class="sub cancel"', true).'<span ="margin-right:10px;">&nbsp</span>'.html_print_button(__('Create'), 'create_button', false, 'create_button_palette_callback();', 'class="sub wand"', true).'</td>';
foreach ($form_items as $item => $item_options) {
echo '<tr id="'.$item.'" class="'.implode(' ', (array) $item_options['items']).'">';
@ -829,7 +897,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background)
</td>
</tr>
</tbody>
<tbody id="advance_options" class="invisible">
<tbody id="advance_options" style="display: none">
<?php
$form_items_advance = [];

2
pandora_console/include/styles/pandora.css
View File

@ -8348,7 +8348,7 @@ span,
float: right;
margin-right: 100px;
}
.steps_vsmap {
div.steps_vsmap {
display: none;
position: absolute;
z-index: 99;