From de0a6de5263937e6b4e59c3d079dff2450916880 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.cc>
Date: Wed, 25 Oct 2017 07:19:20 +0200
Subject: [PATCH 1/4] Just Read: Extended metadata block for non-article pages

---
 Just-Read/templates/base.html | 50 ++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/Just-Read/templates/base.html b/Just-Read/templates/base.html
index a61b22b2c..715b8c4d5 100644
--- a/Just-Read/templates/base.html
+++ b/Just-Read/templates/base.html
@@ -14,9 +14,7 @@
 	<meta name="author" content="{{ AUTHOR }}" />
 	<meta name="copyright" content="{{ AUTHOR }}" />
 	{% endif %}
-
 	<meta property="og:site_name" content="{{SITENAME}}" />
-
 	{% if GOOGLE_PLUS_PROFILE_URL %}
 	<link rel="author" href={{GOOGLE_PLUS_PROFILE_URL}} />
 	{% endif %}
@@ -24,9 +22,8 @@
 	<meta name="twitter:site" content="@{{TWITTER_USERNAME}}" />
 	<meta name="twitter:creator" content="@{{TWITTER_USERNAME}}" />
 	{% endif %}
-
-	{%if article %}
 	<meta name="twitter:card" content="summary" />
+	{%if article %}
 	<meta name="twitter:title" content="{{article.title}}" />
 	<meta name="date" content="{{article.date}}" />
 	<meta property="og:type" content="article" />
@@ -34,21 +31,50 @@
 	<meta property="og:published_time" content="{{article.date}}" />
 	<meta property="og:title" content="{{article.title}}" />
 	<meta property="og:url" content="{{SITEURL}}/{{ article.url }}" />
-	{% if  article.featured_image %}
+		{% if article.featured_image %}
 	
-	{% endif %}
-	{%if DESCRIPTION %}
+		{% endif %}
+		{%if DESCRIPTION %}
 	<meta property="og:description" content="{{DESCRIPTION}} " />
 	<meta name="description" content="{{DESCRIPTION}}" />
-	{%else %}
+		{%else %}
 	<meta property="og:description" content="{{article.summary|striptags}}" />
 	<meta name="description" content="{{article.summary|striptags}}" />
-	{% endif %}
-	{%if FACEBOOK_PROFILE_URL %}
+		{% endif %}
+		{%if FACEBOOK_PROFILE_URL %}
 	<meta property="article:author" content="{{FACEBOOK_PROFILE_URL}}" />
+		{% endif %}
+	{% elif page %}
+	<meta name="twitter:title" content="{{page.title}}" />
+	<meta name="date" content="{{page.date}}" />
+	<meta property="og:type" content="website" />
+	<meta property="og:locale" content="{{page.lang}}" />
+	<meta property="og:published_time" content="{{page.date}}" />
+	<meta property="og:title" content="{{page.title}}" />
+	<meta property="og:url" content="{{SITEURL}}/{{ page.url }}" />
+		{% if page.featured_image %}
+	
+		{% endif %}
+		{%if DESCRIPTION %}
+	<meta property="og:description" content="{{DESCRIPTION}} " />
+	<meta name="description" content="{{DESCRIPTION}}" />
+		{%else %}
+	<meta property="og:description" content="{{page.summary|striptags}}" />
+	<meta name="description" content="{{page.summary|striptags}}" />
+		{% endif %}
+	{% else %}
+	<meta name="twitter:title" content="{{SITENAME}}" />
+	<meta property="og:type" content="website" />
+		{% if DEFAULT_LANG %}
+	<meta property="og:locale" content="{{DEFAULT_LANG}}" />
+		{% endif %}
+	<meta property="og:title" content="{{SITENAME}}" />
+	<meta property="og:url" content="{{SITEURL}}/{{ output_file }}" />
+		{%if DESCRIPTION %}
+	<meta property="og:description" content="{{DESCRIPTION}} " />
+	<meta name="description" content="{{DESCRIPTION}}" />
+		{% endif %}
 	{% endif %}
-	{% endif %}
-
 	<meta name="HandheldFriendly" content="True" />
 	<meta name="MobileOptimized" content="320" />
 	<meta name="viewport" content="width=device-width, target-densitydpi=160dpi, initial-scale=1.0" />

From 9d033a3ea6efd51af3926b02394596652ed97c97 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias@schmidl.cc>
Date: Mon, 13 Nov 2017 10:03:33 +0100
Subject: [PATCH 2/4] fixup! Just Read: Extended metadata block for non-article
 pages

---
 Just-Read/templates/base.html | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Just-Read/templates/base.html b/Just-Read/templates/base.html
index 715b8c4d5..8b980b5ab 100644
--- a/Just-Read/templates/base.html
+++ b/Just-Read/templates/base.html
@@ -31,19 +31,19 @@
 	<meta property="og:published_time" content="{{article.date}}" />
 	<meta property="og:title" content="{{article.title}}" />
 	<meta property="og:url" content="{{SITEURL}}/{{ article.url }}" />
-		{% if article.featured_image %}
+	{% if article.featured_image %}
 	
-		{% endif %}
-		{%if DESCRIPTION %}
+	{% endif %}
+	{%if DESCRIPTION %}
 	<meta property="og:description" content="{{DESCRIPTION}} " />
 	<meta name="description" content="{{DESCRIPTION}}" />
