Mercurial > dive4elements > gnv-client
changeset 22:367a00e4b9ad
Some GUI-Improvements done
gnv/trunk@117 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Wed, 23 Sep 2009 15:17:32 +0000 |
| parents | 17c92f1f014b |
| children | b11f941f7eb2 |
| files | gnv/Changelog gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp gnv/src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp gnv/src/main/webapp/WEB-INF/jsp/index.jsp |
| diffstat | 5 files changed, 23 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv/Changelog Wed Sep 23 15:04:39 2009 +0000 +++ b/gnv/Changelog Wed Sep 23 15:17:32 2009 +0000 @@ -1,3 +1,14 @@ +2009-09-23 Tim Englich <tim.englich@intevation.de> + + * src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java (execute) Edited: + Removed Image-Element and put it into the jsp-Page + * src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Edited: + Moved Image-Element from Classfile to this location. + URL will now be encoded for usage without cookies. + * src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp Edited, + src/main/webapp/WEB-INF/jsp/index.jsp Edited: + URL will now be encoded for usage without cookies. + 2009-09-23 Tim Englich <tim.englich@intevation.de> * src/main/webapp/WEB-INF/config/templates/describe-ui.xsl Edited:
--- a/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Wed Sep 23 15:04:39 2009 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Wed Sep 23 15:17:32 2009 +0000 @@ -90,11 +90,8 @@ }else{ adc.doFeed(sm.getSelectedArtifactFactory(), sm.getCurrentArtifact(), ips); - String mimeType = "image/png"; - String target = "chart"; - - String src = "<img src='out.do?mimetype="+mimeType+"&target="+target+"&uid="+System.currentTimeMillis()+"' alt='Chart'>"; - request.setAttribute("diagramm", src); + + request.setAttribute("diagramm", true); ArtifactDescription artifactDescription = adc.getCurrentStepDescription(sm.getSelectedArtifactFactory(), sm.getCurrentArtifact());
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Wed Sep 23 15:04:39 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Wed Sep 23 15:17:32 2009 +0000 @@ -1,6 +1,11 @@ -<%Object diagramm = request.getAttribute("diagramm");%> -<%if (diagramm != null){ %> +<%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%> +<%Object diagramm = request.getAttribute("diagramm"); +if (diagramm != null){ + String mimeType = "image/png";// TODO: get from SessionModel SessionModelFactory.getInstance().getSessionModel(request). + String target = "chart"; // TODO: get from SessionModel + %> + <div id="diagram"> - <%=diagramm.toString()%> + <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&target="+target+"&uid="+System.currentTimeMillis())%>' alt='Chart'> </div> <%}%> \ No newline at end of file
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp Wed Sep 23 15:04:39 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp Wed Sep 23 15:17:32 2009 +0000 @@ -9,7 +9,7 @@ Collection<ArtifactObject> artifactFactories = sm.getArtifactFactories(); %> <div id="basefilter"> - <form id="fisSelectionForm" action="selectArtifactFactory.do" method="post"> + <form id="fisSelectionForm" action="<%=response.encodeURL("selectArtifactFactory.do")%>" method="post"> <fieldset> <legend><bean:message key="gnviewer.productselection.fisselection.title"/></legend> <%if (artifactFactories != null){%>
--- a/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Wed Sep 23 15:04:39 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/index.jsp Wed Sep 23 15:17:32 2009 +0000 @@ -21,7 +21,7 @@ <%if (ui != null){%> <div id="timeseriesfilter"> - <form id="fisSelectionForm" action="next.do" method="post"> + <form id="fisSelectionForm" action="<%=response.encodeURL("next.do")%>") method="post"> <fieldset> <%=ui != null ? ui.toString() : "" %> <br/>