# HG changeset patch
# User Christian Lins <christian.lins@intevation.de>
# Date 1364997541 -7200
# Node ID 8d0af912351c2c33cefb31707f35156dd5622591
# Parent  ef32ab3c16794eeb75ae1f8e4188691d3ad8797d
Revert config.yaml to usable version.
Some changes to Map resizing in DigitizePanel.

diff -r ef32ab3c1679 -r 8d0af912351c flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java	Mon Mar 25 14:36:39 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/DigitizePanel.java	Wed Apr 03 15:59:01 2013 +0200
@@ -156,21 +156,18 @@
         Map map  = floodMap.getMap();
 
         helperContainer.addResizedHandler(new ResizedHandler() {
-
             @Override
             public void onResized(ResizedEvent event) {
                 mapPanel.doLayout(helperContainer.getWidth(), helperContainer.getHeight());
             }
         });
         helperContainer.addParentMovedHandler(new ParentMovedHandler() {
-
             @Override
             public void onParentMoved(ParentMovedEvent event) {
-                mapPanel.updateSize();
+                mapPanel.doLayout(helperContainer.getWidth(), helperContainer.getHeight());
             }
         });
         helperContainer.addMember(mapPanel);
-        //helperContainer.setSize(helperContainer.getWidthAsString()(), helperContainer.getHeightAsString()());
 
         parameterList.registerCollectionViewTabHandler(this);
 
diff -r ef32ab3c1679 -r 8d0af912351c flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Mon Mar 25 14:36:39 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java	Wed Apr 03 15:59:01 2013 +0200
@@ -52,11 +52,11 @@
 import de.intevation.flys.client.shared.model.DefaultDataItem;
 import de.intevation.flys.client.shared.model.ExportMode;
 import de.intevation.flys.client.shared.model.FixAnalysisArtifact;
+import de.intevation.flys.client.shared.model.MINFOArtifact;
 import de.intevation.flys.client.shared.model.OutputMode;
 import de.intevation.flys.client.shared.model.ReportMode;
 import de.intevation.flys.client.shared.model.River;
 import de.intevation.flys.client.shared.model.WINFOArtifact;
-import de.intevation.flys.client.shared.model.MINFOArtifact;
 
 import java.util.ArrayList;
 import java.util.List;
diff -r ef32ab3c1679 -r 8d0af912351c flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapPanel.java	Mon Mar 25 14:36:39 2013 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapPanel.java	Wed Apr 03 15:59:01 2013 +0200
@@ -49,10 +49,6 @@
         add(floodMapWidget);
     }
 
