Mercurial > dive4elements > river
changeset 4317:41cf1172825c
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 30 Oct 2012 07:00:06 +0100 |
| parents | c74155ebe3ac (current diff) 4c2005e6ac65 (diff) |
| children | 46511b4d8357 |
| files | |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml Tue Oct 30 06:59:33 2012 +0100 +++ b/flys-artifacts/doc/conf/artifacts/gaugedischargecurve.xml Tue Oct 30 07:00:06 2012 +0100 @@ -13,7 +13,7 @@ </outputmode> <outputmode name="computed_dischargecurve_at_export" description="output.computed_dischargecurve_at_export" mime-type="text/plain" type="export"> <facets> - <facet name="gauge_discharge_curve_at_export" description="facet.gauge_discharge_curve_export.at"/> + <facet name="at" description="facet.gauge_discharge_curve_export.at"/> </facets> </outputmode> </outputmodes>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java Tue Oct 30 06:59:33 2012 +0100 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/GaugeDischargeCurveArtifact.java Tue Oct 30 07:00:06 2012 +0100 @@ -46,7 +46,7 @@ public static final String GAUGE_DISCHARGE_CURVE_FACET = "gauge_discharge_curve"; public static final String GAUGE_DISCHARGE_CURVE_AT_EXPORT_FACET = - "gauge_discharge_curve_at_export"; + "at"; public static final String GAUGE_DISCHARGE_CURVE_OUT = "discharge_curve"; public static final String GAUGE_DISCHARGE_CURVE_AT_EXPORT_OUT =
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Tue Oct 30 06:59:33 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/CollectionView.java Tue Oct 30 07:00:06 2012 +0100 @@ -552,6 +552,7 @@ if (export.getFacet("csv") != null) { hasCSV = true; + parameterList.contractInfoPanel(); } } }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java Tue Oct 30 06:59:33 2012 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterList.java Tue Oct 30 07:00:06 2012 +0100 @@ -1002,5 +1002,15 @@ } } + /** + * Allow to close all folds of the info panel. + * This is necessary e.g. if a csv result should be shown. + */ + public void contractInfoPanel() { + if (infoPanel != null) { + infoPanel.contract(); + } + } + } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :