Merge branch 'release/4.1.0'

AtlasOfLivingAustralia · Jul 25, 2022 · 4bd3082 · 4bd3082
2 parents 57c4dc2 + 3d6910d
commit 4bd3082
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 36 deletions.
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 }
 
-version "4.0.0"
+version "4.1.0"
 group "org.grails.plugins"
 
 apply plugin:"eclipse"

diff --git a/grails-app/taglib/au/org/ala/bootstrap3/TwitterBootstrapTagLib.groovy b/grails-app/taglib/au/org/ala/bootstrap3/TwitterBootstrapTagLib.groovy
@@ -40,7 +40,7 @@ class TwitterBootstrapTagLib {
      */
     Closure paginate = { Map attrsMap ->
         TypeConvertingMap attrs = (TypeConvertingMap)attrsMap
-        def configTabLib = grailsApplication.config.navigate('grails','plugins','twitterbootstrap','fixtaglib')
+        def configTabLib = grailsApplication.config.getProperty('grails.plugins.twitterbootstrap.fixtaglib')
         if (!configTabLib) {
             def renderTagLib = (UrlMappingTagLib) grailsApplication.mainContext.getBean('org.grails.plugins.web.taglib.UrlMappingTagLib')
             renderTagLib.paginate.call(attrs)

diff --git a/grails-app/taglib/au/org/ala/bootstrap3/UrlBuilderTagLib.groovy b/grails-app/taglib/au/org/ala/bootstrap3/UrlBuilderTagLib.groovy
@@ -78,7 +78,7 @@ class UrlBuilderTagLib {
         final baseProperty = attrsMap.remove('baseProperty') as String
         final base = baseProperty ? grailsApplication.config.getProperty(baseProperty) : attrsMap.remove('base') as String
         final pathsProperty = attrsMap.remove('pathsProperty')
-        final paths = pathsProperty ? grailsApplication.config.get(pathsProperty) : attrsMap.remove('paths')
+        final paths = pathsProperty ? grailsApplication.config.getProperty(pathsProperty, Object) : attrsMap.remove('paths')
         final params = attrsMap.remove('params') as Map<String, ?>
         final vars = attrsMap.remove('vars') as Map<String, ?>
         final fragment = attrsMap.remove('fragment') as String

diff --git a/grails-app/views/layouts/_main.gsp b/grails-app/views/layouts/_main.gsp
@@ -4,19 +4,19 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="app.version" content="${g.meta(name:'info.app.version')}"/>
     <meta name="app.build" content="${g.meta(name:'info.app.build')}"/>
-    <meta name="description" content="${grailsApplication.config.skin?.orgNameLong?:'Atlas of Living Australia'}"/>
-    <meta name="author" content="${grailsApplication.config.skin?.orgNameLong?:'Atlas of Living Australia'}">
+    <meta name="description" content="${grailsApplication.config.getProperty('skin.orgNameLong')?:'Atlas of Living Australia'}"/>
+    <meta name="author" content="${grailsApplication.config.getProperty('skin.orgNameLong')?:'Atlas of Living Australia'}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- Favicon -->
-    <link href="${grailsApplication.config.skin.favicon}" rel="shortcut icon"  type="image/x-icon"/>
+    <link href="${grailsApplication.config.getProperty('skin.favicon')}" rel="shortcut icon"  type="image/x-icon"/>
 
     <title><g:layoutTitle /></title>
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeBootstrapCss}">
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/bootstrap.min.css" rel="stylesheet" media="screen,print"/>
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/bootstrap-theme.min.css" rel="stylesheet" media="screen,print"/>
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeBootstrapCss')}">
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/bootstrap.min.css" rel="stylesheet" media="screen,print"/>
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/bootstrap-theme.min.css" rel="stylesheet" media="screen,print"/>
     </g:if>
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeAlaStylesCss}">
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/ala-styles.css" rel="stylesheet"
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeAlaStylesCss')}">
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/ala-styles.css" rel="stylesheet"
               media="screen,print"/>
     </g:if>
 
@@ -28,9 +28,9 @@
                           media="screen,print"/>
     </g:if>
     <g:elseif test="${hfVersion == 2}">
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/autocomplete.min.css" rel="stylesheet" media="screen,print"/>
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/autocomplete-extra.min.css" rel="stylesheet" media="screen,print"/>
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/font-awesome.min.css" rel="stylesheet" media="screen,print"/>
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/autocomplete.min.css" rel="stylesheet" media="screen,print"/>
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/autocomplete-extra.min.css" rel="stylesheet" media="screen,print"/>
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/font-awesome.min.css" rel="stylesheet" media="screen,print"/>
     </g:elseif>
 
 
@@ -42,20 +42,20 @@
     </g:if>
     <g:elseif test="${hfVersion == 2}">
         <script type="text/javascript"
-                src="${grailsApplication.config.headerAndFooter.baseURL}/js/jquery.min.js"></script>
+                src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/jquery.min.js"></script>
         <script type="text/javascript"
-                src="${grailsApplication.config.headerAndFooter.baseURL}/js/jquery-migration.min.js"></script>
+                src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/jquery-migration.min.js"></script>
         <script type="text/javascript"
-                src="${grailsApplication.config.headerAndFooter.baseURL}/js/autocomplete.min.js"></script>
+                src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/autocomplete.min.js"></script>
     </g:elseif>
 
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeApplicationJs}">
-        <script type="text/javascript" src="${grailsApplication.config.headerAndFooter.baseURL}/js/application.js"
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeApplicationJs')}">
+        <script type="text/javascript" src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/application.js"
                 defer></script>
     </g:if>
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeBootstrapJs}">
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeBootstrapJs')}">
         <script type="text/javascript"
