[Mapbender-commits] r5532 - in branches/2.6: http/javascripts resources/db/pgsql/UTF-8/update

[svn_mapbender at osgeo.org]

Author: marc
Date: 2010-02-20 04:48:25 -0500 (Sat, 20 Feb 2010)
New Revision: 5532

Modified:
   branches/2.6/http/javascripts/mod_measure.php
   branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql
Log:
http://trac.osgeo.org/mapbender/ticket/590

Modified: branches/2.6/http/javascripts/mod_measure.php
===================================================================
--- branches/2.6/http/javascripts/mod_measure.php	2010-02-20 08:06:19 UTC (rev 5531)
+++ branches/2.6/http/javascripts/mod_measure.php	2010-02-20 09:48:25 UTC (rev 5532)
@@ -27,7 +27,7 @@
 var mod_measure_fontsize = "9px";
 var mod_measure_basepoint = "#8a2be2";
 var mod_measure_linepoint = "#ff00ff";
-var mod_measure_bg = "";
+var mod_measure_bg = "white";
 var mod_measure_pgsql = true;
 
 var mod_measure_win = null;
@@ -50,11 +50,6 @@
 var mod_measure_img_off = new Image(); mod_measure_img_off.src = "<?php  echo $e_src;  ?>";
 var mod_measure_img_over = new Image(); mod_measure_img_over.src = "<?php  echo preg_replace("/_off/","_over",$e_src);  ?>";
 
-eventBeforeInit.register(function () {
-	mb_regButton(function (ind) {
-		init_mod_measure(ind);
-	});
-});
 
 function init_mod_measure(ind){
 	mod_measure_mapObj = getMapObjByName(mod_measure_target);

Modified: branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql
===================================================================
--- branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql	2010-02-20 08:06:19 UTC (rev 5531)
+++ branches/2.6/resources/db/pgsql/UTF-8/update/update_2.6_to_2.6.1_pgsql_UTF-8.sql	2010-02-20 09:48:25 UTC (rev 5532)
@@ -345,4 +345,7 @@
 INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) 
 SELECT gui_element.fkey_gui_id, 'treeGDE', 'switchwms', 'true', 'enables/disables all layer of a wms' ,'var' 
 FROM gui_element WHERE gui_element.e_id = 'treeGDE' AND gui_element.fkey_gui_id NOT IN 
-(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'switchwms' AND fkey_e_id = 'treeGDE'); 
+(SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'switchwms' AND fkey_e_id = 'treeGDE'); 
+
+-- http://trac.osgeo.org/mapbender/ticket/590 toggle Module and measure
+UPDATE gui_element set e_attributes ='onmouseover = "mb_regButton(''init_mod_measure'')"' where e_id='measure'