JAL-3594 Images for splash screen
authorBen Soares <b.soares@dundee.ac.uk>
Wed, 9 Dec 2020 18:23:02 +0000 (18:23 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Wed, 9 Dec 2020 18:23:02 +0000 (18:23 +0000)
66 files changed:
resources/default_images/UoD_banner-28.png [new file with mode: 0644]
resources/default_images/UoD_banner-30.png [new file with mode: 0644]
resources/default_images/UoD_banner-32.png [new file with mode: 0644]
resources/default_images/UoD_banner.png [deleted file]
resources/default_images/barton_group-28.png [new file with mode: 0644]
resources/default_images/barton_group-30.png [new file with mode: 0644]
resources/default_images/barton_group-32.png [new file with mode: 0644]
resources/default_images/barton_group-62.png [deleted file]
src/jalview/gui/Desktop.java
src/jalview/gui/SplashScreen.java
src/jalview/util/ChannelProperties.java
utils/channels/default/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/default/images/UoD_banner-30.png [new file with mode: 0644]
utils/channels/default/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/default/images/UoD_banner-65.png [new file with mode: 0644]
utils/channels/default/images/UoD_banner.svg [new file with mode: 0644]
utils/channels/default/images/barton_group-28.png [new file with mode: 0644]
utils/channels/default/images/barton_group-30.png [new file with mode: 0644]
utils/channels/default/images/barton_group-32.png [new file with mode: 0644]
utils/channels/default/resources/channel_properties
utils/channels/default/resources/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/default/resources/images/UoD_banner-30.png [new file with mode: 0644]
utils/channels/default/resources/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/default/resources/images/barton_group-28.png [new file with mode: 0644]
utils/channels/default/resources/images/barton_group-30.png [new file with mode: 0644]
utils/channels/default/resources/images/barton_group-32.png [new file with mode: 0644]
utils/channels/default/resources/images/barton_group-62.png [deleted file]
utils/channels/develop/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/develop/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/develop/images/barton_group-30.png [new file with mode: 0644]
utils/channels/develop/resources/channel_properties
utils/channels/develop/resources/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/develop/resources/images/UoD_banner-30.png [new file with mode: 0644]
utils/channels/develop/resources/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/develop/resources/images/barton_group-28.png [new file with mode: 0644]
utils/channels/develop/resources/images/barton_group-30.png [new file with mode: 0644]
utils/channels/develop/resources/images/barton_group-32.png [new file with mode: 0644]
utils/channels/develop/resources/images/barton_group-62.png [deleted file]
utils/channels/release/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/release/images/UoD_banner-30.png [new file with mode: 0644]
utils/channels/release/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/release/images/UoD_banner-65.png [new file with mode: 0644]
utils/channels/release/images/UoD_banner.svg [new file with mode: 0644]
utils/channels/release/images/barton_group-28.png [new file with mode: 0644]
utils/channels/release/images/barton_group-30.png [new file with mode: 0644]
utils/channels/release/images/barton_group-32.png [new file with mode: 0644]
utils/channels/release/resources/channel_properties
utils/channels/release/resources/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/release/resources/images/UoD_banner-30.png [new file with mode: 0644]
utils/channels/release/resources/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/release/resources/images/UoD_banner.png [deleted file]
utils/channels/release/resources/images/barton_group-28.png [new file with mode: 0644]
utils/channels/release/resources/images/barton_group-30.png [new file with mode: 0644]
utils/channels/release/resources/images/barton_group-32.png [new file with mode: 0644]
utils/channels/release/resources/images/barton_group-62.png [deleted file]
utils/channels/test-release/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/test-release/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/test-release/images/barton_group-30.png [new file with mode: 0644]
utils/channels/test-release/resources/channel_properties
utils/channels/test-release/resources/images/UoD_banner-28.png [new file with mode: 0644]
utils/channels/test-release/resources/images/UoD_banner-30.png [new file with mode: 0644]
utils/channels/test-release/resources/images/UoD_banner-32.png [new file with mode: 0644]
utils/channels/test-release/resources/images/barton_group-28.png [new file with mode: 0644]
utils/channels/test-release/resources/images/barton_group-30.png [new file with mode: 0644]
utils/channels/test-release/resources/images/barton_group-32.png [new file with mode: 0644]
utils/channels/test-release/resources/images/barton_group-62.png [deleted file]

diff --git a/resources/default_images/UoD_banner-28.png b/resources/default_images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/resources/default_images/UoD_banner-28.png differ
diff --git a/resources/default_images/UoD_banner-30.png b/resources/default_images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/resources/default_images/UoD_banner-30.png differ
diff --git a/resources/default_images/UoD_banner-32.png b/resources/default_images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/resources/default_images/UoD_banner-32.png differ
diff --git a/resources/default_images/UoD_banner.png b/resources/default_images/UoD_banner.png
deleted file mode 100644 (file)
index 2aff7e2..0000000
Binary files a/resources/default_images/UoD_banner.png and /dev/null differ
diff --git a/resources/default_images/barton_group-28.png b/resources/default_images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/resources/default_images/barton_group-28.png differ
diff --git a/resources/default_images/barton_group-30.png b/resources/default_images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/resources/default_images/barton_group-30.png differ
diff --git a/resources/default_images/barton_group-32.png b/resources/default_images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/resources/default_images/barton_group-32.png differ
diff --git a/resources/default_images/barton_group-62.png b/resources/default_images/barton_group-62.png
deleted file mode 100644 (file)
index 542acd9..0000000
Binary files a/resources/default_images/barton_group-62.png and /dev/null differ
index 0f5a931..39c68a0 100644 (file)
@@ -137,12 +137,35 @@ public class Desktop extends jalview.jbgui.GDesktop
         implements DropTargetListener, ClipboardOwner, IProgressIndicator,
         jalview.api.StructureSelectionManagerProvider
 {
-  private static final String CITATION = "<br><br>Development managed by The Barton Group, University of Dundee, Scotland, UK.<br>"
-          + "<br><br>For help, see the FAQ at <a href=\"http://www.jalview.org/faq\">www.jalview.org/faq</a> and/or join the jalview-discuss@jalview.org mailing list"
-          + "<br><br>If  you use Jalview, please cite:"
-          + "<br>Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
-          + "<br>Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
-          + "<br>Bioinformatics doi: 10.1093/bioinformatics/btp033";
+  private static final String CITATION;
+  static
+  {
+    URL bg_logo_url = ChannelProperties.getImageURL(
+            "bg_logo." + String.valueOf(SplashScreen.logoSize));
+    URL uod_logo_url = ChannelProperties.getImageURL(
+            "uod_banner." + String.valueOf(SplashScreen.logoSize));
+    boolean logo = (bg_logo_url != null || uod_logo_url != null);
+    StringBuilder sb = new StringBuilder();
+    sb.append(
+            "<br><br>Development managed by The Barton Group, University of Dundee, Scotland, UK.");
+    if (logo)
+    {
+      sb.append("<br>");
+    }
+    sb.append(bg_logo_url == null ? ""
+            : "<img alt=\"Barton Group logo\" src=\""
+                    + bg_logo_url.toString() + "\">");
+    sb.append(uod_logo_url == null ? ""
+            : "&nbsp;<img alt=\"University of Dundee shield\" src=\""
+                    + uod_logo_url.toString() + "\">");
+    sb.append(
+            "<br><br>For help, see the FAQ at <a href=\"https://www.jalview.org/faq\">www.jalview.org/faq</a> and/or join the jalview-discuss@jalview.org mailing list");
+    sb.append("<br><br>If  you use Jalview, please cite:"
+            + "<br>Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)"
+            + "<br>Jalview Version 2 - a multiple sequence alignment editor and analysis workbench"
+            + "<br>Bioinformatics doi: 10.1093/bioinformatics/btp033");
+    CITATION = sb.toString();
+  }
 
   private static final String DEFAULT_AUTHORS = "The Jalview Authors (See AUTHORS file for current list)";
 
@@ -962,7 +985,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     } catch (java.lang.ClassCastException cex)
     {
       Cache.log.warn(
-              "Squashed a possible GUI implementation error. If you can recreate this, please look at http://issues.jalview.org/browse/JAL-869",
+              "Squashed a possible GUI implementation error. If you can recreate this, please look at https://issues.jalview.org/browse/JAL-869",
               cex);
     }
   }
