--- a/flys-client/src/main/webapp/WEB-INF/config.yaml	Thu Apr 04 18:41:36 2013 +0200
+++ b/flys-client/src/main/webapp/WEB-INF/config.yaml	Thu Apr 04 19:21:09 2013 +0200
@@ -52,169 +52,96 @@
   - !dnsMatch
     host: osm.intevation.de
     port: 80
+  - !dnsMatch
+    host: osm.wheregroup.com
+    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}'
-      author: 'Flys'
+      author: 'Flusshydrologische Software'
       subject: 'Kartendruck A4 Quer'
       keywords: 'map,print'
       creator: 'd4e-river'
 
     #-------------------------------------------------------------------------
     mainPage:
+       # 842 * 595
       pageSize: A4
       landscape: true
-      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
-          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}'
+      marginLeft: 20
+      marginRight: 20
+      marginTop: 20
+      marginBottom: 20
       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
+          absoluteX: 20
           align: left
-          maxIconWidth: 32
-          maxIconHeight: 32
-      footer: *commonFooter
+          absoluteY: 575
+          width: 592
+          height: 555
+          spacingAfter: 0
+        #Flys and BFG Logo
+        - !columns
+          absoluteX: 747
+          absoluteY: 100
+          width: 60
+          items:
+            - !image
+              maxWidth: 60
+              maxHeight: 60
+              url: '${configDir}/../images/FLYS_Logo.png'
+        - !columns
+          absoluteX: 732
+          absoluteY: 160
+          width: 90
+          items:
+            - !image
+              maxWidth: 90
+              maxHeight: 60
+              url: '${configDir}/../images/bfg_logo.gif'
+        # Legend header, a bit hackish with the border
+        # but I don't know how to put two rows in a column and I don't want to
+        # use tables
+        - !columns
+          absoluteX: 612
+          absoluteY: 575
+          width: 200
+          items:
+            - !text
+              text: "Legende:"
+              align: center
+          config:
+            borderWidthLeft: 1
+            borderWidthRight: 1
+            borderWidthTop: 1
+            borderWidthBottom: 0
+        # The legend
+        - !columns
+          absoluteX: 612
+          absoluteY: 564
+          width: 200
+          items:
+            - !legends
+              maxHeight: 0
+              maxWidth: 0
+              maxIconHeight: 200
+              inline: true
+              classIndentation: 10
+              layerSpace: 5
+              classSpace: 2
+              layerFont: Helvetica
+              layerFontSize: 0
+              classFont: Helvetica
+              classFontSize: 12
+              fontEncoding: Cp1252
+              columnMargin: 2
+              defaultScale: 0.7
+          config:
+            borderWidthLeft: 1
+            borderWidthRight: 1
+            borderWidthTop: 0
+            borderWidthBottom: 1