2010-02-25 Miguel de Dios <miguel.dedios@artica.es>

* 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

@@ -1,4 +1,17 @@
-2010-02-24  Miguel de Dios  <miguel.dedios@artica.es>
+2010-02-25  Miguel de Dios  <miguel.dedios@artica.es>
+
+	* 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  <miguel.dedios@artica.es>
 
 	* include/functions_gis.php: change the setup params "maxExtent",
 	"maxResolution", "numZoomLevels" from map to baselayer. Add new function

pandora_console/godmode/gis_maps/configure_gis_map.php

@@ -313,7 +313,7 @@ $table->data[0][2] = "<table class='databox' border='0' id='map_connection'>
 $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('<?php echo __("Edit Layer"); ?>');
+	$("input[name=save_layer]").val('<?php echo __("Update Layer"); ?>');
 
 	$("#form_layer_table").css('visibility', 'visible');
 	

pandora_console/godmode/gis_maps/index.php

@@ -53,7 +53,7 @@ switch ($action) {
 		break;
 }
 
-echo "<h2>" . __('GIS Maps') . " &raquo; " . __('Builder') . "</h2>";
+print_page_header (__('GIS Maps builder'), "images/server_web.png", false, "gis_map_builder", true);
 
 $table->width = '500px';
 $table->head[0] = __('Map name');

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');

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');

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 "<div class='nf'>".__('This agent doesn\'t have any GIS data')."</div>";
-    echo '<h3 class="error">'.__('There was a problem locating the positional data or empty history.').'</h3>';
 }
 else {
     pagination ($countData, false) ;