[Mapbender-commits] r4011 - in branches/2.6: conf http/img http/javascripts

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2009-06-09 04:21:09 -0400 (Tue, 09 Jun 2009)
New Revision: 4011

Added:
   branches/2.6/http/img/exclamation.png
Modified:
   branches/2.6/conf/wfs_additional_spatial_search.conf
   branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php
Log:
http://trac.osgeo.org/mapbender/ticket/482

Modified: branches/2.6/conf/wfs_additional_spatial_search.conf
===================================================================
--- branches/2.6/conf/wfs_additional_spatial_search.conf	2009-06-08 17:21:29 UTC (rev 4010)
+++ branches/2.6/conf/wfs_additional_spatial_search.conf	2009-06-09 08:21:09 UTC (rev 4011)
@@ -47,8 +47,9 @@
 var mb_wfs_tolerance = 8;
 
 /**
- * If spatialRequest is set, show this message
+ * If spatialRequest is set, show this image and this message
  */
+var spatialRequestIsSetImg = '../img/exclamation.png';
 var spatialRequestIsSetMessage = '<?php echo _mb("Spatial filter is set.");?>';
 
 /**
@@ -74,6 +75,27 @@
 
 // --------------------------------------------------------
 //
+// General Form settings
+//
+// --------------------------------------------------------
+
+/**
+ * If the WFS Request is started, show this image while waiting for results
+ */
+var progressIndicatorImg = '../img/indicator_wheel.gif';
+
+/**
+ * If the WFS Request is started, show this text while waiting for results
+ */
+var progressIndicatorText = '<?php echo _mb("Searching...");?>';
+
+/**
+ * If the WFS Request is finished and search results are arranged, show this text while waiting
+ */
+var arrangeResultsText = '<?php echo _mb("Arranging search results...");?>';
+
+// --------------------------------------------------------
+//
 // Result geometry highlight settings
 //
 // --------------------------------------------------------

Added: branches/2.6/http/img/exclamation.png
===================================================================
(Binary files differ)


Property changes on: branches/2.6/http/img/exclamation.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php	2009-06-08 17:21:29 UTC (rev 4010)
+++ branches/2.6/http/javascripts/mod_wfs_gazetteer_client.php	2009-06-09 08:21:09 UTC (rev 4011)
@@ -232,8 +232,9 @@
 				var spatialRes = document.createElement("span");
 				spatialRes.id = "spatialResHint";
 				spatialRes.name = "spatialResHint";
+				spatialRes.className = "spatialResHint";
 				document.getElementById("displaySpatialButtons").appendChild(spatialRes);
-				document.getElementById("spatialResHint").innerHTML = "<br>"+spatialRequestIsSetMessage;
+				document.getElementById("spatialResHint").innerHTML = "<br><img src='"+spatialRequestIsSetImg+"'></img>"+spatialRequestIsSetMessage;
 				spatialRequestGeom = queryGeom;
 			}
 			parent.mb_disableThisButton(selectedType);
@@ -995,7 +996,7 @@
 	
 			var filter = "<ogc:Filter xmlns:ogc='http://ogc.org' xmlns:gml='http://www.opengis.net/gml'>"+andConditions+"</ogc:Filter>";
 	
-			document.getElementById("res").innerHTML = "<table><tr><td><img src='../img/indicator_wheel.gif'></td><td>Searching...</td></tr></table>";
+			document.getElementById("res").innerHTML = "<table><tr><td><img src='"+progressIndicatorImg+"'></td><td>"+progressIndicatorText+"</td></tr></table>";
 			var parameters = {
 				"command" : "getSearchResults", 
 				"wfs_conf_id" : global_selectedWfsConfId, 
@@ -1005,7 +1006,7 @@
 				"backlink" : ""
 			};
 			parent.mb_ajax_get("../php/mod_wfs_gazetteer_server.php", parameters, function (jsCode, status) {
-				document.getElementById("res").innerHTML = "<table><tr><td>Arranging search results...</td></tr></table>";
+				document.getElementById("res").innerHTML = "<table><tr><td>"+arrangeResultsText+"</td></tr></table>";
 				
 				if(status=='success'){
 					for (var i=0; i < parent.wms.length; i++) {
@@ -1287,6 +1288,6 @@
 <div name='displaySpatialButtons' id='displaySpatialButtons' style='width:180px;margin-top:5px;background-color:#FFFFFF;'></div>
 <form name='wfsForm' id='wfsForm' onsubmit='return validate()'>
 </form>
-<div name='res' id='res' style='width:180px'></div>
+<div class='resultDiv' name='res' id='res' style='width:180px'></div>
 </body>
 </html>