[Mapbender-commits] r5853 - in trunk/mapbender/http: javascripts php

Mon Mar 29 06:39:00 EDT 2010

Author: verenadiewald
Date: 2010-03-29 06:38:50 -0400 (Mon, 29 Mar 2010)
New Revision: 5853

Modified:
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
   trunk/mapbender/http/php/mod_wfs_conf_interface.js
Log:
http://trac.osgeo.org/mapbender/ticket/630

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================

--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2010-03-29 10:07:43 UTC (rev 5852)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2010-03-29 10:38:50 UTC (rev 5853)
@@ -962,6 +962,7 @@
 }
 
 function registerFunctions(){
+	
 	mod_digitizePreFunctions = [];
 	mod_digitizeSubFunctions = [];
 	registerDigitizePreFunctions("updateExtent()");
@@ -969,7 +970,6 @@
 	registerDigitizeSubFunctions("updateListOfGeometries()");
 	registerDigitizeSubFunctions("drawDashedLine()");
 
-
 	if (parent.Mapbender.events.init.done) {
 		completeInitialization();
 	}
@@ -2072,6 +2072,7 @@
 	onChangeText += "window.opener.buildElementForm(this.value, " + geometryIndex + ");";
 	onChangeText += "window.opener.setWfsWindowStyle(this.value);";
 	onChangeText += "$('.hasDatepicker').datepicker();";
+	onChangeText += "$('.uploader').upload({callback: function(result,stat,msg){if(stat !== true){alert(msg);}}});";
 	
 	str += "\t<select name='wfs' size='" + wfsConf.length + "'";
 	str += " onChange=\""+ onChangeText +"\"";
@@ -2099,7 +2100,7 @@
 		elForm = buildElementForm(defaultIndex, geometryIndex);
 
 		var headStr = "<html><head><meta http-equiv='Content-Type' content='text/html; charset=<?php echo CHARSET;?>'><style type='text/css'>" + wfsConf[defaultIndex]['g_style'] + "</style>";
-		headStr += '<link rel="stylesheet" type="text/css" href="../extensions/theme/ui.all.css" />';
+		headStr += '<link rel="stylesheet" type="text/css" href="../extensions/jquery-ui-1.7.2.custom/development-bundle/themes/base/ui.all.css" />';
 		headStr += '<style type="text/css">'
 		headStr += 'a.tabheader { margin: 0 3px 0 0;padding: 1px 5px;text-decoration: none;color: #999;background-color: #F5F5F5;border: 1px solid #999;border-bottom: 0; }';
 		headStr += 'a.tabheader.active { color: #666;background-color: transparent;border-color: #666;border-bottom: 1px solid #FFF;cursor: default; }';
@@ -2110,7 +2111,7 @@
 		headStr += 'a img { vertical-align: middle;border: 0; }';
 		headStr += '.mandatory { border:1px solid red; }';
 		headStr += '</style>';
-		headStr += '</head><body onload="window.opener.toggleTabs(\''+initialTab+'\'); var $dp = $(\'.hasdatepicker\');$dp.datepicker();">';
+		headStr += '</head><body onload="window.opener.toggleTabs(\''+initialTab+'\'); var $dp = $(\'.hasdatepicker\');$dp.datepicker(); var $uploader = $(\'.uploader\');$uploader.upload({callback: function(result,stat,msg){if(stat !== true){alert(msg);}}});">';
 		wfsWindow.document.write(headStr);
 	}
 	else {
@@ -2120,6 +2121,7 @@
 	str += "<div id='elementForm'>\n" + elForm + "</div>";
 	str += "<script type='text/javascript' src='../extensions/jquery-ui-1.7.2.custom/js/jquery-1.3.2.min.js'><\/script>";
 	str += "<script type='text/javascript' src='../extensions/jquery-ui-1.7.1.w.o.effects.min.js'><\/script>";
+	str += "<script type='text/javascript' src='../plugins/jq_upload.js'><\/script>";
 	str += "</body></html>";
 	wfsWindow.document.write(str);
 	wfsWindow.document.close();

Modified: trunk/mapbender/http/php/mod_wfs_conf_interface.js
===================================================================
--- trunk/mapbender/http/php/mod_wfs_conf_interface.js	2010-03-29 10:07:43 UTC (rev 5852)
+++ trunk/mapbender/http/php/mod_wfs_conf_interface.js	2010-03-29 10:38:50 UTC (rev 5853)
@@ -118,6 +118,10 @@
 		"checkbox" : {
 			"title" : "Checkbox",
 			"code" : "<input type='checkbox' id='' value='1'>"
+		},
+		"upload" : {
+			"title" : "Upload",
+			"code" : "<div id='' class='uploader'></div>"
 		}
 	};
 	

