Merge pull request #108 from offen/development

Add support section on index and links to menu

homepage/content/pages/about.md

@@ -14,7 +14,7 @@ Offen is created by [Frederik Ring][frederik-ring]{: target="_blank"} and [Hendr
 
 [![NLnet Foundation](/theme/images/nlnet-logo.svg){:width="160px" height="60px" class="mt4"}](https://nlnet.nl/){: target="_blank"}
 
-We are happy to work with [NLnet Foundation][nlnet-foundation]{: target="_blank"} who complement our activities within their [Next Generation Internet][next-generation-internet]{: target="_blank"} initiative.
+We are happy to work with [NLnet Foundation,][nlnet-foundation]{: target="_blank"} which actively supports our efforts as part of its [Next Generation Internet][next-generation-internet]{: target="_blank"} initiative.
 
 [nlnet-foundation]: https://nlnet.nl/
 [next-generation-internet]: https://nlnet.nl/NGI/

homepage/pelicanconf.py

@@ -1,5 +1,6 @@
 import os
 from datetime import datetime
+from pelican_decorate_content import decorate_content
 # If your site is available via HTTPS, make sure SITEURL begins with https://
 RELATIVE_URLS = False
 
@@ -44,7 +45,7 @@ PAGE_SAVE_AS = '{slug}/index.html'
 ARTICLE_SAVE_AS = 'blog/{slug}/index.html'
 
 PLUGIN_PATHS = ['./plugins']
-PLUGINS = ['decorate_content', 'assets']
+PLUGINS = [decorate_content, 'assets']
 
 MARKDOWN = {
     'extension_configs': {
@@ -84,11 +85,13 @@ DECORATE_CONTENT = {
 
 DOCS_URL = 'https://docs.offen.dev'
 GITHUB_REPO = 'https://github.com/offen/offen'
+ROADMAP = 'https://github.com/offen/offen/projects/1'
 CONTACT_EMAIL = 'hioffen@posteo.de'
 PGP_KEY_FILE = '74B041E23DB29D552644CEB1B18C633D6967FE3F.asc'
 PATREON_URL = 'https://www.patreon.com/offen'
 LINKEDIN_URL = 'https://www.linkedin.com/company/hioffen'
 TWITTER_URL = 'https://twitter.com/hioffen'
+MASTODON_URL = 'https://fosstodon.org/@offen'
 RELEASE_DIRECT_URL = 'https://get.offen.dev'
 DOCKER_DIRECT_URL = 'https://hub.docker.com/r/offen/offen'
 HEROKU_DIRECT_URL = 'https://heroku.com/deploy?template=https://github.com/offen/heroku/tree/master'

homepage/plugins/decorate_content/__init__.py

@@ -1 +0,0 @@
-from .decorate_content import *

homepage/plugins/decorate_content/decorate_content.py

@@ -1,33 +0,0 @@
-from json import loads
-
-from pelican import signals
-from pelican.contents import Article, Page, Static
-from bs4 import BeautifulSoup
-
-
-def content_object_init(instance):
-    if isinstance(instance, (Article, Page, Static)):
-        plugin_settings = instance.settings.get("DECORATE_CONTENT", {})
-        content_overrides = (
-            instance.metadata.get("decorate_content", None)
-            if instance.metadata is not None
-            else None
-        )
-
-        settings = plugin_settings.copy()
-        settings.update(
-            loads(content_overrides) if content_overrides is not None else {}
-        )
-
-        soup = BeautifulSoup(instance._content, "html.parser")
-
-        for selector, class_names in settings.items():
-            elems = soup.select(selector)
-            for elem in elems:
-                elem["class"] = elem.get("class", []) + class_names
-
-        instance._content = soup.decode()
-
-
-def register():
-    signals.content_object_init.connect(content_object_init)

homepage/requirements.txt

@@ -2,3 +2,4 @@ pelican==4.0.1
 markdown==3.1.1
 git+git://github.com/miracle2k/webassets#d1f3455e383446ca4ab0c644f326ee937e68e809
 beautifulsoup4==4.8.1
+pelican-decorate-content==0.1.1

homepage/theme/static/css/fix.css

@@ -84,6 +84,9 @@ LAYOUT
 }
 
 /* HWidths and heights */
+.wx64 {
+	width: 100%;
+}
 .wx18 {
 	width: 18rem;
 }
@@ -156,7 +159,11 @@ LAYOUT
 		height: 33rem;
 	}
 }
-
+@media only screen and (min-width: 64em) {
+	.wx64 {
+		width: 64rem;
+	}
+}
 /* Margins an paddings */
 .ptx-feature-2 {
 	padding-top: 9rem;

homepage/theme/templates/base.html

@@ -48,11 +48,14 @@
                 <li>
                   <a class="b link dim cclr-fnt-black-mid" href="/">Summary</a>
                 </li>
+                <li>
+                  <a class="b link dim cclr-fnt-black-mid" href="/blog/">Blog</a>
+                </li>
                 <li>
                   <a class="b link dim cclr-fnt-black-mid" href="/deep-dive/">Deep dive</a>
                 </li>
                 <li>
-                  <a class="b link dim cclr-fnt-black-mid" href="/blog/">Blog</a>
+                  <a class="b link dim cclr-fnt-black-mid" href="{{ ROADMAP }}" rel="noopener" target="_blank">Roadmap</a>
                 </li>
                 <li>
                   <a class="b link dim cclr-fnt-black-mid" href="/about/">About</a>
@@ -177,6 +180,9 @@
               <p class="ma0">
                 <a class="link b dim gray" href="{{ TWITTER_URL }}" rel="noopener" target="_blank">Twitter</a>
               </p>
+              <p class="ma0">
+                <a class="link b dim gray" href="{{ MASTODON_URL }}" rel="noopener" target="_blank">Mastodon</a>
+              </p>
               <p class="ma0 mt2">
                 <a class="link b dim gray" href="/legal-notice/">Legal Notice</a>
               </p>

homepage/theme/templates/index.html

@@ -100,6 +100,26 @@
     </div>
   </div>
 
+  <!-- SUPPORT -->
+  <div class="w-100 dib bg-white">
+      <div class="wx64 center cclr-bg-yellow-bright-very pv5">
+        <div class="tc mh4">
+          <div class="mw7 center">
+            <div class="flex flex-column flex-row-l mh0 mh3-m mh5-l">
+              <div class="tl-l w-100 w-30-l mb3 mb0-l">
+                <div class="mt2">
+                  <a class="link dim" href="https://nlnet.nl/" target="_blank" rel="noopener"><img src="/theme/images/nlnet-logo-gray.svg" alt="NLnet logo gray" width="132" height="49"></a>
+                </div>
+              </div>
+              <p class="f5 tl-l  w-100 w-70-l ma0">
+                We are happy to work with <a class="b link dim cclr-fnt-black-mid" href="https://nlnet.nl/" target="_blank" rel="noopener">NLnet Foundation,</a> which actively supports our efforts as part of its <a class="b link dim cclr-fnt-black-mid" href="https://nlnet.nl/NGI/" target="_blank" rel="noopener">Next Generation Internet</a> initiative.
+              </p>
+            </div>
+          </div>
+        </div>
+      </div>
+  </div>
+
 <!-- INSIGHTS -->
   <div class="w-100 dib bg-white">
     <div class="tc mh4">