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.

8 files changed, 54 insertions, 35 deletions

diff --git a/config.toml b/config.toml
index dc1d75b..3f847c3 100644
--- a/config.toml
+++ b/config.toml
@@ -34,6 +34,10 @@ moreprompt = "Les mer..."
 latest = "Siste innlegg:"
 allposts = "se alle innleggene i"
 read_in = "Les på"
+lic_content = """
+Innholdet på disse sidene er lisensiert under en Creative Commons Navngivelse-DelPåSammeVilkår 4.0
+lisens. [Mer detaljer her](@/lisens.md).
+"""
 en = "English"
 nb = "norsk"
 
@@ -43,6 +47,10 @@ moreprompt = "More..."
 latest = "Latest posts:"
 allposts = "View all posts in"
 read_in = "Read in"
+lic_content = """
+The contents of these pages are licensed under a Creative Commons Attribution-ShareAlike 4.0
+license. [Details here](@/lisens.en.md).
+"""
 en = "english"
 nb = "Norsk"
 
diff --git a/content/lisens.en.md b/content/lisens.en.md
index adf580a..6f7ae29 100644
--- a/content/lisens.en.md
+++ b/content/lisens.en.md
@@ -3,12 +3,19 @@ title = "License and rights"
 slug = "license"
 +++
 
-The content of these pages have been made available under a [Creative Commons
-Attribution ShareAlike](https://creativecommons.org/licenses/by-sa/4.0/)
+The text content of these pages are been made available under a [Creative Commons
+Attribution ShareAlike 4.0 International](https://creativecommons.org/licenses/by-sa/4.0/)
 license.
 
-This means you are free to use the contents of these pages in your own derived
-works, either completely or in part. You only have to give attribution to this
-website, and share your derived work on the same terms.
+This means you are free to quote, link to or reuse the text from these pages in
+your own derived works, either completely or in part. You _must_ however give
+attribution to this website and/or the post author, and share your derived work
+under a compatible license.
 
-{{ license() }}
+Images, video, audio or other elements used on these pages are licensed
+separately, as noted for each element. Where no license is explicitly given,
+the element is under regular copyright, and used in good faith under fair use
+provisions.
+
+The CC BY-SA logo by [Peter Leth](http://www.flickr.com/photos/48310997@N08)
+is licensed under [CC BY-NC 2.0](https://creativecommons.org/licenses/by-nc/2.0/)
diff --git a/content/lisens.md b/content/lisens.md
index c94fa47..663a4a4 100644
--- a/content/lisens.md
+++ b/content/lisens.md
@@ -2,13 +2,19 @@
 title = "Lisens og rettigheter"
 +++
 
-Innholdet på disse sidene er gjort tilgjengelig under en [Creative Commons
-Attribution ShareAlike](https://creativecommons.org/licenses/by-sa/4.0/)
-lisens.
+Teksten på disse sidene er gjort tilgjengelig under en [Creative Commons
+Navngivelse-DelPåSammeVilkår 4.0
+Internasjonal](https://creativecommons.org/licenses/by-sa/4.0/) lisens.
 
-Det betyr at du fritt kan bruke innholdet på disse sidene i eget materiale,
-enten i sin helhet, eller som en base å bygge videre på. Det eneste som kreves
-er at du oppgir en kildehenvisning til at du fant materialet her, og at du
-deler din versjon på samme vilkår.
+Det betyr at du fritt kan sitere, lenke til eller gjenbruke teksten på disse
+sidene i eget materiale, enten i sin helhet, eller som et avledet verk. Det
+kreves imidlertid at du oppgir en kildehenvisning til denne vevsiden og/eller
+innleggets forfatter, og at du deler din versjon under en kompatibel lisens.
 
-{{ license() }}
+Bilder, video, lyd eller andre elementer brukt på disse sidene er lisensiert
+separat, og lisens oppgitt for hvert element. Dersom ingen eksplisitt lisens er
+oppgitt, gjelder ordinær opphavsrett, og elementet er forsøkt brukt i samsvar
+med god skikk, og innenfor [sitatretten](https://snl.no/sitatrett).
+
+CC BY-SA logoen er ved [Peter Leth](http://www.flickr.com/photos/48310997@N08)
+og er lisensiert under [CC BY-NC 2.0](https://creativecommons.org/licenses/by-nc/2.0/)
diff --git a/sass/styles.scss b/sass/styles.scss
index 76a75ab..9b7141d 100644
--- a/sass/styles.scss
+++ b/sass/styles.scss
@@ -56,10 +56,13 @@ pre {
     border-top: 1px solid #aaa;
     padding-top: 0.5em;
     .cc-by-sa-logo {
-        width: 10em;
+        width: 8rem;
     }
     .license-text {
-        font-size: small;
+        font-size: x-small;
+        p {
+            margin-top: 0;
+        }
     }
 }
 
diff --git a/static/cc-by-sa-logo.jpg b/static/cc-by-sa-logo.jpg
new file mode 100644
index 0000000..4451854
--- /dev/null
+++ b/static/cc-by-sa-logo.jpg
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>