[Mapbender-commits] r2510 - branches/beck_dev/mapbender/http/php

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2008-06-18 04:00:18 -0400 (Wed, 18 Jun 2008)
New Revision: 2510

Modified:
   branches/beck_dev/mapbender/http/php/mod_editApplication.php
   branches/beck_dev/mapbender/http/php/mod_editApplication_server.php
Log:
minor enhancements

Modified: branches/beck_dev/mapbender/http/php/mod_editApplication.php
===================================================================
--- branches/beck_dev/mapbender/http/php/mod_editApplication.php	2008-06-17 16:25:57 UTC (rev 2509)
+++ branches/beck_dev/mapbender/http/php/mod_editApplication.php	2008-06-18 08:00:18 UTC (rev 2510)
@@ -62,6 +62,8 @@
 		controlPopup = new mb_popup({
 			left:300,
 			top:300,
+			width:200,
+			height:50,
 			html:"<div id='controls'></div>",
 			title:"Toolbox"
 		});
@@ -221,8 +223,9 @@
 		var callback = options.callback;
 		var data = [];
 		$(".collection").children().each(function() {
+			console.log("id: %s (%s)", this.id, this.tagName);
 			data.push({
-				name:this.name,
+				id:this.id,
 				top:parseInt(this.style.top),
 				left:parseInt(this.style.left)	
 			});
@@ -275,6 +278,9 @@
 				echo "<div ";
 				echo " style = 'border-width:1px;border-style:solid;border-color:black;background-color: #ffffff;";
 			}
+			if (db_result($res,$i,"e_closetag") == "div" ) {
+				echo "border-width:1px;border-style:solid;border-color:black;background-color: #ffffff;";
+			}
 	//			echo "<div class='wrap' ";
 			if(db_result($res,$i,"e_left") != "" && db_result($res,$i,"e_top") != ""){
 				echo "position:absolute;";
@@ -286,17 +292,21 @@
 				echo "height:".db_result($res,$i,"e_height").";";
 			}
 			if(db_result($res,$i,"e_z_index") != ""){
-		    	echo "z-index:".db_result($res,$i,"e_z_index").";";
+//		    	echo "z-index:".db_result($res,$i,"e_z_index").";";
 			}
 			if(db_result($res,$i,"e_more_styles") != ""){
 		    	echo db_result($res,$i,"e_more_styles");
 			}
+			echo "' ";
 	//			echo "' >";
 	//			echo "<".db_result($res,$i,"e_element")." ";
 			if(db_result($res,$i,"e_id") != ""){
 				echo " id='".db_result($res,$i,"e_id")."' ";
 				echo " name='".db_result($res,$i,"e_id")."' ";
 			}
+			if (db_result($res,$i,"e_closetag") == "select" ) {
+				echo " disabled ";
+			}
 			if(db_result($res,$i,"e_attributes") != ""){
 	//				echo " ".stripslashes(preg_replace($pattern,$replacement,db_result($res,$i,"e_attributes")));
 			}
@@ -321,8 +331,11 @@
 				}
 			}
 			echo "' >";
+			if (db_result($res,$i,"e_closetag") == "iframe" || db_result($res,$i,"e_closetag") == "div") {
+				echo db_result($res,$i,"e_id");
+			}
 			if(db_result($res,$i,"e_content") != ""){
-				echo " ".stripslashes(db_result($res,$i,"e_content"));
+//				echo " ".stripslashes(db_result($res,$i,"e_content"));
 			}
 			if(db_result($res,$i,"e_closetag") != "" && db_result($res,$i,"e_closetag") != "body"){
 				if (db_result($res,$i,"e_closetag") != "iframe" ) {

Modified: branches/beck_dev/mapbender/http/php/mod_editApplication_server.php
===================================================================
--- branches/beck_dev/mapbender/http/php/mod_editApplication_server.php	2008-06-17 16:25:57 UTC (rev 2509)
+++ branches/beck_dev/mapbender/http/php/mod_editApplication_server.php	2008-06-18 08:00:18 UTC (rev 2510)
@@ -31,7 +31,7 @@
 		$elementArray = $queryObj->parameters->data;		
 		for ($i = 0; $i < count($elementArray); $i++) {
 			$currentElement = $elementArray[$i];
-			$id = $currentElement->name;
+			$id = $currentElement->id;
 			$top = $currentElement->top;
 			$left = $currentElement->left;
 			$app = $queryObj->parameters->applicationId;