[Mapbender-commits] r3998 - branches/google_dev/http/javascripts

svn_mapbender at osgeo.org svn_mapbender at osgeo.org
Thu Jun 4 06:27:00 EDT 2009


Author: christoph
Date: 2009-06-04 06:27:00 -0400 (Thu, 04 Jun 2009)
New Revision: 3998

Modified:
   branches/google_dev/http/javascripts/mod_wfs_SpatialRequest.php
   branches/google_dev/http/javascripts/mod_wfs_gazetteer_client.php
   branches/google_dev/http/javascripts/wfs.php
Log:


Modified: branches/google_dev/http/javascripts/mod_wfs_SpatialRequest.php
===================================================================
--- branches/google_dev/http/javascripts/mod_wfs_SpatialRequest.php	2009-06-04 10:10:58 UTC (rev 3997)
+++ branches/google_dev/http/javascripts/mod_wfs_SpatialRequest.php	2009-06-04 10:27:00 UTC (rev 3998)
@@ -117,23 +117,24 @@
 	});
 }
 else {
-	buttonWfs_toDigitize_on = 1;
-	mb_registerWfsReadSubFunctions(function(geom){
-		if (buttonWfs_toDigitize_target && window.frames[buttonWfs_toDigitize_target]) {
-			try {
-				tab_open(buttonWfs_toDigitize_target);
+	if (buttonWfs_toDigitize_on == 1) {
+		mb_registerWfsReadSubFunctions(function(geom){
+			if (buttonWfs_toDigitize_target && window.frames[buttonWfs_toDigitize_target]) {
+				try {
+					tab_open(buttonWfs_toDigitize_target);
+				}
+				catch (exc) {
+					new Mb_warning("Tab open failed, pssibly because you do not have tabs in your application."); 
+				}
+				appendGeometryArrayToDigitize(geom);
 			}
-			catch (exc) {
-				new Mb_warning("Tab open failed, pssibly because you do not have tabs in your application."); 
+			else {
+				var msg = "No digitizing module available. " + 
+					"Check you WFS spatial request configuration.";
+				var e = new Mb_warning(msg);
 			}
-			appendGeometryArrayToDigitize(geom);
-		}
-		else {
-			var msg = "No digitizing module available. " + 
-				"Check you WFS spatial request configuration.";
-			var e = new Mb_warning(msg);
-		}
-	});
+		});
+	}
 }
 
 var msgObj;
@@ -782,4 +783,4 @@
 		wfsPopup = new mb_popup(detailPopupTitle,resultHtml,detailPopupWidth,detailPopupHeight,detailPopupX,detailPopupY);
 	}
 	wfsPopup.show();
-}
\ No newline at end of file
+}

Modified: branches/google_dev/http/javascripts/mod_wfs_gazetteer_client.php
===================================================================
--- branches/google_dev/http/javascripts/mod_wfs_gazetteer_client.php	2009-06-04 10:10:58 UTC (rev 3997)
+++ branches/google_dev/http/javascripts/mod_wfs_gazetteer_client.php	2009-06-04 10:27:00 UTC (rev 3998)
@@ -19,7 +19,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 require_once(dirname(__FILE__)."/../php/mb_validatePermission.php");
-$gui_id = $_SESSION["mb_user_gui"];
 
 $target = $_REQUEST["e_target"];
 $isLoaded = $_REQUEST["isLoaded"];
@@ -28,34 +27,16 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset='<?php echo CHARSET;?>'">	
+<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET;?>">	
 <title>mod_wfs_gazetteer</title>
 
 <?php
 include '../include/dyn_css.php';
 ?>
-
-<style type="text/css">
-	#feedback { font-size: 1.4em; }
-	#ui-sortable-result-list .ui-selecting { background: #4473C4; color: white; }
-	#ui-sortable-result-list .ui-selected { background: #4473C4; color: white; }
-	#ui-sortable-result-list { list-style-type: none; margin: 0; padding: 0; width: 100%; }
-	#ui-sortable-result-list li { margin: 3px; padding: 0.4em; height: 18px; cursor: move}
-	.contextMenu
-	{
-		display:none;
-	}
-</style>
-
 <script type="text/javascript">
 <?php 
 	include '../include/dyn_js.php';
 	include '../include/dyn_php.php';
-	include '../extensions/jquery-1.3.2.min.js';
-	include '../extensions/jquery-ui-selectable.min.js';
-	include '../extensions/jquery.contextmenu.r2.js';
-//	include '../extensions/ui.core.js';
-//	include '../extensions/ui.selectable.js';
 	include(dirname(__FILE__) . "/../../conf/" . $wfs_spatial_request_conf_filename);
 
 	echo "var targetString = '" . $target . "';";
