From 4f4bd92820a72f1c28c414f13cd6667886c056ac Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Mon, 8 Jun 2020 19:08:09 +0200
Subject: Improve license section.

- Use local image for license icon.
- Clarify that the text and images/other elements are licensed
separately.
- Add license blurb to all pages.
- Translate license blurb.
---
 templates/license.html            | 11 +++++++++++
 templates/page.html               |  3 +++
 templates/shortcodes/license.html | 19 -------------------
 3 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 templates/license.html
 delete mode 100644 templates/shortcodes/license.html

(limited to 'templates')

diff --git a/templates/license.html b/templates/license.html
new file mode 100644
index 0000000..ace73cc
--- /dev/null
+++ b/templates/license.html
@@ -0,0 +1,11 @@
+<div class="license">
+	<div class="cc-by-sa-logo">
+		<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
+			<img alt="Creative Commons-lisens"
+					 src="{{ get_url(path="cc-by-sa-logo.jpg") | safe }}" />
+		</a>
+	</div>
+	<div class="license-text">
+		{{ trans(key="lic_content", lang=lang) | markdown | safe }}
+	</div>
+</div>
diff --git a/templates/page.html b/templates/page.html
index 6a6b280..1ad56a9 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -11,5 +11,8 @@
 	<section class="post-body">
 		{{ post.content | safe }}
 	</section>
+	<footer>
+		{% include "license.html" %}
+	</footer>
 </article>
 {% endblock content %}
diff --git a/templates/shortcodes/license.html b/templates/shortcodes/license.html
deleted file mode 100644
index 8e9a1aa..0000000
--- a/templates/shortcodes/license.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="license">
-	<div class="cc-by-sa-logo">
-		<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
-			<img alt="Creative Commons-lisens" style="border-width:0"
-				src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" />
-		</a>
-	</div>
-	<div class="license-text">
-		Innholdet på denne siden er publisert av
-		<a xmlns:cc="http://creativecommons.org/ns#"
-			 href="{{ page.permalink }}"
-			property="cc:attributionName"
-			rel="cc:attributionURL">
-			Rabalder/Harald Eilertsen</a>
-		og gjort tilgjengelig under en
-		<a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">
-			Creative Commons Navngivelse-DelPåSammeVilkår 4.0 Internasjonal lisens</a>.
-	</div>
-</div>
-- 
cgit v1.2.3