# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1267712846 0
# Node ID b31e81f35b646b7a19399a217a8763cd2e301552
# Parent  2f3d885fed0913a761d436868861f15abb68b602
Adjusted rendering of OpenLayers client.

gnv/trunk@732 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 2f3d885fed09 -r b31e81f35b64 gnv/ChangeLog
--- a/gnv/ChangeLog	Tue Mar 02 14:55:29 2010 +0000
+++ b/gnv/ChangeLog	Thu Mar 04 14:27:26 2010 +0000
@@ -1,3 +1,14 @@
+2010-03-04  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* src/main/webapp/WEB-INF/jsp/index.jsp,
+	  src/main/webapp/WEB-INF/jsp/wmslayout.jsp: Removed map-div from index.jsp 
+	  and moved it to wmslayout. So, we don't have an empty div with grey border
+	  in our application if there is no map currently existing. Load images from
+	  MapServer as 'image/png'.
+
+	* src/main/webapp/styles/default.css: Adjusted style for customizing
+	  map-div.
+
 2010-03-02  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClient.java,
diff -r 2f3d885fed09 -r b31e81f35b64 gnv/src/main/webapp/WEB-INF/jsp/index.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Tue Mar 02 14:55:29 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp	Thu Mar 04 14:27:26 2010 +0000
@@ -54,9 +54,7 @@
     <%}%>
     </div>
 
-    <div id="map"></div>
-
-        <%-- render export options if existing for this state --%>
+    <%-- render export options if existing for this state --%>
     <jsp:include page="includes/display_export_inc.jsp"></jsp:include>
 
     <%if (chart != null) {%>
diff -r 2f3d885fed09 -r b31e81f35b64 gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp	Tue Mar 02 14:55:29 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/wmslayout.jsp	Thu Mar 04 14:27:26 2010 +0000
@@ -29,7 +29,8 @@
                         "MyWMS",
                         "http://denmark.atlas/cgi-bin/mapserv-gp?MAP=/opt/artifacts/mapfiles/mapfile.map",
                         {
-                            layers: getURLParam("layer")
+                            layers: getURLParam("layer"),
+                            format: 'image/png'
                         },
                         {
                             singleTile: 'true'
@@ -76,6 +77,8 @@
         <jsp:include page="header.jsp" />
          <jsp:include page="index.jsp" />
         <jsp:include page="footer.jsp" />
+
+        <div id="map"></div>
     </div>
     </body>
 </html>
diff -r 2f3d885fed09 -r b31e81f35b64 gnv/src/main/webapp/styles/default.css
--- a/gnv/src/main/webapp/styles/default.css	Tue Mar 02 14:55:29 2010 +0000
+++ b/gnv/src/main/webapp/styles/default.css	Thu Mar 04 14:27:26 2010 +0000
@@ -267,10 +267,11 @@
 
 div#map {
     position: absolute;
-    top: 33px;
+    top: 62px;
     left: 350px;
-    width: 325px;
-    height: 325px;
+    width: 555px;
+    height: 436px;
+    border: 1px solid #CCD5DE;
 }
 
 div.histogram {