From 639c143ba382ed9b4d65e2cd493ee14360e0e169 Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 5 Aug 2020 20:58:15 +0200 Subject: [PATCH] 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 %}