From b0ad42523398b0e4dd59ce712a010b104da34de2 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Thu, 12 Sep 2024 11:56:49 +1000 Subject: [PATCH 01/13] #280 Inlined all styles for biosecurity template Used tool: https://templates.mailchimp.com/resources/inline-css/ --- grails-app/views/email/biosecurity.gsp | 436 +++++++------------------ 1 file changed, 115 insertions(+), 321 deletions(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index d91001bb..80088f6c 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -3,349 +3,143 @@ <%@ page import="org.apache.commons.lang3.StringUtils" %> - - - - - - ${title} - + + + + + + ${title} - -
-
+ +
+
- + -
-
-
Biosecurity Alerts
-
- ${new SimpleDateFormat("dd MMMM yyyy").format(new Date())} +
+
+
Biosecurity Alerts
+
+ ${new SimpleDateFormat("dd MMMM yyyy").format(new Date())}
-
- Alerts service for new ALA records listing potential invasive species +
+ Alerts service for new ALA records listing potential invasive species
-
-
+
+
${totalRecords} new ${totalRecords == 1 ? 'record' : 'records'} for
- ${StringUtils.abbreviate(speciesListInfo.name, 40)}, ${speciesListInfo.drId} + ${StringUtils.abbreviate(speciesListInfo.name, 40)}, ${speciesListInfo.drId}
since ${new SimpleDateFormat("dd MMM yyyy").format(query.lastChecked)}
-
- - - -
-
- - - - - - - - - -
- ${i+1}. ${oc.scientificName ?:"N/A"} -
- - Supplied as:${oc.raw_scientificName}
- - - Common name: ${oc.vernacularName}
- - - ${oc.locality}; ${oc.stateProvince}>
- - - ${oc.locality}
- - - ${oc.stateProvince}
- - - Coordinates: ${oc.latLong}
- - - Time & date: ${new SimpleDateFormat('dd-MM-yyyy HH:mm').format(oc.eventDate)}
- - - Source: ${oc.dataResourceName}
- - -
-
-
- - - - - -
-
- - location preview map - -
- 		-
- - -
- - - -
- -
-
-
+
+ + +
+
+ + + + + + + + + +
+ ${i+1}. ${oc.scientificName ?:"N/A"} +
+ + Supplied as:${oc.raw_scientificName}
+ + + Common name: ${oc.vernacularName}
+ + + ${oc.locality}; ${oc.stateProvince}>
+ + + ${oc.locality}
+ + + ${oc.stateProvince}
+ + + Coordinates: ${oc.latLong}
+ + + Time & date: ${new SimpleDateFormat('dd-MM-yyyy HH:mm').format(oc.eventDate)}
+ + + Source: ${oc.dataResourceName}
+ +
+
+
+ + + + + +
+
+ + location preview map + +
+ 		+
+ + +
+ + + +
+ +
+
+
- - -%{--
--}% + +%{-- +
--}% %{-- --}% -%{-- --}% %{-- --}% -%{--
--}% - -
+%{-- +
+--}% +

If you notice a record has been misidentified, we encourage you to use your expertise to improve the quality of Australia's biosecurity data.

Please either annotate the record in the provider platform itself or notify us at biosecurity@ala.org.au for assistance.

-
- -
+
+

The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.

- We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country.

-
- -
+ We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country. +

+
+
- Affiliated orgs - - NCRIS - CSIRO - GBIF - -

You are receiving this email because you opted in to ALA alerts. -

-

Our mailing address is:

- Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia + Affiliated orgs + + NCRIS + CSIRO + GBIF + +

You are receiving this email because you opted in to ALA alerts. +

+

Our mailing address is:

+ Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia

Don't want to receive these emails? You can unsubscribe. -

+

-
- - +
+ \ No newline at end of file From 1211537a107f013a20040bb292f58f3721d2be4b Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Thu, 12 Sep 2024 12:03:40 +1000 Subject: [PATCH 02/13] #280 Also fixed blogs email to use inline styles only --- grails-app/views/email/blogs.gsp | 280 ++++++++----------------------- 1 file changed, 68 insertions(+), 212 deletions(-) diff --git a/grails-app/views/email/blogs.gsp b/grails-app/views/email/blogs.gsp index fd473549..af39c2f1 100644 --- a/grails-app/views/email/blogs.gsp +++ b/grails-app/views/email/blogs.gsp @@ -2,246 +2,103 @@ <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="org.apache.commons.lang3.StringUtils" %> - - - - - - - - ${title} - - - -
-
+ + + + + + + + ${title} + + +
+
- +
-
-
Latest ALA Blog Updates
+
+
Latest ALA Blog Updates