@@ -63,13 +44,6 @@
 	echo "var e_id_css = '" . $e_id_css . "';";
 ?>
 
-parent.eventAfterMapRequest.register(function () {
-	if (typeof global_resultHighlight !== "undefined") {
-		global_resultHighlight.paint();
-	}
-});
-
-
 // Element var maxHighlightedPoints
 try{
 	if (maxHighlightedPoints){
@@ -95,36 +69,6 @@
 	openLinkFromSearch =0;
 }
 
-function clickPdf (flstkArray) {
-	new parent.Mb_notice(flstkArray);
-}
-
-function clickBild (flstkArray) {
-	new parent.Mb_notice(flstkArray);
-}
-
-function clickAlkisbuch (flstkArray) {
-	new parent.Mb_notice(flstkArray);
-}
-
-var global_flstkElementName = "fsk";
-
-function parameterizedSearch (confId, featuretypeElementName, valueArray) {
-	try {
-		parent.tab_open(this.name);
-	}
-	catch (e) {
-		new parent.Mb_notice("tab_open() failed...maybe '" + this.name + "' is not in a tab.");
-	}
-	clearFilter();
-	selectWfsConfId(confId);
-	document.getElementById(featuretypeElementName).value = valueArray.join(" ");
-	if (validate()) {
-		document.getElementById("wfsForm").submit();
-	}
-	var global_flstkElementName = featuretypeElementName;
-}
-
 var targetArray = targetString.split(",");
 var global_wfsConfObj;
 var global_selectedWfsConfId;
@@ -231,9 +175,8 @@
 			currentImg.name = buttonWfs_id[i];
 			currentImg.title = buttonWfs_title_off[i];
 			currentImg.src = buttonWfs_imgdir+buttonWfs_src[i];
-			currentImg.style.marginRight = "5px";
+			currentImg.style.margin = "5px";
 			currentImg.onmouseover = new Function("wfsInitFunction("+i+")");
-			
 			document.getElementById("displaySpatialButtons").appendChild(currentImg);
 		}
 	}
@@ -290,7 +233,7 @@
 				spatialRes.id = "spatialResHint";
 				spatialRes.name = "spatialResHint";
 				document.getElementById("displaySpatialButtons").appendChild(spatialRes);
-				document.getElementById("spatialResHint").innerHTML = spatialRequestIsSetMessage;
+				document.getElementById("spatialResHint").innerHTML = "<br>"+spatialRequestIsSetMessage;
 				spatialRequestGeom = queryGeom;
 			}
 			parent.mb_disableThisButton(selectedType);
