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

Merge branch 'ent-5318-no-hay-opcion-de-pantalla-completa-para-las-consolas-visuales-en-la-meta' into 'develop' 

Ent 5318 no hay opcion de pantalla completa para las consolas visuales en la meta

See merge request artica/pandorafms!3053
This commit is contained in:
Daniel Rodriguez 2020-02-12 17:05:29 +01:00
parent 79fe01ee56 e908019d4f
commit 29f34ae416
3 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/styles/visual_maps.css
View File

@ -19,6 +19,15 @@ div#vc-controls div.vc-refr {
div#vc-controls div.vc-refr > div {
display: inline;
}
div#vc-controls div.vc-title-meta,
div#vc-controls div.vc-refr-meta {
margin-top: 5px;
margin-left: 3px;
margin-right: 3px;
}
div#vc-controls div.vc-refr-meta > div {
display: inline;
}
div#vc-controls img.vc-qr {
margin-top: 12px;
margin-left: 8px;

37
pandora_console/operation/visual_console/legacy_view.php
View File

@ -61,7 +61,7 @@ $refr = (int) get_parameter('refr', $config['vc_refr']);
$graph_javascript = (bool) get_parameter('graph_javascript', true);
$vc_refr = false;
if (isset($config['vc_refr']) and $config['vc_refr'] != 0) {
if (isset($config['vc_refr']) && $config['vc_refr'] != 0) {
$view_refresh = $config['vc_refr'];
} else {
$view_refresh = '300';
@ -181,7 +181,7 @@ if (!is_metaconsole()) {
}
if ($config['pure']) {
// Container of the visual map (ajax loaded)
// Container of the visual map (ajax loaded).
echo '<div id="vc-container">'.visual_map_print_visual_map(
$id_layout,
true,
@ -193,22 +193,32 @@ if ($config['pure']) {
true
).'</div>';
// Floating menu - Start
// Floating menu - Start.
echo '<div id="vc-controls" style="z-index: 999">';
echo '<div id="menu_tab">';
echo '<ul class="mn">';
// Quit fullscreen
// Quit fullscreen.
echo '<li class="nomn">';
echo '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'">';
if (!is_metaconsole()) {
echo '<a href="index.php?sec=network&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'">';
} else {
echo '<a href="index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$id_layout.'&refr='.$refr.'">';
}
echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]);
echo '</a>';
echo '</li>';
// Countdown
// Countdown.
echo '<li class="nomn">';
echo '<div class="vc-refr">';
if (is_metaconsole()) {
echo '<div class="vc-refr-meta">';
} else {
echo '<div class="vc-refr">';
}
echo '<div class="vc-countdown"></div>';
echo '<div id="vc-refr-form">';
echo __('Refresh').':';
@ -217,16 +227,21 @@ if ($config['pure']) {
echo '</div>';
echo '</li>';
// Console name
// Console name.
echo '<li class="nomn">';
echo '<div class="vc-title">'.$layout_name.'</div>';
if (is_metaconsole()) {
echo '<div class="vc-title-meta">'.$layout_name.'</div>';
} else {
echo '<div class="vc-title">'.$layout_name.'</div>';
}
echo '</li>';
echo '</ul>';
echo '</div>';
echo '</div>';
// Floating menu - End
// Floating menu - End.
ui_require_jquery_file('countdown');
?>
@ -299,7 +314,7 @@ $ignored_params['refr'] = '';
startCountDown(refr, false);
var controls = document.getElementById('vc-controls');
autoHideElement(controls, 1000);
// autoHideElement(controls, 1000);
$('select#refr').change(function (event) {
refr = Number.parseInt(event.target.value, 10);

21
pandora_console/operation/visual_console/view.php
View File

@ -309,7 +309,12 @@ if ($pure === true) {
// Quit fullscreen.
echo '<li class="nomn">';
$urlNoFull = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&refr='.$refr;
if (is_metaconsole()) {
$urlNoFull = 'index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=0&id_visualmap='.$visualConsoleId.'&refr='.$refr;
} else {
$urlNoFull = 'index.php?sec=network&sec2=operation/visual_console/render_view&id='.$visualConsoleId.'&refr='.$refr;
}
echo '<a class="vc-btn-no-fullscreen" href="'.$urlNoFull.'">';
echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]);
echo '</a>';
@ -317,7 +322,12 @@ if ($pure === true) {
// Countdown.
echo '<li class="nomn">';
echo '<div class="vc-refr">';
if (is_metaconsole()) {
echo '<div class="vc-refr-meta">';
} else {
echo '<div class="vc-refr">';
}
echo '<div id="vc-refr-form">';
echo __('Refresh').':';
echo html_print_select(
@ -337,7 +347,12 @@ if ($pure === true) {
// Console name.
echo '<li class="nomn">';
echo '<div class="vc-title">'.$visualConsoleName.'</div>';
if (is_metaconsole()) {
echo '<div class="vc-title-meta">'.$visualConsoleName.'</div>';
} else {
echo '<div class="vc-title">'.$visualConsoleName.'</div>';
}
echo '</li>';
echo '</ul>';