Mercurial > dive4elements > gnv-client
comparison gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_options_inc.jsp @ 967:c7f8a9b4b006
Improved parsing i18n values of chart/histogram options (issue289).
gnv/trunk@1129 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 26 May 2010 17:03:29 +0000 |
| parents | c84147a3105c |
| children | 2444da07e487 |
comparison
equal
deleted
inserted
replaced
| 966:13de46229f63 | 967:c7f8a9b4b006 |
|---|---|
| 7 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> | 7 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%> |
| 8 <%@page import="de.intevation.gnv.artifactdatabase.objects.OutputParameter"%> | 8 <%@page import="de.intevation.gnv.artifactdatabase.objects.OutputParameter"%> |
| 9 <%@page import="de.intevation.gnv.artifactdatabase.objects.ExportMode"%> | 9 <%@page import="de.intevation.gnv.artifactdatabase.objects.ExportMode"%> |
| 10 <%@page import="java.util.Collection"%> | 10 <%@page import="java.util.Collection"%> |
| 11 <%@page import="java.util.Iterator"%> | 11 <%@page import="java.util.Iterator"%> |
| 12 <%@page import="java.util.Locale"%> | |
| 12 <%@page import="java.net.URLEncoder"%> | 13 <%@page import="java.net.URLEncoder"%> |
| 13 <% | 14 <% |
| 14 String exceptionMsg = (String)request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE); | 15 String exceptionMsg = (String)request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_MESSAGE); |
| 15 String exceptionValue = (String)request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_VALUE); | 16 String exceptionValue = (String)request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_VALUE); |
| 16 String target = "chart"; | 17 String target = "chart"; |
| 17 String targetPDF = "pdf"; | 18 String targetPDF = "pdf"; |
| 18 String targetSVG = "svg"; | 19 String targetSVG = "svg"; |
| 19 String targetIMG = "img"; | 20 String targetIMG = "img"; |
| 20 SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); | 21 SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request); |
| 22 Locale locale = sm.getCurrentLocale(); | |
| 21 OutputMode outputMode = sm.getOutputMode(target); | 23 OutputMode outputMode = sm.getOutputMode(target); |
| 22 DiagrammOptions diagrammOptions = sm.getDiagrammOptions(); | 24 DiagrammOptions diagrammOptions = sm.getDiagrammOptions(); |
| 23 | 25 |
| 24 boolean useDiagrammOptions = diagrammOptions != null; | 26 boolean useDiagrammOptions = diagrammOptions != null; |
| 25 ExportMode supportIMG = outputMode.getExportMode(targetIMG); | 27 ExportMode supportIMG = outputMode.getExportMode(targetIMG); |
| 75 <td class="parameter"> | 77 <td class="parameter"> |
| 76 <bean-el:message key="<%=om.getName()%>"/> | 78 <bean-el:message key="<%=om.getName()%>"/> |
| 77 </td> | 79 </td> |
| 78 <td> | 80 <td> |
| 79 <%if (om.getType().equalsIgnoreCase("boolean")){ | 81 <%if (om.getType().equalsIgnoreCase("boolean")){ |
| 80 boolean checked = useDiagrammOptions ? "true".equalsIgnoreCase(diagrammOptions.getValue(om.getName())) : om.getValue().equalsIgnoreCase("true"); | 82 boolean checked = useDiagrammOptions ? "true".equalsIgnoreCase(diagrammOptions.getValue(om.getName(), locale)) : om.getValue().equalsIgnoreCase("true"); |
| 81 %> | 83 %> |
| 82 <input type="checkbox" | 84 <input type="checkbox" |
| 83 name="<%=om.getName() %>" | 85 name="<%=om.getName() %>" |
| 84 <%=checked ? " value=\"true\" checked=\"checked\"": "" %>/> | 86 <%=checked ? " value=\"true\" checked=\"checked\"": "" %>/> |
| 85 <%}else{%> | 87 <%}else{%> |
| 86 <input type="text" name="<%=om.getName() %>" value="<%=useDiagrammOptions ? diagrammOptions.getValue(om.getName()): om.getValue()%>"/> | 88 <input type="text" name="<%=om.getName() %>" value="<%=useDiagrammOptions ? diagrammOptions.getValue(om.getName(), locale): om.getValue()%>"/> |
| 87 <%}%> | 89 <%}%> |
| 88 </td> | 90 </td> |
| 89 </tr> | 91 </tr> |
| 90 <%}%> | 92 <%}%> |
| 91 </table> | 93 </table> |