# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1253719052 0
# Node ID 367a00e4b9ad95072071e16667bee9a64658eda9
# Parent  17c92f1f014b44e9db965f0fc961b762add866ad
Some GUI-Improvements done

gnv/trunk@117 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 17c92f1f014b -r 367a00e4b9ad gnv/Changelog
--- 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:
diff -r 17c92f1f014b -r 367a00e4b9ad gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java
--- 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());
             
diff -r 17c92f1f014b -r 367a00e4b9ad gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp
--- 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
diff -r 17c92f1f014b -r 367a00e4b9ad gnv/src/main/webapp/WEB-INF/jsp/includes/display_fis_inc.jsp
--- 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){%>
diff -r 17c92f1f014b -r 367a00e4b9ad gnv/src/main/webapp/WEB-INF/jsp/index.jsp
--- 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/>