@@ -1174,7 +1197,7 @@ public class Desktop extends jalview.jbgui.GDesktop
      * JS: (pending JAL-3038) a plain text field
      */
     JComponent history;
-    String urlBase = "http://www.";
+    String urlBase = "https://www.";
     if (Platform.isJS())
     {
       history = new JTextField(urlBase, 35);
@@ -1368,7 +1391,8 @@ public class Desktop extends jalview.jbgui.GDesktop
   public String getAboutMessage()
   {
     StringBuilder message = new StringBuilder(1024);
-    message.append("<h1><strong>Version: ")
+    message.append("<div style=\"font-family: sans-serif;\">")
+            .append("<h1><strong>Version: ")
             .append(Cache.getProperty("VERSION")).append("</strong></h1>")
             .append("<strong>Built: <em>")
             .append(Cache.getDefault("BUILD_DATE", "unknown"))
@@ -1397,7 +1421,7 @@ public class Desktop extends jalview.jbgui.GDesktop
               .append(Cache.getDefault("LATEST_VERSION", "..Checking.."))
               .append(" is available for download from ")
               .append(Cache.getDefault("www.jalview.org",
-                      "http://www.jalview.org"))
+                      "https://www.jalview.org"))
               .append(" !!");
       if (red)
       {
@@ -1408,6 +1432,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     message.append(Cache.getDefault("AUTHORFNAMES", DEFAULT_AUTHORS));
     message.append(CITATION);
 
+    message.append("</div>");
+
     return message.toString();
   }
 
