Merge branch 'develop' of github.com:AtlasOfLivingAustralia/biocache-…

…hubs into epic/grails4/oidc-auth

.travis.yml

@@ -13,6 +13,7 @@ branches:
  - epic/grails4/oidc-auth
  - feature/data-quality
  - grails4
+ - 552_records_page_error
 before_cache:
  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

README.md

@@ -1,4 +1,4 @@
-# biocache-hubs [![Build Status](https://travis-ci.com/AtlasOfLivingAustralia/biocache-hubs.svg?branch=develop)](https://travis-ci.com/AtlasOfLivingAustralia/biocache-hubs) 
+# biocache-hubs [![Build Status](https://app.travis-ci.com/AtlasOfLivingAustralia/biocache-hubs.svg?branch=develop)](https://app.travis-ci.com/github/AtlasOfLivingAustralia/biocache-hubs) 
 
 **biocache-hubs** is a Grails plugin that provides the core functionality for the _Atlas of Living Australia_ (ALA) [Occurrence search portal](https://biocache.ala.org.au/search) (Biocache) front-end.
 

grails-app/assets/javascripts/search.js

@@ -234,7 +234,9 @@ $(document).ready(function() {
  $.getJSON(jsonUri, function(data) {
  // use HTML template, see http:https://stackoverflow.com/a/1091493/249327
  var speciesPageUri = BC_CONF.bieWebappUrl + "/species/" + lsid;
- var speciesPageLink = "<a href='" + speciesPageUri + "' title='Species page' target='BIE'>view species page</a>";
+ var speciesPageLinkTitle = jQuery.i18n.prop("search.species.view.title");
+ var speciesPageLinkDesc = jQuery.i18n.prop("search.species.view.desc");
+ var speciesPageLink = "<a href='" + speciesPageUri + "' title='" + speciesPageLinkTitle + "' target='BIE'>" + speciesPageLinkDesc + "</a>";
  $clone.find('a.btn').text(nameString).attr("href", speciesPageUri);
  $clone.find('.nameString').text(nameString);
  $clone.find('.speciesPageLink').html(speciesPageLink);
@@ -647,14 +649,20 @@ $(document).ready(function() {
 
  $('#copy-al4r').on('click', function() {
  var input = document.querySelector('#al4rcode');
- navigator.clipboard.writeText(input.value)
- .then(() => {
- $(this).qtip({
- content: jQuery.i18n.prop('list.copylinks.tooltip.copied'),
- show: true,
- hide: { when: { event: 'mouseout'} }
- })})
- .catch((error) => { alert(jQuery.i18n.prop('list.copylinks.alert.failed') + error) })
+ if (navigator.clipboard && window.isSecureContext) {
+ // navigator clipboard api method'
+ navigator.clipboard.writeText(input.value)
+ .then(() => {
+ $(this).qtip({
+ content: jQuery.i18n.prop('list.copylinks.tooltip.copied'),
+ show: true,
+ hide: { when: { event: 'mouseout'} }
+ })})
+ .catch((error) => { alert(jQuery.i18n.prop('list.copylinks.alert.failed') + error) })
+ } else {
+ alert("Copying to clipboard requires a secure HTTPS connection. Value copied to clipboard is: " + input.value);
+ }
+
  });
 
  $('#copy-al4r').on('mouseleave', function() {

grails-app/assets/javascripts/show.js

@@ -369,7 +369,10 @@ $(document).ready(function() {
  }).click('click', function(e) { e.preventDefault(); });
 
  // add BS tooltip to elements with class "tooltips"
- $(".tooltips").tooltip();
+ $(".tooltips").tooltip( {
+ trigger: "hover",
+ delay: { "show": 100, "hide": 1000 }
+ });
 
  $(".dataQualityHelpLink").popover({
  html : true,
@@ -422,6 +425,21 @@ $(document).ready(function() {
  }
  });
 
+ // Copied from list.js TODO: consolidate into common JS code
+ $('#copy-al4r').on('click', function() {
+ var input = document.querySelector('#al4rcode');
+ if (navigator.clipboard && window.isSecureContext) {
+ // navigator clipboard api method'
+ navigator.clipboard.writeText(input.value)
+
+ .then(() => { alert(jQuery.i18n.prop('list.copylinks.tooltip.copied')) })
+ .catch((error) => { alert(jQuery.i18n.prop('list.copylinks.alert.failed') + error) })
+ } else {
+ alert("Copying to clipboard requires a secure HTTPS connection. Value: " + input.value);
+ }
+
+ });
+
 }); // end JQuery document ready
 
 /**

grails-app/assets/stylesheets/search.css

@@ -1173,4 +1173,4 @@ a.copyLink {
 #content .tooltip-inner {
  word-break: break-word;
  white-space: normal;
-}
+}

grails-app/assets/stylesheets/searchMap.css

@@ -6,9 +6,11 @@
 #leafletMap, input {
  margin: 0px;
 }
-.tooltip-inner {
+#content .leaflet-draw-section .tooltip-inner {
  max-width: 350px;
+ /*min-width: 100px;*/
  white-space: nowrap;
+ word-break: normal;
  /* If max-width does not work, try using width instead */
  /*width: 150px;*/
 }