diff --git a/application.properties b/application.properties index 83e3a0fde..ee0e529b4 100644 --- a/application.properties +++ b/application.properties @@ -2,5 +2,5 @@ #Tue Jun 20 09:06:54 EST 2017 app.grails.version=2.5.6 app.name=fieldcapture -app.version=1.60 +app.version=1.60.1 diff --git a/grails-app/views/activity/activityReportView.gsp b/grails-app/views/activity/activityReportView.gsp index 73b29b432..53ef27edd 100644 --- a/grails-app/views/activity/activityReportView.gsp +++ b/grails-app/views/activity/activityReportView.gsp @@ -147,12 +147,14 @@ var reportSite = ${reportSite?.encodeAsJSON() ?: '{}' }; var formFeatures = new ecodata.forms.FeatureCollection(reportSite ? reportSite.features : []); fcConfig.featureCollection = formFeatures; + var mapOptions = {}; if (fcConfig.useGoogleBaseMap) { mapOptions.baseLayersName = 'Google'; // Default is Open Street Maps } // Initialise our map so we can supply options (otherwise it's initialised with defaults) ecodata.forms.maps.featureMap(mapOptions); + } $('.imageList a[target="_photo"]').attr('rel', 'gallery').fancybox({type:'image', autoSize:true, nextEffect:'fade', preload:0, 'prevEffect':'fade'}); diff --git a/grails-app/views/layouts/nrmPrint.gsp b/grails-app/views/layouts/nrmPrint.gsp index e3a7122db..9094528dd 100644 --- a/grails-app/views/layouts/nrmPrint.gsp +++ b/grails-app/views/layouts/nrmPrint.gsp @@ -40,7 +40,5 @@ - - \ No newline at end of file