';
if($action == 'new'){
- html_print_submit_button ($textButtonSubmit, 'update_layout', true,
+ html_print_submit_button ($textButtonSubmit, 'update_layout', false,
'class="' . $classButtonSubmit . '"');
}
else{
diff --git a/pandora_console/godmode/reporting/visual_console_builder.editor.js b/pandora_console/godmode/reporting/visual_console_builder.editor.js
index 5eef61cdc3..7a79bbc768 100755
--- a/pandora_console/godmode/reporting/visual_console_builder.editor.js
+++ b/pandora_console/godmode/reporting/visual_console_builder.editor.js
@@ -195,8 +195,10 @@ function update_button_palette_callback() {
else {
$("#image_" + idItem).removeAttr('width');
$("#image_" + idItem).removeAttr('height');
- $("#" + idItem).css('width', '');
- $("#" + idItem).css('height', '');
+ $("#" + idItem +" img").css('width', '70px');
+ $("#" + idItem +" img").css('height', '70px');
+ $("#" + idItem).css('width', '70px');
+ $("#" + idItem).css('height', '70px');
}
break;
case 'percentile_bar':
@@ -237,8 +239,11 @@ function update_button_palette_callback() {
else {
$("#image_" + idItem).removeAttr('width');
$("#image_" + idItem).removeAttr('height');
- $("#" + idItem).css('width', '');
- $("#" + idItem).css('height', '');
+ $("#" + idItem).css('width', '70px');
+ $("#" + idItem).css('height', '70px');
+
+ $("#" + idItem +" img").css('width', '70px');
+ $("#" + idItem +" img").css('height', '70px');
}
var image = values['image'] + ".png";
set_image("image", idItem, image);
@@ -1253,8 +1258,8 @@ function setModuleGraph(id_data) {
id_agente_modulo = data['id_agente_modulo'];
id_custom_graph = data['id_custom_graph'];
label = data['label'];
- height = (data['height'] + 60);
- width = (data['width'] + 60);
+ height = (data['height']);
+ width = (data['width']);
period = data['period'];
background_color = data['image'];
@@ -1291,7 +1296,15 @@ function setModuleGraph(id_data) {
$('#' + id_data).html(data['url']);
}
else {
- $("#image_" + id_data).attr('src', data['url']);
+ if($("#module_row").css('display')!='none'){
+ $("#" + id_data + " img").attr('src', 'images/console/signes/module_graph.png');
+ $("#" + id_data + " img").css('width', $('#text-width_module_graph').val()+'px');
+ $("#" + id_data + " img").css('height', $('#text-height_module_graph').val()+'px');
+ }else{
+ $("#" + id_data + " img").attr('src', 'images/console/signes/custom_graph.png');
+ $("#" + id_data + " img").css('width', $('#text-width_module_graph').val()+'px');
+ $("#" + id_data + " img").css('height', $('#text-height_module_graph').val()+'px');
+ }
}
}
});
@@ -1320,7 +1333,7 @@ function setModuleValue(id_data, process_simple_value, period) {
success: function (data) {
var currentValue = $("#text_" + id_data).html();
currentValue = currentValue.replace(/_VALUE_/gi, data.value);
- $("#text_" + id_data).html(currentValue);
+ $("#text_" + id_data).html('Data value');
}
});
}
@@ -1377,7 +1390,11 @@ function setPercentileBar(id_data, values) {
'width=' + width_percentile + '&mode=1&progress=' + percentile +
'&font=' + font + '&value_text=' + value_text + '&colorRGB=' + colorRGB;
- $("#image_" + id_data).attr('src', img);
+ $("#"+ id_data).attr('src', img);
+
+ $("#" + id_data + " img").attr('src', 'images/console/signes/percentil.png');
+ $("#" + id_data + " img").css('width', $('#text-width_percentile').val()+'px');
+ $("#" + id_data + " img").css('height', '30px');
}
});
}
@@ -1432,6 +1449,11 @@ function setPercentileBubble(id_data, values) {
'&font=' + font + '&value_text=' + value_text + '&colorRGB=' + colorRGB;
$("#image_" + id_data).attr('src', img);
+
+ $("#" + id_data + " img").attr('src', 'images/console/signes/percentil_bubble.png');
+ $("#" + id_data + " img").css('width', $('#text-width_percentile').val()+'px');
+ $("#" + id_data + " img").css('height', $('#text-width_percentile').val()+'px');
+
}
});
}
@@ -2775,6 +2797,7 @@ function showPreviewStaticGraph(staticGraph) {
jQuery.each(data, function(i, line) {
$("#preview").append(line);
+ $('#preview > img').css({'max-width':'70px','max-height':'70px'});
});
}
});
@@ -2816,6 +2839,7 @@ function showPreviewIcon(icon) {
$("#preview")
.empty()
.append(data);
+ $('#preview > img').css({'max-width':'70px','max-height':'70px'});
}
});
}
diff --git a/pandora_console/godmode/reporting/visual_console_builder.wizard.php b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
index caf62aafe1..10096ec291 100644
--- a/pandora_console/godmode/reporting/visual_console_builder.wizard.php
+++ b/pandora_console/godmode/reporting/visual_console_builder.wizard.php
@@ -137,7 +137,23 @@ $table->data["staticgraph_modulegraph"][1] .= ' ' .
__('Height') . ': ' .
html_print_input_text('height', 0, '', 5, 5, true);
- $fontf = array('comic sans ms' => 'comic sans ms');
+ $fontf = array('andale mono,times' => 'Andale Mono',
+ 'arial,helvetica,sans-serif' => 'Arial',
+ 'arial black,avant garde' => 'Arial Black',
+ 'comic sans ms,sans-serif' => 'Comic Sans MS',
+ 'courier new,courier' => 'Courier New',
+ 'georgia,palatino' => 'Georgia',
+ 'helvetica,impact' => 'Helvetica',
+ 'impact,chicago' => 'Impact',
+ 'symbol' => 'Symbol',
+ 'tahoma,arial,helvetica,sans-serif' => 'Tahoma',
+ 'terminal,monaco' => 'Terminal',
+ 'times new roman,times' => 'Times New Roman',
+ 'trebuchet ms,geneva' => 'Trebuchet MS',
+ 'verdana,geneva' => 'Verdana',
+ 'Webdings' => 'Webdings',
+ 'Wingdings' => 'Wingdings'
+ );
$table->rowstyle['all_9'] = 'display: none;';
$table->data['all_9'][0] = __('Font');
diff --git a/pandora_console/images/console/icons/_building_verde.png b/pandora_console/images/console/icons/_building_ok.png
similarity index 100%
rename from pandora_console/images/console/icons/_building_verde.png
rename to pandora_console/images/console/icons/_building_ok.png
diff --git a/pandora_console/images/console/signes/custom_graph.png b/pandora_console/images/console/signes/custom_graph.png
new file mode 100644
index 0000000000..fec62c446d
Binary files /dev/null and b/pandora_console/images/console/signes/custom_graph.png differ
diff --git a/pandora_console/images/console/signes/module_graph.png b/pandora_console/images/console/signes/module_graph.png
new file mode 100644
index 0000000000..c145c64370
Binary files /dev/null and b/pandora_console/images/console/signes/module_graph.png differ
diff --git a/pandora_console/images/console/signes/percentil.png b/pandora_console/images/console/signes/percentil.png
new file mode 100644
index 0000000000..3fe8ae74de
Binary files /dev/null and b/pandora_console/images/console/signes/percentil.png differ
diff --git a/pandora_console/images/console/signes/percentil_bubble.png b/pandora_console/images/console/signes/percentil_bubble.png
new file mode 100644
index 0000000000..a804787dfd
Binary files /dev/null and b/pandora_console/images/console/signes/percentil_bubble.png differ
diff --git a/pandora_console/images/console/signes/service.png b/pandora_console/images/console/signes/service.png
new file mode 100644
index 0000000000..e06c630942
Binary files /dev/null and b/pandora_console/images/console/signes/service.png differ
diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php
index bc6ecaafb0..e972eb0eb7 100755
--- a/pandora_console/include/functions_visual_map.php
+++ b/pandora_console/include/functions_visual_map.php
@@ -750,8 +750,6 @@ function visual_map_print_item($mode = "read", $layoutData,
$percentile = 100;
break;
case MODULE_GRAPH:
- $width += 60;
- $height += 60;
if (!empty($proportion)) {
$width =
((integer)($proportion['proportion_width'] * $width));
@@ -771,11 +769,23 @@ function visual_map_print_item($mode = "read", $layoutData,
$only_image = !$graph_javascript || $isExternalLink;
if ($layoutData['id_custom_graph'] != 0) {
// Show only avg on the visual console
- $img = custom_graphs_print(
+ if(get_parameter('action') == 'edit'){
+
+ $img = '
';
+
+ }
+ else{
+
+ $img = custom_graphs_print(
$layoutData['id_custom_graph'], $height, $width,
$period, null, true, 0, false, $layoutData['image'],
array(), '', array(), array(), true,
false, false, true, 1, false, true);
+
+ }
+
+
+
}
else {
if ($isExternalLink)
@@ -783,11 +793,20 @@ function visual_map_print_item($mode = "read", $layoutData,
else
$homeurl = '';
+ if(get_parameter('action') == 'edit'){
+
+ $img = '
';
+
+ }
+ else{
+
$img = grafico_modulo_sparse($id_module, $period, 0,$width,$height,
'',null,
false, 1, false, 0, '', 0, 0, true, false, '', 1, false,
'', false, false, false, $layoutData['image'], null, true, false,$type_graph);
- }
+
+ }
+ }
//Restore db connection
if ($layoutData['id_metaconsole'] != 0) {
@@ -903,6 +922,10 @@ function visual_map_print_item($mode = "read", $layoutData,
$img_style_title .= "
" . __("Last value: ") .
$value;
}
+
+ if(get_parameter('action') == 'edit'){
+ $img_style_title = '';
+ }
}
if (!empty($proportion)) {
@@ -937,6 +960,8 @@ function visual_map_print_item($mode = "read", $layoutData,
echo html_print_image($img, true,
array("class" => "image",
"id" => "image_" . $id,
+ "width" => "70px",
+ "height" => "70px",
"title" => $img_style_title,
"style" => $borderStyle), false,
false, false, $isExternalLink);
@@ -947,6 +972,50 @@ function visual_map_print_item($mode = "read", $layoutData,
break;
case PERCENTILE_BAR:
+ $progress_bar_heigh = 15;
+ if (!empty($proportion)) {
+ if ($width != 0) {
+ $width = (integer)($proportion['proportion_width'] * $width);
+ }
+ else {
+ $width = (integer)($proportion['proportion_width'] * $infoImage[0]);
+ }
+
+ if ($height != 0) {
+ $height = (integer)($proportion['proportion_height'] * $height);
+ $progress_bar_heigh = $progress_bar_heigh * $proportion['proportion_height'];
+ }
+ else {
+ $height = (integer)($proportion['proportion_height'] * $infoImage[1]);
+ }
+ }
+ echo io_safe_output($text) . '
';
+
+ ob_start();
+ if ($type == PERCENTILE_BUBBLE) {
+ echo progress_bubble($percentile, $width, $width, '', 1, $value_text, $colorStatus);
+ }
+ else {
+ echo progress_bar($percentile, $width, $progress_bar_heigh, '', 1, $value_text, $colorStatus);
+ }
+ $img = ob_get_clean();
+
+
+ if(get_parameter('action') == 'edit'){
+
+ $img = '
';
+
+ }
+ else{
+
+ $img = str_replace('>', 'class="image" id="image_' . $id . '" />', $img);
+
+ }
+
+ echo $img;
+
+ break;
+
case PERCENTILE_BUBBLE:
$progress_bar_heigh = 15;
if (!empty($proportion)) {
@@ -975,8 +1044,21 @@ function visual_map_print_item($mode = "read", $layoutData,
echo progress_bar($percentile, $width, $progress_bar_heigh, '', 1, $value_text, $colorStatus);
}
$img = ob_get_clean();
+
+
+ if(get_parameter('action') == 'edit'){
+
+ $img = '
';
+
+ }
+ else{
+
$img = str_replace('>', 'class="image" id="image_' . $id . '" />', $img);
- echo $img;
+
+ }
+
+ echo $img;
+
break;
case MODULE_GRAPH:
@@ -1032,7 +1114,18 @@ function visual_map_print_item($mode = "read", $layoutData,
$io_safe_output_text = str_replace(array('_VALUE_','_value_'), $value, $io_safe_output_text);
+
+
+ if(get_parameter('action') == 'edit'){
+
+ echo 'Data value';
+
+ }
+ else{
+
echo $io_safe_output_text;
+
+ }
//Restore db connection
@@ -1078,7 +1171,8 @@ function visual_map_print_item($mode = "read", $layoutData,
false, false, $isExternalLink);
else
echo html_print_image($img, true,
- array("class" => "image", "id" => "image_" . $id),
+ array("class" => "image", "id" => "image_" . $id,"width" => "70px",
+ "70px" => "$height"),
false, false, false, $isExternalLink);
echo '
';
}
diff --git a/pandora_console/include/javascript/jquery.pandora.js b/pandora_console/include/javascript/jquery.pandora.js
index a924b8e108..870e86ddcd 100644
--- a/pandora_console/include/javascript/jquery.pandora.js
+++ b/pandora_console/include/javascript/jquery.pandora.js
@@ -72,6 +72,22 @@ $(document).ready (function () {
);
return false;
});
+
+ $("a.modalpopup").click (function () {
+ $('body').append( "
" );
+ jQuery.get ("ajax.php",
+ {"page": "general/alert_enterprise",
+ "message":$(this).attr("id")},
+ function (data, status) {
+ $("#alert_messages").hide ()
+ .empty ()
+ .append (data)
+ .show ();
+ },
+ "html"
+ );
+ return false;
+ });
// Creacion de ventana modal y botones
diff --git a/pandora_console/operation/visual_console/render_view.php b/pandora_console/operation/visual_console/render_view.php
index e2f7aedf24..175fd83b9c 100755
--- a/pandora_console/operation/visual_console/render_view.php
+++ b/pandora_console/operation/visual_console/render_view.php
@@ -276,5 +276,12 @@ $ignored_params['refr'] = '';
$('#hidden-vc_refr').val($('#refr option:selected').val());
});
}
+
+
+ $(".module_graph").each(function(){
+ left = parseInt($(this).css("left")) + 150;
+ $(this).css('left', left);
+ });
+
});
