From e7b6a9c4774491e06073c19c20837eae366174b1 Mon Sep 17 00:00:00 2001
From: rra <r.roscamabbing@artez.nl>
Date: Sat, 19 May 2018 12:29:30 +0200
Subject: [PATCH] update syndication, site urls, make static banner unclickable

---
 theme/wttf/templates/article.html     |  4 ++--
 theme/wttf/templates/base.html        |  8 ++++----
 theme/wttf/templates/index.html       |  2 +-
 theme/wttf/templates/syndication.html | 17 +++++++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/theme/wttf/templates/article.html b/theme/wttf/templates/article.html
index b5e582e..9b239f1 100644
--- a/theme/wttf/templates/article.html
+++ b/theme/wttf/templates/article.html
@@ -8,7 +8,7 @@
 
 {% block header %}
 <h1 id="menu" class="sticky">
-	<a href="/{{SITEURL}}">Welcome to
+	<a href="{{SITEURL}}/">Welcome to
 	the 
 	 <select onchange="window.location.href=this.value">
 	 	{%- for t, article in tags|sort %}
@@ -32,7 +32,7 @@
 		<span class="entry-tags">
 			{% for tag in article.tags %}
 				<span itemprop="keywords">
-					<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+					<a href="{{ SITEURL }}/{{ tag.url }}" rel="tag">{{ tag }}</a>
 				</span> 
 			{% endfor %}
 		</span> 
diff --git a/theme/wttf/templates/base.html b/theme/wttf/templates/base.html
index 3978258..b949157 100644
--- a/theme/wttf/templates/base.html
+++ b/theme/wttf/templates/base.html
@@ -11,7 +11,7 @@
 		{% from 'syndication.html' import syndication with context %}
 		{{ syndication(article) }}
 
-		<link rel="icon" href="{{ SITEURL}}/favicon.ico" type="image/x-icon">
+		<link rel="icon" href="{{ SITEURL }}/favicon.ico" type="image/x-icon">
 	{% if FEED_ALL_ATOM %}
 		<link href="{{ FEED_DOMAIN }}/{% if FEED_ALL_ATOM_URL %}{{ FEED_ALL_ATOM_URL }}{% else %}{{ FEED_ALL_ATOM }}{% endif %}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Full Atom Feed" />
 		{% endif %}
@@ -60,14 +60,14 @@
 			</div>
 		</h1>
 		<h1 id="menu" class="sticky">
-			<a href="{{SITEURL}}">Welcome to
+			Welcome to
 			the <span id="character">�</span> 
 			 <select onchange="window.location.href=this.value">
 			 	{%- for t, article in tags|sort %}
 				<option value="{{SITEURL}}/{{ t.url }}" {% if t == tag %}selected{% endif %}>{{ t }}</option>
 				{% endfor %}
 			</select> 
-			Federation</a>
+			Federation
 		</h1>
 		{% endblock %}
 	</header>
@@ -89,7 +89,7 @@
 		var t = getRandom(-5,95);
 		var l = getRandom(-5,98);
 		var s = getRandom(1,6);
-		$('header #menu.main').append('<img class="shape" src="/theme/img/shape'+s.toString()+'.svg" style="top:'+t.toString()+'%; left:'+l.toString()+'%;"/>');
+		$('header #menu.main').append('<img class="shape" src="{{ SITEURL }}/theme/img/shape'+s.toString()+'.svg" style="top:'+t.toString()+'%; left:'+l.toString()+'%;"/>');
 	}
 </script>
 </html>
diff --git a/theme/wttf/templates/index.html b/theme/wttf/templates/index.html
index ce7646c..77dd1c8 100644
--- a/theme/wttf/templates/index.html
+++ b/theme/wttf/templates/index.html
@@ -73,7 +73,7 @@
 							<span class="entry-tags">
 								{% for tag in article.tags %}
 									<span itemprop="keywords">
-										<a href="/{{ tag.url }}" rel="tag">{{ tag }}</a>
+										<a href="{{ SITEURL }}/{{ tag.url }}" rel="tag">{{ tag }}</a>
 									</span> 
 								{% endfor %}
 							</span> 
diff --git a/theme/wttf/templates/syndication.html b/theme/wttf/templates/syndication.html
index ea55fb6..e96d5b5 100644
--- a/theme/wttf/templates/syndication.html
+++ b/theme/wttf/templates/syndication.html
@@ -5,7 +5,7 @@
 {# Thumbnail image to show when homepage is shared on social media. It also
 serves as the default image for posts whose featured_image is not set. #}
 {% if not FEATURED_IMAGE %}
-{% set FEATURED_IMAGE = 'https://roelof.info/~r/wttf/images/fi.png' %}
+{% set FEATURED_IMAGE = 'https://roelof.info/~r/wttf/images/fi.jpg' %}
 {% else %}
 {% set FEATURED_IMAGE = FEATURED_IMAGE %}
 {% endif %}
@@ -24,16 +24,16 @@ serves as the default image for posts whose featured_image is not set. #}
 {% if article.locale_modified and article.modified %}
 <meta property="" content="{{ article.modified.isoformat() }}" />
 {% endif %}
-<meta name="twitter:card" content="summary_large_image">
 <meta name="twitter:title" content="{{ article.title|striptags|e }} {%if article.subtitle %} - {{ article.subtitle|striptags|e }} {% endif %}">
 <meta name="twitter:description" content="{% if article.summary %}{{article.summary|striptags}}{% endif %}">
 {% if article.featured_image %}
     {% if I18N_SUBSITES %}
     {% for lang, url in I18N_SUBSITES.items() %}
-        {% if lang == 'en' %} 
-<meta property="og:image" content="{{SITEURL}}{{article.featured_image}}" />
-<meta property="og:image:secure_url" content="{{SITEURL}}{{article.featured_image}}" />
-<meta name="twitter:image" content="{{SITEURL}}{{article.featured_image}}" >           
+        {% if lang == 'en' %}
+<meta name="twitter:card" content="summary_large_image">
+<meta property="og:image" content="{{SITEURL}}/{{article.featured_image}}" />
+<meta property="og:image:secure_url" content="{{SITEURL}}/{{article.featured_image}}" />
+<meta name="twitter:image" content="{{SITEURL}}/{{article.featured_image}}" >           
         {% endif %}
     {% endfor %}
 {% endif %}
@@ -43,14 +43,15 @@ serves as the default image for posts whose featured_image is not set. #}
     <meta name="twitter:image" content="{{FEATURED_IMAGE}}" >
     {% endif %}
 {% endif %}
+<meta name="twitter:card" content="summary" />
 {% endif %}
 {% if not article %}
 <meta property="og:title" content="{{ SITENAME|striptags|e }}"/>
 <meta name="twitter:title" content="{{ SITENAME|striptags|e }}">
 <meta name="twitter:card" content="summary" />
 <meta property="og:url" content="{{ SITEURL }}" />
-<meta property="og:description" content="{{ SITESUBTITLE }}">
-<meta property="twitter:description" content=" {{ SITESUBTITLE }}">
+<meta property="og:description" content="{{ SUBTITLE }}">
+<meta property="twitter:description" content=" {{ SUBTITLE }}">
 <meta property="og:site_name" content="{{ SITENAME|striptags|e }}" />
 <meta property="og:article:author" content="{{ AUTHOR }}" />
 {% if FEATURED_IMAGE %}