# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1263729137 0
# Node ID dacfb0755956a77773e55745545cd73feb489fef
# Parent  8330c1dbab3411260034864ed998a334e9944042
Added download links for ZIP files and WMS layers.


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

diff -r 8330c1dbab34 -r dacfb0755956 gnv/ChangeLog
--- a/gnv/ChangeLog	Fri Jan 15 20:22:38 2010 +0000
+++ b/gnv/ChangeLog	Sun Jan 17 11:52:17 2010 +0000
@@ -1,3 +1,22 @@
+2010-01-17	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp:
+	  Add links to download zip files and WMS layers if they are
+	  available.
+
+	* src/main/resources/applicationMessages.properties,
+	  src/main/resources/applicationMessages_en.properties:
+	  Added i10n for new download link types.
+
+	* src/main/webapp/images/svg.png: New. Gimp rendered PNG
+	  of official SVG logo. Creative Commons license.
+
+	* src/main/webapp/images/pdf.png: New. Crystal pdf icon.
+	  LGPLv2 license.
+
+	* src/main/webapp/images/disk.png, src/main/webapp/images/map_go.png:
+	  famfamfam icons for disk and map. Creative Commons license.
+
 2010-01-15	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/gnv/action/PreviousArtifactStepAction.java,
diff -r 8330c1dbab34 -r dacfb0755956 gnv/src/main/resources/applicationMessages.properties
--- a/gnv/src/main/resources/applicationMessages.properties	Fri Jan 15 20:22:38 2010 +0000
+++ b/gnv/src/main/resources/applicationMessages.properties	Sun Jan 17 11:52:17 2010 +0000
@@ -64,6 +64,8 @@
 gnviewer.output.options.export.odv.title=Daten als ODV exportieren
 gnviewer.output.options.export.pdf.title=Diagramm als PDF exportieren
 gnviewer.output.options.export.svg.title=Diagramm als SVG exportieren
+gnviewer.output.options.export.zip.title=ZIP-Archiv exportieren
+gnviewer.output.options.export.wms.title=WMS-Layer bereitstellen
 
 height=H\u00f6he
 width=Breite
diff -r 8330c1dbab34 -r dacfb0755956 gnv/src/main/resources/applicationMessages_en.properties
--- a/gnv/src/main/resources/applicationMessages_en.properties	Fri Jan 15 20:22:38 2010 +0000
+++ b/gnv/src/main/resources/applicationMessages_en.properties	Sun Jan 17 11:52:17 2010 +0000
@@ -64,6 +64,8 @@
 gnviewer.output.options.export.odv.title=Export Data as ODV
 gnviewer.output.options.export.pdf.title=Export chart as PDF
 gnviewer.output.options.export.svg.title=Export chart as SVG
+gnviewer.output.options.export.zip.title=Export as ZIP archive
+gnviewer.output.options.export.wms.title=Serve as WMS layer
 
 height=Height
 width=Width
diff -r 8330c1dbab34 -r dacfb0755956 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	Fri Jan 15 20:22:38 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_diagramm_inc.jsp	Sun Jan 17 11:52:17 2010 +0000
@@ -14,11 +14,15 @@
     String targetODV = "odv";
     String targetPDF = "pdf";
     String targetSVG = "svg";
+    String targetZIP = "zip";
+    String targetWMS = "wms";
     boolean supportChart = sm.getOutputMode(target) != null;
     boolean supportCSV   = sm.getOutputMode(targetCSV) != null;
     boolean supportODV   = sm.getOutputMode(targetODV) != null;
     boolean supportPDF   = sm.getOutputMode(targetPDF) != null;
     boolean supportSVG   = sm.getOutputMode(targetSVG) != null;
+    boolean supportZIP   = sm.getOutputMode(targetZIP) != null;
+    boolean supportWMS   = sm.getOutputMode(targetWMS) != null;
     String mimeType = null;
     String parameterString = "";
     if (supportChart){
@@ -51,22 +55,34 @@
     if (supportODV){
         mimeTypeODV = sm.getOutputMode(targetODV).getMimeType();
     }
+
+    String mimeTypeZIP = null;
+    if (supportZIP) {
+        mimeTypeZIP = sm.getOutputMode(targetZIP).getMimeType();
+    }
+
+    String mimeTypeWMS = null;
+    if (supportWMS) {
+        mimeTypeWMS = sm.getOutputMode(targetWMS).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"/>'/>
         <br/>
         <div id="export">
+            <%if (supportChart) { %>
             <a href="<%=response.encodeURL("export.do?mimetype="+mimeType+"&target="+target+parameterString+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.save.title"/>">
                 <img src="images/diagram_export.png" border="0"/>
             </a>
+            <%}%>
             <%if (supportPDF) { %>
             <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypePDF+"&target="+targetPDF+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.pdf.title"/>">
-                <img src="images/diagram_export.png" border="0"/>
+                <img src="images/pdf.png" border="0"/>
             </a>
             <%}%>
             <%if (supportSVG) { %>
             <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeSVG+"&target="+targetSVG+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.svg.title"/>">
-                <img src="images/diagram_export.png" border="0"/>
+                <img src="images/svg.png" border="0"/>
             </a>
             <%}%>
             <%if (supportCSV) { %>
@@ -79,6 +95,16 @@
                 <img src="images/data_export.png" border="0"/>
             </a>
             <%}%>
+            <%if (supportWMS) { %>
+            <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeWMS+"&target="+targetWMS+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.wms.title"/>">
+                <img src="images/map_go.png" border="0"/>
+            </a>
+            <%}%>
+            <%if (supportZIP) { %>
+            <a href="<%=response.encodeURL("export.do?mimetype="+mimeTypeZIP+"&target="+targetZIP+"&uid="+System.currentTimeMillis())%>" title="<bean:message key="gnviewer.output.options.export.zip.title"/>">
+                <img src="images/disk.png" border="0"/>
+            </a>
+            <%}%>
         </div>
         <jsp:include page="/WEB-INF/jsp/includes/display_diagramm_adons_inc.jsp"></jsp:include>
     </div>
diff -r 8330c1dbab34 -r dacfb0755956 gnv/src/main/webapp/images/disk.png
Binary file gnv/src/main/webapp/images/disk.png has changed
diff -r 8330c1dbab34 -r dacfb0755956 gnv/src/main/webapp/images/map_go.png
Binary file gnv/src/main/webapp/images/map_go.png has changed
diff -r 8330c1dbab34 -r dacfb0755956 gnv/src/main/webapp/images/pdf.png
Binary file gnv/src/main/webapp/images/pdf.png has changed
diff -r 8330c1dbab34 -r dacfb0755956 gnv/src/main/webapp/images/svg.png
Binary file gnv/src/main/webapp/images/svg.png has changed