Merge branch 'release/2.6.3'

deployment/ansible/roles.yml

@@ -1,5 +1,5 @@
 - src: azavea.opentripplanner
-  version: 1.1.0
+  version: 1.1.1
 
 - src: azavea.nginx
   version: 0.3.1

python/cac_tripplanner/templates/base.html

@@ -24,19 +24,18 @@
     <meta property="fb:app_id" content="{{ fb_app_id }}" />
     <meta property="fb:pages" content="299797223477237" />
     <meta property="fb:profile_id" content="gophillygo" />
-    <meta property="og:url"
-    content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/" />
+    <meta property="og:url" content="{{ request.build_absolute_uri }}" />
     <meta property="og:description"
         content="GoPhillyGo from the Clean Air Council, for planning transit, walking, and biking trips around the Delaware Valley region.  Features parks and other destinations." />
     <meta property="og:site_name" content="GoPhillyGo" />
     <meta property="og:locale" content="en_US" />
     <meta name="twitter:card" content="summary" />
     <meta name="twitter:site" content="@go_philly_go" />
     <meta name="twitter:description" content="Helping you get around greater Philly" />
-    <meta property="og:image:width" content="360" />
-    <meta property="og:image:height" content="360" />
-    <meta property="og:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/logo@2x.png" />
-    <meta name="twitter:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/logo@2x.png" />
+    <meta property="og:image:width" content="1200" />
+    <meta property="og:image:height" content="600" />
+    <meta property="og:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/sharing_logo_1200_600.png" />
+    <meta name="twitter:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/sharing_logo_1200_600.png" />
     {% endblock %}
 
     {% include "partials/ios-weblinks.html" %}

python/cac_tripplanner/templates/event-detail.html

@@ -16,16 +16,17 @@
 <meta property="fb:app_id" content="{{ fb_app_id }}" />
 <meta property="fb:pages" content="299797223477237" />
 <meta property="fb:profile_id" content="gophillygo" />
-<meta property="og:url"
-    content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/" />
+<meta property="og:url" content="{{ request.build_absolute_uri }}" />
 <meta property="og:site_name" content="GoPhillyGo" />
 <meta property="og:locale" content="en_US" />
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@go_philly_go" />
 <meta property="og:description" content="{{ event.description|striptags }}" />
 <meta name="twitter:description" content="{{ event.description|striptags }}" />
-<meta property="og:image" content="{% cropped_thumbnail event 'wide_image' %}" />
-<meta name="twitter:image" content="{% cropped_thumbnail event 'wide_image' %}" />
+<meta property="og:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail event 'wide_image' %}" />
+<meta name="twitter:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail event 'wide_image' %}" />
+<meta name="og:image:alt" content="{{ event.description|striptags }}" />
+<meta name="twitter:image:alt" content="{{ event.description|striptags }}" />
 <meta property="og:image:width" content="680" />
 <meta property="og:image:height" content="400" />
 {% endblock %}

python/cac_tripplanner/templates/learn-detail.html

@@ -16,8 +16,7 @@
 <meta property="fb:app_id" content="{{ fb_app_id }}" />
 <meta property="fb:pages" content="299797223477237" />
 <meta property="fb:profile_id" content="gophillygo" />
-<meta property="og:url"
-    content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}" />
+<meta property="og:url" content="{{ request.build_absolute_uri }}" />
 <meta property="og:description" content="{{ article.teaser|striptags }}" />
 <meta property="og:image" content="{{ article.image.url }}" />
 <meta property="og:image:width" content="400" />
@@ -28,8 +27,10 @@
 <meta name="twitter:site" content="@go_philly_go" />
 <meta property="og:description" content="{{ article.teaser|striptags }}" />
 <meta name="twitter:description" content="{{ article.teaser|striptags }}" />
-<meta property="og:image" content="{% cropped_thumbnail article 'wide_image' %}" />
-<meta name="twitter:image" content="{% cropped_thumbnail article 'wide_image' %}" />
+<meta property="og:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail article 'wide_image' %}" />
+<meta name="twitter:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail article 'wide_image' %}" />
+<meta name="og:image:alt" content="{{ article.teaser|striptags }}" />
+<meta name="twitter:image:alt" content="{{ article.teaser|striptags }}" />
 <meta property="og:image:width" content="680" />
 <meta property="og:image:height" content="200" />
 {% endblock %}

python/cac_tripplanner/templates/partials/footer.html

@@ -17,6 +17,8 @@ <h2>About</h2>
             <p>
                 GoPhillyGo is a project of the Clean Air Council, Azavea, and Warkulwiz Design Associates. The project is funded by the William Penn Foundation.
             </p>
+            <p><a href="/privacy_policy" target="_blank">Privacy Policy</a></p>
+            <p><a href="/terms_of_service" target="_blank">Terms of Service</a></p>
         </a>
     </div>
     <div class="footer-compact tab-control">

python/cac_tripplanner/templates/place-detail.html

@@ -16,16 +16,17 @@
 <meta property="fb:app_id" content="{{ fb_app_id }}" />
 <meta property="fb:pages" content="299797223477237" />
 <meta property="fb:profile_id" content="gophillygo" />
-<meta property="og:url"
-    content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/" />
+<meta property="og:url" content="{{ request.build_absolute_uri }}" />
 <meta property="og:site_name" content="GoPhillyGo" />
 <meta property="og:locale" content="en_US" />
 <meta name="twitter:card" content="summary" />
 <meta name="twitter:site" content="@go_philly_go" />
 <meta name="twitter:description" content="{{ destination.description|striptags }}" />
 <meta property="og:description" content="{{ destination.description|striptags }}" />
-<meta property="og:image" content="{% cropped_thumbnail destination 'wide_image' %}" />
-<meta name="twitter:image" content="{% cropped_thumbnail destination 'wide_image' %}" />
+<meta property="og:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail destination 'wide_image' %}" />
+<meta name="twitter:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail destination 'wide_image' %}" />
+<meta name="og:image:alt" content="{{ destination.description|striptags }}" />
+<meta name="twitter:image:alt" content="{{ destination.description|striptags }}" />
 <meta property="og:image:width" content="680" />
 <meta property="og:image:height" content="400" />
 {% endblock %}

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_v12';
+var CACHE_NAME = 'cac_tripplanner_v13';
 
 var cacheFiles = {{ cache_files | safe }};