Merge branch 'release/2.6.18'

azavea · Jul 1, 2019 · f90d533 · f90d533
2 parents 691bb2c + 00360c4
commit f90d533
Show file tree

Hide file tree

Showing 10 changed files with 968 additions and 911 deletions.
diff --git a/deployment/ansible/group_vars/all b/deployment/ansible/group_vars/all
@@ -11,8 +11,8 @@ postgres_host: "192.168.8.25"
 
 packer_version: "1.0.2"
 
-nodejs_version: 10.15.3
-nodejs_npm_version: 6.4.1
+nodejs_version: 10.16.0
+nodejs_npm_version: 6.9.0
 
 pip_version: 19.1.*
 virtualenv_version: 16.5.0

diff --git a/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml b/deployment/ansible/roles/cac-tripplanner.app/defaults/main.yml
@@ -15,15 +15,15 @@ root_media_dir: "/media/cac"
 cac_python_dependencies:
     - { name: 'base58', version: '1.0.3' }
     - { name: 'boto', version: '2.49.0' }
-    - { name: 'django', version: '1.11.20' }
-    - { name: 'django-ckeditor', version: '5.6.1' }
+    - { name: 'django', version: '1.11.21' }
+    - { name: 'django-ckeditor', version: '5.7.1' }
     - { name: 'django-image-cropping', version: '1.2.0' }
     - { name: 'django-extensions', version: '1.9.9' }
     - { name: 'django-storages', version: '1.7.1' }
     - { name: 'easy-thumbnails', version: '2.6.0' }
     - { name: 'gunicorn', version: '19.9.0' }
     - { name: 'Pillow', version: '6.0.0' }
-    - { name: 'psycopg2-binary', version: '2.8.2' }
+    - { name: 'psycopg2-binary', version: '2.8.3' }
     - { name: 'pytz', version: '2019.1' }
     - { name: 'troposphere', version: '1.8.1' }
     - { name: 'majorkirby', version: '0.2.1' }

diff --git a/python/cac_tripplanner/templates/event-detail.html b/python/cac_tripplanner/templates/event-detail.html
@@ -52,7 +52,7 @@ <h3>More great events around Philly</h3>
 
 {%block jspage %}
 <script type="text/javascript">
-jQuery(document).ready(function ($) {
+jQuery(document).ready(function () {
     tns({
         container: '.detail-image-carousel',
         autoplayButton: false,
@@ -66,6 +66,7 @@ <h3>More great events around Philly</h3>
         slideBy: 'page',
         autoplay: true
     });
+    jQuery('.detail-image-carousel-extra-image').removeClass('hidden');
 });
 </script>
 {% endblock %}
diff --git a/python/cac_tripplanner/templates/partials/destination-detail.html b/python/cac_tripplanner/templates/partials/destination-detail.html
@@ -7,7 +7,8 @@
             <div class="detail-image-carousel">
                 <img src="{% cropped_thumbnail destination 'wide_image' %}">
                 {% for extra_image in destination.extradestinationpicture_set.all %}
-                <img src="{% cropped_thumbnail extra_image 'wide_image' %}">
+                <img class="detail-image-carousel-extra-image hidden"
+                     src="{% cropped_thumbnail extra_image 'wide_image' %}">
                 {% endfor %}
             </div>
         </div>

diff --git a/python/cac_tripplanner/templates/partials/event-detail.html b/python/cac_tripplanner/templates/partials/event-detail.html
@@ -9,7 +9,8 @@
             <div class="detail-image-carousel">
                 <img src="{% cropped_thumbnail event "wide_image" %}">
                 {% for extra_image in event.extraeventpicture_set.all %}
-                <img src="{% cropped_thumbnail extra_image 'wide_image' %}">
+                <img class="detail-image-carousel-extra-image hidden"
+                     src="{% cropped_thumbnail extra_image 'wide_image' %}">
                 {% endfor %}
             </div>
         </div>

diff --git a/python/cac_tripplanner/templates/place-detail.html b/python/cac_tripplanner/templates/place-detail.html
@@ -52,7 +52,7 @@ <h3>More great, green places around Philly</h3>
 
 {%block jspage %}
 <script type="text/javascript">
-jQuery(document).ready(function ($) {
+jQuery(document).ready(function () {
     tns({
         container: '.detail-image-carousel',
         autoplayButton: false,
@@ -66,6 +66,7 @@ <h3>More great, green places around Philly</h3>
         slideBy: 'page',
         autoplay: true
     });
+    jQuery('.detail-image-carousel-extra-image').removeClass('hidden');
 });
 </script>
 {% endblock %}
diff --git a/python/cac_tripplanner/templates/service-worker.js b/python/cac_tripplanner/templates/service-worker.js
@@ -1,7 +1,7 @@
 // Service Worker to support functioning as a PWA
 // https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers
 
-var CACHE_NAME = 'cac_tripplanner_v22';
+var CACHE_NAME = 'cac_tripplanner_v23';
 
 var cacheFiles = {{ cache_files | safe }};
 

diff --git a/src/app/styles/layouts/_info.scss b/src/app/styles/layouts/_info.scss
@@ -84,6 +84,12 @@
             margin-left: -4rem;
             margin-right: -4rem;
         }
+
+        .detail-image-carousel-extra-image {
+            &.hidden {
+                display: none;
+            }
+        }
     }
 
     .info-article-image-hero {