diff --git a/opentech/static_src/src/images/otf_social.jpg b/opentech/static_src/src/images/otf_social.jpg new file mode 100644 index 0000000000000000000000000000000000000000..926ea5b4bacb3cac9ee4497acf6957eed08e4df0 Binary files /dev/null and b/opentech/static_src/src/images/otf_social.jpg differ diff --git a/opentech/templates/base-apply.html b/opentech/templates/base-apply.html index 2d885f89ccec0dd9c94b9a03a807bab836f0664e..db027ef13f48542defa6ff1b260900b179cb9eec 100644 --- a/opentech/templates/base-apply.html +++ b/opentech/templates/base-apply.html @@ -9,7 +9,7 @@ <!-- favicons --> {% comment %} - Generate favicons by http://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons. + Generate favicons by https://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons. Then favicon.ico should be copied to a directory called "public" in the application root and puppet does some magic to serve it up at the site root. {% endcomment %} <link rel="icon" sizes="144x144" href="{% static 'images/favicons/android-chrome-144.png' %}"> diff --git a/opentech/templates/base.html b/opentech/templates/base.html index e4b81750677a877eac14f192aab9286ff84d4668..94e1cd306d2ef3fa48167831508a0af03cccee3a 100644 --- a/opentech/templates/base.html +++ b/opentech/templates/base.html @@ -9,7 +9,7 @@ <!-- favicons --> {% comment %} - Generate favicons by http://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons. + Generate favicons by https://realfavicongenerator.net using the following path: settings.STATIC_URL + img/favicons. Then favicon.ico should be copied to a directory called "public" in the application root and puppet does some magic to serve it up at the site root. {% endcomment %} <link rel="icon" sizes="144x144" href="{% static 'images/favicons/android-chrome-144.png' %}"> @@ -32,10 +32,10 @@ <meta name="twitter:title" content="{{ page.title }}" /> <meta name="twitter:description" content="{{ page|social_text:request.site }}"> {% if page.social_image %} - {% image page.social_image width-320 as social_img %} - <meta name="twitter:image" content="{{ request.site.root_url }}{{ social_img.url }}"> + {% image page.social_image width-320 as social_img %} + <meta name="twitter:image" content="{{ request.site.root_url }}{{ social_img.url }}"> {% else %} - <!-- Add a default image to use for social sharing here in case one is not provided on the page. --> + <meta name="twitter:image" content="{{ request.site.root_url }}{% static 'images/otf_social.jpg' %}"> {% endif %} <!--facebook opengraph tags--> @@ -44,9 +44,9 @@ <meta property="og:url" content="{{ page.url }}" /> <meta property="og:title" content="{{ page.title }}" /> {% if page.social_image %} - <meta property="og:image" content="http://{{ request.site.hostname }}{{ social_img.url }}" /> + <meta property="og:image" content="{{ request.site.root_url }}{{ social_img.url }}" /> {% else %} - <!-- Add a default image to use for social sharing here in case one is not provided on the page. --> + <meta property="og:image" content="{{ request.site.root_url }}{% static 'images/otf_social.jpg' %}" /> {% endif %} <meta property="og:description" content="{{ page|social_text:request.site }}" /> <meta property="og:site_name" content="{{ settings.utils.SocialMediaSettings.site_name }}" />