Mercurial > dive4elements > gnv-client
diff gnv/src/main/webapp/WEB-INF/jsp/index.jsp @ 408:b5733f9f386b
Design improvements: Moved chart option panel and export actions beneath the parameterization panel on the left side. Do not render a useless 'draw' button after reaching the final state.
gnv/trunk@594 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 22 Jan 2010 09:49:34 +0000 |
| parents | 3a286c9e186c |
| children | 9602f4bffc07 |
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Wed Jan 20 14:44:39 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Fri Jan 22 09:49:34 2010 +0000 @@ -4,37 +4,40 @@ <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%> <%@page import="java.util.Iterator"%> -<%Object ui = request.getAttribute("ui"); - Object staticui = request.getAttribute("staticui"); - boolean furthertargets = true; +<% Object ui = request.getAttribute("ui"); + Object staticui = request.getAttribute("staticui"); + boolean furthertargets = true; - Object furthertargetsObject = request.getAttribute("furthertargets"); - if (furthertargetsObject != null){ - furthertargets = ((Boolean)furthertargetsObject).booleanValue(); - } + Object furthertargetsObject = request.getAttribute("furthertargets"); + if (furthertargetsObject != null){ + furthertargets = ((Boolean)furthertargetsObject).booleanValue(); + } %> <div> <%if (staticui == null){ %> <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> <%} else {%> - <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> <%=staticui.toString()%> <%}%> + <%-- 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> - <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> - - <%if(furthertargets){%> - <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/> - <%}else{%> - <input type="submit" value="<bean:message key="gnviewer.draw.button"/>"/> - <%}%> - </fieldset> - </form> - </div> + <div id="timeseriesfilter"> + <form id="fisSelectionForm" onsubmit="displayOverlay()" action="<%=response.encodeURL("next.do")%>") method="post"> + <fieldset> + <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> + + <%if(furthertargets){%> + <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/> + <%}%> + </fieldset> + </form> + </div> <%}%> </div> + + <%-- render chart options if existing for this state --%> <jsp:include page="includes/display_diagramm_inc.jsp"></jsp:include> + + <%-- render export options if existing for this state --%> + <jsp:include page="includes/display_export_inc.jsp"></jsp:include>