Add ESA badge and acknowledgement.

Starlink · May 8, 2013 · 84cdba9 · 84cdba9
1 parent 0fa3488
commit 84cdba9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/topcat/src/docs/sun253.xml b/topcat/src/docs/sun253.xml
@@ -15512,15 +15512,17 @@ for the latest news and releases.
 Since then it has been supported by 
 grant PP/D002486/1 from the 
 UK's Particle Physics and Astronomy Research Council,
-the <webref url="http://eurovotech.org/">VOTech</webref> project (from EU FP6),
+the <webref url="http://eurovotc.org/">VOTech</webref> project (from EU FP6),
 the <webref url="http://www.astrogrid.org/">AstroGrid</webref> project
     (from PPARC/STFC),
 the <webref url="http://cds.u-strasbg.fr/twikiAIDA/bin/view/EuroVOAIDA/WebHome"
             >AIDA</webref> project (from EU FP7),
 grants ST/H008470/1, ST/I00176X/1 and ST/J001414/1
 from the UK's Science and Technology Facilities Council (STFC),
-and the <webref url="http://www.g-vo.org/">GAVO</webref> project
-(BMBF Bewilligungsnummer 05A08VHA).
+the <webref url="http://www.g-vo.org/">GAVO</webref> project
+(BMBF Bewilligungsnummer 05A08VHA),
+and
+the European Space Agency.
 All of this support is gratefully acknowledged.
 </p>
 

diff --git a/topcat/src/main/uk/ac/starlink/topcat/AuxWindow.java b/topcat/src/main/uk/ac/starlink/topcat/AuxWindow.java
@@ -651,16 +651,19 @@ private static Component getSponsorLogos() {
         box.add( brisLogo );
         box.add( Box.createHorizontalStrut( igap ) );
         JLabel votechLogo = new JLabel( ResourceIcon.VOTECH_LOGO );
-        votechLogo = new JLabel( ResourceIcon.VOTECH_LOGO );
         votechLogo.setToolTipText( "VO-Tech project: "
-                                 + "http://www.eurovotech.org/" );
+                                 + "http://www.eurovotc.org/" );
         box.add( votechLogo );
         box.add( Box.createHorizontalStrut( igap ) );
         JLabel gavoLogo = new JLabel( ResourceIcon.GAVO_LOGO );
-        gavoLogo = new JLabel( ResourceIcon.GAVO_LOGO );
         gavoLogo.setToolTipText( "German Astrophysical Virtual Observatory: "
                                + "http://www.g-vo.org/" );
         box.add( gavoLogo );
+        box.add( Box.createHorizontalStrut( igap ) );
+        JLabel esaLogo = new JLabel( ResourceIcon.ESA_LOGO );
+        esaLogo.setToolTipText( "European Space Agency: "
+                              + "http://www.esa.int/" );
+        box.add( esaLogo );
         return box;
     }
 

diff --git a/topcat/src/main/uk/ac/starlink/topcat/ResourceIcon.java b/topcat/src/main/uk/ac/starlink/topcat/ResourceIcon.java
@@ -82,6 +82,7 @@ public class ResourceIcon implements Icon {
         VOTECH_LOGO = makeIcon( "votech48.gif" ),
         STFC_LOGO = makeIcon( "stfc48.gif" ),
         GAVO_LOGO = makeIcon( "gavo48.gif" ),
+        ESA_LOGO = makeIcon( "esa48.gif" ),
         VIZIER_LOGO = makeIcon( "vizier_logo.gif" ),
 
         /* Generic actions. */

diff --git a/topcat/src/resources/uk/ac/starlink/topcat/images/esa48.gif b/topcat/src/resources/uk/ac/starlink/topcat/images/esa48.gif