diff --git a/pandora_console/include/styles/visual_maps.css b/pandora_console/include/styles/visual_maps.css index ffaebd4677..7c4809eeeb 100644 --- a/pandora_console/include/styles/visual_maps.css +++ b/pandora_console/include/styles/visual_maps.css @@ -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; diff --git a/pandora_console/operation/visual_console/legacy_view.php b/pandora_console/operation/visual_console/legacy_view.php index 62ed4fbd18..856b2db862 100644 --- a/pandora_console/operation/visual_console/legacy_view.php +++ b/pandora_console/operation/visual_console/legacy_view.php @@ -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 '
'.visual_map_print_visual_map( $id_layout, true, @@ -193,22 +193,32 @@ if ($config['pure']) { true ).'
'; - // Floating menu - Start + // Floating menu - Start. echo '
'; echo ''; echo '
'; - // 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); diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php index db891792c0..1c58612347 100644 --- a/pandora_console/operation/visual_console/view.php +++ b/pandora_console/operation/visual_console/view.php @@ -309,7 +309,12 @@ if ($pure === true) { // Quit fullscreen. echo '
  • '; - $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 ''; echo html_print_image('images/normal_screen.png', true, ['title' => __('Back to normal mode')]); echo ''; @@ -317,7 +322,12 @@ if ($pure === true) { // Countdown. echo '
  • '; - echo '
    '; + if (is_metaconsole()) { + echo '
    '; + } else { + echo '
    '; + } + echo '
    '; echo __('Refresh').':'; echo html_print_select( @@ -337,7 +347,12 @@ if ($pure === true) { // Console name. echo '
  • '; - echo '
    '.$visualConsoleName.'
    '; + if (is_metaconsole()) { + echo '
    '.$visualConsoleName.'
    '; + } else { + echo '
    '.$visualConsoleName.'
    '; + } + echo '
  • '; echo '';