Merge branch 'hotfix/4.8.9'

AtlasOfLivingAustralia · Feb 20, 2020 · d142e03 · d142e03
2 parents 809460b + ea4ec05
commit d142e03
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 32 deletions.
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.8
+app.version=4.8.9
diff --git a/grails-app/assets/javascripts/base.js b/grails-app/assets/javascripts/base.js
@@ -6,4 +6,5 @@
 //= require jquery-ui/1.9.2/jquery-ui-1.9.2.custom.js
 //= require jquery.appear/jquery.appear.js
 //= require bootstrap/js/bootstrap.js
-//= require bootstrap-combobox/bootstrap-combobox.js
+//= require bootstrap-combobox/bootstrap-combobox.js
+//= require fieldcapture-application.js
diff --git a/grails-app/assets/javascripts/common.js b/grails-app/assets/javascripts/common.js
@@ -13,7 +13,6 @@
 //= require moment/moment.min.js
 //= require moment/moment-timezone-with-data.min.js
 //= require vkbeautyfy/vkbeautify.0.99.00.beta.js
-//= require fieldcapture-application.js
 //= require knockout-dates.js
 //= require knockout-custom-bindings.js
 //= require knockout-custom-extenders.js

diff --git a/grails-app/assets/javascripts/project-finder.js b/grails-app/assets/javascripts/project-finder.js
@@ -7,6 +7,8 @@
 // leaflet
 //= require leaflet-manifest.js
 //= require_self
+// responsive table
+//= require responsive-table-stacked/stacked.js
 
 function ProjectFinder(config) {
 

diff --git a/grails-app/assets/stylesheets/common.css b/grails-app/assets/stylesheets/common.css
@@ -201,6 +201,10 @@ select,input[type="text"],input[type="password"],input[type="datetime"],input[ty
     margin-left: 20px;
 }
 
+.margin-bottom-0, #overviewDocumentList input[type="text"].margin-bottom-0 {
+    margin-bottom: 0;
+}
+
 .margin-bottom-1 {
     display: inline-block;
     margin-bottom: 10px;
@@ -783,4 +787,10 @@ input.full-width-input {
     #content-starting-point{
         margin-top: 70px;
     }
+}
+
+@media (max-width: 767px) {
+    .modal.fade {
+        top: -500px;
+    }
 }
diff --git a/grails-app/assets/stylesheets/project-finder.css b/grails-app/assets/stylesheets/project-finder.css
@@ -2,6 +2,7 @@
  *= require leaflet-manifest
  *= require facets-filter-view.css
  *= require project-daystogo.css
+ *= require responsive-table-stacked/stacked.css
  */
 
 .projectLogo {
@@ -123,7 +124,6 @@ input[type=checkbox] {
 
 
 #pt-selectors label {
-    color: #C44D34;
     font-weight: 200;
 }
 

diff --git a/grails-app/views/hub/configurableHubTemplate1.gsp b/grails-app/views/hub/configurableHubTemplate1.gsp
@@ -33,6 +33,14 @@ section#breadcrumb {
   /* Echo out a label for the example */
   /*image display size on project finder*/
 }
+
+@media (max-width: 767px) {
+    #main-content>.container-fluid, #custom-footer .container-fluid {
+        padding-left: 5px;
+        padding-right: 5px;
+    }
+}
+
 #main-content h1, #main-content h2, #main-content h3, #main-content h4, #main-content h5 {
   font-family: Roboto, Helvetica, "Helvetica Neue", Arial, sans-serif;
   font-weight: 500;
@@ -367,11 +375,20 @@ section#breadcrumb {
 #main-content #bannerHubOuter .logo {
   left: 80px;
   top: -25px;
-  max-width: 250px;
-  max-height: 250px;
+  width: 350px;
+  height: 300px;
   position: absolute;
   z-index: 5;
 }
+
+@media (max-width: 767px) {
+    #main-content #bannerHubOuter .logo {
+        left: 25px;
+        width: 250px;
+        height: 200px;
+    }
+}
+
 #main-content #pt-search {
   Min-width: 150px;
   Max-width: 300px;
@@ -712,6 +729,11 @@ section#breadcrumb {
   color: ${footertextcolor};
   text-decoration: none;
 }
+
+#custom-footer .navbar-inverse .nav > li {
+  color: ${footertextcolor};
+}
+
 #custom-footer .navbar-inverse .nav > li > a:hover {
   text-decoration: underline;
 }
@@ -752,8 +774,7 @@ section#breadcrumb {
 }
 
 #custom-footer #alaLink.brand {
-  margin-top:10px;
-  margin-right: 10px;
+  margin: 15px;
   display: inline-block;
 }
 
