tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problems with size elements in visual console. ticket: #4096

Browse Source 
(cherry picked from commit 59857533263ffbf42ba9532657f1e5494ecbc83a)
This commit is contained in:
m-lopez-f 2016-10-25 11:41:59 +02:00
parent 134478fc15
commit 83ef2e82ee
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/ajax/visual_console_builder.ajax.php
View File

@ -189,8 +189,8 @@ switch ($action) {
case 'get_layout_data': case 'get_layout_data':
$layoutData = db_get_row_filter('tlayout_data', $layoutData = db_get_row_filter('tlayout_data',
array('id' => $id_element)); array('id' => $id_element));
$layoutData['height'] = $layoutData['height'] + 60; $layoutData['height'] = $layoutData['height'];
$layoutData['width'] = $layoutData['width'] + 60; $layoutData['width'] = $layoutData['width'];
echo json_encode($layoutData); echo json_encode($layoutData);
break; break;

6
pandora_console/include/functions_visual_map.php
View File

@ -95,8 +95,8 @@ function visual_map_print_item($mode = "read", $layoutData,
require_once ($config["homedir"] . '/include/functions_custom_graphs.php'); require_once ($config["homedir"] . '/include/functions_custom_graphs.php');
//add 60 px for visual console map //add 60 px for visual console map
$width = $layoutData['width'] + 60; $width = $layoutData['width'];
$height = $layoutData['height'] + 60; $height = $layoutData['height'];
$max_percentile = $layoutData['height']; $max_percentile = $layoutData['height'];
$top = $layoutData['pos_y']; $top = $layoutData['pos_y'];
$left = $layoutData['pos_x']; $left = $layoutData['pos_x'];
@ -749,6 +749,8 @@ function visual_map_print_item($mode = "read", $layoutData,
$percentile = 100; $percentile = 100;
break; break;
case MODULE_GRAPH: case MODULE_GRAPH:
$width += 60;
$height += 60;
if (!empty($proportion)) { if (!empty($proportion)) {
$width = $width =
((integer)($proportion['proportion_width'] * $width)); ((integer)($proportion['proportion_width'] * $width));