[Mapbender-commits] r7655 - in trunk/mapbender/http/print: . classes

[svn_mapbender at osgeo.org]

Author: astrid_emde
Date: 2011-02-26 07:57:18 -0800 (Sat, 26 Feb 2011)
New Revision: 7655

Modified:
   trunk/mapbender/http/print/A3_landscape_template.json
   trunk/mapbender/http/print/A3_portrait_template.json
   trunk/mapbender/http/print/A4_landscape_template.json
   trunk/mapbender/http/print/A4_portrait_template.json
   trunk/mapbender/http/print/classes/mbTextDecorator.php
Log:
fix in transfer of date tp pdf, added time as element to json-template

Modified: trunk/mapbender/http/print/A3_landscape_template.json
===================================================================
--- trunk/mapbender/http/print/A3_landscape_template.json	2011-02-26 15:08:25 UTC (rev 7654)
+++ trunk/mapbender/http/print/A3_landscape_template.json	2011-02-26 15:57:18 UTC (rev 7655)
@@ -140,7 +140,7 @@
 	    		"y_ul" : 158.7,
 	    		"font_family" : "Arial",
 	    		"font_size" : 20,
-				"value" : "scale"
+				"value" : "date"
 	   		},
 	   		"nordpfeil" : {
     			"type" : "image",

Modified: trunk/mapbender/http/print/A3_portrait_template.json
===================================================================
--- trunk/mapbender/http/print/A3_portrait_template.json	2011-02-26 15:08:25 UTC (rev 7654)
+++ trunk/mapbender/http/print/A3_portrait_template.json	2011-02-26 15:57:18 UTC (rev 7655)
@@ -140,7 +140,7 @@
 	    		"y_ul" : 29.9,
 	    		"font_family" : "Arial",
 	    		"font_size" : 14,
-				"value" : "scale"
+				"value" : "date"
 	   		},
 	   		"nordpfeil" : {
     			"type" : "image",

Modified: trunk/mapbender/http/print/A4_landscape_template.json
===================================================================
--- trunk/mapbender/http/print/A4_landscape_template.json	2011-02-26 15:08:25 UTC (rev 7654)
+++ trunk/mapbender/http/print/A4_landscape_template.json	2011-02-26 15:57:18 UTC (rev 7655)
@@ -140,8 +140,16 @@
 	    		"y_ul" : 114,
 	    		"font_family" : "Arial",
 	    		"font_size" : 12,
-				"value" : "scale"
-	   		},
+				"value" : "date"
+	   		},
+		        "time" : {
+		            "type" : "text",
+		            "x_ul" : 270,
+		            "y_ul" : 114,
+		            "font_family" : "Arial",
+		            "font_size" : 11,
+		            "value" : "time"
+		        },
 	   		"nordpfeil" : {
     			"type" : "image",
     			"x_ul" : 230,

Modified: trunk/mapbender/http/print/A4_portrait_template.json
===================================================================
--- trunk/mapbender/http/print/A4_portrait_template.json	2011-02-26 15:08:25 UTC (rev 7654)
+++ trunk/mapbender/http/print/A4_portrait_template.json	2011-02-26 15:57:18 UTC (rev 7655)
@@ -140,8 +140,16 @@
                     "y_ul" : 25,
                     "font_family" : "Arial",
                     "font_size" : 11,
-                    "value" : "scale"
+                    "value" : "date"
                 },
+                "time" : {
+                    "type" : "text",
+                    "x_ul" : 58,
+                    "y_ul" : 25,
+                    "font_family" : "Arial",
+                    "font_size" : 11,
+                    "value" : "time"
+                },
                 "nordpfeil" : {
                     "type" : "image",
                     "x_ul" : 184,

Modified: trunk/mapbender/http/print/classes/mbTextDecorator.php
===================================================================
--- trunk/mapbender/http/print/classes/mbTextDecorator.php	2011-02-26 15:08:25 UTC (rev 7654)
+++ trunk/mapbender/http/print/classes/mbTextDecorator.php	2011-02-26 15:57:18 UTC (rev 7655)
@@ -29,8 +29,11 @@
 		foreach ($this->overrideMembersFromRequest as $overrideMemberFromRequest) {
 			switch ($this->conf->{$overrideMemberFromRequest})  {
 				case "date": 
-					$this->{$overrideMemberFromRequest} = date("d.m.y");
+					$this->{$overrideMemberFromRequest} = date("j. n. Y");
 					break;
+				case "time": 
+					$this->{$overrideMemberFromRequest} = date("G:i");
+					break;
 				case "scale": 
 					$mapInfoScale = $this->pdf->getMapInfo();
 					$this->{$overrideMemberFromRequest} = "1 : ".$mapInfoScale["scale"];