From 7fc115c6b86c77d9bcce910303aa8cc8f76435ba Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 5 Aug 2020 09:01:34 +0200 Subject: [PATCH 1/8] update try demo --- homepage/theme/static/css/fix.css | 2 +- homepage/theme/templates/trydemo.html | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index 1759176..bd8eae7 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -362,7 +362,7 @@ pre { code { border-radius: 3px; font-size: 85%; - padding: 0.2em 0.4em; + padding: 0.2em 0; color: #39352A; background-color: #EEEEEE; } diff --git a/homepage/theme/templates/trydemo.html b/homepage/theme/templates/trydemo.html index 6d3b6a5..1f6a88c 100644 --- a/homepage/theme/templates/trydemo.html +++ b/homepage/theme/templates/trydemo.html @@ -39,13 +39,20 @@

- Read the docs + Learn more

Details on how to
install and run Offen

- Open Docs + Open Docs +
+ +
+

+ All you need
to use Offen in production +

+ Get started
From 4c776b697a1dc5e6cd6a30272f84d3a2b9c5fe35 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 5 Aug 2020 09:34:38 +0200 Subject: [PATCH 2/8] update get started --- homepage/pelicanconf.py | 1 + homepage/theme/templates/getstarted.html | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py index 935bf4f..8b72a4e 100644 --- a/homepage/pelicanconf.py +++ b/homepage/pelicanconf.py @@ -95,6 +95,7 @@ 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' +UBERSPACE_DIRECT_URL = 'https://lab.uberspace.de/guide_offen.html' OFFEN_AUDITORIUM_URL = 'https://offen.offen.dev/auditorium/' DOCS_GETSTARTED_URL = 'https://docs.offen.dev/running-offen/' DOCS_TRYDEMO_URL = 'https://docs.offen.dev/running-offen/test-drive/' diff --git a/homepage/theme/templates/getstarted.html b/homepage/theme/templates/getstarted.html index 1030e56..d76226c 100644 --- a/homepage/theme/templates/getstarted.html +++ b/homepage/theme/templates/getstarted.html @@ -19,7 +19,9 @@ Single binary file
for Linux, Windows or MacOS

Download - + +
+

Offen as a lightweight
Docker image

@@ -28,7 +30,12 @@

Your own instance on Heroku

- Deploy to Heroku + Deploy to Heroku + +

+ Your own instance on Uberspace +

+ Deploy to Uberspace
From 639c143ba382ed9b4d65e2cd493ee14360e0e169 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 5 Aug 2020 20:58:15 +0200 Subject: [PATCH 3/8] update cta --- homepage/content/pages/404.md | 1 + homepage/content/pages/about.md | 2 +- homepage/content/pages/deep-dive.md | 1 + homepage/content/pages/legal-notice.md | 1 + homepage/theme/static/css/fix.css | 6 +++ homepage/theme/templates/archives.html | 50 +++++++++++++---------- homepage/theme/templates/article.html | 2 +- homepage/theme/templates/base.html | 56 +++++++++++--------------- homepage/theme/templates/page.html | 2 +- 9 files changed, 63 insertions(+), 58 deletions(-) diff --git a/homepage/content/pages/404.md b/homepage/content/pages/404.md index fc5d331..aca0ada 100644 --- a/homepage/content/pages/404.md +++ b/homepage/content/pages/404.md @@ -3,6 +3,7 @@ description: This link isn’t working. save_as: 404.html no_stats: true exclude_from_sitemap: true +cta_blog_article: budget ![Page not Found](/theme/images/offen-404.png){:class="image-text-600-338"} diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md index 01f71ab..6b06d4c 100644 --- a/homepage/content/pages/about.md +++ b/homepage/content/pages/about.md @@ -1,10 +1,10 @@ title: About | Offen description: Who we are, who supports us and how you can can get in touch. slug: about +cta_blog_article: fair ## About - ### Status Quo Offen is created by [Frederik Ring][frederik-ring]{: target="_blank"} and [Hendrik Niefeld][hendrik-niefeld]{: target="_blank"} and is currently being conceptually designed and in active development, both as a product as well as as a software. diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md index 625862e..abe92c1 100644 --- a/homepage/content/pages/deep-dive.md +++ b/homepage/content/pages/deep-dive.md @@ -2,6 +2,7 @@ title: Deep dive | Offen description: What do users know about their data? How can they access it? Do operators benefit from a careful handling of user data? Does Offen work in accordance with GDPR? slug: deep-dive sitemap_priority: 0.7 +cta_blog_article: budget ## Deep dive diff --git a/homepage/content/pages/legal-notice.md b/homepage/content/pages/legal-notice.md index 8728fb1..4bad4c5 100644 --- a/homepage/content/pages/legal-notice.md +++ b/homepage/content/pages/legal-notice.md @@ -2,6 +2,7 @@ title: Legal Notice | Offen description: Information in accordance with Section 5 TMG slug: legal-notice exclude_from_sitemap: true +cta_blog_article: fair ## Legal Notice diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index bd8eae7..8db5b80 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -399,6 +399,12 @@ IMAGES height: 190px; } } +@media only screen and (min-width: 60em) { + .larger-image { + margin-left: 0rem; + margin-right: 0rem; + } +} /* --------------------------------------------------- diff --git a/homepage/theme/templates/archives.html b/homepage/theme/templates/archives.html index 9f2ba19..48a843f 100644 --- a/homepage/theme/templates/archives.html +++ b/homepage/theme/templates/archives.html @@ -5,30 +5,36 @@ {% set href = 'blog/' %} {% set no_stats = False %} {% set template = 'archives' %} -{% set cta_1 = True %} +{% set cta_index = True %} {% block content %} - {% for article in articles %} - {% if loop.index != 1 %} -
- {% endif %} -
-
-
- - {{ article.title }} - -
-
- {{ article.date | strftime('%d %b %Y') }}{% if article.modified %}(article.updated {{ article.modified | strftime('%d %b %Y') }}){% endif %}, {{ article.author }} -
-

- {{ article.title }} -

-

- {{ article.description }} Read more -

+
+
+ {% for article in articles %} +
+ {% if loop.index != 1 %} +
+ {% endif %} +
+
+
+ + {{ article.title }} + +
+
+ {{ article.date | strftime('%d %b %Y') }}{% if article.modified %}(article.updated {{ article.modified | strftime('%d %b %Y') }}){% endif %}, {{ article.author }} +
+

+ {{ article.title }} +

+

+ {{ article.description }} Read more +

+
+
-
{% endfor %} + + {% endblock %} diff --git a/homepage/theme/templates/article.html b/homepage/theme/templates/article.html index 366516e..8ef7b24 100644 --- a/homepage/theme/templates/article.html +++ b/homepage/theme/templates/article.html @@ -6,7 +6,7 @@ {% set image_url = article.image_url %} {% set no_stats = article.no_stats %} {% set template = article.template %} -{% set cta_1 = True %} +{% set cta_blog_index = True %} {% block content %}
diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index cd4d559..814461a 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -104,41 +104,31 @@
-
+
- {% if cta_1 %} -
-

- Participate -

-

- Audit our open source code and feel free to make a contribution. -

- Get involved -
- {% endif %} - - {% if cta_2 %} -
-

- In the making -

-

- Discover what is already up and running and where we want to go. -

- Open blog -
- {% endif %} - -
-

- Ethical internet -

-

- Help to ensure that Offen is independent and can be sustained. + {% if cta_index %} +

+ OPEN INDEX PAGE

- Support us -
+ {% endif %} + + {% if cta_blog_index %} +

+ OPEN BLOG INDEX +

+ {% endif %} + + {% if cta_blog_article == 'fair'%} +

+ OPEN BLOG ARTICLE FAIR +

+ {% endif %} + + {% if cta_blog_article == 'budget'%} +

+ OPEN BLOG ARTICLE BUDGET +

+ {% endif %}
diff --git a/homepage/theme/templates/page.html b/homepage/theme/templates/page.html index f366112..cbf9041 100644 --- a/homepage/theme/templates/page.html +++ b/homepage/theme/templates/page.html @@ -6,7 +6,7 @@ {% set image_url = page.image_url %} {% set no_stats = page.no_stats %} {% set template = page.template %} -{% set cta_2 = True %} +{% set cta_blog_article = page.cta_blog_article %} {% block content %}
From e5c43a25e06779ddc44e20ff6c09dfa5b8eb14e8 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 5 Aug 2020 21:24:39 +0200 Subject: [PATCH 4/8] update blog index desktop --- homepage/theme/static/css/fix.css | 23 +++++++++++++++++++++-- homepage/theme/templates/archives.html | 8 ++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index 8db5b80..f29ac9a 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -54,8 +54,14 @@ COLORS .cclr-bg-white-fade-metrics { background: linear-gradient(180deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%), #F3F0E7; } - - +.cclr-bg-white-responsive { + background-color: #f9f7f2; +} +@media only screen and (min-width: 60rem) { + .cclr-bg-white-responsive { + background-color: #ffffff; + } +} /* --------------------------------------------------- LAYOUT ----------------------------------------------------*/ @@ -281,6 +287,19 @@ body { .f25 { font-size: 1.9rem; } +.f26 { + font-size: 1.9rem; +} +@media only screen and (min-width: 60em) { + .f26 { + font-size: 2.25rem; + } +} +@media only screen and (min-width: 60em) { + .f26 { + font-size: 1.9rem; + } +} span { display: table; } diff --git a/homepage/theme/templates/archives.html b/homepage/theme/templates/archives.html index 48a843f..5e51d94 100644 --- a/homepage/theme/templates/archives.html +++ b/homepage/theme/templates/archives.html @@ -8,15 +8,15 @@ {% set cta_index = True %} {% block content %} -
+
{% for article in articles %}
{% if loop.index != 1 %} -
+
{% endif %}
-
+
{{ article.title }} @@ -25,7 +25,7 @@
{{ article.date | strftime('%d %b %Y') }}{% if article.modified %}(article.updated {{ article.modified | strftime('%d %b %Y') }}){% endif %}, {{ article.author }}
-

+

{{ article.title }}

From d8153ca80cafd6b7eca0fbe2e323ecb540126c2d Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 5 Aug 2020 22:37:56 +0200 Subject: [PATCH 5/8] update cta texts --- homepage/theme/static/css/fix.css | 4 ++-- homepage/theme/templates/base.html | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/homepage/theme/static/css/fix.css b/homepage/theme/static/css/fix.css index f29ac9a..e4b6306 100644 --- a/homepage/theme/static/css/fix.css +++ b/homepage/theme/static/css/fix.css @@ -290,7 +290,7 @@ body { .f26 { font-size: 1.9rem; } -@media only screen and (min-width: 60em) { +@media only screen and (min-width: 30em) { .f26 { font-size: 2.25rem; } @@ -560,7 +560,7 @@ nav ul li { nav ul li a, nav ul li a:visited { display: block; - padding: 0 1.4rem; + padding: 0 1.2rem; line-height: 4rem; text-decoration: none; font-weight: 700; diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 814461a..9be89d0 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -107,15 +107,25 @@

{% if cta_index %} -

- OPEN INDEX PAGE -

+
+
+

+ How do fair web analytics work? +

+ Open summary +
+
{% endif %} {% if cta_blog_index %} -

- OPEN BLOG INDEX -

+
+
+

+ Continue reading? +

+ See all blog posts +
+
{% endif %} {% if cta_blog_article == 'fair'%} From 58d59ad9aa1d2988d7a00d5abbbcb70889e48fa0 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Thu, 6 Aug 2020 11:02:17 +0200 Subject: [PATCH 6/8] update bottom cta --- homepage/content/articles/0010-milestone-1.md | 1 + homepage/content/articles/0020-untold-roads.md | 1 + homepage/content/articles/0030-milestone-2.md | 1 + homepage/content/articles/0040-test-offen-today.md | 1 + homepage/content/articles/0050-milestone-3.md | 1 + homepage/content/articles/0060-milestone-4.md | 1 + homepage/content/articles/0070-budget.md | 1 + homepage/content/articles/0080-beta.md | 1 + homepage/content/articles/0090-milestone-5.md | 1 + homepage/content/pages/404.md | 2 +- homepage/content/pages/about.md | 2 +- homepage/content/pages/deep-dive.md | 2 +- homepage/content/pages/legal-notice.md | 2 +- homepage/theme/templates/archives.html | 2 +- homepage/theme/templates/article.html | 2 +- homepage/theme/templates/base.html | 8 ++++---- homepage/theme/templates/page.html | 2 +- 17 files changed, 20 insertions(+), 11 deletions(-) diff --git a/homepage/content/articles/0010-milestone-1.md b/homepage/content/articles/0010-milestone-1.md index e797b23..aba0197 100644 --- a/homepage/content/articles/0010-milestone-1.md +++ b/homepage/content/articles/0010-milestone-1.md @@ -5,6 +5,7 @@ slug: laying-foundation-for-fair-web-analytics sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0010-milestone1.jpg author: Hendrik Niefeld +bottom_cta: blog # Episode One — Laying the foundation for fair web analytics diff --git a/homepage/content/articles/0020-untold-roads.md b/homepage/content/articles/0020-untold-roads.md index dd14df5..c7c8264 100644 --- a/homepage/content/articles/0020-untold-roads.md +++ b/homepage/content/articles/0020-untold-roads.md @@ -5,6 +5,7 @@ slug: untold-roads-versioning-early-stage-software sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0020-untoldRoads.jpg author: Frederik Ring +bottom_cta: blog # Untold roads to v1.0 diff --git a/homepage/content/articles/0030-milestone-2.md b/homepage/content/articles/0030-milestone-2.md index 79b199f..8d514a4 100644 --- a/homepage/content/articles/0030-milestone-2.md +++ b/homepage/content/articles/0030-milestone-2.md @@ -5,6 +5,7 @@ slug: collecting-data-securely sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0030-milestone-2.jpg author: Hendrik Niefeld +bottom_cta: blog # Episode Two — Collecting data securely diff --git a/homepage/content/articles/0040-test-offen-today.md b/homepage/content/articles/0040-test-offen-today.md index eb26b92..aa64d09 100644 --- a/homepage/content/articles/0040-test-offen-today.md +++ b/homepage/content/articles/0040-test-offen-today.md @@ -5,6 +5,7 @@ slug: test-offen-today sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0040-test-offen-today.jpg author: Hendrik Niefeld +bottom_cta: blog # Test Offen today diff --git a/homepage/content/articles/0050-milestone-3.md b/homepage/content/articles/0050-milestone-3.md index 4381754..bc90fbe 100644 --- a/homepage/content/articles/0050-milestone-3.md +++ b/homepage/content/articles/0050-milestone-3.md @@ -5,6 +5,7 @@ slug: displaying-data sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0050-milestone-3.jpg author: Frederik Ring +bottom_cta: blog # Episode Three — Displaying data diff --git a/homepage/content/articles/0060-milestone-4.md b/homepage/content/articles/0060-milestone-4.md index 7763a3d..6295259 100644 --- a/homepage/content/articles/0060-milestone-4.md +++ b/homepage/content/articles/0060-milestone-4.md @@ -6,6 +6,7 @@ sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0060-milestone-4.jpg image_caption: Photo by WOCinTechChat / CC BY 3.0 author: Frederik Ring +bottom_cta: blog # Episode Four — Managing data diff --git a/homepage/content/articles/0070-budget.md b/homepage/content/articles/0070-budget.md index 9762213..8fe7405 100644 --- a/homepage/content/articles/0070-budget.md +++ b/homepage/content/articles/0070-budget.md @@ -5,6 +5,7 @@ slug: hosting-offen-on-budget sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0070-budget.jpg author: Frederik Ring +bottom_cta: blog # Hosting Offen on a budget diff --git a/homepage/content/articles/0080-beta.md b/homepage/content/articles/0080-beta.md index 6b40e14..6e4c408 100644 --- a/homepage/content/articles/0080-beta.md +++ b/homepage/content/articles/0080-beta.md @@ -5,6 +5,7 @@ slug: privacy-friendly-and-fair-web sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0080-beta.jpg author: Hendrik Niefeld +bottom_cta: blog # Let's build a web that is privacy friendly and fair diff --git a/homepage/content/articles/0090-milestone-5.md b/homepage/content/articles/0090-milestone-5.md index aae05a3..66c792c 100644 --- a/homepage/content/articles/0090-milestone-5.md +++ b/homepage/content/articles/0090-milestone-5.md @@ -5,6 +5,7 @@ slug: resilience-documentation sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0090-milestone-5.jpg author: Frederik Ring +bottom_cta: blog # Episode Five — Resilience and documentation diff --git a/homepage/content/pages/404.md b/homepage/content/pages/404.md index aca0ada..2fdf0cd 100644 --- a/homepage/content/pages/404.md +++ b/homepage/content/pages/404.md @@ -3,7 +3,7 @@ description: This link isn’t working. save_as: 404.html no_stats: true exclude_from_sitemap: true -cta_blog_article: budget +bottom_cta: budget ![Page not Found](/theme/images/offen-404.png){:class="image-text-600-338"} diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md index 6b06d4c..f52838c 100644 --- a/homepage/content/pages/about.md +++ b/homepage/content/pages/about.md @@ -1,7 +1,7 @@ title: About | Offen description: Who we are, who supports us and how you can can get in touch. slug: about -cta_blog_article: fair +bottom_cta: fair ## About diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md index abe92c1..6fbc1a0 100644 --- a/homepage/content/pages/deep-dive.md +++ b/homepage/content/pages/deep-dive.md @@ -2,7 +2,7 @@ title: Deep dive | Offen description: What do users know about their data? How can they access it? Do operators benefit from a careful handling of user data? Does Offen work in accordance with GDPR? slug: deep-dive sitemap_priority: 0.7 -cta_blog_article: budget +bottom_cta: budget ## Deep dive diff --git a/homepage/content/pages/legal-notice.md b/homepage/content/pages/legal-notice.md index 4bad4c5..14aae6e 100644 --- a/homepage/content/pages/legal-notice.md +++ b/homepage/content/pages/legal-notice.md @@ -2,7 +2,7 @@ title: Legal Notice | Offen description: Information in accordance with Section 5 TMG slug: legal-notice exclude_from_sitemap: true -cta_blog_article: fair +bottom_cta: fair ## Legal Notice diff --git a/homepage/theme/templates/archives.html b/homepage/theme/templates/archives.html index 5e51d94..d01fe96 100644 --- a/homepage/theme/templates/archives.html +++ b/homepage/theme/templates/archives.html @@ -5,7 +5,7 @@ {% set href = 'blog/' %} {% set no_stats = False %} {% set template = 'archives' %} -{% set cta_index = True %} +{% set bottom_cta = 'index' %} {% block content %}
diff --git a/homepage/theme/templates/article.html b/homepage/theme/templates/article.html index 8ef7b24..af98e3e 100644 --- a/homepage/theme/templates/article.html +++ b/homepage/theme/templates/article.html @@ -6,7 +6,7 @@ {% set image_url = article.image_url %} {% set no_stats = article.no_stats %} {% set template = article.template %} -{% set cta_blog_index = True %} +{% set bottom_cta = article.bottom_cta %} {% block content %}
diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 9be89d0..d734ba8 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -106,7 +106,7 @@
- {% if cta_index %} + {% if bottom_cta == 'index' %}

@@ -117,7 +117,7 @@

{% endif %} - {% if cta_blog_index %} + {% if bottom_cta == 'blog' %}

@@ -128,13 +128,13 @@

{% endif %} - {% if cta_blog_article == 'fair'%} + {% if bottom_cta == 'fair' %}

OPEN BLOG ARTICLE FAIR

{% endif %} - {% if cta_blog_article == 'budget'%} + {% if bottom_cta == 'budget' %}

OPEN BLOG ARTICLE BUDGET

diff --git a/homepage/theme/templates/page.html b/homepage/theme/templates/page.html index cbf9041..491273f 100644 --- a/homepage/theme/templates/page.html +++ b/homepage/theme/templates/page.html @@ -6,7 +6,7 @@ {% set image_url = page.image_url %} {% set no_stats = page.no_stats %} {% set template = page.template %} -{% set cta_blog_article = page.cta_blog_article %} +{% set bottom_cta = page.bottom_cta %} {% block content %}
From d699074f2ee900b913b2fa299b7b836d7398fa36 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Thu, 6 Aug 2020 11:57:07 +0200 Subject: [PATCH 7/8] ad article in bottom cta --- homepage/theme/templates/base.html | 46 +++++++++++++++++++++++------- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index d734ba8..0433e53 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -102,13 +102,12 @@ {% else %} {% block outro %}
-
+
-
{% if bottom_cta == 'index' %} -
-
+
+

How do fair web analytics work?

@@ -118,8 +117,8 @@ {% endif %} {% if bottom_cta == 'blog' %} -
-
+
+

Continue reading?

@@ -129,9 +128,36 @@ {% endif %} {% if bottom_cta == 'fair' %} -

- OPEN BLOG ARTICLE FAIR -

+
+ +

+ Also on our blog +

+ +
+ +
+
+ + Let's build a web that is privacy friendly and fair + +
+
+ +
+
+

+ Let's build a web that is privacy friendly and fair +

+

+ What does the term 'privacy friendly' actually stand for? Mostly it's just about technical issues that don't tackle the underlying problem. Read more +

+
+
+ +
+ +
{% endif %} {% if bottom_cta == 'budget' %} @@ -140,7 +166,7 @@

{% endif %} -
+
From 4b1461cbfcd2b7664fb02aaaec698d267671eb26 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Thu, 6 Aug 2020 20:40:44 +0200 Subject: [PATCH 8/8] add further article to bottom cta --- homepage/theme/templates/base.html | 41 ++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 0433e53..dc56e16 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -129,41 +129,56 @@ {% if bottom_cta == 'fair' %}
-

Also on our blog

-
-
- + Let's build a web that is privacy friendly and fair
-
-

- Let's build a web that is privacy friendly and fair +

+ Let's build a web that is privacy friendly and fair

- What does the term 'privacy friendly' actually stand for? Mostly it's just about technical issues that don't tackle the underlying problem. Read more + What does the term 'privacy friendly' actually stand for? Mostly it's just about technical issues that don't tackle the underlying problem. Read more

-
-
{% endif %} {% if bottom_cta == 'budget' %} -

- OPEN BLOG ARTICLE BUDGET -

+
+

+ Also on our blog +

+
+
+
+ + Hosting Offen on a budget + +
+
+
+
+

+ Hosting Offen on a budget +

+

+ Here are some real world options for hosting Offen on a budget. Let's compare how they relate in terms of ease of deployment, performance and pricing. Read more +

+
+
+
+
{% endif %}