Merge pull request #159 from charvolant/master

Cosmetic changes and config
AtlasOfLivingAustralia · Jun 24, 2019 · a730b2c · a730b2c
2 parents fb25ca4 + 001a6df
commit a730b2c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
@@ -161,6 +161,7 @@ idxtype.COLLECTION=Collection
 idxtype.DATAPROVIDER=Data provider
 idxtype.DATASET=Dataset
 idxtype.DATARESOURCE=Data resource
+idxtype.KNOWLEDGEBASE=Support article
 idxtype.REGION=Region
 idxtype.LOCALITY=Locality
 idxtype.WORDPRESS=Site Page

diff --git a/grails-app/views/externalSite/_bhl.gsp b/grails-app/views/externalSite/_bhl.gsp
@@ -1,6 +1,6 @@
 <div class="results-summary">
     <g:if test="${!max}">
-        <g:message code="bhl.page.none" args="${[search.join(', ')]}"/>
+        <g:message code="page.bhl.none" args="${[search.join(', ')]}"/>
     </g:if>
     <g:else>
     <g:message code="page.bhl.showing" args="${[ start + 1, Math.min(max, start + rows), max, search.join(', ')]}"/>

diff --git a/grails-app/views/species/bhlSearch.gsp b/grails-app/views/species/bhlSearch.gsp
@@ -68,7 +68,7 @@
                 return cancelSearch("No names were found to search BHL");
             }
 
-            var source = "${grailsApplication.config.literature?.bhl?.url ?: '//bhlidx.ala.org.au/select'}";
+            var source = "${grailsApplication.config.literature.bhl.url}";
             var url = source + "?q=" + query + '&start=' + start + "&rows=" + rows +
                     "&wt=json&fl=name%2CpageId%2CitemId%2Cscore&hl=on&hl.fl=text&hl.fragsize=200&" +
                     "group=true&group.field=itemId&group.limit=11&group.ngroups=true&taxa=false";