From c34a57c6ec9e4c0f3c7af119c594d027d95d683b Mon Sep 17 00:00:00 2001
From: Rita Chen <Rita.Chen@csiro.au>
Date: Wed, 11 Mar 2020 15:38:44 +1100
Subject: [PATCH 1/4] Bump SNAPSHOT version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2d9c4be..b34bd21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 }
 
-version "1.4.25-SNAPSHOT"
+version "1.4.26-SNAPSHOT"
 
 group "au.org.ala.plugins.grails"
 

From 4d60d042e85902c8705dda7003343c4dcf33e8cd Mon Sep 17 00:00:00 2001
From: Rita Chen <Rita.Chen@csiro.au>
Date: Mon, 23 Mar 2020 13:07:01 +1100
Subject: [PATCH 2/4] #120 add twitter tags to species page

---
 grails-app/views/species/_facebookTags.gsp    | 28 ------------
 .../views/species/_facebookTwitterTags.gsp    | 44 +++++++++++++++++++
 grails-app/views/species/show.gsp             |  4 +-
 3 files changed, 46 insertions(+), 30 deletions(-)
 delete mode 100644 grails-app/views/species/_facebookTags.gsp
 create mode 100644 grails-app/views/species/_facebookTwitterTags.gsp

diff --git a/grails-app/views/species/_facebookTags.gsp b/grails-app/views/species/_facebookTags.gsp
deleted file mode 100644
index 9a64832..0000000
--- a/grails-app/views/species/_facebookTags.gsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<meta property="og:url" content="${grailsApplication.config.bie.baseURL}/species/${tc?.taxonConcept?.guid}">
-<meta property="og:type" content="website">
-<meta property="og:title" content="${tc?.taxonConcept?.nameString} ${(tc?.commonNames) ? ' : ' + tc?.commonNames?.get(0)?.nameString : ''}">
-<meta property="og:description" content="${raw(grailsApplication.config.skin.orgNameLong)}">
-<g:if test="${grailsApplication.config.facebook.app_id}">
-    <meta property="fb:app_id" content="${grailsApplication.config.facebook.app_id}">
-</g:if>
-
-<g:if test="${tc.imageIdentifier}">
-    <meta property="og:image" content="${grailsApplication.config.image.thumbnailUrl}${tc.imageIdentifier}">
-    <meta property="og:image:type" content="image/jpeg">
-    <meta property="og:image:width" content="300">
-    <meta property="og:image:height" content="225">
-</g:if>
-<g:else>
-    <g:if test="${logoFile}">
-        <meta property="og:image" content="${resource(dir: 'images', file: logoFile)}">
-        <meta property="og:image:type" content="image/png">
-        <meta property="og:image:width" content="300">
-        <meta property="og:image:height" content="271">
-    </g:if>
-    <g:else>
-        <meta property="og:image" content="${resource(dir: 'images', file: 'noImage.jpg')}">
-        <meta property="og:image:type" content="image/jpeg">
-        <meta property="og:image:width" content="300">
-        <meta property="og:image:height" content="300">
-    </g:else>
-</g:else>
diff --git a/grails-app/views/species/_facebookTwitterTags.gsp b/grails-app/views/species/_facebookTwitterTags.gsp
new file mode 100644
index 0000000..1f069c7
--- /dev/null
+++ b/grails-app/views/species/_facebookTwitterTags.gsp
@@ -0,0 +1,44 @@
+<g:set var="description" value="${raw(grailsApplication.config.skin.orgNameLong)} species page for the ${commonNameDisplay}"/>
+
+<meta property="og:url" content="${grailsApplication.config.bie.baseURL}/species/${tc?.taxonConcept?.guid}"/>
+<meta property="og:type" content="website"/>
+<meta property="og:title" content="Species: ${commonNameDisplay} (${scientificName})"/>
+<meta property="og:description" content="${description}"/>
+
+<meta name="twitter:card" content="summary"/>
+<meta name="twitter:description" content="${description}"/>
+
+<g:if test="${grailsApplication.config.facebook.app_id}">
+    <meta property="fb:app_id" content="${grailsApplication.config.facebook.app_id}"/>
+</g:if>
+
+<g:if test="${tc.imageIdentifier}">
+    <g:set var="image" value="${grailsApplication.config.image.thumbnailUrl}${tc.imageIdentifier}"/>
+    <meta name="twitter:image" content="${image}"/>
+    <meta name="twitter:image:alt" content="${scientificName}"/>
+
+    <meta property="og:image" content="${image}"/>
+    <meta property="og:image:type" content="image/jpeg"/>
+    <meta property="og:image:width" content="300"/>
+    <meta property="og:image:height" content="225"/>
+</g:if>
+<g:else>
+    <g:if test="${logoFile}">
+        <g:set var="image" value="${resource(dir: 'images', file: logoFile)}"/>
+        <meta name="twitter:image" content="${image}"/>
+        <meta name="twitter:image:alt" content="logo"/>
+        <meta property="og:image" content="${image}"/>
+        <meta property="og:image:type" content="image/png"/>
+        <meta property="og:image:width" content="300"/>
+        <meta property="og:image:height" content="271"/>
+    </g:if>
+    <g:else>
+        <g:set var="image" value="${resource(dir: 'images', file: 'noImage.jpg')}"/>
+        <meta name="twitter:image" content="${image}"/>
+        <meta name="twitter:image:alt" content="no image"/>
+        <meta property="og:image" content="${image}"/>
+        <meta property="og:image:type" content="image/jpeg"/>
+        <meta property="og:image:width" content="300"/>
+        <meta property="og:image:height" content="300"/>
+    </g:else>
+</g:else>
diff --git a/grails-app/views/species/show.gsp b/grails-app/views/species/show.gsp
index 21a4b57..e188574 100644
--- a/grails-app/views/species/show.gsp
+++ b/grails-app/views/species/show.gsp
@@ -44,8 +44,8 @@
     <title>${tc?.taxonConcept?.nameString}<g:if test="${commonNameDisplay}"> : ${commonNameDisplay}</g:if> | ${raw(grailsApplication.config.skin.orgNameLong)}</title>
     <meta name="layout" content="${grailsApplication.config.skin.layout}"/>
 
