tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 17:25:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed CV in console mobile metaconsole #8676

Browse Source
This commit is contained in:
Daniel Barbero Martin 2022-03-16 17:50:46 +01:00
parent eca1ba3917
commit 066568e1d4
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/mobile/operation/visualmap.php
View File

@ -141,11 +141,7 @@ class Visualmap
if (empty($this->width) === true
&& empty($this->height) === true
) {
// Reload forcing user to send width and height.
$ui = Ui::getInstance();
$ui->retrieveViewPort();
$this->show_visualmap();
return;
$this->show_fail_acl();
}
// Padding.
@ -208,29 +204,7 @@ class Visualmap
*/
public function ajax(string $parameter2='')
{
$system = System::getInstance();
$this->checkVisualmapACL($this->visualmap['id_group']);
if ((bool) $this->validAcl === false) {
$this->show_fail_acl();
} else {
switch ($parameter2) {
case 'render_map':
$map_id = $system->getRequest('map_id', '0');
$width = $system->getRequest('width', '400');
$height = $system->getRequest('height', '400');
visual_map_print_visual_map(
$map_id,
false,
true,
$width,
$height
);
exit;
default:
exit;
}
}
return;
}
@ -385,11 +359,15 @@ class Visualmap
$output .= "$('.container-center').css('transform', 'rotate(90deg)');";
}
$output .= '$( window ).on( "orientationchange", function( event )';
$output .= ' { window.location.href = "';
$output .= '$( window ).on( "orientationchange", function( event ) {';
$output .= ' $(".container-center").empty();';
$output .= ' $.mobile.loading("show");';
$output .= ' var dimensions = "&width="+$(window).height();';
$output .= ' dimensions += "&height="+$(window).width();';
$output .= ' window.location.href = "';
$output .= ui_get_full_url('/', false, false, false);
$output .= 'mobile/index.php?page=visualmap&id='.$visualConsoleId;
$output .= '" });';
$output .= '"+dimensions; });';
$output .= '</script>';

18
pandora_console/mobile/operation/visualmaps.php
View File

@ -188,6 +188,20 @@ class Visualmaps
$ui->showFooter(false);
$ui->beginContent();
$this->listVisualmapsHtml();
$output = '<script type="text/javascript">';
$output .= 'function loadVisualConsole(id) {';
$output .= ' var dimensions = "&width="+$(window).width();';
$output .= ' dimensions += "&height="+$(window).height();';
$output .= ' window.location.href = "';
$output .= ui_get_full_url('/', false, false, false);
$output .= 'mobile/index.php?page=visualmap&id="';
$output .= '+id+dimensions;';
$output .= '};';
$output .= '</script>';
$ui->contentAddHtml($output);
$ui->endContent();
$ui->showPage();
}
@ -214,8 +228,8 @@ class Visualmaps
$table->id = 'list_visualmaps';
foreach ($visualmaps as $map) {
$link = '<a class="ui-link" data-ajax="false" ';
$link .= ' href="index.php?page=visualmap&id=';
$link .= $map['id'].'">'.io_safe_output($map['name']).'</a>';
$link .= ' href="#" onclick="loadVisualConsole(';
$link .= $map['id'].')">'.io_safe_output($map['name']).'</a>';
$row = $link;
$row .= ui_print_group_icon(