@@ -1421,7 +1447,7 @@ public class Desktop extends jalview.jbgui.GDesktop
     {
       if (Platform.isJS())
       {
-        BrowserLauncher.openURL("http://www.jalview.org/help.html");
+        BrowserLauncher.openURL("https://www.jalview.org/help.html");
       }
       else
       /**
index 9dfd1d5..a8a849e 100755 (executable)
@@ -59,6 +59,13 @@ public class SplashScreen extends JPanel
 
   private JPanel iconimg = new JPanel(new BorderLayout());
 
+  // could change fg, bg, font later to use ChannelProperties
+  private static Color bg = Color.WHITE;
+
+  private static Color fg = Color.BLACK;
+
+  private static Font font = new Font("SansSerif", Font.PLAIN, FONT_SIZE);
+
   /*
    * as JTextPane in Java, JLabel in javascript
    */
@@ -72,6 +79,8 @@ public class SplashScreen extends JPanel
 
   private long oldTextLength = -1;
 
+  public static int logoSize = 32;
+
   /*
    * allow click in the initial splash screen to dismiss it
    * immediately (not if opened from About menu)
@@ -119,6 +128,9 @@ public class SplashScreen extends JPanel
        */
       {
         splashText = new JTextPane();
+        splashText.setBackground(bg);
+        splashText.setForeground(fg);
+        splashText.setFont(font);
         Thread t = new Thread(this);
         t.start();
       }
@@ -167,12 +179,20 @@ public class SplashScreen extends JPanel
     {
     }
 
+    this.setBackground(bg);
+    this.setForeground(fg);
+    this.setFont(font);
+
     iframe = new JInternalFrame();
     iframe.setFrameIcon(null);
     iframe.setClosable(true);
     this.setLayout(new BorderLayout());
     iframe.setContentPane(this);
     iframe.setLayer(JLayeredPane.PALETTE_LAYER);
+    iframe.setBackground(bg);
+    iframe.setForeground(fg);
+    iframe.setFont(font);
+
     if (Platform.isJS())
     {
       // ignore in JavaScript
@@ -185,9 +205,13 @@ public class SplashScreen extends JPanel
      */
     {
       ((JTextPane) splashText).setEditable(false);
+      splashText.setBackground(bg);
+      splashText.setForeground(fg);
+      splashText.setFont(font);
 
       SplashImage splashimg = new SplashImage(image);
-      iconimg.add(splashimg, BorderLayout.CENTER);
+      iconimg.add(splashimg, BorderLayout.LINE_START);
+      iconimg.setBackground(bg);
       add(iconimg, BorderLayout.NORTH);
     }
     add(splashText, BorderLayout.CENTER);
@@ -229,6 +253,9 @@ public class SplashScreen extends JPanel
       {
         JTextPane jtp = new JTextPane();
         jtp.setEditable(false);
+        jtp.setBackground(bg);
+        jtp.setForeground(fg);
+        jtp.setFont(font);
         jtp.setContentType("text/html");
         jtp.setText("<html>" + newtext + "</html>");
         jtp.addHyperlinkListener(this);
@@ -237,7 +264,10 @@ public class SplashScreen extends JPanel
       splashText.addMouseListener(closer);
 
       splashText.setVisible(true);
-      splashText.setSize(new Dimension(750, 375));
+      splashText.setSize(new Dimension(750, 375 + logoSize));
+      splashText.setBackground(bg);
+      splashText.setForeground(fg);
+      splashText.setFont(font);
       add(splashText, BorderLayout.CENTER);
       revalidate();
       iframe.setBounds((Desktop.instance.getWidth() - 750) / 2,
@@ -327,10 +357,10 @@ public class SplashScreen extends JPanel
     @Override
     public void paintComponent(Graphics g)
     {
-      g.setColor(Color.white);
+      g.setColor(bg);
       g.fillRect(0, 0, getWidth(), getHeight());
-      g.setColor(Color.black);
-      g.setFont(new Font("Verdana", Font.BOLD, FONT_SIZE + 6));
+      g.setColor(fg);
+      g.setFont(new Font(font.getFontName(), Font.BOLD, FONT_SIZE + 6));
 
       if (image != null)
       {
index 2194c4d..c33198b 100644 (file)
@@ -26,6 +26,8 @@ public class ChannelProperties
 
   private static Map<String, Image> imageMap = new HashMap<String, Image>();
 
+  private static Map<String, URL> urlMap = new HashMap<String, URL>();
+
   private static final ArrayList<Image> iconList;
 
   static
@@ -45,8 +47,12 @@ public class ChannelProperties
     defaultProps.put("logo.512", "/default_images/jalview_logo-512.png");
     defaultProps.put("rotatable_logo.48",
             "/default_images/rotatable_jalview_logo-38.png");
-    defaultProps.put("bg_logo.62", "/default_images/barton_group-62.png");
-    defaultProps.put("uod_banner", "/default_images/UoD_banner.png");
+    defaultProps.put("bg_logo.28", "/default_images/barton_group-28.png");
+    defaultProps.put("bg_logo.30", "/default_images/barton_group-30.png");
+    defaultProps.put("bg_logo.32", "/default_images/barton_group-32.png");
+    defaultProps.put("uod_banner.28", "/default_images/UoD_banner-28.png");
+    defaultProps.put("uod_banner.30", "/default_images/UoD_banner-30.png");
+    defaultProps.put("uod_banner.32", "/default_images/UoD_banner-32.png");
     defaultProps.put("default_appbase",
             "https://www.jalview.org/getdown/release/1.8");
 
@@ -122,6 +128,11 @@ public class ChannelProperties
     return imageMap;
   }
 
+  private static Map<String, URL> urlMap()
+  {
+    return urlMap;
+  }
+
   /*
    * getProperty(key) will get property value from channel_properties for key.
    * If no property for key is found, it will fall back to using the defaultProps defined for this class.
@@ -217,12 +228,30 @@ public class ChannelProperties
       else
       {
         imageMap().put(key, img);
+        urlMap.put(key, imageURL);
       }
     }
     return img;
   }
 
   /*
+   * Public method to get the URL object pointing to a cached image.
+   */
+  public static URL getImageURL(String key)
+  {
+    if (getImage(key) != null)
+    {
+      if (urlMap().containsKey(key))
+      {
+        return urlMap().getOrDefault(key, null);
+      }
+      System.err.println(
+              "Do not use getImageURL(key) before using getImage(key...)");
+    }
+    return null;
+  }
+
+  /*
    * Get a List of Icon images of different sizes.
    */
   public static ArrayList<Image> getIconList()
diff --git a/utils/channels/default/images/UoD_banner-28.png b/utils/channels/default/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/default/images/UoD_banner-28.png differ
diff --git a/utils/channels/default/images/UoD_banner-30.png b/utils/channels/default/images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/utils/channels/default/images/UoD_banner-30.png differ
diff --git a/utils/channels/default/images/UoD_banner-32.png b/utils/channels/default/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/default/images/UoD_banner-32.png differ
diff --git a/utils/channels/default/images/UoD_banner-65.png b/utils/channels/default/images/UoD_banner-65.png
new file mode 100644 (file)
index 0000000..45f7d29
Binary files /dev/null and b/utils/channels/default/images/UoD_banner-65.png differ
diff --git a/utils/channels/default/images/UoD_banner.svg b/utils/channels/default/images/UoD_banner.svg
new file mode 100644 (file)
index 0000000..27cae5d
--- /dev/null
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="264.79999"
+   height="52.906666"
+   viewBox="0 0 264.79999 52.906666"
+   sodipodi:docname="UoD_banner.svg"
+   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"
+   inkscape:export-filename="/home/bsoares/Work/git/develop/jalview/utils/channels/release/images/UoD_banner-30.png"
+   inkscape:export-xdpi="54.429451"
+   inkscape:export-ydpi="54.429451"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2955"
+     inkscape:window-height="1263"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="7.0203931"
+     inkscape:cx="132.39999"
+     inkscape:cy="26.453333"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+     inkscape:document-rotation="0" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,52.906667)"><g
+       id="g12"
+       transform="scale(0.1)"><path
+         d="M 229.703,72.1758 C 223.219,64.6094 216.098,57.3516 208.352,50.4414 179.551,24.7617 150.344,11.293 141.789,7.66016 133.281,11.2617 104.371,24.5703 75.6016,50.1172 67.7109,57.125 60.4727,64.4922 53.8828,72.1797 L 141.789,139.703 7.08984,243.18 v 0 H 276.496 L 141.789,139.703 Z M 18.707,335.93 c 0.0782,0.043 0.1641,0.062 0.2461,0.062 13.0117,-0.648 16.9922,-8.613 17.0352,-8.695 1.3984,-2.426 1.8086,-5.305 1.168,-8.047 1.5625,1.512 3.5937,2.566 5.7343,2.93 7.5313,1.285 14.4297,-4.391 18.1524,-10.575 0.1523,-0.226 0.1523,-0.527 0.0039,-0.761 -5.1914,-8.289 -11.3828,-10.203 -14.3594,-10.637 1.0547,-0.66 1.918,-1.559 2.543,-2.641 2.0508,-3.554 0.9609,-8.078 -2.4102,-10.32 -0.0078,-0.004 -0.0156,-0.012 -0.0273,-0.016 -0.2227,-0.128 -0.5117,-0.05 -0.6407,0.172 l -27.6171,47.883 c -0.1289,0.227 -0.0508,0.512 0.1718,0.645 z m 48.5938,-4.532 11.0898,2.973 -2.9726,11.098 c -0.3985,1.488 0.4843,3.011 1.9687,3.414 l 6.7149,1.801 c 1.4804,0.398 3.0078,-0.485 3.4062,-1.973 l 2.9727,-11.098 11.0895,2.973 c 1.481,0.398 3.008,-0.484 3.407,-1.973 l 1.796,-6.715 c 0.399,-1.488 -0.48,-3.015 -1.964,-3.414 l -11.0942,-2.972 4.0391,-15.074 c 0.3984,-1.481 -0.4844,-3.008 -1.9726,-3.407 l -6.7149,-1.801 c -1.4805,-0.394 -3.0039,0.485 -3.4023,1.969 l -4.0313,15.071 -11.0937,-2.977 c -1.4844,-0.395 -3.0078,0.484 -3.4024,1.969 l -1.8047,6.722 c -0.3984,1.489 0.4844,3.008 1.9688,3.414 z m 59.9452,13.356 c 2.035,0.758 4.324,0.863 6.43,0.336 v -0.008 l 0.012,0.023 c -1.93,2.051 -3.012,4.766 -3.012,7.602 -0.024,0.348 -0.5,9.141 10.734,16.215 0.231,0.144 0.535,0.144 0.766,0 11.301,-7.109 10.742,-16.172 10.738,-16.266 0,-2.801 -1.086,-5.5 -3.008,-7.551 2.11,0.528 4.395,0.418 6.43,-0.335 7.16,-2.657 10.305,-11.024 10.441,-18.243 0.016,-0.269 -0.132,-0.535 -0.382,-0.664 -8.633,-4.578 -14.95,-3.136 -17.743,-2.023 0.578,-1.102 0.879,-2.313 0.879,-3.559 0,-4.269 -3.465,-7.746 -7.734,-7.746 -4.27,0 -7.742,3.477 -7.742,7.746 0,1.239 0.3,2.446 0.871,3.543 -2.793,-1.113 -9.11,-2.551 -17.738,2.028 -0.25,0.125 -0.399,0.39 -0.383,0.66 0.14,7.222 3.281,15.586 10.441,18.242 z m 49.563,-12.863 1.796,6.722 c 0.399,1.489 1.926,2.371 3.407,1.969 l 11.093,-2.977 2.969,11.106 c 0.399,1.488 1.926,2.371 3.406,1.973 l 6.715,-1.805 c 1.485,-0.399 2.368,-1.922 1.965,-3.41 l -2.972,-11.102 11.093,-2.976 c 1.485,-0.399 2.367,-1.918 1.969,-3.407 l -1.805,-6.722 c -0.394,-1.489 -1.918,-2.364 -3.402,-1.969 l -11.094,2.977 -4.031,-15.071 c -0.398,-1.488 -1.922,-2.371 -3.41,-1.969 l -6.707,1.801 c -1.488,0.399 -2.367,1.926 -1.973,3.407 l 4.039,15.074 -11.094,2.972 c -1.484,0.399 -2.363,1.926 -1.964,3.407 z m 55.957,-52.575 -9.942,-17.203 c -24.515,14.2 -52.535,21.703 -81.031,21.703 -28.492,0 -56.5117,-7.503 -81.0274,-21.703 l -9.9414,17.203 c 27.5313,15.946 58.9888,24.375 90.9688,24.375 31.984,0 63.441,-8.429 90.973,-24.375 z m -10.227,32.289 c 3.723,6.184 10.621,11.86 18.152,10.575 2.141,-0.364 4.172,-1.418 5.735,-2.93 -0.641,2.742 -0.231,5.621 1.172,8.047 0.039,0.082 4.019,8.047 17.031,8.695 0.086,0 0.168,-0.019 0.246,-0.062 0.223,-0.133 0.301,-0.418 0.172,-0.645 L 237.43,287.402 c -0.129,-0.222 -0.418,-0.3 -0.641,-0.172 -0.012,0.004 -0.019,0.012 -0.027,0.016 -3.367,2.242 -4.461,6.766 -2.407,10.32 0.622,1.082 1.485,1.981 2.54,2.641 -2.977,0.434 -9.168,2.348 -14.36,10.637 -0.148,0.234 -0.148,0.535 0.004,0.761 z M 0,385.563 c 0,0 0,-44.665 0,-187.059 C 0,53.3281 141.793,0 141.793,0 c 0,0 141.793,53.3281 141.793,198.504 0,142.394 0.004,187.059 0.004,187.059 H 0"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path14" /><path
+         d="m 439.125,317.734 v 67.754 h -19.98 v -68.297 c 0,-31.535 14.761,-49.918 46.082,-49.918 30.964,0.18 46.265,18.024 46.265,49.918 v 68.297 h -19.98 v -67.754 c 0,-21.445 -7.024,-32.437 -26.285,-32.437 -19.262,0 -26.102,10.992 -26.102,32.437 m 140.953,43.067 c -11.883,0 -21.422,-6.125 -26.101,-13.516 h -1.622 l -0.718,10.992 h -17.465 v -87.578 h 18.902 v 45.41 c 0,9.731 1.981,16.039 5.403,20.004 4.14,4.867 10.441,7.571 17.101,7.571 10.981,0 16.738,-5.77 16.738,-21.266 v -51.719 h 18.903 v 58.207 c 0,23.965 -14.578,31.895 -31.141,31.895 m 75.602,23.789 c 0,7.207 -5.399,12.254 -12.063,12.254 -6.84,0 -12.238,-5.047 -12.238,-12.254 0,-7.031 5.398,-11.895 12.238,-11.895 6.664,0 12.063,4.864 12.063,11.895 m -2.7,-26.313 h -18.902 v -87.578 h 18.902 z m 81.547,0 -22.863,-67.574 -22.68,67.574 h -21.601 l 33.301,-87.578 h 20.343 l 33.301,87.578 z m 68.407,2.524 c -25.383,0 -42.485,-18.922 -42.485,-45.953 0,-28.469 18.184,-45.95 42.844,-45.95 17.82,0 32.402,10.45 36.184,23.247 l -15.122,8.289 c -3.781,-10.454 -11.703,-14.957 -21.242,-14.957 -12.961,0 -22.504,9.371 -23.761,26.488 h 62.285 v 5.226 c 0.359,24.329 -13.864,43.61 -38.703,43.61 m -0.719,-16.039 c 12.058,0 19.262,-7.926 20.34,-19.641 H 780.07 c 2.34,12.434 10.801,19.641 22.145,19.641 m 100.988,15.859 c -9.543,0 -18.902,-6.129 -23.223,-15.496 h -1.261 l -0.899,12.973 h -17.64 v -87.399 h 19.082 v 48.836 c 0,15.137 9.359,23.067 21.238,23.067 3.422,0 5.582,-0.364 7.023,-1.082 l 1.438,18.378 c -1.438,0.543 -3.238,0.723 -5.758,0.723 m 21.957,-62.172 -9.543,-12.613 c 6.305,-9.012 17.824,-16.938 35.465,-16.938 20.344,0 34.203,10.993 34.203,27.93 0,16.399 -13.5,22.707 -28.98,26.852 -10.621,2.703 -19.082,5.226 -19.082,12.433 0,5.047 4.679,9.012 13.679,9.012 9.539,0 19.082,-5.406 23.762,-11.176 l 9.359,13.336 c -7.378,8.11 -18.898,13.695 -32.761,13.695 -19.442,0 -32.762,-10.089 -32.762,-26.128 0,-16.579 13.5,-22.707 30.063,-26.852 11.878,-3.062 18.179,-6.305 18.179,-13.152 0,-6.489 -5.937,-10.274 -15.48,-10.274 -12.063,0 -21.782,6.848 -26.102,13.875 m 100.81,86.141 c 0,7.207 -5.4,12.254 -12.06,12.254 -6.84,0 -12.24,-5.047 -12.24,-12.254 0,-7.031 5.4,-11.895 12.24,-11.895 6.66,0 12.06,4.864 12.06,11.895 m -2.7,-26.313 h -18.9 v -87.578 h 18.9 z m 45.72,-53.699 v 38.383 h 21.42 v 15.316 h -21.6 v 24.328 l -18.72,-2.343 v -21.985 h -11.34 v -15.316 h 11.34 v -40.184 c 0,-25.953 16.92,-33.339 32.04,-33.339 5.4,0 9.18,0.539 12.6,1.441 v 17.301 c -2.88,-0.903 -7.02,-1.621 -10.8,-1.621 -9.72,0 -14.94,5.765 -14.94,18.019 m 115.75,53.699 h -19.8 l -22.86,-67.574 -22.69,67.574 h -21.6 l 33.55,-87.984 -11.95,-32.57 h 19.63 l 39.06,102.894 -0.18,-0.179 6.84,17.839"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path16" /><path
+         d="m 134.875,323.93 h -0.004 0.004 z"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path18" /><path
+         d="m 1300.16,311.453 c 0,26.547 -16.49,43.399 -40.63,43.399 -23.98,0 -40.64,-16.852 -40.64,-43.399 0,-26.551 16.66,-43.402 40.64,-43.402 24.14,0 40.63,16.851 40.63,43.402 m -18.02,0 c 0,-17.531 -8.33,-27.742 -22.61,-27.742 -13.95,0 -22.62,10.211 -22.62,27.742 0,17.527 8.67,27.738 22.62,27.738 14.28,0 22.61,-10.211 22.61,-27.738 m 72.59,59.735 c 3.74,0 7.65,-0.68 10.54,-1.532 v 16.34 c -3.23,0.852 -7.14,1.192 -12.24,1.192 -14.45,0 -30.94,-6.809 -30.94,-31.485 v -3.234 h -13.26 V 338 h 13.26 v -68.246 h 17.68 V 338 h 22.1 v 14.469 h -22.1 V 354 c 0,11.742 5.27,17.188 14.96,17.188 m 87.42,13.355 h -35.83 V 269.754 h 35.83 c 42.66,0 62.1,22.344 62.1,57.844 0,35.14 -19.44,56.945 -62.1,56.945 m -15.84,-16.938 h 15.66 c 31.32,0 42.3,-13.695 42.3,-40.007 0,-26.668 -11.16,-40.727 -42.3,-40.727 h -15.66 z m 152.29,-10.273 v -45.41 c 0,-9.731 -1.98,-16.039 -5.4,-20.004 -4.14,-4.863 -10.44,-7.566 -17.1,-7.566 -10.98,0 -16.74,5.765 -16.74,21.261 v 51.719 h -18.91 v -58.203 c 0,-23.969 14.59,-31.899 31.15,-31.899 11.88,0 21.42,6.129 26.1,13.516 h 1.62 l 0.72,-10.992 h 17.46 v 87.578 z m 85.51,2.523 c -11.88,0 -21.43,-6.125 -26.11,-13.515 h -1.62 l -0.72,10.992 h -17.46 v -87.578 h 18.9 v 45.41 c 0,9.731 1.98,16.039 5.4,20.004 4.15,4.867 10.45,7.57 17.11,7.57 10.98,0 16.74,-5.769 16.74,-21.265 v -51.719 h 18.9 v 58.207 c 0,23.965 -14.58,31.894 -31.14,31.894 m 113.04,30.817 v -43.43 h -1.26 c -4.86,7.387 -13.5,12.613 -26.46,12.613 -21.24,0 -39.24,-17.3 -39.24,-45.953 0,-28.468 18,-45.949 39.42,-45.949 13.14,0 21.6,5.406 26.46,12.793 h 1.08 v -10.992 h 18.9 v 123.441 z m -24.48,-105.961 c -14.22,0 -23.4,10.273 -23.4,29.191 0,18.922 9.18,29.196 23.22,29.196 13.32,0 23.22,-8.11 24.66,-24.688 v -8.652 c -1.44,-16.938 -11.16,-25.047 -24.48,-25.047 m 101.35,75.144 c -25.38,0 -42.48,-18.921 -42.48,-45.953 0,-28.468 18.18,-45.949 42.84,-45.949 17.82,0 32.4,10.449 36.18,23.246 l -15.12,8.289 c -3.78,-10.453 -11.7,-14.957 -21.24,-14.957 -12.96,0 -22.5,9.371 -23.76,26.489 h 62.28 v 5.226 c 0.36,24.328 -13.86,43.609 -38.7,43.609 m -0.72,-16.039 c 12.06,0 19.26,-7.925 20.34,-19.64 h -42.48 c 2.34,12.433 10.8,19.64 22.14,19.64 m 93.97,16.039 c -25.38,0 -42.49,-18.921 -42.49,-45.953 0,-28.468 18.19,-45.949 42.85,-45.949 17.82,0 32.4,10.449 36.18,23.246 l -15.12,8.289 c -3.78,-10.453 -11.7,-14.957 -21.24,-14.957 -12.96,0 -22.5,9.371 -23.76,26.489 h 62.28 v 5.226 c 0.36,24.328 -13.86,43.609 -38.7,43.609 m -0.72,-16.039 c 12.06,0 19.26,-7.925 20.34,-19.64 h -42.48 c 2.34,12.433 10.8,19.64 22.14,19.64"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path20" /></g></g></svg>
diff --git a/utils/channels/default/images/barton_group-28.png b/utils/channels/default/images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/utils/channels/default/images/barton_group-28.png differ
diff --git a/utils/channels/default/images/barton_group-30.png b/utils/channels/default/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/default/images/barton_group-30.png differ
diff --git a/utils/channels/default/images/barton_group-32.png b/utils/channels/default/images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/utils/channels/default/images/barton_group-32.png differ
index a581120..4e6d27a 100644 (file)
@@ -9,6 +9,10 @@ logo.128=/images/jalview_logo-128.png
 logo.256=/images/jalview_logo-256.png
 logo.512=/images/jalview_logo-512.png
 rotatable_logo.48=/images/rotatable_jalview_logo-38.png
-bg_logo.62=/images/barton_group-62.png
-uod_banner=/images/UoD_banner.png
+bg_logo.28=/images/barton_group-28.png
+bg_logo.30=/images/barton_group-30.png
+bg_logo.32=/images/barton_group-32.png
+uod_banner.28=/images/UoD_banner-28.png
+uod_banner.30=/images/UoD_banner-30.png
+uod_banner.32=/images/UoD_banner-32.png
 default_appbase=https://www.jalview.org/getdown/release/1.8
diff --git a/utils/channels/default/resources/images/UoD_banner-28.png b/utils/channels/default/resources/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/default/resources/images/UoD_banner-28.png differ
diff --git a/utils/channels/default/resources/images/UoD_banner-30.png b/utils/channels/default/resources/images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/utils/channels/default/resources/images/UoD_banner-30.png differ
diff --git a/utils/channels/default/resources/images/UoD_banner-32.png b/utils/channels/default/resources/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/default/resources/images/UoD_banner-32.png differ
diff --git a/utils/channels/default/resources/images/barton_group-28.png b/utils/channels/default/resources/images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/utils/channels/default/resources/images/barton_group-28.png differ
diff --git a/utils/channels/default/resources/images/barton_group-30.png b/utils/channels/default/resources/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/default/resources/images/barton_group-30.png differ
diff --git a/utils/channels/default/resources/images/barton_group-32.png b/utils/channels/default/resources/images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/utils/channels/default/resources/images/barton_group-32.png differ
diff --git a/utils/channels/default/resources/images/barton_group-62.png b/utils/channels/default/resources/images/barton_group-62.png
deleted file mode 100644 (file)
index 542acd9..0000000
Binary files a/utils/channels/default/resources/images/barton_group-62.png and /dev/null differ
diff --git a/utils/channels/develop/images/UoD_banner-28.png b/utils/channels/develop/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/develop/images/UoD_banner-28.png differ
diff --git a/utils/channels/develop/images/UoD_banner-32.png b/utils/channels/develop/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/develop/images/UoD_banner-32.png differ
diff --git a/utils/channels/develop/images/barton_group-30.png b/utils/channels/develop/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/develop/images/barton_group-30.png differ
index 606cc5f..fa848de 100644 (file)
@@ -9,6 +9,10 @@ logo.128=/images/jalview_develop_logo-128.png
 logo.256=/images/jalview_develop_logo-256.png
 logo.512=/images/jalview_develop_logo-512.png
 rotatable_logo.48=/images/rotatable_jalview_develop_logo-38.png
-bg_logo.62=/images/barton_group-62.png
-uod_banner=/images/UoD_banner.png
+bg_logo.28=/images/barton_group-28.png
+bg_logo.30=/images/barton_group-30.png
+bg_logo.32=/images/barton_group-32.png
+uod_banner.28=/images/UoD_banner-28.png
+uod_banner.30=/images/UoD_banner-30.png
+uod_banner.32=/images/UoD_banner-32.png
 default_appbase=https://www.jalview.org/getdown/develop/11
diff --git a/utils/channels/develop/resources/images/UoD_banner-28.png b/utils/channels/develop/resources/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner-28.png differ
diff --git a/utils/channels/develop/resources/images/UoD_banner-30.png b/utils/channels/develop/resources/images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner-30.png differ
diff --git a/utils/channels/develop/resources/images/UoD_banner-32.png b/utils/channels/develop/resources/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner-32.png differ
diff --git a/utils/channels/develop/resources/images/barton_group-28.png b/utils/channels/develop/resources/images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/utils/channels/develop/resources/images/barton_group-28.png differ
diff --git a/utils/channels/develop/resources/images/barton_group-30.png b/utils/channels/develop/resources/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/develop/resources/images/barton_group-30.png differ
diff --git a/utils/channels/develop/resources/images/barton_group-32.png b/utils/channels/develop/resources/images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/utils/channels/develop/resources/images/barton_group-32.png differ
diff --git a/utils/channels/develop/resources/images/barton_group-62.png b/utils/channels/develop/resources/images/barton_group-62.png
deleted file mode 100644 (file)
index 542acd9..0000000
Binary files a/utils/channels/develop/resources/images/barton_group-62.png and /dev/null differ
diff --git a/utils/channels/release/images/UoD_banner-28.png b/utils/channels/release/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/release/images/UoD_banner-28.png differ
diff --git a/utils/channels/release/images/UoD_banner-30.png b/utils/channels/release/images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/utils/channels/release/images/UoD_banner-30.png differ
diff --git a/utils/channels/release/images/UoD_banner-32.png b/utils/channels/release/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/release/images/UoD_banner-32.png differ
diff --git a/utils/channels/release/images/UoD_banner-65.png b/utils/channels/release/images/UoD_banner-65.png
new file mode 100644 (file)
index 0000000..45f7d29
Binary files /dev/null and b/utils/channels/release/images/UoD_banner-65.png differ
diff --git a/utils/channels/release/images/UoD_banner.svg b/utils/channels/release/images/UoD_banner.svg
new file mode 100644 (file)
index 0000000..27cae5d
--- /dev/null
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="264.79999"
+   height="52.906666"
+   viewBox="0 0 264.79999 52.906666"
+   sodipodi:docname="UoD_banner.svg"
+   inkscape:version="1.0.1 (0767f8302a, 2020-10-17)"
+   inkscape:export-filename="/home/bsoares/Work/git/develop/jalview/utils/channels/release/images/UoD_banner-30.png"
+   inkscape:export-xdpi="54.429451"
+   inkscape:export-ydpi="54.429451"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2955"
+     inkscape:window-height="1263"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="7.0203931"
+     inkscape:cx="132.39999"
+     inkscape:cy="26.453333"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+     inkscape:document-rotation="0" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,52.906667)"><g
+       id="g12"
+       transform="scale(0.1)"><path
+         d="M 229.703,72.1758 C 223.219,64.6094 216.098,57.3516 208.352,50.4414 179.551,24.7617 150.344,11.293 141.789,7.66016 133.281,11.2617 104.371,24.5703 75.6016,50.1172 67.7109,57.125 60.4727,64.4922 53.8828,72.1797 L 141.789,139.703 7.08984,243.18 v 0 H 276.496 L 141.789,139.703 Z M 18.707,335.93 c 0.0782,0.043 0.1641,0.062 0.2461,0.062 13.0117,-0.648 16.9922,-8.613 17.0352,-8.695 1.3984,-2.426 1.8086,-5.305 1.168,-8.047 1.5625,1.512 3.5937,2.566 5.7343,2.93 7.5313,1.285 14.4297,-4.391 18.1524,-10.575 0.1523,-0.226 0.1523,-0.527 0.0039,-0.761 -5.1914,-8.289 -11.3828,-10.203 -14.3594,-10.637 1.0547,-0.66 1.918,-1.559 2.543,-2.641 2.0508,-3.554 0.9609,-8.078 -2.4102,-10.32 -0.0078,-0.004 -0.0156,-0.012 -0.0273,-0.016 -0.2227,-0.128 -0.5117,-0.05 -0.6407,0.172 l -27.6171,47.883 c -0.1289,0.227 -0.0508,0.512 0.1718,0.645 z m 48.5938,-4.532 11.0898,2.973 -2.9726,11.098 c -0.3985,1.488 0.4843,3.011 1.9687,3.414 l 6.7149,1.801 c 1.4804,0.398 3.0078,-0.485 3.4062,-1.973 l 2.9727,-11.098 11.0895,2.973 c 1.481,0.398 3.008,-0.484 3.407,-1.973 l 1.796,-6.715 c 0.399,-1.488 -0.48,-3.015 -1.964,-3.414 l -11.0942,-2.972 4.0391,-15.074 c 0.3984,-1.481 -0.4844,-3.008 -1.9726,-3.407 l -6.7149,-1.801 c -1.4805,-0.394 -3.0039,0.485 -3.4023,1.969 l -4.0313,15.071 -11.0937,-2.977 c -1.4844,-0.395 -3.0078,0.484 -3.4024,1.969 l -1.8047,6.722 c -0.3984,1.489 0.4844,3.008 1.9688,3.414 z m 59.9452,13.356 c 2.035,0.758 4.324,0.863 6.43,0.336 v -0.008 l 0.012,0.023 c -1.93,2.051 -3.012,4.766 -3.012,7.602 -0.024,0.348 -0.5,9.141 10.734,16.215 0.231,0.144 0.535,0.144 0.766,0 11.301,-7.109 10.742,-16.172 10.738,-16.266 0,-2.801 -1.086,-5.5 -3.008,-7.551 2.11,0.528 4.395,0.418 6.43,-0.335 7.16,-2.657 10.305,-11.024 10.441,-18.243 0.016,-0.269 -0.132,-0.535 -0.382,-0.664 -8.633,-4.578 -14.95,-3.136 -17.743,-2.023 0.578,-1.102 0.879,-2.313 0.879,-3.559 0,-4.269 -3.465,-7.746 -7.734,-7.746 -4.27,0 -7.742,3.477 -7.742,7.746 0,1.239 0.3,2.446 0.871,3.543 -2.793,-1.113 -9.11,-2.551 -17.738,2.028 -0.25,0.125 -0.399,0.39 -0.383,0.66 0.14,7.222 3.281,15.586 10.441,18.242 z m 49.563,-12.863 1.796,6.722 c 0.399,1.489 1.926,2.371 3.407,1.969 l 11.093,-2.977 2.969,11.106 c 0.399,1.488 1.926,2.371 3.406,1.973 l 6.715,-1.805 c 1.485,-0.399 2.368,-1.922 1.965,-3.41 l -2.972,-11.102 11.093,-2.976 c 1.485,-0.399 2.367,-1.918 1.969,-3.407 l -1.805,-6.722 c -0.394,-1.489 -1.918,-2.364 -3.402,-1.969 l -11.094,2.977 -4.031,-15.071 c -0.398,-1.488 -1.922,-2.371 -3.41,-1.969 l -6.707,1.801 c -1.488,0.399 -2.367,1.926 -1.973,3.407 l 4.039,15.074 -11.094,2.972 c -1.484,0.399 -2.363,1.926 -1.964,3.407 z m 55.957,-52.575 -9.942,-17.203 c -24.515,14.2 -52.535,21.703 -81.031,21.703 -28.492,0 -56.5117,-7.503 -81.0274,-21.703 l -9.9414,17.203 c 27.5313,15.946 58.9888,24.375 90.9688,24.375 31.984,0 63.441,-8.429 90.973,-24.375 z m -10.227,32.289 c 3.723,6.184 10.621,11.86 18.152,10.575 2.141,-0.364 4.172,-1.418 5.735,-2.93 -0.641,2.742 -0.231,5.621 1.172,8.047 0.039,0.082 4.019,8.047 17.031,8.695 0.086,0 0.168,-0.019 0.246,-0.062 0.223,-0.133 0.301,-0.418 0.172,-0.645 L 237.43,287.402 c -0.129,-0.222 -0.418,-0.3 -0.641,-0.172 -0.012,0.004 -0.019,0.012 -0.027,0.016 -3.367,2.242 -4.461,6.766 -2.407,10.32 0.622,1.082 1.485,1.981 2.54,2.641 -2.977,0.434 -9.168,2.348 -14.36,10.637 -0.148,0.234 -0.148,0.535 0.004,0.761 z M 0,385.563 c 0,0 0,-44.665 0,-187.059 C 0,53.3281 141.793,0 141.793,0 c 0,0 141.793,53.3281 141.793,198.504 0,142.394 0.004,187.059 0.004,187.059 H 0"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path14" /><path
+         d="m 439.125,317.734 v 67.754 h -19.98 v -68.297 c 0,-31.535 14.761,-49.918 46.082,-49.918 30.964,0.18 46.265,18.024 46.265,49.918 v 68.297 h -19.98 v -67.754 c 0,-21.445 -7.024,-32.437 -26.285,-32.437 -19.262,0 -26.102,10.992 -26.102,32.437 m 140.953,43.067 c -11.883,0 -21.422,-6.125 -26.101,-13.516 h -1.622 l -0.718,10.992 h -17.465 v -87.578 h 18.902 v 45.41 c 0,9.731 1.981,16.039 5.403,20.004 4.14,4.867 10.441,7.571 17.101,7.571 10.981,0 16.738,-5.77 16.738,-21.266 v -51.719 h 18.903 v 58.207 c 0,23.965 -14.578,31.895 -31.141,31.895 m 75.602,23.789 c 0,7.207 -5.399,12.254 -12.063,12.254 -6.84,0 -12.238,-5.047 -12.238,-12.254 0,-7.031 5.398,-11.895 12.238,-11.895 6.664,0 12.063,4.864 12.063,11.895 m -2.7,-26.313 h -18.902 v -87.578 h 18.902 z m 81.547,0 -22.863,-67.574 -22.68,67.574 h -21.601 l 33.301,-87.578 h 20.343 l 33.301,87.578 z m 68.407,2.524 c -25.383,0 -42.485,-18.922 -42.485,-45.953 0,-28.469 18.184,-45.95 42.844,-45.95 17.82,0 32.402,10.45 36.184,23.247 l -15.122,8.289 c -3.781,-10.454 -11.703,-14.957 -21.242,-14.957 -12.961,0 -22.504,9.371 -23.761,26.488 h 62.285 v 5.226 c 0.359,24.329 -13.864,43.61 -38.703,43.61 m -0.719,-16.039 c 12.058,0 19.262,-7.926 20.34,-19.641 H 780.07 c 2.34,12.434 10.801,19.641 22.145,19.641 m 100.988,15.859 c -9.543,0 -18.902,-6.129 -23.223,-15.496 h -1.261 l -0.899,12.973 h -17.64 v -87.399 h 19.082 v 48.836 c 0,15.137 9.359,23.067 21.238,23.067 3.422,0 5.582,-0.364 7.023,-1.082 l 1.438,18.378 c -1.438,0.543 -3.238,0.723 -5.758,0.723 m 21.957,-62.172 -9.543,-12.613 c 6.305,-9.012 17.824,-16.938 35.465,-16.938 20.344,0 34.203,10.993 34.203,27.93 0,16.399 -13.5,22.707 -28.98,26.852 -10.621,2.703 -19.082,5.226 -19.082,12.433 0,5.047 4.679,9.012 13.679,9.012 9.539,0 19.082,-5.406 23.762,-11.176 l 9.359,13.336 c -7.378,8.11 -18.898,13.695 -32.761,13.695 -19.442,0 -32.762,-10.089 -32.762,-26.128 0,-16.579 13.5,-22.707 30.063,-26.852 11.878,-3.062 18.179,-6.305 18.179,-13.152 0,-6.489 -5.937,-10.274 -15.48,-10.274 -12.063,0 -21.782,6.848 -26.102,13.875 m 100.81,86.141 c 0,7.207 -5.4,12.254 -12.06,12.254 -6.84,0 -12.24,-5.047 -12.24,-12.254 0,-7.031 5.4,-11.895 12.24,-11.895 6.66,0 12.06,4.864 12.06,11.895 m -2.7,-26.313 h -18.9 v -87.578 h 18.9 z m 45.72,-53.699 v 38.383 h 21.42 v 15.316 h -21.6 v 24.328 l -18.72,-2.343 v -21.985 h -11.34 v -15.316 h 11.34 v -40.184 c 0,-25.953 16.92,-33.339 32.04,-33.339 5.4,0 9.18,0.539 12.6,1.441 v 17.301 c -2.88,-0.903 -7.02,-1.621 -10.8,-1.621 -9.72,0 -14.94,5.765 -14.94,18.019 m 115.75,53.699 h -19.8 l -22.86,-67.574 -22.69,67.574 h -21.6 l 33.55,-87.984 -11.95,-32.57 h 19.63 l 39.06,102.894 -0.18,-0.179 6.84,17.839"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path16" /><path
+         d="m 134.875,323.93 h -0.004 0.004 z"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path18" /><path
+         d="m 1300.16,311.453 c 0,26.547 -16.49,43.399 -40.63,43.399 -23.98,0 -40.64,-16.852 -40.64,-43.399 0,-26.551 16.66,-43.402 40.64,-43.402 24.14,0 40.63,16.851 40.63,43.402 m -18.02,0 c 0,-17.531 -8.33,-27.742 -22.61,-27.742 -13.95,0 -22.62,10.211 -22.62,27.742 0,17.527 8.67,27.738 22.62,27.738 14.28,0 22.61,-10.211 22.61,-27.738 m 72.59,59.735 c 3.74,0 7.65,-0.68 10.54,-1.532 v 16.34 c -3.23,0.852 -7.14,1.192 -12.24,1.192 -14.45,0 -30.94,-6.809 -30.94,-31.485 v -3.234 h -13.26 V 338 h 13.26 v -68.246 h 17.68 V 338 h 22.1 v 14.469 h -22.1 V 354 c 0,11.742 5.27,17.188 14.96,17.188 m 87.42,13.355 h -35.83 V 269.754 h 35.83 c 42.66,0 62.1,22.344 62.1,57.844 0,35.14 -19.44,56.945 -62.1,56.945 m -15.84,-16.938 h 15.66 c 31.32,0 42.3,-13.695 42.3,-40.007 0,-26.668 -11.16,-40.727 -42.3,-40.727 h -15.66 z m 152.29,-10.273 v -45.41 c 0,-9.731 -1.98,-16.039 -5.4,-20.004 -4.14,-4.863 -10.44,-7.566 -17.1,-7.566 -10.98,0 -16.74,5.765 -16.74,21.261 v 51.719 h -18.91 v -58.203 c 0,-23.969 14.59,-31.899 31.15,-31.899 11.88,0 21.42,6.129 26.1,13.516 h 1.62 l 0.72,-10.992 h 17.46 v 87.578 z m 85.51,2.523 c -11.88,0 -21.43,-6.125 -26.11,-13.515 h -1.62 l -0.72,10.992 h -17.46 v -87.578 h 18.9 v 45.41 c 0,9.731 1.98,16.039 5.4,20.004 4.15,4.867 10.45,7.57 17.11,7.57 10.98,0 16.74,-5.769 16.74,-21.265 v -51.719 h 18.9 v 58.207 c 0,23.965 -14.58,31.894 -31.14,31.894 m 113.04,30.817 v -43.43 h -1.26 c -4.86,7.387 -13.5,12.613 -26.46,12.613 -21.24,0 -39.24,-17.3 -39.24,-45.953 0,-28.468 18,-45.949 39.42,-45.949 13.14,0 21.6,5.406 26.46,12.793 h 1.08 v -10.992 h 18.9 v 123.441 z m -24.48,-105.961 c -14.22,0 -23.4,10.273 -23.4,29.191 0,18.922 9.18,29.196 23.22,29.196 13.32,0 23.22,-8.11 24.66,-24.688 v -8.652 c -1.44,-16.938 -11.16,-25.047 -24.48,-25.047 m 101.35,75.144 c -25.38,0 -42.48,-18.921 -42.48,-45.953 0,-28.468 18.18,-45.949 42.84,-45.949 17.82,0 32.4,10.449 36.18,23.246 l -15.12,8.289 c -3.78,-10.453 -11.7,-14.957 -21.24,-14.957 -12.96,0 -22.5,9.371 -23.76,26.489 h 62.28 v 5.226 c 0.36,24.328 -13.86,43.609 -38.7,43.609 m -0.72,-16.039 c 12.06,0 19.26,-7.925 20.34,-19.64 h -42.48 c 2.34,12.433 10.8,19.64 22.14,19.64 m 93.97,16.039 c -25.38,0 -42.49,-18.921 -42.49,-45.953 0,-28.468 18.19,-45.949 42.85,-45.949 17.82,0 32.4,10.449 36.18,23.246 l -15.12,8.289 c -3.78,-10.453 -11.7,-14.957 -21.24,-14.957 -12.96,0 -22.5,9.371 -23.76,26.489 h 62.28 v 5.226 c 0.36,24.328 -13.86,43.609 -38.7,43.609 m -0.72,-16.039 c 12.06,0 19.26,-7.925 20.34,-19.64 h -42.48 c 2.34,12.433 10.8,19.64 22.14,19.64"
+         style="fill:#465fb5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         id="path20" /></g></g></svg>
diff --git a/utils/channels/release/images/barton_group-28.png b/utils/channels/release/images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/utils/channels/release/images/barton_group-28.png differ
diff --git a/utils/channels/release/images/barton_group-30.png b/utils/channels/release/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/release/images/barton_group-30.png differ
diff --git a/utils/channels/release/images/barton_group-32.png b/utils/channels/release/images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/utils/channels/release/images/barton_group-32.png differ
index 69a1339..d19b281 100644 (file)
@@ -9,6 +9,10 @@ logo.128=/images/jalview_logo-128.png
 logo.256=/images/jalview_logo-256.png
 logo.512=/images/jalview_logo-512.png
 rotatable_logo.48=/images/rotatable_jalview_logo-38.png
-bg_logo.62=/images/barton_group-62.png
-uod_banner=/images/UoD_banner.png
+bg_logo.28=/images/barton_group-28.png
+bg_logo.30=/images/barton_group-30.png
+bg_logo.32=/images/barton_group-32.png
+uod_banner.28=/images/UoD_banner-28.png
+uod_banner.30=/images/UoD_banner-30.png
+uod_banner.32=/images/UoD_banner-32.png
 default_appbase=https://www.jalview.org/getdown/release/1.8
diff --git a/utils/channels/release/resources/images/UoD_banner-28.png b/utils/channels/release/resources/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner-28.png differ
diff --git a/utils/channels/release/resources/images/UoD_banner-30.png b/utils/channels/release/resources/images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner-30.png differ
diff --git a/utils/channels/release/resources/images/UoD_banner-32.png b/utils/channels/release/resources/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner-32.png differ
diff --git a/utils/channels/release/resources/images/UoD_banner.png b/utils/channels/release/resources/images/UoD_banner.png
deleted file mode 100644 (file)
index 2aff7e2..0000000
Binary files a/utils/channels/release/resources/images/UoD_banner.png and /dev/null differ
diff --git a/utils/channels/release/resources/images/barton_group-28.png b/utils/channels/release/resources/images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/utils/channels/release/resources/images/barton_group-28.png differ
diff --git a/utils/channels/release/resources/images/barton_group-30.png b/utils/channels/release/resources/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/release/resources/images/barton_group-30.png differ
diff --git a/utils/channels/release/resources/images/barton_group-32.png b/utils/channels/release/resources/images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/utils/channels/release/resources/images/barton_group-32.png differ
diff --git a/utils/channels/release/resources/images/barton_group-62.png b/utils/channels/release/resources/images/barton_group-62.png
deleted file mode 100644 (file)
index 542acd9..0000000
Binary files a/utils/channels/release/resources/images/barton_group-62.png and /dev/null differ
diff --git a/utils/channels/test-release/images/UoD_banner-28.png b/utils/channels/test-release/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/test-release/images/UoD_banner-28.png differ
diff --git a/utils/channels/test-release/images/UoD_banner-32.png b/utils/channels/test-release/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/test-release/images/UoD_banner-32.png differ
diff --git a/utils/channels/test-release/images/barton_group-30.png b/utils/channels/test-release/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/test-release/images/barton_group-30.png differ
index 3a4dcb6..6351a8b 100644 (file)
@@ -9,6 +9,10 @@ logo.128=/images/jalview_logo-128.png
 logo.256=/images/jalview_logo-256.png
 logo.512=/images/jalview_logo-512.png
 rotatable_logo.48=/images/rotatable_jalview_logo-38.png
-bg_logo.62=/images/barton_group-62.png
-uod_banner=/images/UoD_banner.png
+bg_logo.28=/images/barton_group-28.png
+bg_logo.30=/images/barton_group-30.png
+bg_logo.32=/images/barton_group-32.png
+uod_banner.28=/images/UoD_banner-28.png
+uod_banner.30=/images/UoD_banner-30.png
+uod_banner.32=/images/UoD_banner-32.png
 default_appbase=https://www.jalview.org/getdown/release/1.8
diff --git a/utils/channels/test-release/resources/images/UoD_banner-28.png b/utils/channels/test-release/resources/images/UoD_banner-28.png
new file mode 100644 (file)
index 0000000..5a7a940
Binary files /dev/null and b/utils/channels/test-release/resources/images/UoD_banner-28.png differ
diff --git a/utils/channels/test-release/resources/images/UoD_banner-30.png b/utils/channels/test-release/resources/images/UoD_banner-30.png
new file mode 100644 (file)
index 0000000..3f56b13
Binary files /dev/null and b/utils/channels/test-release/resources/images/UoD_banner-30.png differ
diff --git a/utils/channels/test-release/resources/images/UoD_banner-32.png b/utils/channels/test-release/resources/images/UoD_banner-32.png
new file mode 100644 (file)
index 0000000..d7dd5d2
Binary files /dev/null and b/utils/channels/test-release/resources/images/UoD_banner-32.png differ
diff --git a/utils/channels/test-release/resources/images/barton_group-28.png b/utils/channels/test-release/resources/images/barton_group-28.png
new file mode 100644 (file)
index 0000000..8d95482
Binary files /dev/null and b/utils/channels/test-release/resources/images/barton_group-28.png differ
diff --git a/utils/channels/test-release/resources/images/barton_group-30.png b/utils/channels/test-release/resources/images/barton_group-30.png
new file mode 100644 (file)
index 0000000..40c95d5
Binary files /dev/null and b/utils/channels/test-release/resources/images/barton_group-30.png differ
diff --git a/utils/channels/test-release/resources/images/barton_group-32.png b/utils/channels/test-release/resources/images/barton_group-32.png
new file mode 100644 (file)
index 0000000..70de633
Binary files /dev/null and b/utils/channels/test-release/resources/images/barton_group-32.png differ
diff --git a/utils/channels/test-release/resources/images/barton_group-62.png b/utils/channels/test-release/resources/images/barton_group-62.png
deleted file mode 100644 (file)
index 542acd9..0000000
Binary files a/utils/channels/test-release/resources/images/barton_group-62.png and /dev/null differ