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

2009-03-10 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* include/functions_visual_map: Small fixes to render backgrounds with 
	spaces in filename correctly
	
	* operation/visual_console/index.php, godmode/reporting/map_builder.php: 
	Fixes to render icons correctly.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1522 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2009-03-10 20:03:06 +00:00
parent 7feab70ec5
commit 227fc56921
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2009-03-10 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/functions_visual_map: Small fixes to render backgrounds with
spaces in filename correctly
* operation/visual_console/index.php, godmode/reporting/map_builder.php:
Fixes to render icons correctly.
2009-03-09 Evi Vanoost <vanooste@rcbi.rochester.edu>
* include/javascript/pandora.js: Moved agent_changed here from map_builder

4
pandora_console/godmode/reporting/map_builder.php
View File

@ -277,9 +277,9 @@ if (! $edit_layout && ! $id_layout) {
$data[0] = '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'">'.$map['name'].'</a>';
$data[1] = print_image ("images/".get_group_icon ($map['id_group']).'.png', true).'&nbsp;';
$data[1] = print_group_icon ($map['id_group'], true).'&nbsp;';
$data[1] .= get_group_name ($map['id_group']);
$data[2] = get_db_sql ("SELECT COUNT(id) FROM tlayout_data WHERE id_layout = ".$map['id']);
$data[2] = get_db_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']);
$data[3] = '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder_wizard&amp;id_layout='.$map['id'].'">'.print_image ("images/pill.png", true).'</a>';
$data[4] = '<a href="index.php?sec=greporting&amp;sec2=godmode/reporting/map_builder&amp;id_layout='.$map['id'].'&amp;delete_layout=1">'.print_image ("images/cross.png", true).'</a>';

6
pandora_console/include/functions_visual_map.php
View File

@ -29,7 +29,7 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
global $config;
$layout = get_db_row ('tlayout', 'id', $id_layout);
echo '<div id="layout_map" style="z-index: 0; position:relative; background: url(images/console/background/'.$layout["background"].'); width:'.$layout["width"].'px; height:'.$layout["height"].'px;">';
echo '<div id="layout_map" style="z-index: 0; position:relative; background: url(\'images/console/background/'.safe_input ($layout["background"]).'\'); width:'.$layout["width"].'px; height:'.$layout["height"].'px;">';
$layout_datas = get_db_all_rows_field_filter ('tlayout_data', 'id_layout', $id_layout);
$lines = array ();
@ -164,12 +164,12 @@ function print_pandora_visual_map ($id_layout, $show_links = true, $draw_lines =
echo '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;pure='.$config["pure"].'&amp;id='.$layout_data['id_layout_linked'].'">';
}
}
print_image ("reporting/fgraph.php?tipo=sparse&amp;id=".$layout_data['id_agente_modulo']."&amp;label=".$layout_data['label']."&amp;height=".$layout_data['height']."&amp;width=".$layout_data['width']."&amp;period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
print_image ("reporting/fgraph.php?tipo=sparse&amp;id=".$layout_data['id_agente_modulo']."&amp;label=".safe_input ($layout_data['label'])."&amp;height=".$layout_data['height']."&amp;width=".$layout_data['width']."&amp;period=".$layout_data['period'], false, array ("title" => $layout_data['label'], "border" => 0));
echo "</a>";
echo "</div>";
// Line, not implemented in editor
} else if ($layout_data['type'] == 2) {
} elseif ($layout_data['type'] == 2) {
$line['id'] = $layout_data['id'];
$line['x'] = $layout_data['pos_x'];
$line['y'] = $layout_data['pos_y'];

4
pandora_console/operation/visual_console/index.php
View File

@ -41,8 +41,8 @@ foreach ($layouts as $layout) {
$data[0] = '<a href="index.php?sec=visualc&amp;sec2=operation/visual_console/render_view&amp;id='.
$layout['id'].'">'.$layout['name'].'</a> ';
$data[1] = print_image ("images/".get_group_icon ($layout["id_group"]).".png", true, array ("title" => get_group_name ($layout["id_group"])));
$data[1] .= " ".get_group_name ($layout["id_group"]);
$data[1] = print_group_icon ($layout["id_group"], true);
$data[1] .= "&nbsp;".get_group_name ($layout["id_group"]);
$data[2] = get_db_value ('COUNT(*)', 'tlayout_data', 'id_layout', $layout['id']);
array_push ($table->data, $data);