Mercurial > dive4elements > gnv-client
diff gnv/src/main/webapp/WEB-INF/jsp/index.jsp @ 971:a0e6566cd111
Integrated Openlayers using ext and geoext into the GNV-WebClient
gnv/trunk@1139 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Tue, 01 Jun 2010 12:55:24 +0000 |
| parents | 5f29bfeb61bd |
| children | cfea6dacd52a |
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Thu May 27 16:51:52 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Tue Jun 01 12:55:24 2010 +0000 @@ -14,15 +14,10 @@ Object chart = request.getAttribute("chart"); Object statistic = request.getAttribute("statistic"); Object histogram = request.getAttribute("histogram"); - Object wms = request.getAttribute("wms"); Object wms_published = request.getAttribute("wms_published"); - String serverPath = (String) request.getAttribute("mapserver"); - String mapfilePath = (String) request.getAttribute("mapfile"); - String layerName = (String) request.getAttribute("layer"); - String timeToLive = (String) request.getAttribute("ttl"); boolean furthertargets = true; - if (chart == null && statistic == null && histogram == null && wms == null) { + if (chart == null && statistic == null && histogram == null && wms_published == null) { boolean supportChart = sm.getOutputMode("chart") != null; if (supportChart) { chart = "true"; @@ -128,7 +123,7 @@ <%}%> <%-- render wms options --%> - <%if (wms != null) {%> + <%if (wms_published != null) {%> <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include> <%}%> </div> @@ -161,25 +156,7 @@ <%-- render wms layer --%> <%if (wms_published != null) {%> - <div class="outerMap"> - <div id="wms"> - <table> - <tr> - <td class="parameter"><bean:message key="gnviewer.wms.server.path"/>:</td> - <td class="wmsvalue"><%=serverPath%>?SERVICE=WMS&REQUEST=GetCapabilities</td> - </tr> - <tr> - <td class="parameter"><bean:message key="gnviewer.wms.server.layer"/>:</td> - <td class="wmsvalue"><%=layerName%></td> - </tr> - <tr> - <td class="parameter"><bean:message key="gnviewer.wms.layer.ttl"/>:</td> - <td class="wmsvalue"><%=timeToLive%></td> - </tr> - </table> - </div> - <div id="map"></div> - </div> + <jsp:include page="includes/display_map_inc.jsp"></jsp:include> <%}%> </td> </tr>