[Mapbender-commits] r3497 - in branches/print_dev/http/print: . classes

[svn_mapbender at osgeo.org]

Author: mschulz
Date: 2009-01-28 11:23:40 -0500 (Wed, 28 Jan 2009)
New Revision: 3497

Modified:
   branches/print_dev/http/print/classes/mbTemplatePdf.php
   branches/print_dev/http/print/testConfigTemplate.json
Log:
Page elements now have an id and a type

Modified: branches/print_dev/http/print/classes/mbTemplatePdf.php
===================================================================
--- branches/print_dev/http/print/classes/mbTemplatePdf.php	2009-01-26 22:09:00 UTC (rev 3496)
+++ branches/print_dev/http/print/classes/mbTemplatePdf.php	2009-01-28 16:23:40 UTC (rev 3497)
@@ -37,7 +37,7 @@
             $this->objPdf->useTemplate($tplidx);
             
             foreach ($pageConf->elements as $pageElementId => $pageElementConf) {
-				switch ($pageElementId) {
+				switch ($pageElementConf->type) {
 					case "map":
 						$err = new mbMapDecorator($this, $pageElementConf);
 						break;

Modified: branches/print_dev/http/print/testConfigTemplate.json
===================================================================
--- branches/print_dev/http/print/testConfigTemplate.json	2009-01-26 22:09:00 UTC (rev 3496)
+++ branches/print_dev/http/print/testConfigTemplate.json	2009-01-28 16:23:40 UTC (rev 3497)
@@ -9,14 +9,14 @@
     		"label" : "Titel",
     		"type" : "text",
     		"size" : 20,
-    		"pageElementsLink" : "title:value"
+    		"pageElementsLink" : "titel:value"
     	},
     	{
     		"id" : "dpi",
     		"label" : "DPI",
     		"type" : "select",
     		"size" : 20,
-    		"pageElementsLink" : "map:res_dpi",
+    		"pageElementsLink" : "karte:res_dpi",
     		"options" : [
     			{
     			"value" : "56",
@@ -43,16 +43,16 @@
     	 "tpl" : "mbtemplate1.pdf",
     	 "useTplPage" : 1,
     	 "elements" : {
-	    	 "map" : {
-    			"show" : true,
+	    	 "karte" : {
+    			"type" : "map",
     			"res_dpi" : 72, 
     			"x_ul" : 10.1,
 	    		"y_ul" : 15.2,
 	    		"width" : 280,
     			"height" : 185
 	   			},
-	   		"overview" : {
-    			"show" : true,
+	   		"minikarte" : {
+    			"type" : "overview",
     			"res_dpi" : 72, 
     			"x_ul" : 10.1,
 	    		"y_ul" : 15.2,