Mercurial > dive4elements > gnv-client
changeset 158:f38a86c2c012
Added link to export data as odv.
gnv/trunk@291 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 06 Nov 2009 09:51:19 +0000 (2009-11-06) |
parents | 013d47662161 |
children | b98a6d175916 |
files | gnv/ChangeLog gnv/src/main/resources/applicationMessages.properties gnv/src/main/resources/applicationMessages_en.properties gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp |
diffstat | 4 files changed, 29 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv/ChangeLog Thu Nov 05 14:53:24 2009 +0000 +++ b/gnv/ChangeLog Fri Nov 06 09:51:19 2009 +0000 @@ -1,3 +1,12 @@ +2009-11-06 Ingo Weinzierl <ingo.weinzierl@intevation.de> + + * src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp: Added link + for exporting data in ODV format. + + * src/main/resources/applicationMessages.properties, + src/main/resources/applicationMessages_en.properties: Added label for + odv export and changed label of CSV export. + 2009-11-05 Tim Englich <tim.englich@intevation.de> * src/main/java/de/intevation/gnv/artifactdatabase/client/ArtifactDatabaseClientFactory.java (ArtifactDatabaseClientFactory):
--- a/gnv/src/main/resources/applicationMessages.properties Thu Nov 05 14:53:24 2009 +0000 +++ b/gnv/src/main/resources/applicationMessages.properties Fri Nov 06 09:51:19 2009 +0000 @@ -55,7 +55,8 @@ # attachedOutputOptions gnviewer.output.options.diagramm.alt=Diagramm gnviewer.output.options.save.title=Diagramm speichern -gnviewer.output.options.export.title=Daten exportieren +gnviewer.output.options.export.csv.title=Daten als CSV exportieren +gnviewer.output.options.export.odv.title=Daten als ODV exportieren height=H�he -width=Breite \ No newline at end of file +width=Breite
--- a/gnv/src/main/resources/applicationMessages_en.properties Thu Nov 05 14:53:24 2009 +0000 +++ b/gnv/src/main/resources/applicationMessages_en.properties Fri Nov 06 09:51:19 2009 +0000 @@ -55,7 +55,8 @@ # attachedOutputOptions gnviewer.output.options.diagramm.alt=Diagram gnviewer.output.options.save.title=Save Diagram -gnviewer.output.options.export.title=Export Data +gnviewer.output.options.export.csv.title=Export Data as CSV +gnviewer.output.options.export.odv.title=Export Data as ODV height=Height -width=Width \ No newline at end of file +width=Width
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Thu Nov 05 14:53:24 2009 +0000 +++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp Fri Nov 06 09:51:19 2009 +0000 @@ -10,8 +10,10 @@ if (diagramm != null){ String target = "chart"; String targetCSV = "csv"; + String targetODV = "odv"; boolean supportChart = sm.getOutputMode(target) != null; boolean supportCSV = sm.getOutputMode(targetCSV) != null; + boolean supportODV = sm.getOutputMode(targetODV) != null; String mimeType = null; String parameterString = ""; if (supportChart){ @@ -30,6 +32,11 @@ if (supportCSV){ mimeTypeCSV = sm.getOutputMode(targetCSV).getMimeType(); } + + String mimeTypeODV = null; + if (supportODV){ + mimeTypeODV = sm.getOutputMode(targetODV).getMimeType(); + } %> <div id="diagram"> <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&target="+target+parameterString+"&uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.diagramm.alt"/>'/> @@ -39,11 +46,16 @@ <img src="images/diagram_export.png" border="0"/> </a> <%if (supportCSV) { %> - <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeCSV+"&target="+targetCSV+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.title"/>"> + <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeCSV+"&target="+targetCSV+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.csv.title"/>"> + <img src="images/data_export.png" border="0"/> + </a> + <%}%> + <%if (supportODV) { %> + <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeODV+"&target="+targetODV+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.odv.title"/>"> <img src="images/data_export.png" border="0"/> </a> <%}%> </div> <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_adons_inc.jsp"></jsp:include> </div> -<%}%> \ No newline at end of file +<%}%>