-    public void updateSize() {
-        floodMapWidget.getMap().updateSize();
-    }
-
     public void doLayout(int w, int h) {
         int width = w;
         int height = h;
diff -r ef32ab3c1679 -r 8d0af912351c flys-client/src/main/webapp/WEB-INF/config.yaml
--- a/flys-client/src/main/webapp/WEB-INF/config.yaml	Mon Mar 25 14:36:39 2013 +0100
+++ b/flys-client/src/main/webapp/WEB-INF/config.yaml	Wed Apr 03 15:59:01 2013 +0200
@@ -25,7 +25,7 @@
   - 2000000
   - 4000000
 
-outputFilename: "flys-${date}.pdf"
+outputFilename: 'flys-${date}.pdf'
 
 #===========================================================================
 # the list of allowed hosts
@@ -54,12 +54,65 @@
     port: 80
 
 layouts:
+  #===========================================================================
+  A4 portrait:
+  #===========================================================================
+    metaData:
+      title: '${title}'
+      author: 'Flys'
+      subject: 'Kartendruck A4 Portrait'
+      keywords: 'map,print'
+      creator: 'd4e-river'
+
+    #-------------------------------------------------------------------------
+    mainPage:
+      pageSize: A4
+      landscape: false
+      header:
+        height: 50
+        items:
+          - !image
+            align: left
+            maxWidth: 60
+            maxHeight: 60
+            url: '${configDir}/../images/FLYS_Logo.png'
+      items:
+        - !text
+            font: Helvetica
+            fontSize: 30
+            align: right
+            text: '${mapTitle}'
+            spacingAfter: 30
+        - !map
+          spacingAfter: 30
+          width: 440
+          height: 483
+        - !scalebar
+          type: bar
+          maxSize: 100
+          barBgColor: white
+          fontSize: 8
+          align: right
+        - !text
+          text: '${comment}'
+          spacingAfter: 30
+        - !text
+          font: Helvetica
+          fontSize: 9
+          align: right
+          text: '1:${scale} ${now MM.dd.yyyy}'
+        - !legends
+          align: left
+          maxIconWidth: 32
+          maxIconHeight: 32
+      footer: *commonFooter
+      
 
   #===========================================================================
   A4 landscape:
   #===========================================================================
     metaData:
-      title: "${title}"
+      title: '${title}'
       author: 'Flys'
       subject: 'Kartendruck A4 Quer'
       keywords: 'map,print'
@@ -72,27 +125,96 @@
       header:
         height: 50
         items:
-          - !columns
-            config:
-              cells:
-                - paddingBottom: 5
-            items:
-            - !image
-              align: left
-              maxWidth: 50
-              maxHeight: 50
-              url: "${configDir}/../images/FLYS_Logo.png"
-            - !text
-              font: Helvetica
-              fontSize: 30
-              align: right
-              text: "${mapTitle}"
-              
+          - !image
+            align: left
+            maxWidth: 60
+            maxHeight: 60
+            url: '${configDir}/../images/FLYS_Logo.png'
       items:
-      - !map
-        absoluteX: 45
-        absoluteY: 510
-        spacingAfter: 200
-        width: 540
-        height: 480
-        align: left
+        - !text
+            font: Helvetica
+            fontSize: 30
+            align: right
+            text: '${mapTitle}'
+            spacingAfter: 30
+        - !map
+          absoluteX: 45
+          absoluteY: 510
+          #spacingAfter: 30
+          width: 540
+          height: 480
+          align: left
+        - !scalebar
+          type: bar
+          maxSize: 100
+          barBgColor: white
+          fontSize: 8
+          align: right
+        - !text
+          text: '${comment}'
+          spacingAfter: 30
+        - !text
+          font: Helvetica
+          fontSize: 9
+          align: right
+          text: '1:${scale} ${now MM.dd.yyyy}'
+        - !legends
+          align: right
+          maxIconWidth: 32
+          maxIconHeight: 32
+#         - !columns
+#           widths: [500, 200]
+#           items:
+#             - !map
+#               width: 500
+#               height: 500
+#             - !legends
+      footer: *commonFooter
+
+
+  #===========================================================================
+  A0 portrait:
+  #===========================================================================
+    metaData:
+      title: '${title}'
+      author: 'MapFish print module'
+      subject: 'Simple layout'
+      keywords: 'map,print'
+      creator: 'MapFish'
+
+    #-------------------------------------------------------------------------
+    mainPage:
+      pageSize: A0
+      rotation: true
+      header:
+        height: 50
+        items:
+          - !text
+            font: Helvetica
+            fontSize: 30
+            align: right
+            text: '${mapTitle}'
+      items:
+        - !map
+          spacingAfter: 30
+          width: 1760
+          height: 1932
+        - !scalebar
+          type: bar
+          maxSize: 100
+          barBgColor: white
+          fontSize: 8
+          align: right
+        - !text
+          text: '${comment}'
+          spacingAfter: 30
+        - !text
+          font: Helvetica
+          fontSize: 9
+          align: right
+          text: '1:${scale} ${now MM.dd.yyyy}'
+        - !legends
+          align: left
+          maxIconWidth: 32
+          maxIconHeight: 32
+      footer: *commonFooter