@@ -406,19 +349,16 @@
 
 function initModWfsGazetteer() {
 	// empty nodes
-	var nodesToEmpty = ["selectWfsConfForm", "wfsForm", "res", "wfsInfo"];
+	var nodesToEmpty = ["selectWfsConfForm", "wfsForm", "res", "wfsIcons"];
 	while (nodesToEmpty.length > 0) {
 		var currentId = nodesToEmpty.pop();
 		var currentNode = document.getElementById(currentId);
 		removeChildNodes(currentNode);
 	}
-	document.getElementById("wfsGeomType").style.visibility = "hidden";
-	document.getElementById("wfsRemove").style.visibility = "hidden";
-		
+	
 	geomArray = new parent.GeometryArray();
 
 	parent.mb_ajax_json("../php/mod_wfs_gazetteer_server.php", {command:"getWfsConf",wfsConfIdString:wfsConfIdString}, function(json, status) {
-//	parent.mb_ajax_json("../php/mod_wfs_gazetteer_server.php", {command:"getWfsConfsForThisApplication",wfsConfIdString:wfsConfIdString}, function(json, status) {
 		global_wfsConfObj = json;
 		var wfsCount = 0;
 		for (var wfsConfId in global_wfsConfObj) {
@@ -433,11 +373,10 @@
 		else if (wfsCount === 1) {
 			appendStyles();
 			appendWfsForm();
-			setWfsInfo();	
 		}
 		else {
 			appendWfsConfSelectBox();
-			setWfsInfo();	
+			
 		}
 		parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
 	});
@@ -450,7 +389,13 @@
 }
 
 function setWfsInfo() {
-	var bulbNode = document.getElementById("wfsInfo"); 	
+	
+	var bodyNode = document.getElementById("wfsIcons");
+	removeChildNodes(bodyNode);
+	var bulbNode = document.createElement("a");	
+	bulbNode.name = "wfsInfo";
+	bulbNode.id = "wfsInfo";
+	bodyNode.appendChild(bulbNode);
 
 	// append bulb image
 	removeChildNodes(bulbNode);
@@ -459,12 +404,41 @@
 	//imgNode.src = "../img/button_digitize/geomInfo.png";
 	imgNode.src = "../img/tree_new/info.png";
 	imgNode.border = 0;
+	imgNode.title = "show metadata";
 	bulbNode.appendChild(imgNode);
 	bulbNode.href = "javascript:openwindow('../php/mod_featuretypeMetadata.php?wfs_conf_id=" + global_selectedWfsConfId.toString() + "');";
 	bulbNode.style.visibility = "visible";
-	
+		
+	// set image: remove this WFS
+	var wfsRemoveNode = document.createElement("img");
+	wfsRemoveNode.name = "wfsRemove";
+	wfsRemoveNode.id = "wfsRemove";
+	wfsRemoveNode.title = "remove WFS Conf";
+	bodyNode.appendChild(wfsRemoveNode);
+	//wfsRemoveNode.src = "../img/button_digitize/geomRemove.png";
+	wfsRemoveNode.src = "../img/tree_new/delete_wms.png";
+	wfsRemoveNode.style.visibility = 'visible';
+	// Internet explorer
+	if (parent.ie) {
+		wfsRemoveNode.onclick = function() {
+			var x = new Function ("", "delete global_wfsConfObj[global_selectedWfsConfId];setWfsConfIdString();initModWfsGazetteer();parent.mb_setWmcExtensionData({'wfsConfIdString':wfsConfIdString});"); 
+			x(); 
+		};
+	}
+	// Firefox
+	else {
+		wfsRemoveNode.onclick = function () {
+			delete global_wfsConfObj[global_selectedWfsConfId];
+			setWfsConfIdString();
+			initModWfsGazetteer();			
+			parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
+		}
+	} 
 	// set wfsGeomType image
-	var wfsGeomTypeNode = document.getElementById("wfsGeomType");
+	var wfsGeomTypeNode = document.createElement("img");
+	wfsGeomTypeNode.name = "wfsGeomType";
+	wfsGeomTypeNode.id = "wfsGeomType";
+	bodyNode.appendChild(wfsGeomTypeNode);
 	var wfsGeomType = "";
 	for (var i=0; i < global_wfsConfObj[global_selectedWfsConfId].element.length; i++) {
 		if (parseInt(global_wfsConfObj[global_selectedWfsConfId].element[i].f_geom)) {
@@ -474,40 +448,19 @@
 	if (wfsGeomType.match(/Point/)) {
 		wfsGeomTypeNode.src = "../img/button_digitize/point.png";
 		wfsGeomTypeNode.style.visibility = 'visible';
+		wfsGeomTypeNode.title = 'Point';
 	}
 	else if (wfsGeomType.match(/Line/)) {
 		wfsGeomTypeNode.src = "../img/button_digitize/line.png";
-		wfsGeomTypeNode.style.visibility = 'visible';
+		wfsGeomTypeNode.title = 'Line';
 	}
 	else if (wfsGeomType.match(/Polygon/)) {
 		wfsGeomTypeNode.src = "../img/button_digitize/polygon.png";
-		wfsGeomTypeNode.style.visibility = 'visible';
+		wfsGeomTypeNode.title = 'Polygon';
 	}
 	else {
 		var e = new parent.Mb_exception("WFS gazetteer: geometry type unknown.");
 	}
-	
-	// set image: remove this WFS
-	var wfsRemoveNode = document.getElementById("wfsRemove");
-	//wfsRemoveNode.src = "../img/button_digitize/geomRemove.png";
-	wfsRemoveNode.src = "../img/tree_new/delete_wms.png";
-	wfsRemoveNode.style.visibility = 'visible';
-	// Internet explorer
-	if (parent.ie) {
-		wfsRemoveNode.onclick = function() {
-			var x = new Function ("", "delete global_wfsConfObj[global_selectedWfsConfId];setWfsConfIdString();initModWfsGazetteer();parent.mb_setWmcExtensionData({'wfsConfIdString':wfsConfIdString});"); 
-			x(); 
-		};
-	}
-	// Firefox
-	else {
-		wfsRemoveNode.onclick = function () {
-			delete global_wfsConfObj[global_selectedWfsConfId];
-			setWfsConfIdString();
-			initModWfsGazetteer();			
-			parent.mb_setWmcExtensionData({"wfsConfIdString":wfsConfIdString});
-		}
-	}  
 }
 
 function setWfsConfIdString() {
@@ -521,31 +474,26 @@
 	wfsConfIdString = str.join(",");
 }
 
-function selectWfsConfId (confId) {
-	global_selectedWfsConfId = confId;
- 	if(typeof(resultGeometryPopup)!="undefined"){
- 		resultGeometryPopup.destroy();
- 	}
- 	if(typeof(wfsPopup)!="undefined"){
- 		wfsPopup.destroy();
- 	}
-	setWfsInfo();
-	appendStyles();
-	appendWfsForm();	
-}
-
 function appendWfsConfSelectBox() {
 	var selectNode = document.createElement("select");
 	selectNode.name = "wfs_conf_sel";
 	var wfsFormNode = document.getElementById("selectWfsConfForm");
-//	if (parent.ie) {
+	if (parent.ie) {
 		selectNode.onchange = function() {
-			selectWfsConfId(parseInt(this.value, 10));
+		global_selectedWfsConfId = this.value;
+     	if(typeof(resultGeometryPopup)!="undefined"){
+	 		resultGeometryPopup.destroy();
+	 	}
+	 	if(typeof(wfsPopup)!="undefined"){
+	 		wfsPopup.destroy();
+	 	}
+    	appendStyles();
+		appendWfsForm();
 		};
-//	}
-//	else{
-//	   selectNode.setAttribute("onchange", "if(typeof(resultGeometryPopup)!='undefined'){resultGeometryPopup.destroy();}if(typeof(wfsPopup)!='undefined'){wfsPopup.destroy();};global_selectedWfsConfId = this.value;setWfsInfo();appendStyles();appendWfsForm();");
-//	}
+	}
+	else{
+	   selectNode.setAttribute("onchange", "if(typeof(resultGeometryPopup)!='undefined'){resultGeometryPopup.destroy();}if(typeof(wfsPopup)!='undefined'){wfsPopup.destroy();};global_selectedWfsConfId = this.value;appendStyles();appendWfsForm();");
+	}
 	var isSelected = false;
 	for (var wfsConfId in global_wfsConfObj) {
 		var optionNode = document.createElement("option");
@@ -569,6 +517,9 @@
 }
 
 function appendWfsForm() {
+	if(showWfsIcons) {
+		setWfsInfo();
+	}
 	var form = document.getElementById("wfsForm");
 	removeChildNodes(form);
 	var resultDiv = document.getElementById("res");
@@ -635,7 +586,7 @@
 	var delFilterButton = document.createElement("input");
 	delFilterButton.type = "button";
 	delFilterButton.style.marginLeft = "5px";
-	delFilterButton.className = global_wfsConfObj[global_selectedWfsConfId].g_button_id;
+	delFilterButton.className = "buttonDelFilter";
 	delFilterButton.value = clearFilterButtonLabel;
 	// Internet explorer
 	if (parent.ie) {
@@ -674,8 +625,6 @@
 }
 
 function clearFilter(){
-	createGlobalResultHighlight(targetArray);
-
 	var wfsConfElementArray = global_wfsConfObj[global_selectedWfsConfId].element;
 	for (var i = 0; i < wfsConfElementArray.length; i++){
 		if (parseInt(wfsConfElementArray[i].f_search)) {
@@ -760,11 +709,6 @@
 	
 	return cnt;
 }
-
-function createGlobalResultHighlight (targetArray) {
-	global_resultHighlight = new parent.Highlight(targetArray, "wfs_gazetteer_highlight", {"position":"absolute", "top":"0px", "left":"0px", "z-index":100}, 2);
-}
-
 function validate(){
 	if(geomArray.count()>0){
  		geomArray.empty();
@@ -775,7 +719,8 @@
  	if(typeof(wfsPopup)!="undefined"){
  		wfsPopup.destroy();
  	}
-	createGlobalResultHighlight(targetArray);
+	global_resultHighlight = new parent.Highlight(targetArray, "wfs_gazetteer_highlight", {"position":"absolute", "top":"0px", "left":"0px", "z-index":100}, 2);
+
 	var filterParameterCount = getNumberOfFilterParameters();
 	
 	if(filterParameterCount == 0 && spatialRequestGeom == null){
@@ -806,7 +751,7 @@
 						var elementValue = selectedVal.join(",");
 					}
 					else{
-						var elementValue = document.getElementById(el[i]['element_name']).value.toString().split(" ").join(",");
+						var elementValue = document.getElementById(el[i]['element_name']).value;
 					}
 				}
 				
@@ -1107,38 +1052,10 @@
 	return false;
 }
 
-function flstkNrBeautifier (flstkNr) {
-	var pattern = /^\d{2}(\d{4})(\d{3})(\d{5})(\d{4})?/;
-	var regExpSegments = pattern.exec(flstkNr);
-	var beautified = "";
-	beautified += regExpSegments[1] + "-" + regExpSegments[2] + "-" + 
-		String(parseInt(regExpSegments[3], 10));
-		
-	if (regExpSegments[4]) {
-		beautified += "/" + String(parseInt(regExpSegments[4], 10));
-	}
-	return beautified;
-}
-
-function getFlstkFromSelection ($selection) {
-	var flstkArray = [];
-
-	var geomIndices = getSelectedResultGeometries($selection);
-	var attributeName = getTitleAttribute();
-	if (attributeName !== null) {
-		for (var i = 0; i < geomIndices.length; i++) {
-			var flstkNr = geomArray.get(geomIndices[i]).e.getElementValueByName(attributeName);
-			flstkArray.push(flstkNr);
-		}
-	}
-	return flstkArray;
-}
-
 function displayResult(geom){
 	geomArray = geom;
 	if(geomArray!=null && geomArray.count()>0){
-//		var contentHtml = createListOfGeometries();
-		var contentHtml = createUiResultList();
+		var contentHtml = createListOfGeometries();
 	}
 	else{
 		var contentHtml = "No results.";
@@ -1154,116 +1071,15 @@
 		}
 		resultGeometryPopup.show();
 		parent.$("#resultTable").tablesorter({
-     		sortList: [[0,0]]
+     		sortList: [[0,0]],
+     		widgets: ['zebra'] 
         });
 	}
 	else{
-		$("#res").html(contentHtml);
-		$("#ui-sortable-result-list").children().contextMenu('folderMenu', {
-			"shadow" : false,
-			onContextMenu: function(e){
-				$("#resultgeometry_zoom").css("display", "block");
-				
-				if (!$(e.target).hasClass('ui-selected')) {
-					$('.ui-selected').removeClass('ui-selected');
-					$(e.target).addClass('ui-selected');
-				}
-				if ($('.ui-selected').size() > 1) {
-					$("#resultgeometry_zoom").css("display", "none");
-				}
-				return true;
-			},
-			onShowMenu: function(e, menu){
-				showContextMenu();
-				return menu;
-			},
-			bindings: {
-				'resultgeometry_pdf': function (item) {
-					var flstkArray = getFlstkFromSelection($(".ui-selected"));
-					clickPdf(flstkArray);
-				},
-				'resultgeometry_bild': function () {
-					var flstkArray = getFlstkFromSelection($(".ui-selected"));
-					clickBild(flstkArray);
-				},
-				'resultgeometry_alkisbuch': function () {
-					var flstkArray = getFlstkFromSelection($(".ui-selected"));
-					clickAlkisbuch(flstkArray);
-				},
-				'resultgeometry_zoom': function (item) {
-					var geomIndices = getSelectedResultGeometries($(".ui-selected"));
-					if (geomIndices.length !== 1) {
-						geomIndices = getSelectedResultGeometries($(item));
-					}
-					setResult('click', geomIndices[0]);
-				}
-			}
-		});
-
-		$("#ui-sortable-result-list").selectable({
-			"selecting" : function () {
-			},
-			"selected" : function (event, ui) {
-				var geomIds = getSelectedResultGeometries($(ui.selected));
-				setResult('over', geomIds[0]);
-			},
-			"unselected" : function(event, ui){
-				var geomIds = getSelectedResultGeometries($(ui.unselected));
-				setResult('out', geomIds[0]);
-			},
-			"start" : function () {
-				hideContextMenu();
-				createGlobalResultHighlight(targetArray);
-			},
-			"stop" : function (event, ui) {
-			}
-		});
+		document.getElementById("res").innerHTML = contentHtml;
 	}
 } 
 
-function clearUiGeometryList () {
-}
-
-function getSelectedResultGeometries ($nodes) {
-	var indexArray = [];
-	$nodes.each(function () {
-		var elementId = this.id;
-		var geometryId = parseInt(elementId.substr(15), 10);
-		indexArray.push(geometryId);
-	});
-	return indexArray;
-}
-
-function showContextMenu () {
-	$("#jqContextMenu").css("display", "block");
-}
-
-function hideContextMenu () {
-	$("#jqContextMenu").css("display", "none");
-}
-
-function createUiResultList () {
-	var listItemArray = [];
-	if (geomArray.count() > 0) {
-		for (var i = 0 ; i < geomArray.count(); i ++) {
-			if (geomArray.get(i).get(-1).isComplete()) {
-				var currentHtml = "<li class='ui-widget-content'";
-				currentHtml += " id='resultgeometry_" + i + "'>";
-				var resultElObj = getListValues(geomArray.get(i));
-				for (var l = 1 ; l < resultElObj.length; l ++) {
-					if(resultElObj[l]!=''){
-						currentHtml += resultElObj[l];
-					}
-				}	
-				currentHtml += "</li>";
-				listItemArray.push(currentHtml);
-			}
-		}
-	}
-	return "<ul id='ui-sortable-result-list'>" + listItemArray.join("") + "</ul>";
-	
-}
-
 function createListOfGeometries(){
 	if(showResultInPopup==1){
 		var domPath = "window.frames['"+frameName+"'].";
@@ -1296,10 +1112,10 @@
 						listOfGeom += "<td style='cursor:pointer;\n";
 						if(showResultInPopup==1){
 							if ((i % 2) === 0) {
-								listOfGeom += "color:blue'";
+								listOfGeom += "' class='even'";
 							}
 							else {
-								listOfGeom += "color:red'";
+								listOfGeom += "' class='odd'";
 							}
 						}
 						else{
@@ -1324,16 +1140,6 @@
 	return listOfGeom; 
 }
 
-function getTitleAttribute () {
-	var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
-	for (var j = 0 ; j < wfsConf.element.length ; j++) {
-		if(wfsConf.element[j].f_show == 1){
-			return wfsConf.element[j].element_name;
-		}
-	}	
-	return null;
-}
-
 function getListTitle(){
 	var wfsConf = global_wfsConfObj[global_selectedWfsConfId];
 	var labelArray = [];
@@ -1353,12 +1159,7 @@
 		if (wfsConf.element[i].f_show == 1 && geom.e.getElementValueByName(wfsConf.element[i].element_name) !=false) {
 			var pos = wfsConf.element[i].f_respos;
 			if(pos>0){
-				if (global_flstkElementName !== null && wfsConf.element[i].element_name == global_flstkElementName) {
-					resultArray[pos] = flstkNrBeautifier(geom.e.getElementValueByName(wfsConf.element[i].element_name));
-				}
-				else {
-					resultArray[pos] = geom.e.getElementValueByName(wfsConf.element[i].element_name);
-				}
+				resultArray[pos] = geom.e.getElementValueByName(wfsConf.element[i].element_name);
 			}
 		}
 	}
@@ -1486,22 +1287,12 @@
 
 </script>
 </head>
-<body leftmargin='0' topmargin='10'  bgcolor='#ffffff'>
+<body>
 <form name='selectWfsConfForm' id='selectWfsConfForm'></form>
-<div name='displaySpatialButtons' id='displaySpatialButtons' style='width:180px'></div>
-<a name='wfsInfo' id='wfsInfo'></a>
-<img src = "" name='wfsRemove' id='wfsRemove'>
-<img src = "" name='wfsGeomType' id='wfsGeomType'>
-<form name='wfsForm' id='wfsForm' onsubmit='return validate()'></form>
+<div name='wfsIcons' id='wfsIcons'></div>
+<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="contextMenu" id="folderMenu">
-			<ul>
-				<li id="resultgeometry_pdf">PDF</li>
-				<li id="resultgeometry_bild">Bild</li>
-				<li id="resultgeometry_alkisbuch">Alkisbuch</li>
-				<li id="resultgeometry_zoom">Zoom</li>
-			</ul>
-		</div>
-		<br><br><br><br>
 </body>
 </html>

Modified: branches/google_dev/http/javascripts/wfs.php
===================================================================
--- branches/google_dev/http/javascripts/wfs.php	2009-06-04 10:10:58 UTC (rev 3997)
+++ branches/google_dev/http/javascripts/wfs.php	2009-06-04 10:27:00 UTC (rev 3998)
@@ -325,7 +325,7 @@
 	}
 }
 
-function mb_wfs_perform(type,m, colour){
+function mb_wfs_perform(type,m, colour) {
 	if (typeof(colour) == "undefined") {
 		colour = "#ff0000";
 	}



More information about the Mapbender_commits mailing list