Mercurial > dive4elements > gnv-client
diff gnv/src/main/webapp/WEB-INF/jsp/index.jsp @ 710:5f29bfeb61bd
Improved the design and layout of the user interface.
gnv/trunk@980 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Sun, 25 Apr 2010 21:05:44 +0000 |
| parents | 7448b6f5f1ed |
| children | a0e6566cd111 |
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Fri Apr 23 14:57:32 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Sun Apr 25 21:05:44 2010 +0000 @@ -15,6 +15,11 @@ 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) { @@ -23,7 +28,7 @@ chart = "true"; } } - + Object furthertargetsObject = request.getAttribute("furthertargets"); if (furthertargetsObject != null){ furthertargets = ((Boolean)furthertargetsObject).booleanValue(); @@ -32,7 +37,7 @@ Object exceptionMessage = request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID); exceptionMessage = (exceptionMessage != null ? exceptionMessage.toString().replaceAll(" ", ".").replaceAll(":",".").toLowerCase() : null); exceptionMessage = (exceptionMessage != null && exceptionMessage.toString().endsWith(".") ? exceptionMessage.toString().substring(0,exceptionMessage.toString().length()-1) : exceptionMessage); - + boolean showmapviewercallBody = request.getAttribute("MAPVIEWERCALL") != null; String exceptionProject = (String) request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_PROJECT); @@ -68,85 +73,114 @@ </a> </div> <%}%> - - <br/> <%if (showmapviewercallBody){ %> <jsp:include page="includes/display_mapviewercall_inc.jsp" /> <%}%> </div> - <div class="errormsg" id="load_error"> - <%if (exceptionMessage != null){ %> - <bean-el:message key="<%=exceptionMessage.toString()%>"/> - <p class="reload"> - <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>"> - <bean:message key="application.reload"/> - </a> - </p> - <%}%> - </div> - <%-- the parameter panel is following --%> - <div id="parameterPanel"> - <%if (staticui == null){ %> - <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> - <%} else {%> - <div class="down"> - <fieldset> - <legend><bean:message key="gnviewer.history.title"/></legend> - <%=staticui.toString()%> - </fieldset> - </div> - <%}%> - - <%-- render the dynamic part to feed the state and advance to the next state --%> - <%if (ui != null){%> - <div id="timeseriesfilter"> - <form id="fisSelectionForm" onsubmit="displayOverlay()" action="<%=response.encodeURL("next.do")%>" method="post"> - <fieldset> - - <%-- error message, if user input was not valid --%> - <%if (exception != null) {%> - <div class="inputException"><%=exception%></div> + <table style="width:100%;"> + <tr id="contentRow"> + <td id="parameterColumn"> + <%-- the parameter panel is following --%> + <div id="parameterPanel"> + <%if (staticui == null){ %> + <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> + <%} else {%> + <div class="down"> + <fieldset> + <legend><bean:message key="gnviewer.history.title"/></legend> + <%=staticui.toString()%> + </fieldset> + </div> <%}%> - <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> - - <%if(furthertargets){%> - <input style="margin-top: 5px;" type="image" src="<bean:message key="gnviewer.select.button.src"/>"/> - <%}%> - </fieldset> - </form> - </div> - <%}%> - - <%-- render export options if existing for this state --%> - <jsp:include page="includes/display_export_inc.jsp"></jsp:include> - - <%if (chart != null) {%> - <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include> - <%}%> - - <%if (histogram != null) {%> - <jsp:include page="/WEB-INF/jsp/includes/display_histogram_options_inc.jsp"></jsp:include> - <%}%> - - <%-- render wms options --%> - <%if (wms != null) {%> - <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include> - <%}%> - </div> + <%-- render the dynamic part to feed the state and advance to the next state --%> + <%if (ui != null){%> + <div id="timeseriesfilter"> + <form id="fisSelectionForm" onsubmit="displayOverlay()" action="<%=response.encodeURL("next.do")%>" method="post"> + <fieldset> - <%if (chart != null) {%> - <%-- render chart options if existing for this state --%> - <jsp:include page="includes/display_diagramm_inc.jsp"></jsp:include> - <%}%> + <%-- error message, if user input was not valid --%> + <%if (exception != null) {%> + <div class="inputException"><%=exception%></div> + <%}%> + <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> - <%-- render statistic --%> - <%if (statistic != null) {%> - <jsp:include page="includes/display_diagramm_statistics_inc.jsp"></jsp:include> - <%}%> + <%if(furthertargets){%> + <br> + <input style="margin-top: 5px;" type="image" src="<bean:message key="gnviewer.select.button.src"/>"/> + <%}%> + </fieldset> + </form> + </div> + <%}%> - <%-- render histogram --%> - <%if (histogram != null) {%> - <jsp:include page="includes/display_histogram_inc.jsp"></jsp:include> - <%}%> + <%-- render export options if existing for this state --%> + <jsp:include page="includes/display_export_inc.jsp"></jsp:include> + + <%if (chart != null) {%> + <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp"></jsp:include> + <%}%> + + + <%if (histogram != null) {%> + <jsp:include page="/WEB-INF/jsp/includes/display_histogram_options_inc.jsp"></jsp:include> + <%}%> + + <%-- render wms options --%> + <%if (wms != null) {%> + <jsp:include page="/WEB-INF/jsp/includes/display_wms_options_inc.jsp"></jsp:include> + <%}%> + </div> + </td> + <td id="contentColumn"> + <%if (exceptionMessage != null){ %> + <div class="errormsg" id="load_error"> + <bean-el:message key="<%=exceptionMessage.toString()%>"/> + <p class="reload"> + <a href="<%=response.encodeURL("describe.do?uid="+System.currentTimeMillis())%>" title="<bean:message key="application.reload"/>"> + <bean:message key="application.reload"/> + </a> + </p> + </div> + <%}%> + <%if (chart != null) {%> + <%-- render chart options if existing for this state --%> + <jsp:include page="includes/display_diagramm_inc.jsp"></jsp:include> + <%}%> + + <%-- render statistic --%> + <%if (statistic != null) {%> + <jsp:include page="includes/display_diagramm_statistics_inc.jsp"></jsp:include> + <%}%> + + <%-- render histogram --%> + <%if (histogram != null) {%> + <jsp:include page="includes/display_histogram_inc.jsp"></jsp:include> + <%}%> + + <%-- 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> + <%}%> + </td> + </tr> + </table>