-                src="${grailsApplication.config.headerAndFooter.baseURL}/js/bootstrap.min.js"></script>
+                src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/bootstrap.min.js"></script>
     </g:if>
     <g:layoutHead />
     <hf:head/>
@@ -65,7 +65,7 @@
 <g:set var="fluidLayout" value="${pageProperty(name:'meta.fluidLayout')?:grailsApplication.config.getProperty('skin.fluidLayout', Boolean, false)}"/>
 <!-- Header -->
 <hf:banner logoutUrl="${g.createLink(controller: "logout", action: "logout", absolute: true)}"
-           ignoreCookie="${grailsApplication.config.ignoreCookie}" fluidLayout="${grailsApplication.config.fluidLayout}"/>
+           ignoreCookie="${grailsApplication.config.getProperty('ignoreCookie', Boolean, false)}" fluidLayout="${grailsApplication.config.getProperty('skin.fluidLayout', Boolean, false)}"/>
 <!-- End header -->
 <g:if test="${!pageProperty(name:'meta.hideBreadcrumb')}">
     <!-- Breadcrumb -->
@@ -77,7 +77,7 @@
             <div class="row">
                 <nav aria-label="Breadcrumb" role="navigation">
                     <ol class="breadcrumb-list">
-                        <li><a href="${grailsApplication.config.skin?.homeUrl?:'https://www.ala.org.au'}"><g:message code="breadcrumb.home" default="Home"/></a></li>
+                        <li><a href="${grailsApplication.config.getProperty('skin.homeUrl')?:'https://www.ala.org.au'}"><g:message code="breadcrumb.home" default="Home"/></a></li>
                         <g:if test="${breadcrumbParent}">
                             <g:set value="${breadcrumbParent.tokenize(',')}" var="parentArray"/>
                             <li><a href="${parentArray[0]}">${parentArray[1]}</a></li>
@@ -108,7 +108,7 @@
 </div><!-- End container #main col -->
 
 <hf:footer logoutUrl="${g.createLink(controller: "logout", action: "logout", absolute: true)}"
