diff --git a/build.gradle b/build.gradle index 921e4d96..dca0ee46 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" group "au.org.ala" } 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 00000000..1849a207 Binary files /dev/null and b/grails-app/assets/images/email/CSIRO_Solid_RGB-150x150.png differ diff --git a/grails-app/assets/images/email/GBIF_109px.png b/grails-app/assets/images/email/GBIF_109px.png new file mode 100644 index 00000000..95ff25ee Binary files /dev/null and b/grails-app/assets/images/email/GBIF_109px.png differ 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 00000000..d557cd09 Binary files /dev/null and b/grails-app/assets/images/email/NCRIS_150px-150x109.jpg differ diff --git a/grails-app/views/email/biosecurity.gsp b/grails-app/views/email/biosecurity.gsp index d91001bb..5402e318 100644 --- a/grails-app/views/email/biosecurity.gsp +++ b/grails-app/views/email/biosecurity.gsp @@ -1,351 +1,137 @@ <%@ page contentType="text/html"%> <%@ page import="java.text.SimpleDateFormat" %> <%@ page import="org.apache.commons.lang3.StringUtils" %> - + - - - - - - ${title} - + + + + ${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}
- - -
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Logo + +
+

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}
+ +

+ 		+ + Map Image + + + + + Species Image + + + + + Species 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.

+
+

+ 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. +
+
- -
- - - - - -
-
- - 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.

-
- -
-
- 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 +
+ + 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