# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1255956598 0
# Node ID 30f0af26b0866904f868e1ccdc3636d95eeda661
# Parent  c5408b0f34c7da67f4888d938a18456e0f5d66a8
Catch Exception that the Calling Program could not put no InputData
into the feed Request.issue56

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

diff -r c5408b0f34c7 -r 30f0af26b086 gnv/ChangeLog
--- a/gnv/ChangeLog	Mon Oct 19 10:30:28 2009 +0000
+++ b/gnv/ChangeLog	Mon Oct 19 12:49:58 2009 +0000
@@ -1,5 +1,11 @@
 2009-10-19  Tim Englich  <tim.englich@intevation.de>
 
+	* src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp, 
+	  src/main/resources/applicationMessages*.properties:
+	  Integrated Ressouces for OutputOptions issue51
+	  
+2009-10-19  Tim Englich  <tim.englich@intevation.de>
+	
 	* src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java (execute): 
 	  Now the UI will compelte be shown if the User has done an Mistake entering 
 	  values to input-fields eg. Coordinates or formatted Date-Strings. issue 35
diff -r c5408b0f34c7 -r 30f0af26b086 gnv/src/main/resources/applicationMessages.properties
--- a/gnv/src/main/resources/applicationMessages.properties	Mon Oct 19 10:30:28 2009 +0000
+++ b/gnv/src/main/resources/applicationMessages.properties	Mon Oct 19 12:49:58 2009 +0000
@@ -51,4 +51,7 @@
 # attachedOutputOptions
 gnviewer.output.options.diagramm.alt=Diagramm
 gnviewer.output.options.save.title=Diagramm speichern
-gnviewer.output.options.export.title=Daten exportieren
\ No newline at end of file
+gnviewer.output.options.export.title=Daten exportieren
+
+height=Höhe
+width=Breite
\ No newline at end of file
diff -r c5408b0f34c7 -r 30f0af26b086 gnv/src/main/resources/applicationMessages_en.properties
--- a/gnv/src/main/resources/applicationMessages_en.properties	Mon Oct 19 10:30:28 2009 +0000
+++ b/gnv/src/main/resources/applicationMessages_en.properties	Mon Oct 19 12:49:58 2009 +0000
@@ -52,4 +52,7 @@
 # attachedOutputOptions
 gnviewer.output.options.diagramm.alt=Diagram
 gnviewer.output.options.save.title=Save Diagram
-gnviewer.output.options.export.title=Export Data
\ No newline at end of file
+gnviewer.output.options.export.title=Export Data
+
+height=Height
+width=Width
\ No newline at end of file
diff -r c5408b0f34c7 -r 30f0af26b086 gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp	Mon Oct 19 10:30:28 2009 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp	Mon Oct 19 12:49:58 2009 +0000
@@ -1,4 +1,5 @@
 <%@ 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="de.intevation.gnv.action.sessionmodel.DiagrammOptions"%>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%>
 <%@page import="de.intevation.gnv.artifactdatabase.objects.OutputMode"%>
@@ -19,12 +20,17 @@
            <bean:message key="gnviewer.diagram.options.header.title"/>
         </legend>
         <form id="outputOptionsForm" method="post" action="changeOptions.do">
+           <table>
            <%if (outputMode != null && outputMode.getOutputParameters() != null && !outputMode.getOutputParameters().isEmpty()){
                Iterator<OutputParameter> it = outputMode.getOutputParameters().iterator();
                while (it.hasNext()){
                    OutputParameter om = it.next(); %>
-               <%=om.getDescription()%>: <input type="text" name="<%=om.getName() %>"value="<%=useDiagrammOptions ? diagrammOptions.getValue(om.getName()): om.getValue()%>"/><br/>
+               <tr>
+                  <td><bean-el:message key="<%=om.getName()%>"/></td>
+                  <td><input type="text" name="<%=om.getName() %>"value="<%=useDiagrammOptions ? diagrammOptions.getValue(om.getName()): om.getValue()%>"/></td>
+              </tr>
            <%}%>
+           </table>
            <input type="hidden" name="target" value="<%=target%>"/>
            <input type="submit" value="<bean:message key="gnviewer.select.button"/>"/>
            <%}%>