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

New function pandora ux, let open pics from base64 image modules #90 - 2

This commit is contained in:
enriquecd 2016-10-28 13:51:12 +02:00
parent cb1403a55c
commit 87666509c1
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/include/ajax/module.php
View File

@ -177,7 +177,7 @@ if ($get_module_detail) {
"Data" => array( "Data" => array(
"data", "data",
"modules_format_data", "modules_format_data",
"align" => "left", "align" => "center",
"width" => "230px"), "width" => "230px"),
); );
@ -185,14 +185,14 @@ if ($get_module_detail) {
$columns["Time"] = array( $columns["Time"] = array(
"utimestamp", "utimestamp",
"modules_format_time", "modules_format_time",
"align" => "left", "align" => "center",
"width" => "50px"); "width" => "50px");
} }
else { else {
$columns["Timestamp"] = array( $columns["Timestamp"] = array(
"utimestamp", "utimestamp",
"modules_format_timestamp", "modules_format_timestamp",
"align" => "left", "align" => "center",
"width" => "50px"); "width" => "50px");
} }
@ -249,7 +249,7 @@ if ($get_module_detail) {
foreach ($columns as $col => $attr) { foreach ($columns as $col => $attr) {
if ($attr[1] != "modules_format_data") { if ($attr[1] != "modules_format_data") {
$data[] = $attr[1] ($row[$attr[0]]); $data[] = date('d F Y - h:i:s A', $row['utimestamp']);
} }
elseif (($config['command_snapshot']) && (preg_match ("/[\n]+/i", $row[$attr[0]]))) { elseif (($config['command_snapshot']) && (preg_match ("/[\n]+/i", $row[$attr[0]]))) {
@ -957,8 +957,10 @@ if ($list_modules) {
base64_encode($module["nombre"]))) . "&" . base64_encode($module["nombre"]))) . "&" .
"refresh=" . SECONDS_10MINUTES . "&" . "refresh=" . SECONDS_10MINUTES . "&" .
"draw_events=$draw_events', 'day_".$win_handle."')"; "draw_events=$draw_events', 'day_".$win_handle."')";
if(!is_snapshot_data($module['datos'])){
$data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> &nbsp;&nbsp;'; $data[8] .= '<a href="javascript:'.$link.'">' . html_print_image("images/chart_curve.png", true, array("border" => '0', "alt" => "")) . '</a> &nbsp;&nbsp;';
}
$server_name = ''; $server_name = '';
$data[8] .= "<a href='javascript: " . $data[8] .= "<a href='javascript: " .
"show_module_detail_dialog(" . "show_module_detail_dialog(" .

2
pandora_console/include/functions_ui.php
View File

@ -3650,7 +3650,7 @@ function ui_print_module_string_value($value, $id_agente_module,
"&label=" . rawurlencode(urlencode(io_safe_output($module_name))) . "','" . $win_handle . "', 700,480)"; "&label=" . rawurlencode(urlencode(io_safe_output($module_name))) . "','" . $win_handle . "', 700,480)";
$salida = '<a href="javascript:' . $link . '">' . $salida = '<a href="javascript:' . $link . '">' .
html_print_image("images/default_list.png", true, html_print_image("images/photo.png", true,
array("border" => '0', array("border" => '0',
"alt" => "", "alt" => "",
"title" => __("Snapshot view"))) . '</a> &nbsp;&nbsp;'; "title" => __("Snapshot view"))) . '</a> &nbsp;&nbsp;';

10
pandora_console/mobile/operation/modules.php
View File

@ -547,14 +547,20 @@ class Modules {
$output = $sub_string; $output = $sub_string;
} }
} }
if (is_snapshot($module['datos'])){
'<span style="white-space: nowrap;">' .
'<span style="display: none;" class="show_collapside">' . $row[__('Status')] . '&nbsp;&nbsp;</span>' .
'<a target='_blank' href='".io_safe_input($row[$attr[0]])."'><img style="width:300px" src='".io_safe_input($row[$attr[0]])."'>' .
$output . '</a>' . '</span>';
}
else{
$row[7] = $row[__('Data')] = $row[7] = $row[__('Data')] =
'<span style="white-space: nowrap;">' . '<span style="white-space: nowrap;">' .
'<span style="display: none;" class="show_collapside">' . $row[__('Status')] . '&nbsp;&nbsp;</span>' . '<span style="display: none;" class="show_collapside">' . $row[__('Status')] . '&nbsp;&nbsp;</span>' .
'<a data-ajax="false" class="ui-link" ' . '<a data-ajax="false" class="ui-link" ' .
'href="index.php?page=module_graph&id=' . $module['id_agente_modulo'] . '&id_agent=' . $this->id_agent . '">' . 'href="index.php?page=module_graph&id=' . $module['id_agente_modulo'] . '&id_agent=' . $this->id_agent . '">' .
$output . '</a>' . '</span>'; $output . '</a>' . '</span>';
}
if (!$ajax) { if (!$ajax) {
if ($this->columns['agent']) { if ($this->columns['agent']) {
unset($row[0]); unset($row[0]);