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

Fixed style of visual mapwidget in dashboards. Gitlab: #374

This commit is contained in:
m-lopez-f 2017-03-03 12:50:03 +01:00
parent a1667fd129
commit b8f6b9fad4
3 changed files with 155 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
pandora_console/include/functions_visual_map.php
View File

@ -124,105 +124,83 @@ function visual_map_print_item($mode = "read", $layoutData,
$text = '<span id="text_' . $id . '" class="text">' . $label .'</span>'; $text = '<span id="text_' . $id . '" class="text">' . $label .'</span>';
if($height == 0){ if ($height == 0) {
switch($type) {
switch($type){
case 0: case 0:
case 11: case 11:
$tableheight0 = '70'; $tableheight0 = '70';
break; break;
case 3: case 3:
$tableheight0 = '30'; $tableheight0 = '30';
break; break;
case 9: case 9:
$tableheight0 = '130'; $tableheight0 = '130';
break; break;
case 1: case 1:
$tableheight0 = '180'; $tableheight0 = '180';
break; break;
case SERVICE: case SERVICE:
$tableheight0 = '50'; $tableheight0 = '50';
break; break;
} }
} }
else{ else {
$tableheight0 = $height; $tableheight0 = $height;
} }
if ($layoutData['width'] == 0 || $layoutData['height'] == 0){
switch($type){
if ($layoutData['width'] == 0 || $layoutData['height'] == 0) {
switch($type) {
case 0: case 0:
case 11: case 11:
$himg = '70'; $himg = '70';
$wimg ='70'; $wimg ='70';
break; break;
case 3: case 3:
if (get_parameter('action') == 'edit') {
if(get_parameter('action') == 'edit'){
$himg = '30'; $himg = '30';
$wimg = '150'; $wimg = '150';
} }
else{ else{
$himg = '15'; $himg = '15';
$wimg = '150'; $wimg = '150';
} }
break; break;
case 9: case 9:
$himg = '130'; $himg = '130';
$wimg = '130'; $wimg = '130';
break; break;
case 1: case 1:
$himg = '180'; $himg = '180';
$wimg = '300'; $wimg = '300';
break; break;
case SERVICE: case SERVICE:
$himg = '50'; $himg = '50';
$wimg = '150'; $wimg = '150';
break; break;
} }
} }
else{ else {
$wimg = $layoutData['width']; $wimg = $layoutData['width'];
$himg = $layoutData['height']; $himg = $layoutData['height'];
if($type == 3){ if ($type == 3) {
if(get_parameter('action') == 'edit'){ if(get_parameter('action') == 'edit')
$himg = '30'; $himg = '30';
else
}
else{
$himg = '15'; $himg = '15';
} }
} if ($type == 9) {
if($type == 9){
$himg = $wimg; $himg = $wimg;
} }
} }
if($label_position == 'left'){ if ($label_position == 'left') {
$text = '<table style="float:left;height:'.$himg.'px;"><tr><td></td></tr><tr><td><span id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>'; $text = '<table style="float:left;height:'.$himg.'px;"><tr><td></td></tr><tr><td><span id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>';
} }
else if($label_position == 'right'){ elseif ($label_position == 'right') {
$text = '<table style="float:right;height:'.$himg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>'; $text = '<table style="float:right;height:'.$himg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>';
} }
else{ else {
$text = '<table style="width:'.$wimg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>'; $text = '<table style="width:'.$wimg.'px;"><tr><td></td></tr><tr><td><span style="" id="text_' . $id . '" class="text">' . $label .'</span></td></tr><tr><td></td></tr></table>';
} }
@ -276,9 +254,7 @@ else{
case GROUP_ITEM: case GROUP_ITEM:
if ($layoutData['enable_link'] if ($layoutData['enable_link']
&& can_user_access_node()) { && can_user_access_node()) {
$link = true; $link = true;
} }
break; break;
case LABEL: case LABEL:
@ -1013,10 +989,11 @@ else{
false, $type_graph) . '</div>'; false, $type_graph) . '</div>';
} }
else { else {
$img = grafico_modulo_sparse($id_module, $period, 0,300,180, $img = grafico_modulo_sparse($id_module,
'',null, $period, 0, 300, 180, '',null, false, 1,
false, 1, false, 0, '', 0, 0, true, $only_image, '', 1, false, false, 0, '', 0, 0, true, $only_image, '',
'', false, false, false, $layoutData['image'], null, true, false,$type_graph); 1, false, '', false, false, false,
$layoutData['image'], null, true, false, $type_graph);
} }
} }
else{ else{
@ -1237,7 +1214,6 @@ else{
break; break;
case PERCENTILE_BAR: case PERCENTILE_BAR:
$imgpos = ''; $imgpos = '';
if($layoutData['label_position']=='left'){ if($layoutData['label_position']=='left'){
@ -1278,21 +1254,16 @@ else{
} }
$img = ob_get_clean(); $img = ob_get_clean();
if (get_parameter('action') == 'edit') {
if(get_parameter('action') == 'edit'){ if ($width == 0) {
if($width == 0){
$img = '<img src="images/console/signes/percentil.png" style="width:130px;height:30px;'.$imgpos.'">'; $img = '<img src="images/console/signes/percentil.png" style="width:130px;height:30px;'.$imgpos.'">';
} }
else{ else {
$img = '<img src="images/console/signes/percentil.png" style="width:'.$width.'px;height:30px;'.$imgpos.'">'; $img = '<img src="images/console/signes/percentil.png" style="width:'.$width.'px;height:30px;'.$imgpos.'">';
} }
} }
else{ else{
$img = str_replace('>', 'class="image" style="height:'.$himg.'px;width:'.$wimg.'px;'.$imgpos.'" id="image_' . $id . '" />', $img); $img = str_replace('>', 'class="image" style="height:'.$himg.'px;width:'.$wimg.'px;'.$imgpos.'" id="image_' . $id . '" />', $img);
} }
echo $img; echo $img;

2
pandora_console/include/graphs/fgraph.php
View File

@ -399,7 +399,7 @@ function stacked_line_graph($flash_chart, $chart_data, $width, $height,
false, false,
'', '',
$menu, $menu,
$background_color, $backgroundColor,
$dashboard, $dashboard,
$vconsole); $vconsole);
} }

102
pandora_console/operation/visual_console/render_view.php
View File

@ -100,7 +100,10 @@ if ($vconsole_write || $vconsole_manage) {
$hash = md5($config["dbpass"] . $id_layout . $config["id_user"]); $hash = md5($config["dbpass"] . $id_layout . $config["id_user"]);
$options['public_link']['text'] = '<a href="' . ui_get_full_url('operation/visual_console/public_console.php?hash='.$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]) . '" target="_blank">'. $options['public_link']['text'] = '<a href="' .
ui_get_full_url('operation/visual_console/public_console.php?hash=' .
$hash.'&id_layout='.$id_layout.'&id_user='.$config["id_user"]) .
'" target="_blank">'.
html_print_image ("images/camera_mc.png", true, html_print_image ("images/camera_mc.png", true,
array ("title" => __('Show link to public Visual Console'))).'</a>'; array ("title" => __('Show link to public Visual Console'))).'</a>';
$options['public_link']['active'] = false; $options['public_link']['active'] = false;
@ -237,32 +240,10 @@ $ignored_params['refr'] = '';
$('#background_<?php echo $id_layout; ?>').html(respuestaSolicitud); $('#background_<?php echo $id_layout; ?>').html(respuestaSolicitud);
startCountDown(refr, false); startCountDown(refr, false);
}); });
} }
}); });
} }
//~ var fetchMap = function () {
//~ $.ajax({
//~ url: 'ajax.php',
//~ type: 'GET',
//~ dataType: 'html',
//~ data: {
//~ page: 'include/ajax/visual_console.ajax',
//~ render_map: true,
//~ keep_aspect_ratio: true,
//~ id_visual_console: <?php echo $id_layout; ?>,
//~ graph_javascript: <?php echo (int) $graph_javascript; ?>,
//~ width: $(window).width(),
//~ height: $(window).height()
//~ }
//~ })
//~ .done(function (data, textStatus, xhr) {
//~ $('div#vc-container').html(data);
//~ startCountDown(refr, false);
//~ });
//~ }
startCountDown(refr, false); startCountDown(refr, false);
//~ // Auto hide controls //~ // Auto hide controls
var controls = document.getElementById('vc-controls'); var controls = document.getElementById('vc-controls');
@ -272,9 +253,6 @@ $ignored_params['refr'] = '';
refr = Number.parseInt(event.target.value, 10); refr = Number.parseInt(event.target.value, 10);
startCountDown(refr, false); startCountDown(refr, false);
}); });
//~ // Start the map fetch
//~ fetchMap();
} }
else { else {
$('#refr').change(function () { $('#refr').change(function () {
@ -282,96 +260,46 @@ $ignored_params['refr'] = '';
}); });
} }
/*
$(".module_graph").each(function(){
left = parseInt($(this).css("left")) + 150 + ((parseInt($(this).css("width"))-300)/2);
$(this).css('left', left);
});
$('.item:not([class~="module_graph"])').each(function(){
left = parseInt($(this).css('left')) + ((parseInt($('#' + $(this).attr('id')).css('width')) - parseInt($('#' + $(this).attr('id') + " img").css('width')))*0.5);
$(this).css('left', left);
});
*/
$(".module_graph .menu_graph").css('display','none'); $(".module_graph .menu_graph").css('display','none');
$(".parent_graph").each(function(){ $(".parent_graph").each( function() {
if ($(this).css('background-color') != 'rgb(255, 255, 255)')
if($(this).css('background-color') != 'rgb(255, 255, 255)'){
$(this).css('color', '#999'); $(this).css('color', '#999');
}
}); });
$(".overlay").removeClass("overlay").addClass("overlaydisabled"); $(".overlay").removeClass("overlay").addClass("overlaydisabled");
$('.item:not(.icon) img').each(function(){ $('.item:not(.icon) img').each( function() {
if ($(this).css('float')=='left' || $(this).css('float')=='right') {
if($(this).css('float')=='left' || $(this).css('float')=='right'){
$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px'); $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
$(this).css('margin-left',''); $(this).css('margin-left','');
} }
else{ else {
$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px'); $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
$(this).css('margin-top',''); $(this).css('margin-top','');
} }
}); });
$('.item > div').each(function(){ $('.item > div').each( function() {
if($(this).css('float')=='left' || $(this).css('float')=='right'){ if ($(this).css('float')=='left' || $(this).css('float')=='right') {
$(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px'); $(this).css('margin-top',(parseInt($(this).parent().css('height'))/2-parseInt($(this).css('height'))/2-15)+'px');
$(this).css('margin-left',''); $(this).css('margin-left','');
} }
else{ else {
$(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px'); $(this).css('margin-left',(parseInt($(this).parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
$(this).css('margin-top',''); $(this).css('margin-top','');
} }
}); });
$('.item > a > div').each(function(){ $('.item > a > div').each( function() {
if($(this).css('float')=='left' || $(this).css('float')=='right'){ if ($(this).css('float')=='left' || $(this).css('float')=='right') {
$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px'); $(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2-5)+'px');
$(this).css('margin-left',''); $(this).css('margin-left','');
} }
else{ else {
$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px'); $(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
$(this).css('margin-top',''); $(this).css('margin-top','');
} }
}); });
/*
$('.percentile_item a > img').each(function(){
if($(this).css('float')=='left' || $(this).css('float')=='right'){
$(this).css('margin-top',(parseInt($(this).parent().parent().css('height'))/2-parseInt($(this).css('height'))/2)+'px');
$(this).css('margin-left','');
}
else{
$(this).css('margin-left',(parseInt($(this).parent().parent().css('width'))/2-parseInt($(this).css('width'))/2)+'px');
$(this).css('margin-top','');
}
});
*/
}); });
</script> </script>