-           ignoreCookie="${grailsApplication.config.ignoreCookie}"/>
+           ignoreCookie="${grailsApplication.config.getProperty('ignoreCookie', Boolean, false)}"/>
 
 <asset:deferredScripts/>
 

diff --git a/grails-app/views/layouts/generic.gsp b/grails-app/views/layouts/generic.gsp
@@ -4,13 +4,13 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="app.version" content="${g.meta(name:'app.version')}"/>
     <meta name="app.build" content="${g.meta(name:'app.build')}"/>
-    <meta name="description" content="${grailsApplication.config.skin.orgNameLong}"/>
-    <meta name="author" content="${grailsApplication.config.skin.orgNameLong}">
+    <meta name="description" content="${grailsApplication.config.getProperty('skin.orgNameLong')}"/>
+    <meta name="author" content="${grailsApplication.config.getProperty('skin.orgNameLong')}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><g:layoutTitle /></title>
 
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeBootstrapCss}">
-        <link href="${grailsApplication.config.headerAndFooter.baseURL}/css/bootstrap.min.css" rel="stylesheet"
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeBootstrapCss')}">
+        <link href="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/css/bootstrap.min.css" rel="stylesheet"
               media="screen,print"/>
     </g:if>
 
@@ -20,13 +20,13 @@
 
     <asset:javascript src="${pageProperty(name: 'meta.head-js') ?: 'head'}"/>
 
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeApplicationJs}">
-        <script type="text/javascript" src="${grailsApplication.config.headerAndFooter.baseURL}/js/application.js"
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeApplicationJs')}">
+        <script type="text/javascript" src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/application.js"
                 defer></script>
     </g:if>
-    <g:if test="${!grailsApplication.config.headerAndFooter.excludeBootstrapJs}">
+    <g:if test="${!grailsApplication.config.getProperty('headerAndFooter.excludeBootstrapJs')}">
         <script type="text/javascript"
-                src="${grailsApplication.config.headerAndFooter.baseURL}/js/bootstrap.min.js"></script>
+                src="${grailsApplication.config.getProperty('headerAndFooter.baseURL')}/js/bootstrap.min.js"></script>
     </g:if>
 
     <g:layoutHead />
@@ -37,14 +37,14 @@
 <!-- Header -->
 <hf:banner logoutUrl="${g.createLink(controller:"logout", action:"logout", absolute: true)}" />
 <!-- End header -->
-<g:set var="fluidLayout" value="${pageProperty(name:'meta.fluidLayout')?:grailsApplication.config.skin?.fluidLayout.toBoolean()}"/>
+<g:set var="fluidLayout" value="${pageProperty(name:'meta.fluidLayout')?:grailsApplication.config.getProperty('skin.fluidLayout', Boolean, false)}"/>
 <!-- Container -->
 <div class="${fluidLayout ? 'container-fluid' : 'container'}" id="main">
     <g:layoutBody />
 </div><!-- End container #main col -->
 
 <hf:footer logoutUrl="${g.createLink(controller: "logout", action: "logout", absolute: true)}"
-           ignoreCookie="${grailsApplication.config.ignoreCookie}"/>
+           ignoreCookie="${grailsApplication.config.getProperty('ignoreCookie', Boolean, false)}"/>
 
 <asset:javascript src="${pageProperty(name: 'meta.deferred-js') ?: 'jquery-extensions'}" />
 <asset:deferredScripts/>

diff --git a/src/main/groovy/au/org/ala/bootstrap3/AlaBootstrap3GrailsPlugin.groovy b/src/main/groovy/au/org/ala/bootstrap3/AlaBootstrap3GrailsPlugin.groovy
@@ -1,8 +1,6 @@
 package au.org.ala.bootstrap3
 
 import grails.plugins.*
-import grails.util.Holders
-import org.springframework.core.env.MapPropertySource
 
 class AlaBootstrap3GrailsPlugin extends Plugin {