Move feedback.md content into global footer

15 files changed, 9 insertions, 39 deletions

diff --git a/_includes/docs-page-footer.md b/_includes/docs-page-footer.md
index 7729b24..39b0c81 100644
--- a/_includes/docs-page-footer.md
+++ b/_includes/docs-page-footer.md
@@ -2,6 +2,3 @@
 
 Changes to the previous version of Schleuder are summarized in [changes](changes.html).
 
-
-{% include feedback.md %}
-
diff --git a/_includes/feedback.md b/_includes/feedback.md
deleted file mode 100644
index 7473774..0000000
--- a/_includes/feedback.md
+++ /dev/null
@@ -1,11 +0,0 @@
-{::options parse_block_html="true" /}
-
-<div class='footer'>
-[↑](#top "Go to top of page")
-{: .linktotop}
-
-{: .feedback }
-To suggest changes to these documents, or if you found any errors in them, please [let us know]({{ "contact.html" | absolute_url }}).
-You can also [see their history](https://0xacab.org/schleuder/schleuder-website/commits/master).
-
-</div>
diff --git a/_includes/footer.html b/_includes/footer.html
new file mode 100644
index 0000000..11d78ff
--- /dev/null
+++ b/_includes/footer.html
@@ -0,0 +1,8 @@
+<footer class="footer">
+  <div class="content has-text-centered">
+    <p>
+      To suggest changes to these documents, or if you found any errors in them, please <a href="/contact.html">please let us know</a>.
+      You can also <a href="https://0xacab.org/schleuder/schleuder-website/commits/master">see their history</a>.
+    </p>
+  </div>
+</footer>
\ No newline at end of file
diff --git a/_includes/footer.md b/_includes/footer.md
index 361a7bf..37af4b2 100644
--- a/_includes/footer.md
+++ b/_includes/footer.md
@@ -6,4 +6,3 @@ To **contact** us read [contact]({{ "contact.html" | absolute_url }}).
 
 To **be notified** of news about Schleuder subscribe to [schleuder-announce](https://lists.nadir.org/mailman/listinfo/schleuder-announce).
 
-{% include feedback.md %}
diff --git a/_layouts/default.html b/_layouts/default.html
index e62494b..7084e7d 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -16,5 +16,6 @@
         {{ content }}
       </div>
     </div>
+    {% include footer.html %}
   </body>
 </html>
diff --git a/index.md b/index.md
index 8f39491..57baebc 100644
--- a/index.md
+++ b/index.md
@@ -32,5 +32,4 @@ These projects also belong to the schleuder-family:
 </div>
 </div>
 
-
 {% include footer.md project="schleuder" %}
diff --git a/schleuder/docs/changes.md b/schleuder/docs/changes.md
index 51fe901..b437088 100644
--- a/schleuder/docs/changes.md
+++ b/schleuder/docs/changes.md
@@ -10,5 +10,3 @@ This list describes changes that users or list-admins of Schleuder should be awa
 User-relevant changes in version 3.4 compared to version 3.3:
 
 * HTML is stripped from multipart/alternative messages if they contain keywords. This is to prevent those keywords from being visible to recipients of resend-messages, and thus leaking confidential information. Filtering the keywords from the HTML is not solidly feasible, so removing the HTML-part entirely is the only option. Generally we recommend to not use HTML with Email at all, as it brings a lot of problems and insecurities.
-
-{% include feedback.md %}
diff --git a/schleuder/docs/concept.md b/schleuder/docs/concept.md
index ec892e0..ac25654 100644
--- a/schleuder/docs/concept.md
+++ b/schleuder/docs/concept.md
@@ -64,6 +64,3 @@ In the list-directory there's also a list specific log-file (might be missing if
 Other logging is sent to syslog. Where that ends up depends on the operating system and the system administration.
 
 All other list-related data is stored in the SQL-database. Most data is unserialized, only some values are JSON-encoded.
-
-
-{% include feedback.md %}
diff --git a/schleuder/docs/index.md b/schleuder/docs/index.md
index 55cbf51..e13b5d4 100644
--- a/schleuder/docs/index.md
+++ b/schleuder/docs/index.md
@@ -12,6 +12,3 @@ title: Documentation
 ### Changed behaviour
 
 Changes to the previous version of Schleuder are summarized in [changes](changes.html).
-
-
-{% include feedback.md %}
diff --git a/schleuder/docs/older/3.2/changes.md b/schleuder/docs/older/3.2/changes.md
index 7a3a503..71029e9 100644
--- a/schleuder/docs/older/3.2/changes.md
+++ b/schleuder/docs/older/3.2/changes.md
@@ -16,6 +16,3 @@ User-relevant changes in version 3.2 compared to version 3.1:
 * `X-SUBSCRIBE` now handles the combination of space-separated fingerprint and additional arguments (admin-flag, delivery-enabled-flag) correctly.
 * `X-RESEND` now respects the encoding the mail was sent with.
 * Fixed broken encoding of certain character-sequences in encrypted+signed messages.
-
-
-{% include feedback.md %}
diff --git a/schleuder/docs/older/3.2/concept.md b/schleuder/docs/older/3.2/concept.md
index da72124..a4b87e0 100644
--- a/schleuder/docs/older/3.2/concept.md
+++ b/schleuder/docs/older/3.2/concept.md
@@ -62,6 +62,3 @@ In the list-directory there's also a list specific log-file (might be missing if
 Other logging is sent to syslog. Where that ends up depends on the operating system and the system administration.
 
 All other list-related data is stored in the SQL-database. Most data is unserialized, only some values are JSON-encoded.
-
-
-{% include feedback.md %}
diff --git a/schleuder/docs/older/3.2/index.md b/schleuder/docs/older/3.2/index.md
index 55cbf51..e13b5d4 100644
--- a/schleuder/docs/older/3.2/index.md
+++ b/schleuder/docs/older/3.2/index.md
@@ -12,6 +12,3 @@ title: Documentation
 ### Changed behaviour
 
 Changes to the previous version of Schleuder are summarized in [changes](changes.html).
-
-
-{% include feedback.md %}
diff --git a/schleuder/docs/older/3.3/changes.md b/schleuder/docs/older/3.3/changes.md
index dbce06b..8c060e1 100644
--- a/schleuder/docs/older/3.3/changes.md
+++ b/schleuder/docs/older/3.3/changes.md
@@ -19,4 +19,3 @@ User-relevant changes in version 3.3 compared to version 3.2:
 * In the pseudoheaders, `sig` and `enc` are now configurable. They can be reordered in or removed from the list-option `headers_to_meta`.
 * Schleuder now handles "protected subjects" in a way that Thunderbird/Enigmail recognize.
 
-{% include feedback.md %}
diff --git a/schleuder/docs/older/3.3/concept.md b/schleuder/docs/older/3.3/concept.md
index 808d8ae..fc917a1 100644
--- a/schleuder/docs/older/3.3/concept.md
+++ b/schleuder/docs/older/3.3/concept.md
@@ -63,5 +63,3 @@ Other logging is sent to syslog. Where that ends up depends on the operating sys
 
 All other list-related data is stored in the SQL-database. Most data is unserialized, only some values are JSON-encoded.
 
-
-{% include feedback.md %}
diff --git a/schleuder/docs/older/3.3/index.md b/schleuder/docs/older/3.3/index.md
index 55cbf51..e13b5d4 100644
--- a/schleuder/docs/older/3.3/index.md
+++ b/schleuder/docs/older/3.3/index.md
@@ -12,6 +12,3 @@ title: Documentation
 ### Changed behaviour
 
 Changes to the previous version of Schleuder are summarized in [changes](changes.html).
-
-
-{% include feedback.md %}