Merge pull request #1164 from AtlasOfLivingAustralia/hotfix

temi · web-flow · commit 68b1904206f3 · 2019-07-24T17:10:42.000+10:00
Fixed the following - stack table rows, fav icon etc.
diff --git a/application.properties b/application.properties
@@ -2,4 +2,4 @@
 #Sat Nov 03 13:30:44 AEDT 2018
 app.grails.version=2.5.6
 app.name=biocollect
-app.version=4.8.5
+app.version=4.8.6-SNAPSHOT
diff --git a/grails-app/assets/vendor/responsive-table-stacked/stacked.css b/grails-app/assets/vendor/responsive-table-stacked/stacked.css
@@ -10,9 +10,14 @@
         left: -9999px;
     }
 
+    table.responsive-table-stacked tbody tr td:nth-child(1) {
+        border-top-width: 5px;
+    }
+
     table.responsive-table-stacked tbody td {
         position: relative;
         width: auto !important;
+        text-align: left !important;
     }
 
     table.responsive-table-stacked tbody td:before {
@@ -42,9 +47,14 @@
         left: -9999px;
     }
 
+    table.responsive-table-stacked tbody tr td:nth-child(1) {
+        border-top-width: 5px;
+    }
+
     table.responsive-table-stacked tbody td {
         position: relative;
         width: auto !important;
+        text-align: left !important;
     }
 
     table.responsive-table-stacked tbody td:before {
diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy
@@ -111,6 +111,9 @@ merit.baseURL="https://fieldcapture-test.ala.org.au"
 
 app.view.nocache = false
 
+// rel icon config
+skin.favicon="https://www.ala.org.au/app/uploads/2019/01/cropped-favicon-32x32.png"
+
 // Markdown configuration to match behaviour of the JavaScript editor.
 markdown.hardwraps = true
 
diff --git a/grails-app/views/layouts/ala.gsp b/grails-app/views/layouts/ala.gsp
@@ -9,7 +9,7 @@
     <meta name="description" content="Atlas of Living Australia Field Capture"/>
     <meta name="author" content="Atlas of Living Australia">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="https://www.ala.org.au/wp-content/themes/ala2011/images/favicon.ico" rel="shortcut icon"  type="image/x-icon"/>
+    <link href="${grailsApplication.config.skin.favicon}"  rel="icon"/>
 
     <title><g:layoutTitle /></title>
     <link rel="stylesheet" href="${grailsApplication.config.headerAndFooter.baseURL}/css/bootstrap.min.css"/>
diff --git a/grails-app/views/layouts/ala2.gsp b/grails-app/views/layouts/ala2.gsp
@@ -10,9 +10,7 @@
     <meta name="author" content="Atlas of Living Australia">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title><g:layoutTitle/></title>
-    <link href="https://www.ala.org.au/wp-content/themes/ala2011/images/favicon.ico" rel="shortcut icon"
-          type="image/x-icon"/>
-
+    <link href="${grailsApplication.config.skin.favicon}"  rel="icon"/>
     <link rel="stylesheet" href="${grailsApplication.config.headerAndFooter.baseURL}/css/bootstrap.min.css"/>
     <link rel="stylesheet" href="${grailsApplication.config.headerAndFooter.baseURL}/css/bootstrap-responsive.min.css"/>
     <link rel="stylesheet" href="${grailsApplication.config.headerAndFooter.baseURL}/css/ala-styles.css"/>
diff --git a/grails-app/views/layouts/configurableHubTemplate1.gsp b/grails-app/views/layouts/configurableHubTemplate1.gsp
@@ -87,8 +87,7 @@
     <g:layoutHead/>
     <link rel="stylesheet" type="text/css"
           href="${createLink(controller: 'hub', action: 'getStyleSheet')}?hub=${hubConfig.urlPath}&ver=${hubConfig.lastUpdated}">
-    <link href="https://www.ala.org.au/wp-content/themes/ala2011/images/favicon.ico" rel="shortcut icon"
-          type="image/x-icon"/>
+    <link href="${grailsApplication.config.skin.favicon}"  rel="icon"/>
 </head>
 
 <body class="${pageProperty(name: 'body.class') ?: 'nav-collections'}" id="${pageProperty(name: 'body.id')}"
