Skip to content

Commit d01b729

Browse files
Merge pull request #1062 from flibbertigibbet/feature/kak/social-sharing-improvements#1021
Feature/kak/social sharing improvements#1021
2 parents 3e1d998 + be0ad3c commit d01b729

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

deployment/ansible/roles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- src: azavea.opentripplanner
2-
version: 1.1.0
2+
version: 1.1.1
33

44
- src: azavea.nginx
55
version: 0.3.1

python/cac_tripplanner/templates/base.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,18 @@
2424
<meta property="fb:app_id" content="{{ fb_app_id }}" />
2525
<meta property="fb:pages" content="299797223477237" />
2626
<meta property="fb:profile_id" content="gophillygo" />
27-
<meta property="og:url"
28-
content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/" />
27+
<meta property="og:url" content="{{ request.build_absolute_uri }}" />
2928
<meta property="og:description"
3029
content="GoPhillyGo from the Clean Air Council, for planning transit, walking, and biking trips around the Delaware Valley region. Features parks and other destinations." />
3130
<meta property="og:site_name" content="GoPhillyGo" />
3231
<meta property="og:locale" content="en_US" />
3332
<meta name="twitter:card" content="summary" />
3433
<meta name="twitter:site" content="@go_philly_go" />
3534
<meta name="twitter:description" content="Helping you get around greater Philly" />
36-
<meta property="og:image:width" content="360" />
37-
<meta property="og:image:height" content="360" />
38-
<meta property="og:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/logo@2x.png" />
39-
<meta name="twitter:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/logo@2x.png" />
35+
<meta property="og:image:width" content="1200" />
36+
<meta property="og:image:height" content="600" />
37+
<meta property="og:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/sharing_logo_1200_600.png" />
38+
<meta name="twitter:image" content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/static/images/sharing_logo_1200_600.png" />
4039
{% endblock %}
4140

4241
{% include "partials/ios-weblinks.html" %}

python/cac_tripplanner/templates/event-detail.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
<meta property="fb:app_id" content="{{ fb_app_id }}" />
1717
<meta property="fb:pages" content="299797223477237" />
1818
<meta property="fb:profile_id" content="gophillygo" />
19-
<meta property="og:url"
20-
content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/" />
19+
<meta property="og:url" content="{{ request.build_absolute_uri }}" />
2120
<meta property="og:site_name" content="GoPhillyGo" />
2221
<meta property="og:locale" content="en_US" />
2322
<meta name="twitter:card" content="summary" />
2423
<meta name="twitter:site" content="@go_philly_go" />
2524
<meta property="og:description" content="{{ event.description|striptags }}" />
2625
<meta name="twitter:description" content="{{ event.description|striptags }}" />
27-
<meta property="og:image" content="{% cropped_thumbnail event 'wide_image' %}" />
28-
<meta name="twitter:image" content="{% cropped_thumbnail event 'wide_image' %}" />
26+
<meta property="og:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail event 'wide_image' %}" />
27+
<meta name="twitter:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail event 'wide_image' %}" />
28+
<meta name="og:image:alt" content="{{ event.description|striptags }}" />
29+
<meta name="twitter:image:alt" content="{{ event.description|striptags }}" />
2930
<meta property="og:image:width" content="680" />
3031
<meta property="og:image:height" content="400" />
3132
{% endblock %}

python/cac_tripplanner/templates/learn-detail.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
<meta property="fb:app_id" content="{{ fb_app_id }}" />
1717
<meta property="fb:pages" content="299797223477237" />
1818
<meta property="fb:profile_id" content="gophillygo" />
19-
<meta property="og:url"
20-
content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}" />
19+
<meta property="og:url" content="{{ request.build_absolute_uri }}" />
2120
<meta property="og:description" content="{{ article.teaser|striptags }}" />
2221
<meta property="og:image" content="{{ article.image.url }}" />
2322
<meta property="og:image:width" content="400" />
@@ -28,8 +27,10 @@
2827
<meta name="twitter:site" content="@go_philly_go" />
2928
<meta property="og:description" content="{{ article.teaser|striptags }}" />
3029
<meta name="twitter:description" content="{{ article.teaser|striptags }}" />
31-
<meta property="og:image" content="{% cropped_thumbnail article 'wide_image' %}" />
32-
<meta name="twitter:image" content="{% cropped_thumbnail article 'wide_image' %}" />
30+
<meta property="og:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail article 'wide_image' %}" />
31+
<meta name="twitter:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail article 'wide_image' %}" />
32+
<meta name="og:image:alt" content="{{ article.teaser|striptags }}" />
33+
<meta name="twitter:image:alt" content="{{ article.teaser|striptags }}" />
3334
<meta property="og:image:width" content="680" />
3435
<meta property="og:image:height" content="200" />
3536
{% endblock %}

python/cac_tripplanner/templates/partials/footer.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ <h2>About</h2>
1717
<p>
1818
GoPhillyGo is a project of the Clean Air Council, Azavea, and Warkulwiz Design Associates. The project is funded by the William Penn Foundation.
1919
</p>
20+
<p><a href="/privacy_policy" target="_blank">Privacy Policy</a></p>
21+
<p><a href="/terms_of_service" target="_blank">Terms of Service</a></p>
2022
</a>
2123
</div>
2224
<div class="footer-compact tab-control">

python/cac_tripplanner/templates/place-detail.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,17 @@
1616
<meta property="fb:app_id" content="{{ fb_app_id }}" />
1717
<meta property="fb:pages" content="299797223477237" />
1818
<meta property="fb:profile_id" content="gophillygo" />
19-
<meta property="og:url"
20-
content="{% if request.is_secure %}https{% else %}http{% endif %}://{{ request.META.HTTP_HOST }}/" />
19+
<meta property="og:url" content="{{ request.build_absolute_uri }}" />
2120
<meta property="og:site_name" content="GoPhillyGo" />
2221
<meta property="og:locale" content="en_US" />
2322
<meta name="twitter:card" content="summary" />
2423
<meta name="twitter:site" content="@go_philly_go" />
2524
<meta name="twitter:description" content="{{ destination.description|striptags }}" />
2625
<meta property="og:description" content="{{ destination.description|striptags }}" />
27-
<meta property="og:image" content="{% cropped_thumbnail destination 'wide_image' %}" />
28-
<meta name="twitter:image" content="{% cropped_thumbnail destination 'wide_image' %}" />
26+
<meta property="og:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail destination 'wide_image' %}" />
27+
<meta name="twitter:image" content="{{ request.build_absolute_uri }}{% cropped_thumbnail destination 'wide_image' %}" />
28+
<meta name="og:image:alt" content="{{ destination.description|striptags }}" />
29+
<meta name="twitter:image:alt" content="{{ destination.description|striptags }}" />
2930
<meta property="og:image:width" content="680" />
3031
<meta property="og:image:height" content="400" />
3132
{% endblock %}
218 KB
Loading

0 commit comments

Comments
 (0)