Mercurial > dive4elements > gnv-client
diff gnv/src/main/webapp/WEB-INF/jsp/index.jsp @ 1002:b1eea43ba133
Second attempt to apply redirect link patch.
gnv/trunk@1206 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Sun, 13 Jun 2010 16:28:37 +0000 |
parents | 27029f0ec7e1 |
children | 1b42a86184f6 |
line wrap: on
line diff
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Fri Jun 11 12:11:52 2010 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Sun Jun 13 16:28:37 2010 +0000 @@ -1,13 +1,10 @@ <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean" %> <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean-el" prefix="bean-el" %> -<%@page import="java.util.Collection"%> <%@page import="de.intevation.gnv.artifactdatabase.objects.ArtifactObject"%> <%@page import="de.intevation.gnv.action.CommunicationKeys"%> <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%> -<%@page import="java.util.Iterator"%> <% - String exception = (String)request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_INPUT_ID); SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); Object ui = request.getAttribute("ui"); Object staticui = request.getAttribute("staticui"); @@ -15,7 +12,6 @@ Object statistic = request.getAttribute("statistic"); Object histogram = request.getAttribute("histogram"); Object wms_published = request.getAttribute("wms_published"); - boolean furthertargets = true; if (chart == null && statistic == null && histogram == null && wms_published == null) { boolean supportChart = sm.getOutputMode("chart") != null; @@ -24,10 +20,6 @@ } } - Object furthertargetsObject = request.getAttribute("furthertargets"); - if (furthertargetsObject != null){ - furthertargets = ((Boolean)furthertargetsObject).booleanValue(); - } Object exceptionMessage = request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE_ID); exceptionMessage = (exceptionMessage != null ? exceptionMessage.toString().replaceAll(" ", ".").replaceAll(":",".").toLowerCase() : null); @@ -94,24 +86,8 @@ <%}%> <%-- 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> - <%}%> - <%=ui != null ? ui.toString().replaceAll(" ", "") : "" %> - - <%if(furthertargets){%> - <br/> - <input style="margin-top: 5px;" type="image" src="<bean:message key="gnviewer.select.button.src"/>"/> - <%}%> - </fieldset> - </form> - </div> + <%if (ui != null) { %> + <%= ui.toString().replaceAll(" ", "") %> <%}%> <%-- render export options if existing for this state --%>