-		{%else %}
+	{%else %}
 	<meta property="og:description" content="{{article.summary|striptags}}" />
 	<meta name="description" content="{{article.summary|striptags}}" />
-		{% endif %}
-		{%if FACEBOOK_PROFILE_URL %}
+	{% endif %}
+	{%if FACEBOOK_PROFILE_URL %}
 	<meta property="article:author" content="{{FACEBOOK_PROFILE_URL}}" />
-		{% endif %}
+	{% endif %}
 	{% elif page %}
 	<meta name="twitter:title" content="{{page.title}}" />
 	<meta name="date" content="{{page.date}}" />
@@ -52,28 +52,28 @@
 	<meta property="og:published_time" content="{{page.date}}" />
 	<meta property="og:title" content="{{page.title}}" />
 	<meta property="og:url" content="{{SITEURL}}/{{ page.url }}" />
-		{% if page.featured_image %}
+	{% if page.featured_image %}
 	
-		{% endif %}
-		{%if DESCRIPTION %}
+	{% endif %}
+	{%if DESCRIPTION %}
 	<meta property="og:description" content="{{DESCRIPTION}} " />
 	<meta name="description" content="{{DESCRIPTION}}" />
-		{%else %}
+	{%else %}
 	<meta property="og:description" content="{{page.summary|striptags}}" />
 	<meta name="description" content="{{page.summary|striptags}}" />
-		{% endif %}
+	{% endif %}
 	{% else %}
 	<meta name="twitter:title" content="{{SITENAME}}" />
 	<meta property="og:type" content="website" />
-		{% if DEFAULT_LANG %}
+	{% if DEFAULT_LANG %}
 	<meta property="og:locale" content="{{DEFAULT_LANG}}" />
-		{% endif %}
+	{% endif %}
 	<meta property="og:title" content="{{SITENAME}}" />
 	<meta property="og:url" content="{{SITEURL}}/{{ output_file }}" />
-		{%if DESCRIPTION %}
+	{%if DESCRIPTION %}
 	<meta property="og:description" content="{{DESCRIPTION}} " />
 	<meta name="description" content="{{DESCRIPTION}}" />
-		{% endif %}
+	{% endif %}
 	{% endif %}
 	<meta name="HandheldFriendly" content="True" />
 	<meta name="MobileOptimized" content="320" />

From 2d078b7f4b0a73ffb2d1bb4dfd43997484411dff Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias.schmidl@corpuls.com>
Date: Fri, 11 May 2018 12:29:19 +0200
Subject: [PATCH 3/4] Justi Read: Replaced twitter widget

This new version is more suitable for a CSP setting
---
 Just-Read/templates/article.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Just-Read/templates/article.html b/Just-Read/templates/article.html
index c68487c5a..1539b78ed 100644
--- a/Just-Read/templates/article.html
+++ b/Just-Read/templates/article.html
@@ -8,8 +8,7 @@ <h1>{{ article.title }}</h1>
 			{{ article.content }}
 			
 			<a href="https://twitter.com/share" class="twitter-share-button" data-via="{{ TWITTER_USERNAME }}" data-lang="en" data-size="large" data-related="{{ TWITTER_USERNAME }}">Tweet</a>
-			<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-						
+			<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 			{% if DISQUS_SITENAME %}
 			<div class="comments">
 			<h2>Comments !</h2>

From 2ba901d67bfef24d1c6066dfb11f683baca06db2 Mon Sep 17 00:00:00 2001
From: Tobias Schmidl <tobias.schmidl@corpuls.com>
Date: Fri, 11 May 2018 12:46:39 +0200
Subject: [PATCH 4/4] Just Read: Replaced disqus code with new version from
 disqus.com

---
 Just-Read/templates/article.html | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/Just-Read/templates/article.html b/Just-Read/templates/article.html
index 1539b78ed..038eb3ba0 100644
--- a/Just-Read/templates/article.html
+++ b/Just-Read/templates/article.html
@@ -6,25 +6,31 @@
 		<div class="post wrapper">
 			<h1>{{ article.title }}</h1>
 			{{ article.content }}
-			
+
 			<a href="https://twitter.com/share" class="twitter-share-button" data-via="{{ TWITTER_USERNAME }}" data-lang="en" data-size="large" data-related="{{ TWITTER_USERNAME }}">Tweet</a>
 			<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
 			{% if DISQUS_SITENAME %}
 			<div class="comments">
-			<h2>Comments !</h2>
-			    <div id="disqus_thread"></div>
-			    <script type="text/javascript">
-			       var disqus_identifier = "{{ article.url }}";
-			       (function() {
-			       var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-			       dsq.src = 'https://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
-			       (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-			      })();
-			    </script>
+				<h2>Comments !</h2>
+				<div id="disqus_thread"></div>
+				<script>
+					var disqus_config = function () {
+						this.page.url = "{{ SITEURL }}/{{ article.url }}";
+						this.page.identifier = "{{ article.slug }}";
+						this.page.title = "{{ article.title }}";
+					};
+					(function() {
+						var d = document, 
+							s = d.createElement('script');
+						s.src = 'https://{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+						s.setAttribute('data-timestamp', +new Date());
+						(d.head || d.body).appendChild(s);
+					})();
+				</script>
+				<noscript>Please enable JavaScript to view the <a href="https://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
 			</div>
-			{% endif %}			
+			{% endif %}
 		</div>
-	
 	{% include 'metadata.html' %}
 	</article>	
 </div>