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

Fixed help content well printed

This commit is contained in:
fbsanchez 2019-11-14 19:10:31 +01:00
parent 0d3817d64d
commit 9dec1709c4
4 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/extensions/quick_shell.php
View File

@ -381,7 +381,12 @@ function quickShellSettings()
}
// Interface.
ui_print_page_header(__('QuickShell settings'));
ui_print_page_header(
__('QuickShell settings'),
'',
false,
'quickshell_settings'
);
if ($changes > 0) {
$msg = __('%d Updated', $changes);

5
pandora_console/include/class/HelpFeedBack.class.php
View File

@ -93,12 +93,13 @@ class HelpFeedBack extends Wizard
ui_require_css_File('discovery');
ui_require_css_file('help_feedback');
$help_url = get_parameter('url', null);
$help_url = get_parameter('b', null);
$help_url = base64_decode($help_url);
if ($help_url === null) {
echo __('Page not found');
} else {
?>
<iframe width="100%" height="100%" frameBorder="0"
<iframe width="100%" height="100%" frameBorder="0" id="h_Viewer"
src="<?php echo $help_url; ?>">
<?php echo __('Browser not compatible.'); ?>
</iframe>

7
pandora_console/include/functions.php
View File

@ -5431,6 +5431,13 @@ function get_help_info($section_name)
$result .= 'GIS&printable=yes#Operation';
}
break;
case 'quickshell_settings':
if ($es) {
$result .= 'Configuracion_Consola&printable=yes#Websocket_Engine';
} else {
$result .= 'Console_Setup&printable=yes#Websocket_engine';
}
}
return $result;

7
pandora_console/include/functions_ui.php
View File

@ -1404,14 +1404,19 @@ function ui_print_help_icon(
}
$url = get_help_info($help_id);
$b = base64_encode($url);
$help_handler = 'index.php?sec=view&sec2=general/help_feedback';
// Needs to use url encoded to avoid anchor lost.
$help_handler .= '&b='.$b;
$help_handler .= '&pure=1&url='.$url;
$output = html_print_image(
$image,
true,
[
'class' => 'img_help',
'title' => __('Help'),
'onclick' => "open_help ('".ui_get_full_url('index.php?sec=view&sec2=general/help_feedback&pure=1&url='.$url)."')",
'onclick' => "open_help ('".ui_get_full_url($help_handler)."')",
'id' => $id,
],
false,