#360 revised the wording on templates

Author: qifeng-bai

grails-app/i18n/messages.properties

@@ -115,7 +115,7 @@ biocache.view.this.record=View this {0} record
 biocache.images.view.all=<b>View all</b> the added/changed records
 biocache.images.disable.this=<b>Disable this alert</b> or manage your alerts
 biocache.images.alt.image=Image for record {0}
-datasets.view.details.of.the.added=View details of the added/changed datasets
+datasets.view.details.of.the.added=View details of the added datasets
 datasets.update=Datasets update
 datasets.name=Name
 datasets.link=Link

grails-app/init/au/org/ala/alerts/BootStrap.groovy

@@ -200,7 +200,7 @@ class BootStrap {
             new PropertyPath([name: "dataset_count", jsonPath: "\$.facetResults[0].fieldResult", query: newOccurrenceDatasets, fireWhenChange: true]).save()
         }
 
-        title = messageSource.getMessage("query.datasets.title", null, siteLocale)
+/*        title = messageSource.getMessage("query.datasets.title", null, siteLocale)
         descr = messageSource.getMessage("query.datasets.descr", null, siteLocale)
         if(Query.findAllByName(title).isEmpty()){
             Query newDatasets = (new Query([
@@ -217,7 +217,7 @@ class BootStrap {
                     idJsonPath: 'uid'
             ])).save()
             new PropertyPath([name: "dataset_count", jsonPath: "\$", query: newDatasets, fireWhenChange: true]).save()
-        }
+        }*/
 
         title = messageSource.getMessage("query.species.lists.title", null, siteLocale)
         descr = messageSource.getMessage("query.species.lists.descr", null, siteLocale)

grails-app/services/au/org/ala/alerts/DiffService.groovy

@@ -281,10 +281,6 @@ class DiffService {
                 records.add(record)
             }
         }
-        int maxRecords = grailsApplication.config.getProperty("biosecurity.query.maxRecords", Integer, 500)
-        if (records.size() > maxRecords) {
-            records = records.subList(0, maxRecords)
-        }
 
         return records
     }

grails-app/views/admin/query.gsp

@@ -140,18 +140,20 @@
                                                     <div style="text-align: right;">
                                                         <hr>
                                                          <div style="padding: 5px;">
-                                                            <label>Evaluate the new record discovery algorithm by comparing the latest and previous results in database </label><g:link class="btn btn-info"  controller="notification" action="evaluateChangeDetectionAlgorithm" params="[queryId: query.id, queryResultId: queryResult.id, emailMe:true]" target="_blank">
+                                                            <label>Evaluate the new record discovery algorithm using <i class="fa fa-info-circle" aria-hidden="true" style="color: #c44d34;"
+                                                                                                                        title="It won't query our data services"></i>
+                                                                <span style="color:#c44d34;">the last check results</span> in Alerts.</label><g:link class="btn btn-info"  controller="notification" action="evaluateChangeDetectionAlgorithm" params="[queryId: query.id, queryResultId: queryResult.id, emailMe:true]" target="_blank">
                                                                 Evaluate & email me
                                                             </g:link>
                                                          </div>
                                                         <g:if test="${queryType != 'biosecurity'}">
                                                             <div style="padding: 5px;">
-                                                            <label>Collect the latest records, compare with the current result in the database, Email me the results </label><g:link class="btn btn-info"  controller="admin" action="emailMeLastCheck" params="[queryId: query.id, frequency: queryResult.frequency?.name]" target="_blank">
-                                                                Collect & Email me
+                                                            <label>Query the latest records from the data services, compare them with the current records in Alerts, and email me the findings.</label><g:link class="btn btn-info"  controller="admin" action="emailMeLastCheck" params="[queryId: query.id, frequency: queryResult.frequency?.name]" target="_blank">
+                                                                Query & Email me
                                                             </g:link>
                                                             </div>
                                                             <div style="padding: 5px;">
-                                                                <label>Collect the latest records, compare them with the current results in the database, and display the changes.</label> <g:link class="btn btn-info"  controller="admin" action="dryRunQuery" params="[queryId: query.id, frequency: queryResult.frequency?.name]" target="_blank">
+                                                                <label>Query the latest records, compare them with the current records in Alerts, and display the changes.</label> <g:link class="btn btn-info"  controller="admin" action="dryRunQuery" params="[queryId: query.id, frequency: queryResult.frequency?.name]" target="_blank">
                                                                     Dry run (no DB update, no emails)
                                                                 </g:link>
                                                             </div>

grails-app/views/email/annotations.gsp

@@ -32,7 +32,7 @@
                 </tr>
                 <tr>
                     <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
-                        <div> ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} ${totalRecords == 1 ? 'has' : 'have'} been updated
+                        <div>Annotations on ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} have been updated
                         </div>
                     </td>
                 </tr>

grails-app/views/email/biocacheImages.gsp

@@ -60,11 +60,11 @@
                     <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
                         <g:set var="totalRecords" value="${totalRecords}" />
                         <div>
-                        <g:formatNumber number="${totalRecords}" format="###,###" /> ${totalRecords == 1 ? ' record with images ' : ' records with images'} ${totalRecords == 1 ? 'has' : 'have'} been added
+                        <g:formatNumber number="${totalRecords}" format="###,###" /> ${totalRecords == 1 ? ' new record with images ' : 'new records with images'} ${totalRecords == 1 ? 'has' : 'have'} been added
                         </div>
                         <br/>
                         <div>
-                            <a class="btn info-button" href="${moreInfo}">View all records with new images</a>
+                            <a class="btn info-button" href="${moreInfo}">View all new records with images</a>
                         </div>
                     </td>
                 </tr>

grails-app/views/email/dataresource.gsp

@@ -44,7 +44,7 @@
                 </tr>
                 <tr>
                     <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
-                        <div> ${totalRecords} ${totalRecords == 1 ? 'dataset' : 'datasets'} ${totalRecords == 1 ? 'has' : 'have'} been updated
+                        <div> ${totalRecords} ${totalRecords == 1 ? 'dataset' : 'datasets'} ${totalRecords == 1 ? 'has' : 'have'} been added
                         </div>
                         <div style="padding-top: 20px;">
                             <a class="btn info-button" href="${moreInfo}"><g:message code="datasets.view.details.of.the.added" /></a>

grails-app/views/email/myAnnotations.gsp

@@ -32,7 +32,7 @@
                 </tr>
                 <tr>
                     <td style="background-color: #E8E8E8;color: #000;padding: 40px 30px 40px 30px;text-align: center;font-family: 'Roboto', sans-serif;font-size: 22px;line-height: 1.5;">
-                        <div> ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} ${totalRecords == 1 ? 'has' : 'have'} been updated
+                        <div>Annotations on ${totalRecords} occurrence ${totalRecords == 1 ? 'record' : 'records'} have been updated
                         </div>
                     </td>
                 </tr>