Merge pull request #295 from AtlasOfLivingAustralia/release/4.2.4

Release/4.2.4

Author: nickdos

build.gradle

@@ -11,7 +11,7 @@
  * rights and limitations under the License.
  */
 buildscript {
-    version "4.2.3"
+    version "4.2.4"
     group "au.org.ala"
 }
 

cicd/slack_notification.sh

@@ -8,8 +8,8 @@
 # Some fun, a different image for each environment
 case $ENVIRONMENT in
   "production")
-    IMAGE_URL=https://inaturalist-open-data.s3.amazonaws.com/photos/321044358/small.png
-    ALT_TEXT="Photo by David Wesolowski. https://www.inaturalist.org/observations/147380645"
+    IMAGE_URL=https://inaturalist-open-data.s3.amazonaws.com/photos/69895591/small.jpg
+    ALT_TEXT="Photo by John D Reynolds. https://www.inaturalist.org/observations/44082017"
     ;;
   "staging")
     IMAGE_URL=https://inaturalist-open-data.s3.amazonaws.com/photos/208429788/small.jpg

grails-app/assets/images/email/no-image-available.png

@@ -12,7 +12,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: #f4f4f4;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
     <tr>
         <td align="center" style="padding: 20px;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-            <table border="0" cellpadding="0" cellspacing="0" width="620" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
+            <table border="0" cellpadding="0" cellspacing="0" width="650" style="background-color: #ffffff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                 <!-- Logo -->
                 <tr>
                     <td align="center" style="padding: 20px; background-color: #fff;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
@@ -23,7 +23,7 @@
                 </tr>
                 <!-- Header -->
                 <tr>
-                    <td align="center" bgcolor="#B53929" background="${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png" width="620" height="120" style="color:white;background-color:#B53929;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png);">
+                    <td align="center" bgcolor="#B53929" background="${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png" width="620" height="120" style="color:white;background-color:#B53929;padding: 20px 10px 20px 10px;text-align: center;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;background-image:url(${grailsApplication.config.grails.serverURL}/assets/email/biosecurity-alert-header.png);background-position: top center;background-size: cover;background-repeat: no-repeat">
                         <h1 style="font-size: 24px; color: #fff;">Biosecurity Alerts</h1>
                         <p style="font-size: 16px; color: #fff;"><strong>${new SimpleDateFormat("dd MMMM yyyy").format(new Date())}</strong></p>
                         <p style="font-size: 16px; color: #fff;">Alerts service for new ALA records listing potential invasive species</p>
@@ -46,7 +46,7 @@
                     <td style="padding: 20px;background-color: white;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
                         <table border="0" cellpadding="0" cellspacing="0" width="100%" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;border-spacing: 0;border-collapse: collapse;">
                             <tr>
-                                <td width="50%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                                <td width="46%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
                                     <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}" style="color: #C44D34;text-decoration: none;font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
                                         <strong>${i+1}. <em>${oc.scientificName ?: 'N/A'}</em></strong>
                                     </a>
@@ -77,20 +77,21 @@
                                         </g:if>
                                     </p>
                                 </td>
-                                <td width="25%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                                <td width="28%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
                                     <a href="https://www.google.com/maps/place/${oc.latLong}" target="_blank" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                        <img src="https://maps.googleapis.com/maps/api/staticmap?center=${oc.latLong}&markers=|${oc.latLong}&zoom=12&size=130x118&maptype=roadmap&key=${grailsApplication.config.getProperty('google.apikey')}" alt="Map Image" style="width: 130px;height: 118px;display: block;border: 0;line-height: 100%;border-radius: 6px;">
+                                        <img src="https://maps.googleapis.com/maps/api/staticmap?center=${oc.latLong}&markers=|${oc.latLong}&zoom=12&size=150x150&maptype=roadmap&key=${grailsApplication.config.getProperty('google.apikey')}" alt="Map Image" style="width: 150px;height: 150px;display: block;border: 0;line-height: 100%;border-radius: 6px;">
                                     </a>
                                 </td>
-                                <td width="25%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
-                                    <g:if test="${oc.thumbnailUrl || oc.smallImageUrl }">
+                                <td width="26%" valign="top" style="font-family: 'Arial', sans-serif;font-size: 16px;line-height: 1.5;">
+                                    <g:set var="imageUrl" value="${oc.imageUrls?.get(0) ?: oc.thumbnailUrl ?: oc.smallImageUrl}" />
+                                    <g:if test="${imageUrl}">
                                         <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}">
-                                            <img src="${oc.thumbnailUrl ?: oc.smallImageUrl}" alt="Species Image" style="width: 130px;vertical-align: top;max-width: 130px;width: 130px;height: 118px;border-radius: 6px;line-height: 100%;" />
+                                            <img src="${imageUrl}${imageUrl.contains('?') ? '&thumbnailType=square_white' : ''}" alt="Species Image" height="150" width="150" style="width: 150px;vertical-align: top;max-width: 150px;width: 150px;height: 150px;border-radius: 6px;line-height: 100%;" />
                                         </a>
                                     </g:if>
                                     <g:else>
                                         <a href="${query.baseUrlForUI}/occurrences/${oc.uuid}">
-                                            <img src="${grailsApplication.config.grails.serverURL}/assets/email/no-img-gray-bg.png" alt="Species Image" style="width: 130px;vertical-align: top;max-width: 130px;width: 130px;height: 118px;border-radius: 6px;line-height: 100%;" />
+                                            <img src="${grailsApplication.config.grails.serverURL}/assets/email/no-image-available.png" alt="Species Image" height="150" width="150" style="width: 150px;vertical-align: top;max-width: 150px;width: 150px;height: 150px;border-radius: 6px;line-height: 100%;" />
                                         </a>
                                     </g:else>
                                 </td>
@@ -119,12 +120,14 @@
                             &nbsp;<a href="https://csiro.au/"><img loading="lazy" src="${grailsApplication.config.grails.serverURL}/assets/email/CSIRO_Solid_RGB-150x150.png" alt="CSIRO logo" width="90" height="90"></a>&nbsp;
                             &nbsp;<a href="https://www.gbif.org/en/"><img loading="lazy"  src="${grailsApplication.config.grails.serverURL}/assets/email/GBIF_109px.png" alt="GBIF logo" width="171" height="90"></a>
                         </p>
-                        <div style="margin-top: 25px;">You are receiving this email because you opted in to ALA alerts.
+                        <div style="margin-top: 25px;">
                             <div>
                                 <p>Our mailing address is: </p>
                                 Atlas of Living Australia <br> GPO Box 1700<br> Canberra, ACT 2601<br>Australia
                             </div>
-                            <br>
+                            <br/>
+                            You are receiving this email because you opted in to ALA alerts.
+                            <br/>
                             Don't want to receive these emails? You can <a href="${unsubscribeOne}" style="color: #C44D34;">unsubscribe</a>.
                         </div>
                     </td>