@@ -764,8 +785,7 @@ section#breadcrumb {
 #custom-footer .footer-logo {
   max-height: 100px;
   max-width: 200px;
-  margin-right:10px;
-  margin-top: 10px;
+  margin: 15px;
   vertical-align: top;
 }
 

diff --git a/grails-app/views/layouts/configurableHubTemplate1.gsp b/grails-app/views/layouts/configurableHubTemplate1.gsp
@@ -233,24 +233,26 @@
                     </div><!--/.spanX -->
                     <div class="pull-right">
                         <div class="row-fluid text-right">
-                            <g:each in="${hubConfig.templateConfiguration?.footer?.logos}" var="logo">
-                                <g:if test="${logo.href}">
-                                    <a href="${logo.href}" title="Link to website" target="_blank">
+                            <div class="span12">
+                                <g:each in="${hubConfig.templateConfiguration?.footer?.logos}" var="logo">
+                                    <g:if test="${logo.href}">
+                                        <a href="${logo.href}" title="Link to website" target="_blank" class="do-not-mark-external">
+                                            <img class="footer-logo" src="${logo.url}" alt="Website logo"/>
+                                        </a>
+                                    </g:if>
+                                    <g:else>
                                         <img class="footer-logo" src="${logo.url}" alt="Website logo"/>
-                                    </a>
-                                </g:if>
-                                <g:else>
-                                    <img class="footer-logo" src="${logo.url}" alt="Website logo"/>
-                                </g:else>
-                            </g:each>
-                            <a class="brand text-left" href="http://ala.org.au/" id="alaLink" title="ALA home page">
-                                <img src="${asset.assetPath(src:'mdba/ALA-logo-BW-124x109.png')}" alt="Powered by ALA logo"
-                                     class="headerLogo"/>
-                                <div id="alaHeadingText"><div id="poweredBy">powered by</div>
-                                    <div id="alaBy" class="visible-desktop">Atlas of Living Australia</div>
-                                    <div class="hidden-desktop">ALA</div>
-                                </div>
-                            </a>
+                                    </g:else>
+                                </g:each>
+                                <a class="brand text-left" href="http://ala.org.au/" id="alaLink" title="ALA home page">
+                                    <img src="${asset.assetPath(src:'mdba/ALA-logo-BW-124x109.png')}" alt="Powered by ALA logo"
+                                         class="headerLogo"/>
+                                    <div id="alaHeadingText"><div id="poweredBy">powered by</div>
+                                        <div id="alaBy" class="visible-desktop">Atlas of Living Australia</div>
+                                        <div class="hidden-desktop">ALA</div>
+                                    </div>
+                                </a>
+                            </div>
                         </div>
                     </div>
                 </div>

diff --git a/grails-app/views/shared/_bannerHub.gsp b/grails-app/views/shared/_bannerHub.gsp
@@ -2,7 +2,7 @@
     <div id="bannerHubOuter">
         <g:if test="${hubConfig.logoUrl}">
             <div class="logo">
-                <img src="${hubConfig.logoUrl}">
+                <img class="image-logo" src="${hubConfig.logoUrl}" onload="findLogoScalingClass(this)">
             </div>
         </g:if>
 
@@ -12,9 +12,10 @@
                     <g:set var="images" value="${hubConfig.templateConfiguration.banner.images}"></g:set>
                     <g:each var="image" in="${images}" status="index">
                         <div class="item ${index ==0? 'active' :''}">
-                            <img src="${image.url}">
+                            <div class="" style="background: url(${image.url}) no-repeat center top; max-height: 500px; min-height: 300px; background-size: cover;">
+                            </div>
                             <g:if test="${image.caption}">
-                                <div class="carousel-caption">
+                                <div class="carousel-caption hidden-phone">
                                     <p>${image.caption}</p>
                                 </div>
                             </g:if>

diff --git a/grails-app/views/shared/_listDocuments.gsp b/grails-app/views/shared/_listDocuments.gsp
@@ -1,9 +1,9 @@
-<div class="row-fluid row-eq-height" id="${containerId}">
+<div class="row-fluid" id="${containerId}">
     <div class="span4">
         <div class="btn-toolbar text-right">
             <div class="input-prepend input-append text-left">
                 <span class="add-on"><i class="fa fa-filter"></i></span>
-                <input type="text" data-bind="textInput: documentFilter">
+                <input class="span2 margin-bottom-0" type="text" data-bind="textInput: documentFilter">
                 <div class="btn-group">
                     <button type="button" class="btn dropdown-toggle" data-toggle="dropdown">
                         <span data-bind="text: documentFilterField().label"></span>