Mercurial > dive4elements > river
changeset 1399:748e7c828d03
Issue312.
Moved images and get image urls from constants to completly support IE7.
flys-client/trunk@3284 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/flys-client/ChangeLog Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/ChangeLog Thu Nov 17 14:10:51 2011 +0000 @@ -1,3 +1,47 @@ +2011-11-17 Raimund Renkert <raimund.renkert@intevation.de> + + Issue312: Moved images to completly support IE7. + + * src/main/java/de/intevation/flys/client/client/FLYSConstants.java, + src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + Added Images to constants. + + * src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java, + src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java, + src/main/java/de/intevation/flys/client/client/ui/range/LocationsTable.java, + src/main/java/de/intevation/flys/client/client/ui/range/RangeTable.java, + src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java, + src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java, + src/main/java/de/intevation/flys/client/client/ui/MapSelection.java, + src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java, + src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java, + src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java: + Get image urls from constants to support IE7. + + * src/main/java/de/intevation/flys/client/client/images/downloadPNG.png, + src/main/java/de/intevation/flys/client/client/images/flys_logo.gif, + src/main/java/de/intevation/flys/client/client/images/loading.gif, + src/main/java/de/intevation/flys/client/client/images/bfg_logo.gif, + src/main/java/de/intevation/flys/client/client/images/marker_green.png, + src/main/java/de/intevation/flys/client/client/images/downloadPDF.png, + src/main/java/de/intevation/flys/client/client/images/downloadSVG.png, + src/main/java/de/intevation/flys/client/client/images/gewkarte.png, + src/main/java/de/intevation/flys/client/client/images/marker_red.png: + Removed. + + * src/main/webapp/images/loading.gif + src/main/webapp/images/bfg_logo.gif + src/main/webapp/images/marker_red.png + src/main/webapp/images/flys_logo.gif + src/main/webapp/images/marker_green.png + src/main/webapp/images/downloadPDF.png + src/main/webapp/images/gewkarte.png + src/main/webapp/images/downloadPNG.png + src/main/webapp/images/downloadSVG.png: + Added images. + 2011-11-14 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/client/client/ui/map/FloodMap.java:
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Nov 17 14:10:51 2011 +0000 @@ -234,6 +234,24 @@ String label_cancel(); + String flysLogo(); + + String bfgLogo(); + + String downloadPNG(); + + String downloadPDF(); + + String downloadSVG(); + + String loadingImg(); + + String markerRed(); + + String markerGreen(); + + String riverMap(); + // Elevation window String ele_window_title();
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Nov 17 14:10:51 2011 +0000 @@ -55,6 +55,19 @@ label_ok = Ok label_cancel = Cancel +# Header images +flysLogo = images/flys_logo.gif +bfgLogo = images/bfg_logo.gif + +# Images +downloadPNG = images/downloadPNG.png +downloadPDF = images/downloadPDF.png +downloadSVG = images/downloadSVG.png +loadingImg = images/loading.gif +markerRed = images/marker_red.png +markerGreen = images/marker_green.png +riverMap = images/gewkarte.png + dpLabelFrom = From dpUnitFrom = km dpLabelTo = To
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Nov 17 14:10:51 2011 +0000 @@ -55,6 +55,19 @@ label_ok = Ok label_cancel = Abbrechen +# Header images +flysLogo = images/flys_logo.gif +bfgLogo = images/bfg_logo.gif + +# Images +downloadPNG = images/downloadPNG.png +downloadPDF = images/downloadPDF.png +downloadSVG = images/downloadSVG.png +loadingImg = images/loading.gif +markerRed = images/marker_red.png +markerGreen = images/marker_green.png +riverMap = images/gewkarte.png + dpLabelFrom = Von dpUnitFrom = km dpLabelTo = Bis
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Thu Nov 17 14:10:51 2011 +0000 @@ -55,6 +55,19 @@ label_ok = Ok label_cancel = Cancel +# Header images +flysLogo = images/flys_logo.gif +bfgLogo = images/bfg_logo.gif + +# Images +downloadPNG = images/downloadPNG.png +downloadPDF = images/downloadPDF.png +downloadSVG = images/downloadSVG.png +loadingImg = images/loading.gif +markerRed = images/marker_red.png +markerGreen = images/marker_green.png +riverMap = images/gewkarte.png + dpLabelFrom = From dpUnitFrom = km dpLabelTo = To
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/bfg_logo.gif has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/downloadPDF.png has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/downloadPNG.png has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/downloadSVG.png has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/flys_logo.gif has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/gewkarte.png has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/loading.gif has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/marker_green.png has changed
Binary file flys-client/src/main/java/de/intevation/flys/client/client/images/marker_red.png has changed
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/FLYSHeader.java Thu Nov 17 14:10:51 2011 +0000 @@ -18,9 +18,6 @@ */ public class FLYSHeader extends HLayout { - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); - /** The interface that provides the message resources. */ private FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); @@ -41,17 +38,16 @@ setLayoutLeftMargin(5); setLayoutRightMargin(5); - ImageResource flysRes = IMAGES.logoFlys(); - ImageResource bfgRes = IMAGES.logoBfg(); + String baseUrl = GWT.getHostPageBaseURL(); Img flys = new Img( - flysRes.getURL(), - calcWidth(flysRes,IMG_HEIGHT), + baseUrl + MESSAGES.flysLogo(), + 50, IMG_HEIGHT); Img bfg = new Img( - bfgRes.getURL(), - calcWidth(bfgRes, HEIGHT), + baseUrl + MESSAGES.bfgLogo(), + 112, HEIGHT); Label fullname = new Label(MESSAGES.fullname());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LoadingPanel.java Thu Nov 17 14:10:51 2011 +0000 @@ -31,7 +31,6 @@ public static final DescribeArtifactServiceAsync describe = GWT.create(DescribeArtifactService.class); - private FLYSImages IMAGES = GWT.create(FLYSImages.class); private FLYSConstants MSG = GWT.create(FLYSConstants.class); @@ -81,6 +80,9 @@ protected VLayout createDialog() { + + String baseUrl = GWT.getHostPageBaseURL(); + title.setStyleName("loading-title"); title.setHeight(25); title.setWidth100(); @@ -90,8 +92,7 @@ msg.setWidth100(); msg.setHeight(100); - ImageResource res = IMAGES.loading(); - Img img = new Img(res.getURL(), 25, 25); + Img img = new Img(baseUrl + MSG.loadingImg(), 25, 25); VLayout box = new VLayout(); box.setStyleName("loading-box");
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/LocationDistancePanel.java Thu Nov 17 14:10:51 2011 +0000 @@ -67,9 +67,6 @@ /** The message class that provides i18n strings. */ protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); - /** The DistanceInfoService used to retrieve locations about rivers. */ protected DistanceInfoServiceAsync distanceInfoService = GWT.create(DistanceInfoService.class); @@ -202,6 +199,8 @@ */ protected void createDistanceTable() { + String baseUrl = GWT.getHostPageBaseURL(); + distanceTable.setWidth100(); distanceTable.setShowRecordComponents(true); distanceTable.setShowRecordComponentsByCell(true); @@ -272,7 +271,7 @@ } } }); - addDistance.setCellIcon(IMAGES.markerGreen().getURL()); + addDistance.setCellIcon(baseUrl + MESSAGES.markerGreen()); ListGridField ddescr = new ListGridField("description", MESSAGES.description()); @@ -314,6 +313,9 @@ * This method creates a table that contains the location values. */ protected void createLocationTable() { + + String baseUrl = GWT.getHostPageBaseURL(); + locationsTable.setWidth100(); locationsTable.setShowRecordComponents(true); locationsTable.setShowRecordComponentsByCell(true); @@ -371,7 +373,7 @@ setLocationValues(selected); } }); - addLocation.setCellIcon (IMAGES.markerGreen ().getURL ()); + addLocation.setCellIcon (baseUrl + MESSAGES.markerGreen ()); ListGridField ldescr = new ListGridField("description", MESSAGES.description()); @@ -407,6 +409,9 @@ * This method creates a table that contains the location values. */ protected void createLocationTableDistance (){ + + String baseUrl = GWT.getHostPageBaseURL(); + locationDistanceTable.setWidth100(); locationDistanceTable.setShowRecordComponents(true); locationDistanceTable.setShowRecordComponentsByCell(true); @@ -435,12 +440,12 @@ ListGridField addfrom = new ListGridField ("", ""); addfrom.setType (ListGridFieldType.ICON); addfrom.setWidth (20); - addfrom.setCellIcon (IMAGES.markerGreen ().getURL ()); + addfrom.setCellIcon(baseUrl + MESSAGES.markerGreen()); ListGridField addto2 = new ListGridField ("", ""); addto2.setType (ListGridFieldType.ICON); addto2.setWidth (20); - addto2.setCellIcon (IMAGES.markerRed ().getURL ()); + addto2.setCellIcon(baseUrl + MESSAGES.markerRed()); locationDistanceTable.addCellClickHandler (new CellClickHandler () { public void onCellClick (CellClickEvent e) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/MapSelection.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/MapSelection.java Thu Nov 17 14:10:51 2011 +0000 @@ -9,7 +9,7 @@ import com.smartgwt.client.widgets.layout.HLayout; import de.intevation.flys.client.shared.model.DataList; -import de.intevation.flys.client.client.FLYSImages; +import de.intevation.flys.client.client.FLYSConstants; import de.intevation.flys.client.shared.model.Data; @@ -23,7 +23,7 @@ public class MapSelection extends SelectProvider { /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); + private FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); protected ModuleSelection moduleSelection; @@ -46,6 +46,8 @@ protected Canvas createWidget(DataList data) { GWT.log("MapSelection - create()"); + String baseUrl = GWT.getHostPageBaseURL(); + HLayout h = new HLayout(); h.setAlign(VerticalAlignment.TOP); h.setHeight(100); @@ -55,8 +57,7 @@ form.setWidth(250); form.setLayoutAlign(VerticalAlignment.TOP); - ImageResource mapRes = IMAGES.riverMap(); - Img map = new Img(mapRes.getURL(), 400, 452); + Img map = new Img(baseUrl + MESSAGES.riverMap(), 400, 452); // TODO implement event handling in the river map
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/SingleLocationPanel.java Thu Nov 17 14:10:51 2011 +0000 @@ -56,9 +56,6 @@ /** The message class that provides i18n strings.*/ protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); - /** The DistanceInfoService used to retrieve locations about rivers.*/ protected DistanceInfoServiceAsync distanceInfoService = GWT.create(DistanceInfoService.class); @@ -130,6 +127,9 @@ */ protected void createLocationTable() { GWT.log("---------- I WAS HERE ---------"); + + String baseUrl = GWT.getHostPageBaseURL(); + locationTable.setWidth100(); locationTable.setShowRecordComponents(true); locationTable.setShowRecordComponentsByCell(true); @@ -154,7 +154,7 @@ setLocationValues(selected); } }); - addLocation.setCellIcon (IMAGES.markerGreen ().getURL ()); + addLocation.setCellIcon (baseUrl + MESSAGES.markerGreen()); ListGridField ldescr = new ListGridField("description", MESSAGES.description());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java Thu Nov 17 14:10:51 2011 +0000 @@ -57,9 +57,6 @@ /** The message class that provides i18n strings.*/ protected FLYSConstants MESSAGE = GWT.create(FLYSConstants.class); - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); - protected WQInfoServiceAsync wqInfoService = GWT.create(WQInfoService.class);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java Thu Nov 17 14:10:51 2011 +0000 @@ -23,8 +23,6 @@ protected static FLYSConstants MSG = GWT.create(FLYSConstants.class); - protected static FLYSImages IMG = GWT.create(FLYSImages.class); - public static final int PANEL_HEIGHT = 30; @@ -76,19 +74,19 @@ String baseUrl = GWT.getHostPageBaseURL(); downloadPNG = new ImgLink( - IMG.downloadPNG().getURL(), + baseUrl + MSG.downloadPNG(), chartTab.getExportUrl(1280, 1024, "png"), 20, 20); downloadPDF = new ImgLink( - IMG.downloadPDF().getURL(), + baseUrl + MSG.downloadPDF(), chartTab.getExportUrl(1280, 1024, "pdf"), 20, 20); downloadSVG = new ImgLink( - IMG.downloadSVG().getURL(), + baseUrl + MSG.downloadSVG(), chartTab.getExportUrl(1280, 1024, "svg"), 20, 20);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/range/LocationsTable.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/range/LocationsTable.java Thu Nov 17 14:10:51 2011 +0000 @@ -23,11 +23,11 @@ /** The message class that provides i18n strings.*/ protected FLYSConstants MSG = GWT.create(FLYSConstants.class); - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); - public LocationsTable() { + + String baseUrl = GWT.getHostPageBaseURL(); + setWidth100(); setHeight100(); setSelectionType(SelectionStyle.SINGLE); @@ -41,12 +41,12 @@ ListGridField addfrom = new ListGridField ("", ""); addfrom.setType(ListGridFieldType.ICON); addfrom.setWidth(20); - addfrom.setCellIcon(IMAGES.markerGreen().getURL()); + addfrom.setCellIcon(baseUrl + MSG.markerGreen()); ListGridField addto = new ListGridField("", ""); addto.setType(ListGridFieldType.ICON); addto.setWidth(20); - addto.setCellIcon(IMAGES.markerRed().getURL()); + addto.setCellIcon(baseUrl + MSG.markerRed()); ListGridField ldescr = new ListGridField( "description", MSG.description());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/range/RangeTable.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/range/RangeTable.java Thu Nov 17 14:10:51 2011 +0000 @@ -22,11 +22,10 @@ /** The message class that provides i18n strings.*/ protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); - public RangeTable() { + String baseUrl = GWT.getHostPageBaseURL(); + setWidth100(); setHeight100(); setSelectionType(SelectionStyle.SINGLE); @@ -40,7 +39,7 @@ ListGridField addDistance = new ListGridField ("", ""); addDistance.setType (ListGridFieldType.ICON); addDistance.setWidth (20); - addDistance.setCellIcon (IMAGES.markerGreen ().getURL ()); + addDistance.setCellIcon(baseUrl + MESSAGES.markerGreen()); ListGridField ddescr = new ListGridField( "description", MESSAGES.description());
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java Mon Nov 14 13:19:02 2011 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java Thu Nov 17 14:10:51 2011 +0000 @@ -19,12 +19,12 @@ /** The message class that provides i18n strings.*/ protected FLYSConstants MESSAGE = GWT.create(FLYSConstants.class); - /** The interface that provides the image resources. */ - private FLYSImages IMAGES = GWT.create(FLYSImages.class); protected boolean lockClick; public QDTable() { + String baseUrl = GWT.getHostPageBaseURL(); + setWidth100(); setHeight100(); setSelectionType(SelectionStyle.SINGLE); @@ -37,12 +37,12 @@ ListGridField addMax = new ListGridField("max", ""); addMax.setType(ListGridFieldType.ICON); addMax.setWidth(30); - addMax.setCellIcon(IMAGES.markerRed().getURL()); + addMax.setCellIcon(baseUrl + MESSAGE.markerRed()); ListGridField addMin = new ListGridField("min", ""); addMin.setType(ListGridFieldType.ICON); addMin.setWidth(30); - addMin.setCellIcon(IMAGES.markerGreen().getURL()); + addMin.setCellIcon(baseUrl + MESSAGE.markerGreen()); ListGridField name = new ListGridField("name", MESSAGE.discharge()); name.setType(ListGridFieldType.TEXT);