Mercurial > dive4elements > gnv-client
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 407:55dae5bb76db | 408:b5733f9f386b |
|---|---|
| 2 <%@page import="java.util.Collection"%> | 2 <%@page import="java.util.Collection"%> |
| 3 <%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactObject"%> | 3 <%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactObject"%> |
| 4 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> | 4 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> |
| 5 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%> | 5 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%> |
| 6 <%@page import="java.util.Iterator"%> | 6 <%@page import="java.util.Iterator"%> |
| 7 <%Object ui = request.getAttribute("ui"); | 7 <% Object ui = request.getAttribute("ui"); |
| 8 Object staticui = request.getAttribute("staticui"); | 8 Object staticui = request.getAttribute("staticui"); |
| 9 boolean furthertargets = true; | 9 boolean furthertargets = true; |
| 10 | 10 |
| 11 Object furthertargetsObject = request.getAttribute("furthertargets"); | 11 Object furthertargetsObject = request.getAttribute("furthertargets"); |
| 12 if (furthertargetsObject != null){ | 12 if (furthertargetsObject != null){ |
| 13 furthertargets = ((Boolean)furthertargetsObject).booleanValue(); | 13 furthertargets = ((Boolean)furthertargetsObject).booleanValue(); |
| 14 } | 14 } |
| 15 %> | 15 %> |
| 16 <div> | 16 <div> |
| 17 <%if (staticui == null){ %> | 17 <%if (staticui == null){ %> |
| 18 <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> | 18 <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> |
| 19 <%} else {%> | 19 <%} else {%> |
| 20 <jsp:include page="includes/display_fis_inc.jsp"></jsp:include> | |
| 21 <%=staticui.toString()%> | 20 <%=staticui.toString()%> |
| 22 <%}%> | 21 <%}%> |
| 23 | 22 |
| 23 <%-- render the dynamic part to feed the state and advance to the next state --%> | |
| 24 <%if (ui != null){%> | 24 <%if (ui != null){%> |
| 25 <div id="timeseriesfilter"> | 25 <div id="timeseriesfilter"> |
| 26 <form id="fisSelectionForm" onsubmit="displayOverlay()" action="<%=response.encodeURL("next.do")%>") method="post"> | 26 <form id="fisSelectionForm" onsubmit="displayOverlay()" action="<%=response.encodeURL("next.do")%>") method="post"> |
| 27 <fieldset> | 27 <fieldset> |
| 28 <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> | 28 <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> |
| 29 | 29 |
| 30 <%if(furthertargets){%> | 30 <%if(furthertargets){%> |
| 31 <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/> | 31 <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/> |
| 32 <%}else{%> | 32 <%}%> |
| 33 <input type="submit" value="<bean:message key="gnviewer.draw.button"/>"/> | 33 </fieldset> |
| 34 <%}%> | 34 </form> |
| 35 </fieldset> | 35 </div> |
| 36 </form> | |
| 37 </div> | |
| 38 <%}%> | 36 <%}%> |
| 39 </div> | 37 </div> |
| 38 | |
| 39 <%-- render chart options if existing for this state --%> | |
| 40 <jsp:include page="includes/display_diagramm_inc.jsp"></jsp:include> | 40 <jsp:include page="includes/display_diagramm_inc.jsp"></jsp:include> |
| 41 | |
| 42 <%-- render export options if existing for this state --%> | |
| 43 <jsp:include page="includes/display_export_inc.jsp"></jsp:include> |