From 45539d31f2b8a950d9f4395be86eb38e1c58901d Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 25 Feb 2010 13:30:42 +0000 Subject: [PATCH] 2010-02-25 Miguel de Dios * operation/agentes/gis_view.php: change the empty message to standar. * godmode/menu.php: change the text of visual console builder and GIS map builder, and move to down the Conection GIS editor. * godmode/gis_maps/configure_gis_map.php: change some text. * godmode/gis_maps/index.php: use new header. * godmode/reporting/map_builder.php: change some text. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2419 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 15 ++++++++++++++- .../godmode/gis_maps/configure_gis_map.php | 4 ++-- pandora_console/godmode/gis_maps/index.php | 2 +- pandora_console/godmode/menu.php | 8 ++++---- pandora_console/godmode/reporting/map_builder.php | 2 +- pandora_console/operation/agentes/gis_view.php | 3 +-- 6 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index d0a4f1f73f..b4aad4058f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,4 +1,17 @@ -2010-02-24 Miguel de Dios +2010-02-25 Miguel de Dios + + * operation/agentes/gis_view.php: change the empty message to standar. + + * godmode/menu.php: change the text of visual console builder and GIS map + builder, and move to down the Conection GIS editor. + + * godmode/gis_maps/configure_gis_map.php: change some text. + + * godmode/gis_maps/index.php: use new header. + + * godmode/reporting/map_builder.php: change some text. + +2010-02-25 Miguel de Dios * include/functions_gis.php: change the setup params "maxExtent", "maxResolution", "numZoomLevels" from map to baselayer. Add new function diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index a2cbdf2306..8da71960f8 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -313,7 +313,7 @@ $table->data[0][2] = " $table->data[1][0] = __('Group') . print_help_tip (__('Group that owns the map'), true). ':'; $table->data[1][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'map_group_id', $map_group_id, '', '', '0', true); -$table->data[2][0] = __('Zoom level') . print_help_tip (__('Default zoom level when opening the map'), true). ':'; +$table->data[2][0] = __('Default zoom') . print_help_tip (__('Default zoom level when opening the map'), true). ':'; $table->data[2][1] = print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true); $table->data[3][0] = __('Center Longitude') . ':'; @@ -624,7 +624,7 @@ function editLayer(indexLayer) { setFieldsFormLayer(layer.layer_name, layer.layer_group, layer.layer_visible, layer.layer_agent_list); $("#hidden-layer_edit_id_form").val(indexLayer); - $("input[name=save_layer]").val(''); + $("input[name=save_layer]").val(''); $("#form_layer_table").css('visibility', 'visible'); diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php index 5c08b96097..52d0e84554 100644 --- a/pandora_console/godmode/gis_maps/index.php +++ b/pandora_console/godmode/gis_maps/index.php @@ -53,7 +53,7 @@ switch ($action) { break; } -echo "

" . __('GIS Maps') . " » " . __('Builder') . "

"; +print_page_header (__('GIS Maps builder'), "images/server_web.png", false, "gis_map_builder", true); $table->width = '500px'; $table->head[0] = __('Map name'); diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index e49e966247..c58fd51206 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -118,12 +118,12 @@ if (give_acl ($config['id_user'], 0, "IW")) { } if (give_acl ($config['id_user'], 0, "IW")) { // Custom map builder - $menu["gmap"]["text"] = __('Map builder'); + $menu["gmap"]["text"] = __('Visual console builder'); $menu["gmap"]["sec2"] = "godmode/reporting/map_builder"; $menu["gmap"]["id"] = "god-map"; if ($config['activate_gis']) { - $menu["godgismaps"]["text"] = __('GIS Maps'); + $menu["godgismaps"]["text"] = __('GIS Maps builder'); $menu["godgismaps"]["sec2"] = "godmode/gis_maps/index"; $menu["godgismaps"]["refr"] = 60; $menu["godgismaps"]["id"] = "god-gismaps"; @@ -168,11 +168,11 @@ if (give_acl ($config['id_user'], 0, "PM")) { $sub = array (); - if ($config['activate_gis']) - $sub["godmode/setup/gis"]["text"] = __('Map conections GIS'); $sub["godmode/setup/performance"]["text"] = __('Performance'); $sub["godmode/setup/setup_visuals"]["text"] = __('Visual styles'); $sub["godmode/setup/file_manager"]["text"] = __('File manager'); + if ($config['activate_gis']) + $sub["godmode/setup/gis"]["text"] = __('Map conections GIS'); $sub["godmode/setup/links"]["text"] = __('Links'); $sub["godmode/setup/news"]["text"] = __('Site news'); enterprise_hook ('historydb_submenu'); diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index b52bbde01a..952dab6e69 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -69,7 +69,7 @@ $height = 0; $background = ''; // Header -print_page_header (__('Map builder'), "images/god9.png", false, "map_builder", true); +print_page_header (__('Visual console builder'), "images/god9.png", false, "map_builder", true); if ($create_layout) { $name = (string) get_parameter ('name'); diff --git a/pandora_console/operation/agentes/gis_view.php b/pandora_console/operation/agentes/gis_view.php index fa1b139750..c2956612da 100644 --- a/pandora_console/operation/agentes/gis_view.php +++ b/pandora_console/operation/agentes/gis_view.php @@ -65,8 +65,7 @@ $sql = sprintf ("SELECT longitude, latitude, altitude, start_timestamp, end_time $result = get_db_all_rows_sql ($sql, true); if ($result === false) { - - echo '

'.__('There was a problem locating the positional data or empty history.').'

'; + echo "
".__('This agent doesn\'t have any GIS data')."
"; } else { pagination ($countData, false) ;