diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js index dc07ec6e22..f6da2968e2 100755 --- a/pandora_console/godmode/reporting/visual_console_builder.editor.js +++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js @@ -742,8 +742,10 @@ function readFields() { var text = tinymce.get('text-label').getContent(); values['label'] = text; - if ($("input[name=percentile_label]").val().length > 0) - values['label'] = $("input[name=percentile_label]").val(); + if ($("input[name=percentile_label]").val().length > 0) { + values['percentile_label_color'] = $("input[name=percentile_label_color]").val(); + values['label'] = "" + $("input[name=percentile_label]").val() + ""; + } values['line-height'] = $("#text-label_ifr").contents().find("p").css('line-height'); values['type_graph'] = $("select[name=type_graph]").val(); @@ -784,7 +786,6 @@ function readFields() { values['event_max_time_row'] = $("select[name=event_max_time_row]").val(); values['type_percentile'] = $("select[name=type_percentile]").val(); values['percentile_color'] = $("input[name=percentile_color]").val(); - values['percentile_label_color'] = $("input[name=percentile_label_color]").val(); values['percentile_label'] = $("input[name=percentile_label]").val(); values['value_show'] = $("select[name=value_show]").val(); diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index 09fee29e70..d512fb0f5c 100755 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1867,7 +1867,9 @@ function visual_map_print_item($mode = "read", $layoutData, } echo $img; - echo io_safe_output($text); + + if (get_parameter('tab')=='editor') + echo "".io_safe_output($text).""; break; case PERCENTILE_BUBBLE: @@ -1911,7 +1913,9 @@ function visual_map_print_item($mode = "read", $layoutData, } echo $img; - echo io_safe_output($text); + + if (get_parameter('tab')=='editor') + echo "".io_safe_output($text).""; break; case CIRCULAR_PROGRESS_BAR: @@ -1955,7 +1959,9 @@ function visual_map_print_item($mode = "read", $layoutData, } echo $img; - echo io_safe_output($text); + + if (get_parameter('tab')=='editor') + echo "".io_safe_output($text).""; break; case CIRCULAR_INTERIOR_PROGRESS_BAR: @@ -2000,7 +2006,9 @@ function visual_map_print_item($mode = "read", $layoutData, } echo $img; - echo io_safe_output($text); + + if (get_parameter('tab')=='editor') + echo "".io_safe_output($text).""; break; case MODULE_GRAPH: diff --git a/pandora_console/include/functions_visual_map_editor.php b/pandora_console/include/functions_visual_map_editor.php index d658a53b67..9799c65b62 100755 --- a/pandora_console/include/functions_visual_map_editor.php +++ b/pandora_console/include/functions_visual_map_editor.php @@ -510,7 +510,7 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { __('Max value') . ' ' . html_print_input_text('max_percentile', 0, '', 3, 5, true) . ''; - $percentile_type = array('percentile' => __('Percentile'), 'bubble' => __('Bubble'), 'circular_progress_bar' => __('Circular porgress bar'), 'interior_circular_progress_bar' => __('Circular progress bar (interior)')); + $percentile_type = array('percentile' => __('Percentile'), 'bubble' => __('Bubble'), 'circular_progress_bar' => __('Circular progress bar'), 'interior_circular_progress_bar' => __('Circular progress bar (interior)')); $percentile_value = array('percent' => __('Percent'), 'value' => __('Value')); if (is_metaconsole()){ $form_items['percentile_item_row_3'] = array(); @@ -903,11 +903,6 @@ function visual_map_editor_print_item_palette($visualConsole_id, $background) { ';