-
+
${new SimpleDateFormat("dd MMMM yyyy").format(new Date())}
- -
+
-%{--
--}% -%{-- --}% -%{-- <%--}% -%{-- if (blog._links['wp:featuredmedia'].size() > 0) {--}% -%{-- // Choose the first one. Need to be updated if we have multiple images--}% -%{-- def featuredMedia = blog._links['wp:featuredmedia'][0]--}% -%{-- def imageUrl = "${featuredMedia?.href}"--}% -%{-- def url = new URL(imageUrl)--}% -%{-- def connection = url.openConnection() as HttpURLConnection--}% -%{-- int responseCode = connection.responseCode--}% -%{-- if (responseCode == 404) {--}% -%{-- // Handle the case where the image URL returns a 404 status code--}% -%{-- out << "Sorry, no image available "--}% -%{-- } else {--}% -%{-- // Handle the case where the image URL returns a different status code--}% -%{-- out << "\"${raw(blog.title.rendered)}\""--}% -%{-- }--}% -%{-- }--}% -%{-- %>--}% -%{-- --}% -%{-- --}% -%{-- --}% -%{-- --}% -%{--
--}% - <% - // Simulate the data you get from the controller - String title= blog.title.rendered.replaceAll(/–|—|–|—/, "-") - String excerpt = blog.excerpt.rendered.replaceAll(/–|—|–|—/, "-") + %{-- +
+ --}% + %{-- + --}% + %{-- <%--}% + %{-- if (blog._links['wp:featuredmedia'].size() > 0) {--}% + %{-- // Choose the first one. Need to be updated if we have multiple images--}% + %{-- def featuredMedia = blog._links['wp:featuredmedia'][0]--}% + %{-- def imageUrl = "${featuredMedia?.href}"--}% + %{-- def url = new URL(imageUrl)--}% + %{-- def connection = url.openConnection() as HttpURLConnection--}% + %{-- int responseCode = connection.responseCode--}% + %{-- if (responseCode == 404) {--}% + %{-- // Handle the case where the image URL returns a 404 status code--}% + %{-- out << "Sorry, no image available "--}% + %{-- } else {--}% + %{-- // Handle the case where the image URL returns a different status code--}% + %{-- out << "\"${raw(blog.title.rendered)}\""--}% + %{-- }--}% + %{-- }--}% + %{-- %>--}% + %{-- + + --}% + %{-- + --}% + %{-- --}% + %{-- + + --}% + %{-- +
+ --}% + <% + // Simulate the data you get from the controller + String title= blog.title.rendered.replaceAll(/–|—|–|—/, "-") + String excerpt = blog.excerpt.rendered.replaceAll(/–|—|–|—/, "-") %>
- ${raw(title)} -
${raw(excerpt)}
+ ${raw(title)} +
${raw(excerpt)}
- -
+
- +
- -
+

The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.

- We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country.

+ We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country. +

- -
+
- Affiliated orgs + Affiliated orgs NCRIS CSIRO GBIF -
You are receiving this email because you opted in to ALA blog alerts. +
+ You are receiving this email because you opted in to ALA blog alerts.

Our mailing address is:

- Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia + Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia

Don't want to receive these emails? You can unsubscribe. @@ -249,6 +106,5 @@
- \ No newline at end of file From 768826e14dd3391a7e37a7905a9fe9838eec15df Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Thu, 12 Sep 2024 12:43:59 +1000 Subject: [PATCH 03/13] Bump version to 4.2.3-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 921e4d96..45447d73 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ * rights and limitations under the License. */ buildscript { - version "4.2.2" + version "4.2.3-SNAPSHOT" group "au.org.ala" } From 589d8f0ecb5f9e524449c60edbf982c521adce1b Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 13 Sep 2024 10:07:49 +1000 Subject: [PATCH 04/13] #280 More inline CSS and table layout Last changes did not fix all of Erin's issues. --- grails-app/views/email/biosecurity.gsp | 255 ++++++++++++------------- 1 file changed, 122 insertions(+), 133 deletions(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index 80088f6c..a910ee07 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -1,145 +1,134 @@ <%@ page contentType="text/html"%> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="org.apache.commons.lang3.StringUtils" %> - + - - ${title} - -
-
- - - -
-
-
Biosecurity Alerts
-
- ${new SimpleDateFormat("dd MMMM yyyy").format(new Date())} -
-
- Alerts service for new ALA records listing potential invasive species -
-
-
-
${totalRecords} new ${totalRecords == 1 ? 'record' : 'records'} for -
-
- ${StringUtils.abbreviate(speciesListInfo.name, 40)}, ${speciesListInfo.drId} -
-
since ${new SimpleDateFormat("dd MMM yyyy").format(query.lastChecked)}
-
- - -
-
- - - - - - - - - -
- ${i+1}. ${oc.scientificName ?:"N/A"} -
- - Supplied as:${oc.raw_scientificName}
- - - Common name: ${oc.vernacularName}
- - - ${oc.locality}; ${oc.stateProvince}>
- - - ${oc.locality}
- - - ${oc.stateProvince}
- - - Coordinates: ${oc.latLong}
- - - Time & date: ${new SimpleDateFormat('dd-MM-yyyy HH:mm').format(oc.eventDate)}
- - - Source: ${oc.dataResourceName}
- -
-
-
- - - - + +
-
- - location preview map - -
- 		-
- - -
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + - -
+%{-- --}% + + Logo + +
+

Biosecurity Alerts

+

${new SimpleDateFormat("dd MMMM yyyy").format(new Date())}

+

Alerts service for new ALA records listing potential invasive species

+
+ + + + + + +
+ + ${i+1}. ${oc.scientificName ?: 'N/A'} + +

+ + Supplied as:${oc.raw_scientificName}
+ + + Common name: ${oc.vernacularName}
+ + + ${oc.locality}; ${oc.stateProvince}>
+ + + ${oc.locality}
+ + + ${oc.stateProvince}
+ + + Coordinates: ${oc.latLong}
+ + + Time & date: ${new SimpleDateFormat('dd-MM-yyyy HH:mm').format(oc.eventDate)}
+ + + Source: ${oc.dataResourceName}
+ +

+ 		+ + Map Image - - -
- + 		+
+ + +
+ + + +
+ +
+
+
+

If you notice a record has been misidentified, we encourage you to use your expertise to improve the quality of Australia's biosecurity data.

+

Please either annotate the record in the provider platform itself or notify us at biosecurity@ala.org.au for assistance.

+
+

The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.

+

We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country.

+
+ Affiliated orgs + + NCRIS + CSIRO + GBIF + +

You are receiving this email because you opted in to ALA alerts. +

+

Our mailing address is:

+ Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia
-
- - - -%{-- -
--}% -%{-- --}% -%{-- --}% -%{-- --}% -%{-- -
---}% -
-

If you notice a record has been misidentified, we encourage you to use your expertise to improve the quality of Australia's biosecurity data.

-

Please either annotate the record in the provider platform itself or notify us at biosecurity@ala.org.au for assistance.

-
-
-

The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.

-

- We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country. -

-
-
-
- Affiliated orgs - - NCRIS - CSIRO - GBIF - -

You are receiving this email because you opted in to ALA alerts. -

-

Our mailing address is:

- Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia -
-
- Don't want to receive these emails? You can unsubscribe. -

-
-
- +
+ Don't want to receive these emails? You can unsubscribe. +

+
+
- \ No newline at end of file + From 62831089575297d00e92c5f90e1dff92f55d1fe3 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 13 Sep 2024 10:09:50 +1000 Subject: [PATCH 05/13] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index bddb5788..b2e35cb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,8 @@ branches: only: - master - develop + # delete any branches below + - 280-email-rendering-issues-v2 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From 55db579a457c532eea85c2f631daa3317e1d3e5e Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 13 Sep 2024 12:25:19 +1000 Subject: [PATCH 06/13] #280 More tweaks to biosecurity email template --- grails-app/views/email/biosecurity.gsp | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index a910ee07..167069db 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -12,10 +12,10 @@ - - -
- +
- - + + + @@ -97,19 +107,19 @@ - - - -
+ %{--
+

Biosecurity Alerts

${new SimpleDateFormat("dd MMMM yyyy").format(new Date())}

Alerts service for new ALA records listing potential invasive species
+
${totalRecords} new ${totalRecords == 1 ? 'record' : 'records'} for +
+
+ ${StringUtils.abbreviate(speciesListInfo.name, 40)}, ${speciesListInfo.drId} +
+
since ${new SimpleDateFormat("dd MMM yyyy").format(query.lastChecked)}
+
+

If you notice a record has been misidentified, we encourage you to use your expertise to improve the quality of Australia's biosecurity data.

Please either annotate the record in the provider platform itself or notify us at biosecurity@ala.org.au for assistance.
+

The Atlas of Living Australia acknowledges Australia's Traditional Owners and pays respect to the past and present Elders of the nation's Aboriginal and Torres Strait Islander communities.

We honour and celebrate the spiritual, cultural and customary connections of Traditional Owners to Country and the biodiversity that forms part of that Country.
+ Affiliated orgs NCRIS From 286d41aa2b34165773ef1c2d127b04f7e4cb2a3e Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 13 Sep 2024 14:37:09 +1000 Subject: [PATCH 07/13] #280 Biosecurity email template tweaks Fixed spacing issues and vertical alignment of images. --- grails-app/views/email/biosecurity.gsp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index 167069db..a8417dad 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -56,7 +56,7 @@ ${i+1}. ${oc.scientificName ?: 'N/A'} -

+

Supplied as:${oc.raw_scientificName}
 @@ -88,8 +88,8 @@ Map Image

-
+
+%{--
--}%
@@ -98,7 +98,7 @@
-
+%{-- --}%
From dbab9d6ca18ebd6cd5fc28591c18bfca7f148807 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 13 Sep 2024 15:23:32 +1000 Subject: [PATCH 08/13] #280 Biosecurity email template tweaks Background images can't be relied on in outlook or forwarding. --- grails-app/views/email/biosecurity.gsp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index a8417dad..651b9763 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -29,7 +29,7 @@
+

Biosecurity Alerts

${new SimpleDateFormat("dd MMMM yyyy").format(new Date())}

Alerts service for new ALA records listing potential invasive species

@@ -83,16 +83,16 @@

+ - Map Image + Map Image + %{--
--}% -
+ Species Image From a75bfa368853cb11cade4090f3582bce4aee45d0 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Fri, 13 Sep 2024 18:21:11 +1000 Subject: [PATCH 09/13] #280 Biosecurity email template tweaks Fixing logos --- .../images/email/CSIRO_Solid_RGB-150x150.png | Bin 0 -> 12780 bytes grails-app/assets/images/email/GBIF_109px.png | Bin 0 -> 12523 bytes .../images/email/NCRIS_150px-150x109.jpg | Bin 0 -> 6511 bytes grails-app/views/email/biosecurity.gsp | 47 ++++++++++-------- 4 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 grails-app/assets/images/email/CSIRO_Solid_RGB-150x150.png create mode 100644 grails-app/assets/images/email/GBIF_109px.png create mode 100644 grails-app/assets/images/email/NCRIS_150px-150x109.jpg diff --git a/grails-app/assets/images/email/CSIRO_Solid_RGB-150x150.png b/grails-app/assets/images/email/CSIRO_Solid_RGB-150x150.png new file mode 100644 index 0000000000000000000000000000000000000000..1849a20788e13baa8d1a269ad4f81df745803388 GIT binary patch literal 12780 zcmVWO{rAoN~k~xRG7yAg4hhw&`Q&2 z1w@|{N-L;1pgsq*TM*a|Jr(%I6Yp%2gS+?_mqY98%6gh=Y+V zL9iI)en1;A2WSOafJUGmspO4d2p9tTfL;*WKyCu@GLkh2R)bsxVjG8do_EcBQD`A*#@3!|#U3br750JsPEHA1XO;b^Zo z`pc=Yy1H`+jzx-21m`0;+RbRzF1~ozy$_otGnVH$;AbFz0^)I&|7AFtpwh2WspJXI zLSY7lHK2OVqRSs&=myDR1Q!Eu0hR(r*_8{^j$om;l~PG4folIdx{!7&B@L{r->&x0 zrdID3g!m3p-o)~yo0R+r^C>I2u&%Q4@ukw6wevoaVSgO?oG-X96c-}pClKO2NSXn= zyCMlX%fV=@LTWq-;i4QMMS84IE~ZxR5JG+r#PxJ`tYaT1SBnFSbx~UEWb0)F!L1;!qqAd!k7;kyzS+kr6dQpLBjuF{S|%p!mDs^b zft3s(#Mh8q&+?A`Diuu`?OTr3Rm_1rANV@3IG776$3^*U)L2@)^38mBPd-|=KC8-}2 z7oQTl$MkCFArSwJ;2SAt^Cwcyu~^mj&8Y-)LemuFnojWH-Pl5RJBZtWzl~y|JW`xV zCD+p*#Thl3t5)zm@v2_4HcT27?n%9A{7~=^$am1WbTu})%EfhdQEIGfR7eKFamwPc zUEOa)i0>kqWltHDuMucd2x^VxYzh@@SYw!TQ7V}{J}d%lT`&uFvh_wX!X!JqEy%OJ z@&xjoEZ_5eFPCFY?Q}z-ScjC?16Np2w^{3B+&fzaqW~?er+`KICvG8mU&Old#Uwra zI|%U+I`{1Cy{kc)y4?+hVjEK4h2S*5dRHII6`uw>k$%!EK`-SR&Wtx?OYu0!3s}B% zk4>z4tepbtDjo~+rwI1nV>$uxf z4?eY(AH39Or&m2|dQI`7eC@KqO79Tx4mvx!9FdbsKF6B8>4vWEcOt~U0r||>v`^y% z>8O@E9zSCdb;f27DJADVypdmR8JMt+Gv_q$+fx^kGv>j@N|I9^SkL3V!&zz{|1+6P zC8Yc)%a?vL6DlKR=}(m$XERLaFBGpph}%FqoGPiRmoXXU!=`CIY@T=T-(ooxfDnTB zE>>5Rs@MCT#VwXo0pxRnOAcrueR>T(ks=@U>l{M-D}~}!6uQAzcJ{T&S8{|!e0lW- z_e7~H+($u87wj?rCy>`xqFl{G(y+(G#bM2OUkBOdX>agXrVH!yI10xhH(qZb$4%`~ zoKH5mb%m-jI~Ty`kknHsUg?=kP2*hNFf+9-VLq@=K?%ucKwRr*HRl=3IPi~#%2;i^ zEhJNB`Py2Wvw5U%z6j7~_8sz5=}pq1%1g4@xQ~54J=h@VlK?T!RW)Vp_qaS)H>j)o zV<4{!ZXCmD0s5q0+|%ZAE~NwO#5!`>T3UIo*q)l6yirqvT?vuTe>N$D-$SE4>i z@H*R78H`M%$sG|Eithrx8r=)C-yqR4B&@;({{Dps`J_?hOP$9-v+HU&dDb)*HP(76 z$E;3e+T@6{Fj<|deAY&KieA^fmB&84o;;I$jzaOn84OLN$#bl(?sJj+o8AnB)wwW^ zkjmE@pUP6^mkz8@!ZfTPpA&rj=(%io{ee7mT03jcIe`Cr@&aa0tI=(iK5sV3uvw~D zCA}K2P;5*~stiY7na!mS>(%S@#DFAUr>py-493P%Zc>h}?qd<+E~2JY=^um{uBAmy zc)5AB3dUe}VhtSt60SLHHdh?fN?lGML~xwf*2IrbY^!9t(De%CtR7Ci!n7Hpxh6AQ zNq{Na)}hGo=?%lw2g~a)O1y@}2p15H7JopY`_)W>PxxxA^c}fEaUO`D0?k&%h66WvfI~ovw-?bfmauO7%bQqOwPZPj8%! zaadnP7KGP>C{QT2CuoBNA5nKR_=b`tZ+xMc2kwIMGL1y5FN{&2Q1G!>X=BlA9;-0b5uKxqty)VcdW9s1;I?J+m{D7!@ix~8 zzQ1ff`J7Ua*2vhSN2t68Hp&Ye_a^V8VJ|`QcDLopRNbhs(A^H)ma3`4b2h_FoJ(HX zYls|4Z4Na(0hhB`HL<2mhfJ^KkmkCGSCzfEv6iD+;+tDjk7iSRGnL$wO(qs@qO1F0 zxApPlTY&acS22g=yNL46&uAosyW@y@4o4!6xG-MpbSh1u4=W68nZm+$Ham{atXacp zSfeA{T$9uKZ7NAAY0l>i+iepMk8Aer!EL+(M!IOgba~^1Z=T0&?bbgX{IKF#NpW@a2@5Iu8p1YxL*3hKTR7#WT3! z=(*aSssDPppSM1~iBSo@(Vd@Mxfo}6YVWZ1WUk~Yp0aFaJ$IkHfHq~z&2zg(IOm}a zyfipk<`;$@^Iny0-Ye;kD~Eti1Mzm?b|uWa8z$X!LoiwP^C?FJ=(*Giy~BIK!X`d)P^)bNI-hw2466O{7@J?D)M2DElMcuW!JQ|}Xa2Mr zjrWk|TE2VSJfhkywoH=p-N$Rniqd^Oh3-_}(l8y%y`xmh4}x5x%_~(RgQrZL%hK)@ z9`kJShWyI?g$tX=d!G8Yv^N|0v=r(|$?n@#5sLwLe#O~TsXb1dS?)t7Y(sKon&c%143ERxJXfSyOH45;l%E38s*NICtNuw_ zL|j;Ph2Du5v6YGlWmL00B@-mM1CkD#lGnGMm`aa%E?o9az4q@|zwTzSBz@?=SlZ7{Jt>v;g4JM0S zt`&?-I&kEvVzafXQ4Kaa=aDk(YdHseVQ1aZx9V<1i1#`BLe(Cm49nQ(b@7|aE!JA0 zM~8Q9F{Mqu^+lIWY0_cJwnm;V>_o~VHCDWnuI}(p8LVwIzIiJ^T#77j-izvH6t9+8 ztK$(*7^j|Sm;EP{UovB<8m3f(!Ryv*G}cXR-q9l@A*RR%bo1RLjiTAj_IqxNw+Sfo3? zGp=oE@z~_0m~As&o79eUR!S-h7mrhS0@frcFQd?H`B5IzxujT(;I+DY3jFuswRsNX zP{K{}#q0REVZTdnJikXu8Xc0T(9`MA^DP;Zl|RIQJI~YN1lreptn^BaRl^H;0*E6C z{yr}vS0C%GLAbAxb-8d{9L9Au@k!*W{*w5sz*IePnZ-derduoMr0U-&Q-N~rC_{6; zOqB$d8a zCXyL2s*bdv7~A7|9@U2X`PxCe8hD@_Vt#E#T#%g4YV~Ng>mm92RH}^h{jPLhf>DB! zI@TH{i;k2wMXW+A`%GV(Nu@(5ScSCb#npcmdNyapYBoo>3#d4j(#Hz^?)LnszVmIX zP!EC4r@dO_kfY9ZxhCGCtu(GwJE-byGnHes|I9R(K9G&CTqaww| zG-Py2AKLE!QuV{zhm>@uwaK(A%K#yZ4j0bQtLiuJ4O89gig8%YAC{nWqg2N_2Pw-A zC>1A`*x}MR%rIi`uEXS0ut{XfNkfLt@2%})#m*6n?WMsn{$*9Kogb-nC`Tf{VOJ_0 zsxF7lq%w;1I`likOso-yjQ(MyGLI$YS=9}vGmxaJu37ASP8g?PJ9lC@2cgmL!8C+3I`E9n^-XRIX2=Y(C@z~*7sch#YHw8Rz9Y~_k) zwz~DEFva^_hE&N&pV#hnPX|0p(PhQD^}dEeF-K=dw7a1l$^JpLCX}j9SpB%@Y#wHK zT0Z9?bUV^e8MkXp^0Q65?Pw`kGcd}7J%j1=#vNHGEynYLhl{-Hq?z(K17BJkv;v1y z-ZoQ0axzF|WD=$Ty%rHf67>s6I={NlKwH@uTEZ}zCRJM?Kbn^FloNsa9a59f`S{w+ms%nS$sV_|%vgQ#KV{S;uOJQ27xoFF|m z2v>X7E(+s)d};6)JZ5iRk6W>G*tf3B8djGU*#QFCiLI}2xjI(ZF)FVDkdVMr0*kd91*nbWxag;{OPTHG;4xgW2M+;aMxG~J5Lix8ukduSV?fz zpL@9ax$QLPgAuP^?$o6>H8zsL(j1Z{5rd%eM1~KJ8mEN|cX%ixTo#DrDtsmuHD0e3 zRP3mPfia0+Z)m>~sisL4rrKxfRqeJD&h!1FtlTwu9IlroTyODM*Vy+O7KdKN zepi~*!|F#l^mwom$;D4@rpNdb%ihs(-uc94#w}Y?)L1F>TKTS)iMe?1!xD#;lcN_7 z$Rp%__STcQCoGJU#=Q?G9pMhXsD^d%C)uLfWLDL2cKPJF!t|!$i5*M9YaR-*zIjj<4^OLMsx6v#ESDC21ap`mMSF2aH=aIBoJ$@;5dD0<6 zRbrN_nU*+tCWW4FrpvlE3{k_SdiKcEY*uOs%SLIWyOQ3`Lt}igd%L>}V(4A9dz3Tg zG&qyo-9K89o21uV&M}=;7&wnTmc6RXiR*340dp$tt}5Ko=TO_&klz{=D%#a{9femY zJb3VCTdrb-2OHUqp+~VvnRYGLjP$yAq1k*lCFHF1{-D!kip1D|x$&dG88O!|&s9;gjNhaY^T-xN5QS=V$wddBYTQC|P>2437fT7_OJwMw-%1M%suQZKX$3dJIDu-!a3&Pn9sGs8o}l6YP6eApx# zrE#BxH|=m?)8vbRt;xZ`O|_IHys&#TSh~roH_mR4US~OG!DiFDEe|vXV1-j_5otw-lSG>MNz*%)Lonp78C*44Im}g4 zSleL?isKVuxF<2z5{^fnMuyFCa^v(mpU&)huR3&=%_$`U_?#IRr&r_47@o*GX?jQU zAO>RljcJUxnkf%1i7zfg;;?Blaw3H=L2N@#aAa5K)N7+l!4TUb{WY{<@xHPaN=E1f#*h?ESKBn>t0(&!%x_L;fM z!KGJCcgU8-W|PulQ|cA;<$&!GmjHd+j6mCF5jKMnpW!ef0cSF6O<{O1DtJ|H7A)$$ zk|xzi(>_(Ni4`fa9=+ow`0tJOn?oUWZS1d@m!wzA3N_Qw?Q*48%ReLBm8NR-N_z81 zxvf%gWv?^jC=$`UQ>bAnC`yE{KPLQfA|YOl(|F_3q@>6B0*R6~3-5@F(fjddw{eo= zZ%kJ9jqsV3J%+3py}q(Z!5}2&3B%&zCDA;V z7q47vyrx`XoXw^?4b~H`U^fnqal-$+#77Tm<@7lXNF=}AGRO_9dzDRmY4sZSu`Qkl ztD2q_o2++J9w}d{M9Azj3`lqLEPUaLJZ)=>D;?5~(-MuHLFNRX)4$_tWhG6jTo=}r z-Wa{TBja54T#p?Q@utu#9rtn1xDTu9mOASs=-rS9u`Y5DXEh#rx9J@Ug&3jUW8<}L zII2NX=ZoTm5vRyj!!$XHUe#7B!(C6KBFtRFb3Jjs^iHK-;lipoh27Na#HzfLq*uxp z^9WW~Mp~}N#dYnf!hF?Q?BkFSSB<_j*d!Tg@*^#F59qbZFN0p`x|yI}!J0hCRsN@I zk}0X$c2tI58EL~!9+%!Ult%vE&>P#8NYI;vtyV8|=Rou#*rc`dmSvMfYCqX!v}S`x zw=c0~GwS0>>RV;i8{zhbUL)S*P1Ku!txoR%Qm)I<*#Youl(v2CYcoEqY7Yv|Wk)KV zF?!SB_J-aG<#87KGU$b8S-v#-+RO@&We-r zH#WLfb-Pk;o>luD=}~#L{7As=DZMT|)|zJutn(GRNzg0h3aEUJ`!PGC6f&DhEnamB z9j1?#LOwxzLoMgFHF9EWJqI@BY02jpldyecoELVF@`oKm{A%+6+eejGsVp640YP(3 zj=yhf;*?qSEN;xxP?KX|yu^mVah~ZL=Dux%<=vaoEkm*OthtTWWagtghJp`~7}y#i zxMcs9R2we=2F4{DhsJnn=P=twN)9_b`D~^i$mihnIgOk?r-37;*U>huhT2^4w)Tqy zV?4fNh+l3VVC~?T--*1=<=5-Q!V^&WjM1Y(xZ1OJk!v{Wig(kAGwZqP&{@20ej_=+ z_Z68BF@up3-1YJ~x{%q^%J%!V`jqqd^f`_E>8$o%0HZ#-%)XU}VlmEk&$o-vJYA2ZiZhq?f6$Seow>GklYIaJJFDwM!d&5%I05`{+5D*BT~v~i-qCS}#!KF(d`!acqHl**^d2$2j&~n0-Qt&0^5X7M zR_q*R)6kex?r=%+-W6MvG)O&7KGO0dfj1+)YF0fTJE*lR)3ghgFKFV{@4w+udn-(_n!6mKCEm!eUNN`ie|l@BjB%Z* z_(bRjC_bWL`4z$cGUf6_f6yd0Ab1+&(ca0gXzk7n4}U68$*kHMu071&j$4wFD_8dL zm0~Ya;V%Jy-ZjEC&u{0()jPT2=()VDy_tVm)yvIm`jqsB7{O63b(Z|EuIdd&Zpu32 z3%dikUt877XAhah$+PPD%BmfTJWsk@q^(t2Pn1TF?ign4$e0y=f6ovwwKwEBbb1{tcMWTz|K-Rz%&4{dQ@`Fa!2fz|lQM!1($YIRPGMs|g^j!Uz=1RP z*Q4f;H)^`e4s7ApwSD|?r}57m-hP&PU(T~i1+)glbLBhb&&E4DN+5q0RBgg@fIXS# ziW6MAcm^}_In1y9UibVCzFh1L1}3U(Dspy=lz7Jzn|b3OHu32{^>~_FXp(uTZ~y=i zl1W5CRC35~t`QF2Kz9F_Q!FMz)WXJY^DueQWhjKK#s93!ei%(a{=H)@pivabfKx z?hbq?AmiUv`H41ZX`Zc#GVHkWh~{mJ>?ZK}{!y-ZetWsOF^*8KAh?&3pKa_9KJkNU zOPPeUzE1`4>7_Gy`~EFN1H@3CB4a#k?$laP<@3HM5vJF`#*&$j73}Wu5}StXG)&70 zC0~NkvFp#f-}A>U42_r2%EZdg;C%CoecZcs(9-qB1x-w^6*|9jp3*2I`^ox=D%YI! zc^XM~)U;{aT*6TRL_`1ZS{oHY+q4=EpKdo(H@&!%@Pm96!8X1UrGyJrf57nAj$uq{ z$>+HJ_<5}RyTyF_*m=BhK@&4;YbrK_t%sONoRoRc+ zqdxWC6<&!yvZc(-470tX9YwE?++SBo!Ea&&A3L~}CgTN*67WplNW_;Hg2Nqs$zN_Bs8kltwAgy@ z+d9C&xNYx|Ep>@lE00vY$RE?$p>-zhKO2W1g7~~P+S6*87%KD4FF%FqNMu|}UK|*u zGQ#l4RCT%ZD%j1#<6QRC7H(fQpL|)D>!Y)^0#2RXz^StvxbE=TeEY>du70kEKGi85 zy4)YH6<+&H{sSBHwA31n0|}r>fNIpHDg*NM+iY%eT`n5IeLp=TC2l@uE=!EHJr_09C1bL3D5(Y@@l^Hxf&8^p9DuUQ(MA%&g0$zzgG?eEfRz0EgYPmbX8?iQjG=WTa$& z?^C^(QgX=jIts693)c5sdL1~zyfhDw9+zGpNh$f>xi+fo=ga+3yjr;D%xhFK zN|EiO$dRPQ>*|vw)mT5@w409KtmS)a`)rxz>xXv?Sr6%(7Be0Qz=-!%I**?*SSI$=HshMjD!Inzt&_||%! zI&%@%96HOZ1K{*I^{hT;F>hTo-RN{0HcQDPj(M-j9;l4unHW{m`@@%ZaqF6$(Q)yU zo6!cMQqo$R9w7)%d~65ZZ^x`Z+M~n zpVyT2CDqs!`FF6qW1Wx1fu13LwPnDP*xr!mk<;6GbNh61 zVGbxVTkC50{9&{C{b~ELs3Ffk9Wt}*T*A_^q^XwwJZS-Q>T>*W*?fL+$^uTDS&ubz zmceGg3l}zNwn!;iJK*0$7}wdZ#uuO1F~s%79hTg4<~8uX16vf?dRm9ZOMK4pqN@OI zI%Y1n9y^bP4f@9!A!wTazO9MJ&RE2<)@c_0@!nznW4%!urb(A%48e7AECO|^p+c4W zuHsh_@`?((RL)@-#(i*oKtnB0p1Fuwb@uGCl#+FWW8AxSkPSm)G}H(VonFW3vm0p2 z+w(S8KewH0o-cQ9CCsR;;rFNQ#}O^lEZ%4OM!0v|AjSSsMoN-}^)+0$Uo%Iw*qQqe zk8I%XO#|pTD!B86`MkMZ-;#6XpL+OGal4UDK|@Z^cis|fk$2uNUbGgW>vDp}PG7{) zGjv<}$4VS`-%G689qzbLtG2*NetPl({-I5OI6@jJNq*Ne$kRJV7#uILpgzxOa~iDe z)gkQ~D{=DuFR^mhh%-LaYfoDUkn;O1U;2-JU}YW)bmvm1A-)LW5XG1p##-KeK=Ry^5Q6<1Ys=X!K){>!Yj!Rhg`4=yf^*TceZ#>F zwq}3QBb#9&%fT~Jf_Fc;g@;dXr%rLi=6sIZj-SUF557z=IW9C25_tRLoB7SD3pr_K zy``ltCpc?vBWF35e@q%2FLBYMo63E@lyi0!8Uj9#Isd6s$#kSBBDz}Mu?4u^y}Y6v zxWn$756+Q3%NzsDz0NlLEo-od4R+=5he+`6`pcRsP1?T&@$G}Jd5?4SsCIj9Fp zpTj{>+Nh*EjvRUQWbZIv>fT|ozGikq(82cPao^}TXa9Z!cRT(}JuPh-8sl{jZQxg1 zcKgdMww(DU%a^Vxiz_+KCD3aoEdqUB;u|2=SX)-r#bJzl<$Qn75XaoNj=R?Hq9paL z8*#^~{!z|*cq5-)*;6(~)d4?zsh`8{S;vj5d)Yl^Z$I%JD|d}>`h)9(jeg!VVc`N3 zD)B+Tuku*O@@ofN_xyHN>>Rc*pFea~u;k*gt8c8t`HyVmy?@-o#`5miG{;y;a@*QI zj=uLL9_SgWl$lv}aR*`xQu_K<+B{a8x;&t+?&TO;BdVbzTc+`k2efc*TO$WI)mjGZ z7%lO;o2+bJzM^ zWx0NNUp{gUe`jo|zF~DQ-;MrGw}PEkljGsj+A%-acgBM+v%^`V2H0a;r}6#c=UaL3 z$DPBx>&Y$gH7CLH)J6L>^QQfpIdyhDGmO6Jn1pBhM!0*^Zoa>+kJSlpJEfq1WckwX zrD4qCSUKS5AYNAqboTC2#060^@;MeYcC1Vb@Xcen!#g|HAmwMP zFw7>`(^AFUP-g5zbWDV%O0R29F|A&;GK;tG+AK~5i4&yu7orj3Tfn_plsL&%qeo#W zMq5s73QTNkQ-$6Lw>R_}a%1x}L5832agble_J!CcQJo+KdmD`j4&n>NcHk)_mBlBs z&Gxn7ncDUktU6bVBV5J6)YnvdL+@1Nu`Xu-$ugFAgm2%Nvj|>tIZsF>gRc_a*|83I z?_a+*qulQ)y)Hdd_O%&4q&OAm(^0YHpBQzASK>Q6{tL-BBgeqZASE%X14S8!5~s$8 zSoF;BVx=Ez6(Dw@Y4@)HtaWelP7)Sw2fk00lzzIwMTPDdC2j4L1-sXu{z=A8DUBe+ z*>rY1Fi}C_sL&+$1Zf-*tp6`}oZGB#asEvn4LvCudLS zH4b6w^~nO~rh)KU%1;6>MX)EF0z={RPjNNdijAi+04ewNO3i_7W7W}~;HSXCcu{Gp_atmJl+@hpi+VHhZbQlo zSiV&KK-xqqkXWp0jcY2w{jQ$szyOX7&ViE?ooSECe4% z$N_IATDu+5n?ENxno^(KIK9FXzqj;id{)Q^LVOk}{$_7F73{%@lSJz3J{TcxLdtXY zwkZ{w$PD-%)+@w=z-3wArkN@V=dt`>o7t08C<0uFlwU>AUWqW82IuJ7np&p%Cdm`7 z>CK3pG`$9|6q^uSiIlgqe5ps@o+nr5U8SjVu(Rcv ztglkx9;a89V};aJtVeJWlFNWsSIWWc2rHLXIhs|C2kWGi*oo*B@^KKi0C!I0HLSfw z;i%B0y)!DzN`)dwxfHk<#9I(7-rFWkh$QO~{1_>JfDq44<+hfoCZA)y@~F@ah?9_9 zfZ%+nY_NNE34(KwoQ2>t zU`{er9dc%&EZ!=&BgKOV?m_Zv1l{GeytL_^$eiOI!>SXc;Gb^5hzI{vM3yOqxGgtX zuqxT{g>H~6MTnD;av5+ef+LY)@)p2dbDhwKlq-Q12=N$_M-i-aG;zN4`Y82RU-lN( zH$j>-A?8!+;@LN`UEMhlZ3vbkBaKE@)@Ze5x=fWkp6C}6=cY?b^aCZpqdU4l_!}9&!+qb*_ z?3~lnJ>@lhy1S;PeyJ+UqM;C>KtVyF$;(N7`{<`WngbHT#~neF=Pwi#9HEV*q^g~y ztfZ5@lZ!g=yP1Wog`~L==q{Em4a* zui>x%`Z}*;vOMn!)uB1$d@^-p62R5=nx`VI>cerIf!p8J96-Tvhp{Ts!1f!3c4dx& zL8Rd!SoJWn=p;>$E6wI_?S{p<&rQ}vw)c6f)dl=vYne`RJT5d|dKC*k=ME?=He8q~ z?q^soK0=HGGb=&Y1%-HdP2N~37j+zDI zTqWC+vctW6(~KYMxwXKH?{7H{J=P&N4t>Q_X*nW4FTNW*Gx5+KY^(JvlqKZIyddq^ zIruh_Y^^3|#AAsf#I0?lR~KPjNEuYDB9?XL{Hbh=p!7TV$$P`R!xBElcQC5nvs7M| zIFQ-n*5AydcYQ4g*Zu3Se)`pr%d>-e_VvNuF;DuKx2M$0Q@f`e#MdQ<|Ln-;@aAVS z3*t**N>cFW{@`%`JQ;Dw!OmOl+E+|iLR+Fed4JY~0(5;gu%ScI;gkX@KHnU<0^Z3} z;J4g&srpElfNEWYaj4iqIFSS)h} zF@#OLCF{~)bOcV^N?gJS<2*}z;)8CXYk`KeiJs2hq_^Q=Q z6?n52SLGoFW;mjL%zQASbc7Vx%fVAdobr%(XHIA;&j=wUNFqrcj`_vY(pP(FBO$(p z*Y+r`Z$%l>>--IExhC&iUla}07b}?2n?k9_7@y${J6;BjYYmQ=`P75aG5DfXS(>ww%fi5w8Xc$d>@1HT4HZ=A1owJ~J;l1I`G zs&5U2be&kyWhzqOpKKqs2$iFyDsF>s!y1@7=zSSp2RkNwM|~%JCw+SiVd4eHvcR3& ztUz**@gT(ZhDdMI8_$!V+3G0SuHq{twf$!@JeOYHZME;5*Yv1JW)f;kfytF8&v-d( z*}|mgX5{lxgs3cyE`xfn+JgVO+ zd*5s@)dkgYN^9rDF~aJL+;SaYo?l4kOC9UJ9nY9;_`>MU3OJsiO?-A&m`OAxs^6rvjP|&(I8al2zN{RwzP7bW!&7Djw zSUntoAJkA#LLLGiLkA1j?-U*m_KqL{4`HhRp%C~O{|9EHqWB*YS36-U9VJx?NhcQz z3LaK&R(2{86bcFoAs2H?fp1bW|C{~eNtnvo)fFhf#^&zs&g#y^>f~a@#=+0e&&JNl z#>vU@LBRs@baegh!Qu#_{$E1=Z#hyHATt*mpsS6OBgKDmzneP!a22Ma`cKjSx&D`( zt~Qqck0wXZ|90!cLAL)eY#glYZ2w302dmJ3PyrPe8;cLk|H&8O5c(g={}1ec>k(r6 zPx=4LnE&PJ|3E)n6+sbV`#-Nu1VyozUKa|A2}fQ^T*CwU%oovwWPbj;}_=Gwna1mjKQ!V7JN#>MGG$nfHUogM<(W*rNYHJ&XY8Gy0$r zg5SdTKpXtZQK@IUTMzsC&xxGVsc9fn`%Z^16UX%uE9FbOI8 zPZY!;bTXbX-t*0XAJ2;voI=>I1v22x6a3t!JYJ25-G4{GTvEg!jO_i8GV*HupT|XC zw^RwR3lgu+vf0#BGdE)>=zF)tN`MrHTgbulo4TE^g4-jMHP1L?crg(xoIY(}yFU7P z<-A_*Fy%1VT`|?3S=SQzZtT#D>#m-Kh-kTA<50p*F9R}z;2V~lJoz`q?o90+AVm@Y z)AcfrkQimb%y(chJTjcG%EmT*=@M|tun`fIkQHitJc*8XgWJ$kMXz%!xJTwk5{`-| zkNZsk@i_gs#&1fXpBlMgi$FyQ2Zt=um#6KjuWFtkA>Bdjvo+eEfIJB3?pTe9mzRgY zi^#mDsjdoJDU3)>O+BzB6@aQZiGpXB>Eexy7=%a$aoRQB2t3pIVZzU87Mg#hD#^8q zPDv$%GSKK<(`iELCjhah?oSY+2<)Z+Qki3FiK}a=hnB5;J!M)A%c6Z;YH<>7B3TR1 zKbA<+NI`Ol4v+KSOz{bQ7v7^>b6YtJM~y^9DS^F?Q>GN24BQHo{h49{&`}HLv54fL za-$%>WtuT2$igcE;+WSDjhj!o^zKqduF*B9*F(x zHbbU~^9Lec+XZl3#g{l$aE*o}qM-jOpkSmz)Bnmx*~N}Q{Tx%LC?E=-^2%T<08^an zO5eF$hnnN~L_mI)9Sdtph8{%}F?T3398K)hfJORwPW4+UG>a}F79M5yFDVJvAnPn7 zY#Xs*?;e!FCdo z`P?2lRy+lR#FQWIOQ5=jW_WYTJ1KdUKRJ_vi0o+|E^7Eh&sNg*AalX8+?ni?0qhMi zK?n~8ht`wT#9|bNj4D~FuCBg*WHd3K=|IG11|}v+d3j_aA|kzUWkEDXMn*X~IWc8r z^cZ1?PXEwQ^V))oK9x}B+}vEtUU1m1V}ZQ4y}kXIux~Qn*``bJ4UYS5jZpGu9Gu{A zB%5&oq`SMjP-9Y>qidEKOj6SIZ_29O1%=x4THo!CWN2gyiMQuH6i6^A1*nKlMj^R1 zf8?AVUG0-%M4owm>AKP04mQTtbQlkVvnB*=J=*z?D0_W=ydb6dP?-Vtquf)WA>#kIn zqhX#m``dwtWMX=Hdc8fa_suw31*HvX9X2x0BRnc%VafA7WnjjO%E^xs3R-GDulm^QOE$ zj24WX8T=XX>LEXj<05Q`gVP!NX~0}Jx7LOrNE#YkWpLt`n#aLoOM$(kr|;r^)P`LQ z)0c8}-gdDQ^oiA4okXAajlp9jp;?{+A6N0MtgP&^4?{F{vwlj%?xz*xbop?ztIM;s z=;9zG&L#BKsb=KtcH={h5SxL9o*#=XR}(&5c_eSJMXMOJU!0xhu@Pc4+!i=`{FTLK3Y>mg;88&QIMx5>`*!7DyIiY3Kw58R11js z>p~-2>@hz@v5gz$fY@X@+2u#O(f)BX-vOK>7f~LVRfz4J5eepbD>Za9XXI6Njbq~F zaX1*v!duVeJhPqSjT7{yhuutie& zAtj?{I-H!fUmhyr`((0MW%%!z=)#MJR838dE*%X~X+sP_gqZkC`luep7zT=m#-SUo zqoi@^&y}A&nyEH;w7=w=D?PZrGAW>W2+RsSQSqJ{hAsPdVO#Lf68z>QoWJ``rf;k6 zN$)R(syeL`l(`G$U~q_&Cmnu^fyst(dw;zLmlkJBd@M2RCM@<&gwGzf6xSL18@b}a zmpzE&1Y)myZ2nhEPj*IU^oNbr+$}}LCTOGrbE$gj#mWQT7ad_-Q$n*R_YxGdyWhM# zCUO_6?v|^0&~BEXtyRDm{5=XHZRx?{8Q)bmHDZ+z`SOf!U)Iym1`2cRF&vDaon7pORbm1hN<7no%Nud#7&Qj}Mg-n_yPFsfkeT;Gq?ODXRluBXM0!(&UDT6d50|)6WPrhc zM8l$A*6bE4dX)Iqf8O4@;^N~sb4+Orb8&J;+5C$K2ka|ZS{6<7rmKV`(ou@L9b~x& zRlckEUE|!a8W^{?9n98QXa7T;vvap09K!3Ysi}b{c*^vKoN`R*XlVS*aOxzC#AD&y z^ZY`edi8|5Tb^Fpxgg7x@{;RmdtmmjTk<<|g$P4%+%$_N@h>fVRUk4McmkVi(eP6R zhK(Y>jd&v2#p}*~2qW5I z$Pst^{#1?=wragKqBe+~v=K${2DR&9fGrC0-B=FR!O1P={pCQE*qv9rcd|kFA8&CS zyU_g_D3#kL0m~ddMY!^WfA$}Xfv&ENU)BA(Ax{7E{RJP?o^NGXcV4&e{knV6`_1a+ z+rpnbC^st#VS9Tdm$$z}r?1nwfnn$Y3F%Z^LDi_V+f}{Fu^HnL;;qbT?Dz0ARoija zwd_|FEIK^oP7Xfs!C-(RwHZZ%D)d(R(5l^p@uE)TuV8v=7T)y$fw))F8Hs4%l<+-) zc2!%7oP*R>ru&BH!(Fw1G>6$B1uJWnMMap!^3D7`3Ne)vRB zhL_X#_Q(BB{7`fzckrr<{bYw zek3{(>YM^DfwlPq6_OLmfDv-r7eX$}+=hm^TV!9x*u6Lm`=rBUD~jr1gzTqKuQ_hH z@@2A54u_Vabh_R3)iXq!KnvyzP(d7N$STK0hA5@*Xk9VOkVNr7bLrTfM2{?}raceo zAm%+y9$Rkf@Wy_*ZXihss>MwxF(DxeXb76%c>t5YFIB0S6=$%;fhl8!A*s{Y7{a%4 zSePgR@QD(m-LC&lopV2yY^q(Sy*ITbmEjx1Wsy=wC{uO&Owxt?5~2UVXYBxP9D6wQ zoPzfD_Ck%p+WGg79lh3k1Uu9J?GZus_{>h8;1AA%q$(GX?tdlofT8@(Hf~| zPHy`}=QBHKUlE*M$V&}W25iH%Lssl8i(ncFCfL1w^{U$nV6u7(_4*72202)4_D~Vi zEm14zIXI>>Z!n0FJ2q;~WEFhev*KiY-F(S>W&CYSJoRL{dnDP}F_|-Wrv82Ta>fJy z>sRcdlfh*4gqgTrs3(xoI!y62^LafuHD0I>fTWl=;g6dH0T@rVa+`Wico}fqed(9- zVzcg?>p9Tr@M;_}ZB8TXS;*c_P+;ZA=FG-X^%2kZYghSB!S2}g>SoE2%>r>=8dayZ z?izZlQ<7kNBk1%_i*W@C9faT;v4e%?L?C|AB5XWt>$iW_SFbxLdJbp|EA<2WB48bx zN=MY`)lF@Q?BcLlb{r%zR1D!ekIU>UWL)n{#p6Oi$ z)Hl<#9i6B8Yg})vilhRS1-piwLn0W#O#ynj=zpWhMU4vD1+YJTB+t)78ydVgKkO-wP&#RkP^kiN)4jRHfgj z(Ne(zI}q6N7bpKhR*93(l6JJBoSR$Rdav|C1}DZO@!M*7LR=a|7O&5)st(3gK$Tig z=A|5IE!M}hbtII7E#8$ez22^7i`_qI#JA&=?(@?pRG1$ zKQ@5u4dSD^ENNu3ZbnP5<#( zyk~WYY;?kPS#l7Xs{H0EW!K$fmZmjFckWFW^#c)R@~>8<#awVhiD2Y)ZJTQf?Usvn za0lvh>xR3q?WFb5BJLtCm2fA<`Rftvup*HO!7^5`!Pparfx1Eo@)DL45-JMSP!Ry@ z_baO{1)7@!m(K%`>nuEAwvNZpo#c*Rr#aibaU&pDcB1ld*t(vJq4)@hIRm5Vy>%&G zMs%MBZ@uOaCJtR|vx$(zgGa5rKeQZ7>H`6J6A4@Ck}&0$HWk~_*CmF5w?Sk>1cbBO zkr=qtjh(6@-)aZ}R4SNfL6L{i}=^ru@F5GYz* zG9>LNh;)hI5VPmP?_RK8HMX8iPEvMC`tJiO99l7jb5umR`I(7%dTt;+2OXAtT}x#} znZcLZCZK6ZRUnK3&6qAH4(9}mp<8#PaG|$3;g8BRo^?4fPr}rM+^9t7%;5QF)w!ft zes%Hzo*`p;Zd$^@5E$S?i{WQpca|c0-ZCJtDX8ty{ruXwljtCFIVAo74wpX4#hIk| zlHK)AckLs;Kw`y@375g^aLjDe_MEBLzhyJy@~<0*rM`65?Ab(iR%=;LdmrC3&X?;| zCh4nJ`+OP=ShGgqi$eN@u+7LW%oy#~vhNWF3+H->dhTGrWq=9l|lH^9N4Tzf+G zg%-E{NG$h2Kv}M{e^7bV-_ZlSj9IsZO8v05^S_^(*WL6ZC(h66vBYoz{xC{BdmN<5 z!r!Y}3o^*W+VKAw5_yy41o|8@z@Z7PDFROeoR_+UFkrDmhff0`C)bR(nrOdMlig4g zc3RifL6}mwqoEpclkv2*7Bow2{$A zi+tuMY%LPwq-4(IXCAiU344yO{0m|7$@@)4Yg>*+%$pjhkj}FHc}~&PH^&!}rmM26 zgxJw`_{m&Y96GisbNQ&X1l#kDrU6bx+Lv(9l8k99enQkfkoxVmlUBNrijEoKE+IK` z`wKCX>a=RaXc3i00Zg!&teN?fPShb6_G}nwur9SScLtuV+CoC8R%Ovu9&nBW`@;l| z^+Q^)sh};i@e`qa=EFIlHSvdAatarUb@sBpYr4xRY%Qv?Ug6QOLxBd}-;4_%1m0|e zQRQ@jSvt2T0EW}SWEM;MoL}t0hoM>t$#J1-^3)c`N?9D0fI}OnXMWgilUK{A(bVXu zpRS2Ynj#^7pb;--;TjU(!c9D;#Loy);kf1aX|0x`e^(j+Y*{PHq6} zb%BjPbXkL8Gx0D(VtnP3(Kn%fXVni>49qEa&dGfA?kkIXt{U{(2?@MK+Lu^|0-6Uq zk!-xrna-KT^iWb{H5U>G@cwUb-e8j{a*a!xei{>f%sgZTdyR6W52%*7ZW_#KxPdu6s9$M9Zfq2Vv;ag^BGtZW4o>vr5K9fu{lDEB#` zIQGvq=pvA`OG9A+44#Bo{g5~l^ot!-4@-G=3U)X^NsT!H*sJ>tA(vwa%(1??stfE6 z*<)^bANjUJxEjPxIh2|%Qg3fvugOlVo<33ze)YC`u{cAI?U0t|^R`-(9vEXSz3Md+(Lq3*96Q=6Ix=o^oM9Rk2hh%iaKcexZpeyvq+qM@9Bd<=t`MoMM_5c(g_D!WNFf9yTt~+D zXlvs{vjx8+30WjB;Ec+~0F8a`=1E0h+^h50RRJ2R!WKvk{}L8QogABn{V+Ow;KBs} zNp#AI-*ZaZdceQ%1H zd^%gyqZ98jRQ*V~oHVIOrcXTASfO8ms(U0^%*MaiI1oI{H^%b${H$(f?F)sqi`Q-> z9JpKE%K-Ss;r(Vbk(d6eLH=`u3;~T(q`=WOD46zgsAcXDbv#PgNX!fwc`vKy5WCf6 zvox<0y8NDP2)_+KpHa~sNO(z8!kPbU29!V#y&aL!I;M!4O1IVuaWTp&$FrSJz_Y+MB6?)SI7n#QWC>s z3f?kezMY=ffIv%EPg$?imErccL@r)M2zTUBFf}4+hzJt(v4%o)DMOTDvE(BrLlgr6L_k5{)DgNA>0Opj0Hu22-MD@Hz3yI=x|XGpo~E%zV#nn_s%&QmP3oys(nJ>9o&Oa@d5?X{6>uqRc|= zDH@p!Hp%ve!$`}=7;$jSdAoM@X?f?$Oz_LZ`sNp!_06%nJEq`;D~Js%YPPFV_JjkM zU_tX4@a+5CT3XDX2op6#*P3_avHO%|ZSy)~F5?c68NsjS+sema9iT|_@mj9oPZh8x zqC?BDFS@A#JcD@g$&+B4yDWh4v42$`@9K#iTYBubHn5c7&<&SP<5op?|457rXpA|x z%M{Pw7_Q8+XEpbziwq{>*=EX;`_AFY{yj~XT|aYWz!XFAaXJynoYj3Z$460m7fUr{ z_Er+@yu>nS+%nLZ*Vv8{q0g@qhvZf2H-j{L!YyLeo&q z2-Pu^Z;wOpj+w|}+s$GYn)@fMF#REOZYg-V{pLx2T3O>YG5GfnHoh@KsV!i3|C>$V zbgu&NS=4c`?-N;fM9_sk5fWa1dp2C5p|pq$&n{7$QNGMr$b zpl;hPnvjFrxwdAID6ema(g5>&B@Ak3@J!%04L$u3QirXpr6qr6&H#p)bG0o3O1U8g zf6YjxZ>clGcqiNswwpwXaRto3uw+LjFQdPiCM>W2k1-Hbc$!0yN8u8e*ees= zOO7Zv6hpeo`7omOv50`44G2ZQO&lBz*OfRYvl%=3WzVz@ zp7bjS0#jv9_TJz>evfyInuBi|p)ts_^>-%?Ul@!wpR}WrFXjyd_Pt0%pQK3AxHJc! z*P|ZlarJXclNl7Utac~4MIE;~1^h#NDxb_=JkMSa$vH-EWm~MH^E6u=Lg0>)ey9bf zm5OrOkI`ZrO>3RJ48*8hy)|`h&rC0ZU*z#kze3a`G8&5ww4tQ3zi|N#LfdX}gfa_H zzC1)xhXagyuZYhbDxdY+>Vj0rjt)qM!AXlZQF1E|&z7C^(Bf$WSFgK3@8GWbEn-MZB*Zwn16^CG3n8(-n1DsH)J$}cS?VST zS!>K!&Qi2^s|AaG%UahCw6c`56H=W$(A&N!{YkzRmzi-^Kam+T%IW#3L|;eHe03ew zIpqE`+xojn&qA~F`~xv?dm5jbY5Dk2f8TO-ZDU4KoJzEXoW}}((`AgsGV2p`t}jfo zblkLSew>3uuD3onmN zG4d!I@9yp{fu0ww2QHx8y|TYL`GtOe(u<^Cr3KnKegXZ>@|gh(>cS1GaY;dj(A)55 zC_2))4e<8g5rE2$c|+G3JNxAtgNkKaF2$KJ-FXGS4t8V_VfK zE15#E&MOs4@8wTwHJwKC=9lNM70fMY^|4*huZb_4p8_q)9%Z&IPehzHgd{nI)z%=t zKwShE4!P<9uhH%8LiI@jL8F|lC`mtRmEFa`rKPwv=QBU>tTrlBJq*N#ZeCt|5<_sL zk6yMAedQ4^t_~O(gt-Oh$A%h?dFGz8uepq7Rn0)K*a!=y3f+Qbn=}w`EOcxTxC~q+ z9icdEPNCjrdeSyyO2BZ&H@5fq5QuYmTR62{8Y{CM%k=&UCn2VGFxHyruO;MqrAl7N z;)ogT#IiumUryk1M~8q&n5??W6Tx`TKjs}Y*a!HcEh0@7@?bW21%LC%xb~8bCYl9s zKR2L$`IBNMzKg~aLytL)TA+F*_fORhOU!-EIm{W`l{-1VeX*AItlVSgclFha1POHC zS{mIXBOy^QqIDa4cV`Ia3%}FR4Let0fdm%n zpE`7w6qt0Ha&dp}ecxflk$!503vo-um`4F#!CPEY!SK@qX8Kg|6I1^vIy<)=Yuu5c zU)4U(20~uPHvqd{ehK}XTp;lm!QzOiY6&5$NfNUKpO0XE->l0O>lwQRhh7l;B0w@l zC@=#Uea_4z0sk`lR4Gw(TS!?uLbx zBA*3D!|{=rw`M;%{)t2z9FC`s|NYw{=C8e;=Y${a1-!sd`8~Y$LUVZKT&61xGUz`m zXC3nwTb&{9RJ=mU5YI%6<*(#YAxr9SCPVsq5xuMhPj$qqiHcS_+8wB|Ia(%m>Z=Au55FYi6^U<=c%}(k$L_Q&sA(sIf zbS@E70!*yVn-O2SHnRI)uR`B$|GjtK40A_`7y#k^rXjumo19{TT&Ee#caUv;m9&^` zGzLE7H8v&cK$Qk`K9#}E}USAPBZDx^J_T4 z816&RlFcW#4n05ZhiZ!l(5drfob_{`e}@_2d8U74T5b24*NH_AY!maBe{VwOxz}+B zwxe=sdmT+KjBj@PT&cn*gS@xT`uLu?K8F?a3k?-x#@{uS_SiZgK3UUtDktZeQ((r2 zQ5=;9kBEDXYQC#5cn@ZYkidNBrEwfF_ld4~9|$`uXAiSOO$N}7!c*Y>_HyITBDWA{ zL$!W8z;w`89RhD8^onM{UU&eZt!Hq3gTNu8Q(yk$#&-VwZci(+SqI1WexmpI%`M?{ z8P8kiHt-gnv82Ut0g_&Qb)VxOXd`Jwz?KEs=B@;tc8~xnx+Qs6q5FTAfi^mfvRgPp%T1IAmw3)u*_)NfJ|a#tB$zMMLu zleneJ5{f}{izS4s@Ujk)UTo03M#*m+an4rpj-P@pxm3|_m;qn7|Z$T{J~** z5>9{Y=7xq(b0Kf%YXz%Tq)rJFPLy9EiQ2V<=_H-?YCrO!1hp2U>}i? z5Bv%uRRG=a!nY~IYwSTt+E2rI!G41X&M{ga=s4lZ*R{95JlV3s&71D-M*bz}eY;HP z)&B44&b8&bN34}Ni-I3s1c%wv1u#UxVTuk4-uGHLPliX%9NWe?0lSB`$cSf!It^#e*TL>5+vkHh6`j0uhl2oyP=CIU!-Q0 zF7k{oT?xsZ3#fW-?5dU0a4#iL)ZvFVU>Yd_00BvL#&^l;SDbHK+xocy*kT+z+%4Nb zGcHFxKdIpx1;5UFkJs6r&-LXJ^%!_OfElCzQ%@Gbe$Ru(L!Cv)gwkoZq1VFIu~(`= zFMsB-lxvZ{3pndnXt88zGZ}htL3+14t&BCa^8L)P#1kAUl!+H0N|w3$rRny zEY4)@5Yy`0lVY;8SX|I0m{@buPv#g61;)W+Y{Kzi@L|=C7g}fXJ;JnKNAdv&T9&WR za)O7;muS4{`%@bMaB*)zk9gGP6wMX2s*u~s`Z8y3753%z0*f$ik0j7Bo~5xh@ECK= zcfZ2}vZf6@4_BzIdjUP>OXd;c?-+2yC`)efBrqGMT-&9i=l3 zO^!?t+C*uLDXkBtA+lkpX5=H3OT_V_NA&va@erZ+BvI#+LhL~z_ySn&27XyM%Z|QZ zm>f!3O)+uT>%2+~`ctAY7Cdw&OEdXd(M{Er24?LvUM#Pfg;xmqW2%a}B$Z^X zS9pwM_W<`2VXz(OLgvEozXf4Rixa+7m)EocaXMM_D4qwQ zeW^j?_=gY3a(>}UE;5&^#eZ4ynWFyS9XXXU>M)rwmNSXV_xah!qg}AYC~>+1x{*oQ zAHE)a7c5^{L_A{XpoiYjYWQ5xP8o}rqNDF?;l8c$*kIN& zZW5l5HmirugDbkGIja%%;$^qGb;T&j&hcs;b;5F`#x&n-C zZ(9$y+|40KtBu!JNXP^iBVvwQ~K$>Gopuq zFoCqEKJJB-U78RbCpg2F)R1_rIXN|l`Vn8&1nPgMTlN{lt;c924{E_fZ!o2_8cZA; z`rB3_w$xxu%oi;7{WYT&&;}F#N2W4y@vB&x$vys3QW9*EGQm=$)BRT`eTq%(PXPM> zWb;R5-MleqD>ydS%`8bz3{W?;3Pu-H@zcM(0NCt*zV7II!s8#+p29CMna7eTAC;gI z_v`#g_v{~4qPLfyfMpnl9~Gp?>+T1t8+{+urL%o(-K8R~AByS!e*^};W9UZb9z+C< S*8W#%EHAArRV85(^nU^OQTVC= literal 0 HcmV?d00001 diff --git a/grails-app/assets/images/email/NCRIS_150px-150x109.jpg b/grails-app/assets/images/email/NCRIS_150px-150x109.jpg new file mode 100644 index 0000000000000000000000000000000000000000..d557cd098020e5c3e1a6efa38143673596295a8c GIT binary patch literal 6511 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 DPNq;Q literal 0 HcmV?d00001 diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index 651b9763..e7314a3b 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -9,10 +9,10 @@ ${title} - +
-
- +
@@ -89,16 +89,16 @@ -%{--
--}% - - - Species Image - - - -
- -%{--
--}% + + + Species Image + + + + + Species Image + +
@@ -119,21 +119,26 @@
- Affiliated orgs - - NCRIS - CSIRO - GBIF - -

You are receiving this email because you opted in to ALA alerts. +

+%{-- Affiliated orgs--}% +%{-- --}% +%{-- NCRIS--}% +%{-- CSIRO--}% +%{-- GBIF--}% +%{-- --}% +

+ NCRIS logo  +  CSIRO logo  +  GBIF logo +

+
You are receiving this email because you opted in to ALA alerts.

Our mailing address is:

Atlas of Living Australia
GPO Box 1700
Canberra, ACT 2601
Australia

Don't want to receive these emails? You can unsubscribe. -

+
From c2d4d5b89486cf1e07213bcfb4fa504e319f46d9 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Mon, 16 Sep 2024 11:28:20 +1000 Subject: [PATCH 10/13] #280 Removed a border from biosecurity template --- grails-app/views/email/biosecurity.gsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index e7314a3b..669234a8 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -9,7 +9,7 @@ ${title} - +
From f94b0b8b8da8c12a7d3db1c320878589773541ad Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Tue, 17 Sep 2024 10:41:06 +1000 Subject: [PATCH 11/13] Update .travis.yml Remove branch from CI/CD builds --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2e35cb4..bddb5788 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,6 @@ branches: only: - master - develop - # delete any branches below - - 280-email-rendering-issues-v2 before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From 8dcce2cdd1fca34b171d06d32fdd86181da3c289 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Tue, 17 Sep 2024 10:42:59 +1000 Subject: [PATCH 12/13] Update biosecurity.gsp Removed commented-out code --- grails-app/views/email/biosecurity.gsp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index 669234a8..5402e318 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -16,12 +16,6 @@
-%{-- --}% Logo @@ -120,12 +114,6 @@
-%{-- Affiliated orgs--}% -%{-- --}% -%{-- NCRIS--}% -%{-- CSIRO--}% -%{-- GBIF--}% -%{-- --}%

NCRIS logo   CSIRO logo  From f26615ccd3cbd63883a9ca1c49c0cd815f33cf22 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Tue, 17 Sep 2024 13:50:44 +1000 Subject: [PATCH 13/13] Version 4.2.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 45447d73..dca0ee46 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ * rights and limitations under the License. */ buildscript { - version "4.2.3-SNAPSHOT" + version "4.2.3" group "au.org.ala" }