[Mapbender-commits] r7680 - in trunk/mapbender: . conf http/extensions http/extensions/FirePHP-0.3 http/javascripts http/print resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: kmq
Date: 2011-03-03 02:58:25 -0800 (Thu, 03 Mar 2011)
New Revision: 7680

Modified:
   trunk/mapbender/
   trunk/mapbender/conf/digitize_default.conf
   trunk/mapbender/conf/wfs_default.conf
   trunk/mapbender/http/extensions/FirePHP-0.3/FirePHP.class.php
   trunk/mapbender/http/extensions/FirePHP-0.3/fb.php
   trunk/mapbender/http/extensions/jqjson.min.js
   trunk/mapbender/http/javascripts/mod_sandclock.js
   trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
   trunk/mapbender/http/print/mapbender_template.json
   trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
Log:
merged -c7677 from kmq_dev, fix for #793


Property changes on: trunk/mapbender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev:4021-4487
   + /branches/kmq_dev:4021-4487,7677

Modified: trunk/mapbender/conf/digitize_default.conf
===================================================================
--- trunk/mapbender/conf/digitize_default.conf	2011-03-03 10:50:08 UTC (rev 7679)
+++ trunk/mapbender/conf/digitize_default.conf	2011-03-03 10:58:25 UTC (rev 7680)
@@ -33,7 +33,7 @@
 
 var geomHighlightColour = "#ff0000";
 
-var snappingHighlightZIndex = 85;
+var snappingHighlightZIndex = 75;
 var digitizeTransactionalZIndex = 80;
 var digitizeNonTransactionalZIndex = 20;
 // see also "generalHighlightZIndex" in wfs_default.conf

Modified: trunk/mapbender/conf/wfs_default.conf
===================================================================
--- trunk/mapbender/conf/wfs_default.conf	2011-03-03 10:50:08 UTC (rev 7679)
+++ trunk/mapbender/conf/wfs_default.conf	2011-03-03 10:58:25 UTC (rev 7680)
@@ -69,7 +69,7 @@
 /**
  * z-Index of the highlighted geometries
  */
-var generalHighlightZIndex = 80;
+var generalHighlightZIndex = 70;
 
 /**
  * Line width of the highlighted geometries in pixel


Property changes on: trunk/mapbender/http/extensions/FirePHP-0.3/FirePHP.class.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/extensions/FirePHP.class.php:4021-4487
   + /branches/kmq_dev/http/extensions/FirePHP-0.3/FirePHP.class.php:7677
/branches/kmq_dev/http/extensions/FirePHP.class.php:4021-4487


Property changes on: trunk/mapbender/http/extensions/FirePHP-0.3/fb.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/http/extensions/fb.php:4021-4487
   + /branches/kmq_dev/http/extensions/FirePHP-0.3/fb.php:7677
/branches/kmq_dev/http/extensions/fb.php:4021-4487


Property changes on: trunk/mapbender/http/extensions/jqjson.min.js
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/kmq_dev/http/extensions/jqjson.min.js:7677


Property changes on: trunk/mapbender/http/javascripts/mod_sandclock.js
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/kmq_dev/http/javascripts/mod_sandclock.js:7677

Modified: trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2011-03-03 10:50:08 UTC (rev 7679)
+++ trunk/mapbender/http/javascripts/mod_wfs_gazetteer_client.php	2011-03-03 10:58:25 UTC (rev 7680)
@@ -292,7 +292,7 @@
 
 
 		// creates a Highlight object for the request geometry
-		var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":80};
+		var styleProperties = {"position":"absolute", "top":"0px", "left":"0px", "z-index":70};
 		requestGeometryHighlight = new parent.Highlight(targetArray, "requestGeometryHighlight", styleProperties, 2);
 		parent.mb_registerSubFunctions("window.frames['" + frameName +"'].requestGeometryHighlight.paint()");
 
@@ -1390,4 +1390,4 @@
 <div id="uploader"></div>
 <div class='resultDiv' name='res' id='res'></div>
 </body>
-</html>
\ No newline at end of file
+</html>


Property changes on: trunk/mapbender/http/print/mapbender_template.json
___________________________________________________________________
Modified: svn:mergeinfo
   - 
   + /branches/kmq_dev/http/print/mapbender_template.json:7677


Property changes on: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql:4021-4487
   + /branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6_pgsql_UTF-8.sql:7677
/branches/kmq_dev/resources/db/pgsql/UTF-8/update/update_2.6rc1_to_2.6rc2_pgsql_UTF-8.sql:4021-4487