Mercurial > dive4elements > river

changeset 9785:672cfb850229 3.2.x

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update logo and reduce number of image copies
author Tom Gottfried <tom@intevation.de>
date Thu, 27 Apr 2023 12:48:53 +0200
parents 7df65516ee8b
children b5af33e5ce1e
files artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java artifacts/src/main/resources/images/bfg_logo.gif artifacts/src/main/resources/images/bfg_logo.png gwt-client/config/mapfish/images/bfg_logo.gif gwt-client/config/mapfish/images/bfg_logo.png gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java gwt-client/src/main/webapp/images/bfg_logo.gif gwt-client/src/main/webapp/images/bfg_logo.png gwt-client/src/main/webapp/images/logo-bfg.gif
diffstat 14 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Thu Apr 27 11:55:46 2023 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java	Thu Apr 27 12:48:53 2023 +0200
@@ -289,7 +289,7 @@
         java.net.URL imageURL;
         if (logo.equals("BfG")) {
             imageURL = DiagramGenerator.class.getResource(
-                "/images/bfg_logo.gif");
+                "/images/bfg_logo.png");
         } else {
             return;
         }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Thu Apr 27 11:55:46 2023 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java	Thu Apr 27 12:48:53 2023 +0200
@@ -181,7 +181,7 @@
         java.net.URL imageURL;
         if (logo.equals("BfG")) {
             imageURL = XYChartGenerator.class.getResource(
-                "/images/bfg_logo.gif");
+                "/images/bfg_logo.png");
         } else {
             return;
         }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java	Thu Apr 27 11:55:46 2023 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java	Thu Apr 27 12:48:53 2023 +0200
@@ -204,7 +204,7 @@
         java.net.URL imageURL;
         if (logo.equals("BfG")) {
             imageURL = XYChartGenerator.class.getResource(
-                "/images/bfg_logo.gif");
+                "/images/bfg_logo.png");
         } else {
             return;
         }
Binary file artifacts/src/main/resources/images/bfg_logo.gif has changed
Binary file artifacts/src/main/resources/images/bfg_logo.png has changed
Binary file gwt-client/config/mapfish/images/bfg_logo.gif has changed
Binary file gwt-client/config/mapfish/images/bfg_logo.png has changed
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Apr 27 11:55:46 2023 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties	Thu Apr 27 12:48:53 2023 +0200
@@ -93,7 +93,7 @@
 welcome_open_or_create = Please open a project from the project list or create a
 # Header images
 flysLogo = images/flys_logo.gif
-bfgLogo = images/bfg_logo.gif
+bfgLogo = images/bfg_logo.png
 bfgLogoSmall = images/bfg_logo_small.png
 
 # Images
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Apr 27 11:55:46 2023 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties	Thu Apr 27 12:48:53 2023 +0200
@@ -95,7 +95,7 @@
 
 # Header images
 flysLogo = images/flys_logo.gif
-bfgLogo = images/bfg_logo.gif
+bfgLogo = images/bfg_logo.png
 bfgLogoSmall = images/bfg_logo_small.png
 
 # Images
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Apr 27 11:55:46 2023 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties	Thu Apr 27 12:48:53 2023 +0200
@@ -94,7 +94,7 @@
 
 # Header images
 flysLogo = images/flys_logo.gif
-bfgLogo = images/bfg_logo.gif
+bfgLogo = images/bfg_logo.png
 bfgLogoSmall = images/bfg_logo_small.png
 
 # Images
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Thu Apr 27 11:55:46 2023 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java	Thu Apr 27 12:48:53 2023 +0200
@@ -391,8 +391,7 @@
 
         if (choiceAttribute != null && choiceAttribute.equals("logo")) {
             SelectItem logoChooser = new SelectItem();
-            logoChooser.setImageURLPrefix(
-                GWT.getHostPageBaseURL() + "images/logo-");
+            logoChooser.setImageURLPrefix(GWT.getHostPageBaseURL());
             logoChooser.setValueIconHeight(50);
             logoChooser.setValueIconWidth(100);
 
@@ -411,7 +410,7 @@
              flys-client/src/main/webapp/images/
              */
             valueMap.put("BfG", "");
-            valueIcons.put("BfG", "bfg.gif");
+            valueIcons.put("BfG", MSG.bfgLogo());
             logoChooser.setValueIcons(valueIcons);
             logoChooser.setValueMap(valueMap);
             logoChooser.setTitleStyle("color:#000;");
Binary file gwt-client/src/main/webapp/images/bfg_logo.gif has changed
Binary file gwt-client/src/main/webapp/images/bfg_logo.png has changed
Binary file gwt-client/src/main/webapp/images/logo-bfg.gif has changed
http://dive4elements.wald.intevation.org