-    <!-- facebook tags -->
-    <g:render template="facebookTags"/>
+    <!-- facebook and twitter tags -->
+    <g:render template="facebookTwitterTags"/>
 
     <asset:javascript src="show.js"/>
     <asset:javascript src="charts.js"/>

From c72b194a1b92b726c2534300b59411069aeb5aef Mon Sep 17 00:00:00 2001
From: Rita Chen <Rita.Chen@csiro.au>
Date: Tue, 24 Mar 2020 11:59:33 +1100
Subject: [PATCH 3/4] #120, swap common name with scientific name in title and
 description.

---
 grails-app/views/species/_facebookTwitterTags.gsp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/grails-app/views/species/_facebookTwitterTags.gsp b/grails-app/views/species/_facebookTwitterTags.gsp
index 1f069c7..149d766 100644
--- a/grails-app/views/species/_facebookTwitterTags.gsp
+++ b/grails-app/views/species/_facebookTwitterTags.gsp
@@ -1,8 +1,11 @@
-<g:set var="description" value="${raw(grailsApplication.config.skin.orgNameLong)} species page for the ${commonNameDisplay}"/>
+<g:set var="description" value="${raw(grailsApplication.config.skin.orgNameLong)} species page for the ${scientificName}"/>
 
 <meta property="og:url" content="${grailsApplication.config.bie.baseURL}/species/${tc?.taxonConcept?.guid}"/>
 <meta property="og:type" content="website"/>
-<meta property="og:title" content="Species: ${commonNameDisplay} (${scientificName})"/>
+<meta property="og:title" content="Species: ${scientificName}${commonNameDisplay ? ' (' + commonNameDisplay +')' : ''}"/>
+
+
+
 <meta property="og:description" content="${description}"/>
 
 <meta name="twitter:card" content="summary"/>

From a09781371fbfd9d54ff7df63291065728d6f045b Mon Sep 17 00:00:00 2001
From: Rita Chen <Rita.Chen@csiro.au>
Date: Thu, 26 Mar 2020 12:48:08 +1100
Subject: [PATCH 4/4] #120 review comments.

---
 grails-app/views/species/_facebookTwitterTags.gsp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/grails-app/views/species/_facebookTwitterTags.gsp b/grails-app/views/species/_facebookTwitterTags.gsp
index 149d766..821a230 100644
--- a/grails-app/views/species/_facebookTwitterTags.gsp
+++ b/grails-app/views/species/_facebookTwitterTags.gsp
@@ -3,12 +3,9 @@
 <meta property="og:url" content="${grailsApplication.config.bie.baseURL}/species/${tc?.taxonConcept?.guid}"/>
 <meta property="og:type" content="website"/>
 <meta property="og:title" content="Species: ${scientificName}${commonNameDisplay ? ' (' + commonNameDisplay +')' : ''}"/>
-
-
-
 <meta property="og:description" content="${description}"/>
 
-<meta name="twitter:card" content="summary"/>
+<meta name="twitter:card" content="summary_large_image"/>
 <meta name="twitter:description" content="${description}"/>
 
 <g:if test="${grailsApplication.config.facebook.app_id}">
@@ -18,7 +15,7 @@
 <g:if test="${tc.imageIdentifier}">
     <g:set var="image" value="${grailsApplication.config.image.thumbnailUrl}${tc.imageIdentifier}"/>
     <meta name="twitter:image" content="${image}"/>
-    <meta name="twitter:image:alt" content="${scientificName}"/>
+    <meta name="twitter:image:alt" content="Photograph of ${scientificName}"/>
 
     <meta property="og:image" content="${image}"/>
     <meta property="og:image:type" content="image/jpeg"/>
@@ -30,6 +27,7 @@
         <g:set var="image" value="${resource(dir: 'images', file: logoFile)}"/>
         <meta name="twitter:image" content="${image}"/>
         <meta name="twitter:image:alt" content="logo"/>
+
         <meta property="og:image" content="${image}"/>
         <meta property="og:image:type" content="image/png"/>
         <meta property="og:image:width" content="300"/>
@@ -39,6 +37,7 @@
         <g:set var="image" value="${resource(dir: 'images', file: 'noImage.jpg')}"/>
         <meta name="twitter:image" content="${image}"/>
         <meta name="twitter:image:alt" content="no image"/>
+
         <meta property="og:image" content="${image}"/>
         <meta property="og:image:type" content="image/jpeg"/>
         <meta property="og:image:width" content="300"/>