From 3d7a392169ca37308c987dcbbc868229e11b1bac Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 28 Oct 2020 21:31:50 +0100 Subject: [PATCH 1/2] update blog cta and menu links --- homepage/content/articles/0050-milestone-3.md | 8 +-- .../content/articles/0120-opt-in-quality.md | 2 +- homepage/content/pages/about.md | 2 +- homepage/content/pages/deep-dive.md | 2 +- homepage/content/pages/legal-notice.md | 5 +- homepage/pelicanconf.py | 5 +- homepage/theme/templates/base.html | 62 +++++++++++++++++-- homepage/theme/templates/getstarted.html | 2 +- homepage/theme/templates/trydemo.html | 2 +- 9 files changed, 75 insertions(+), 15 deletions(-) diff --git a/homepage/content/articles/0050-milestone-3.md b/homepage/content/articles/0050-milestone-3.md index bc90fbe..2287328 100644 --- a/homepage/content/articles/0050-milestone-3.md +++ b/homepage/content/articles/0050-milestone-3.md @@ -5,7 +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 +bottom_cta: Matomo # Episode Three — Displaying data @@ -30,7 +30,7 @@ The Auditorium is where both users and operators access and manage usage data. O The user facing Auditorium is now annotated with explanations for each metric and also explains analytics-specific terms and answers frequently asked questions. This has been implemented in [PR 339](https://github.com/offen/offen/pull/339). -browser setup +browser setup In addition to that we added new metrics and improved the overall user experience for both users and operators alike. Relevant PRs are [331](https://github.com/offen/offen/pull/331), [328](https://github.com/offen/offen/pull/328), [327](https://github.com/offen/offen/pull/327), [324](https://github.com/offen/offen/pull/324), [319](https://github.com/offen/offen/pull/319), [317](https://github.com/offen/offen/pull/317), [291](https://github.com/offen/offen/pull/291) @@ -42,7 +42,7 @@ Operators that are using Offen to improve their services are likely to work in t The command line can seem daunting when you don't use it regularly. This is why we added an in-browser setup screen for Offen. Instead of performing the initial setup using the `offen setup` command from the CLI, operators who prefer to do so can now use their browser to navigate to the `/setup` URL of their installation and perform the initial setup there. We hope this helps us gaining further traction with semi-technical users that want to use privacy friendly tools. This has been implemented in [PR 299](https://github.com/offen/offen/pull/299). -browser setup +browser setup ### Goodbye, Choo @@ -67,7 +67,7 @@ Offen generates client side keys for encrypting data for each user. At the end o Self hosted software is a great fit for privacy focused software like Offen. Yet, it can seem daunting to non-technical users and make them stick to established SaaS solutions longer than needed. This is why we put a lot of effort into finding easy "1-click" options to deploy an Offen instance. In Milestone 3 we have created a 1-click solution for deploying Offen to Heroku: [https://github.com/offen/heroku](https://github.com/offen/heroku). Using free resources only, people interested in running Offen can now deploy a production ready instance to Heroku in less than 1 minute. We hope this encourages website operator to consider self-hosted software and Offen as a real option. Required changes for this were implemented in [PR 287](https://github.com/offen/offen/pull/287). -browser setup +browser setup To offer even more options we are also looking into building a 1-click option for other platforms like YunoHost and DigitalOcean very soon. diff --git a/homepage/content/articles/0120-opt-in-quality.md b/homepage/content/articles/0120-opt-in-quality.md index 58dca65..1d356d0 100644 --- a/homepage/content/articles/0120-opt-in-quality.md +++ b/homepage/content/articles/0120-opt-in-quality.md @@ -5,7 +5,7 @@ slug: opt-in-quality sitemap_priority: 0.7 image_url: /theme/images/offen-blog-0120-opt-in-quality.jpg author: Hendrik Niefeld -bottom_cta: budget +bottom_cta: matomo # Opt in for quality insights diff --git a/homepage/content/pages/about.md b/homepage/content/pages/about.md index f52838c..35be0c4 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 -bottom_cta: fair +bottom_cta: matomo ## About diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md index 03f138b..e58916e 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 -bottom_cta: budget +bottom_cta: quality ## Deep dive diff --git a/homepage/content/pages/legal-notice.md b/homepage/content/pages/legal-notice.md index 14aae6e..a6aece4 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 -bottom_cta: fair +bottom_cta: quality ## Legal Notice @@ -15,5 +15,8 @@ Torfstr. 22 E-Mail: [hioffen@posteo.de](mailto:hioffen@posteo.de) Internet address: [www.offen.dev](https://www.offen.dev/) +### License +The content of this website itself is licensed under the [Creative Commons Attribution 4.0 International (CC BY 4.0) License](https://creativecommons.org/licenses/by/4.0/){: target="_blank"}, and the underlying source code used to format and display that content is licensed under the [GNU Affero General Public License v3.0](https://github.com/offen/website/blob/development/LICENSE). + ### Graphics and Image Sources NLNet Logo [https://nlnet.nl/logo/](https://nlnet.nl/logo/){: target="_blank"} diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py index d5bdb63..5d5a226 100644 --- a/homepage/pelicanconf.py +++ b/homepage/pelicanconf.py @@ -83,7 +83,6 @@ DECORATE_CONTENT = { 'hr': ['mt5', 'mb3', 'b--black-05'] } -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' @@ -98,7 +97,11 @@ HEROKU_DIRECT_URL = 'https://heroku.com/deploy?template=https://github.com/offen UBERSPACE_DIRECT_URL = 'https://lab.uberspace.de/guide_offen.html' YUNOHOST_DIRECT_URL = 'https://github.com/offen/offen_ynh' OFFEN_AUDITORIUM_URL = 'https://offen.offen.dev/auditorium/' +DOCS_URL_CAMPAIGN_TOP = 'https://docs.offen.dev/?utm_campaign=top' +DOCS_URL_CAMPAIGN_BOTTOM = 'https://docs.offen.dev/?utm_campaign=bottom' DOCS_GETSTARTED_URL = 'https://docs.offen.dev/running-offen/' +DOCS_GETSTARTED_URL_CAMPAIGN = 'https://docs.offen.dev/running-offen/?utm_campaign=get-started' DOCS_TRYDEMO_URL = 'https://docs.offen.dev/running-offen/test-drive/' +DOCS_TRYDEMO_URL_CAMPAIGN = 'https://docs.offen.dev/running-offen/test-drive/?utm_campaign=try-demo' OFFEN_ACCOUNT_ID = os.environ.get('OFFEN_ACCOUNT_ID', None) diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 1b6d9b3..01ccf3e 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -66,7 +66,7 @@ GitHub
  • - Docs + Docs
  • Get started @@ -129,6 +129,60 @@ {% endif %} + {% if bottom_cta == 'quality' %} +
    +

    + Also on our blog +

    +
    +
    +
    + + Opt in for quality insights + +
    +
    +
    +
    +

    + Opt in for quality insights +

    +

    + Collecting data only with user consent has a less obvious implication: the quality of insights from web analytics increases. Read more +

    +
    +
    +
    +
    + {% endif %} + + {% if bottom_cta == 'matomo' %} +
    +

    + Also on our blog +

    +
    +
    +
    + + Why Offen is a valid Matomo alternative + +
    +
    +
    +
    +

    + Why Offen is a valid Matomo alternative +

    +

    + This brief comparison of both tools gives you a first insight into the field of fair and lightweight web analytics. Read more +

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

    @@ -148,7 +202,7 @@ 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

    @@ -175,7 +229,7 @@ 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 + 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

    @@ -207,7 +261,7 @@ Blog

    - Docs + Docs

    GitHub diff --git a/homepage/theme/templates/getstarted.html b/homepage/theme/templates/getstarted.html index 785d162..3d7db52 100644 --- a/homepage/theme/templates/getstarted.html +++ b/homepage/theme/templates/getstarted.html @@ -52,7 +52,7 @@

    Details on how to
    install and run Offen

    - Open Docs + Open Docs diff --git a/homepage/theme/templates/trydemo.html b/homepage/theme/templates/trydemo.html index 0b6d8f3..72f21ba 100644 --- a/homepage/theme/templates/trydemo.html +++ b/homepage/theme/templates/trydemo.html @@ -45,7 +45,7 @@

    Details on how to
    install and run Offen

    - Open Docs + Open Docs
    From 2940eb89a767f3f80482f81065d0b2d730d2070f Mon Sep 17 00:00:00 2001 From: Hendrik Niefeld Date: Wed, 28 Oct 2020 21:45:17 +0100 Subject: [PATCH 2/2] fix links --- homepage/content/articles/0050-milestone-3.md | 2 +- homepage/content/pages/legal-notice.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/homepage/content/articles/0050-milestone-3.md b/homepage/content/articles/0050-milestone-3.md index 2287328..98285a7 100644 --- a/homepage/content/articles/0050-milestone-3.md +++ b/homepage/content/articles/0050-milestone-3.md @@ -5,7 +5,7 @@ slug: displaying-data sitemap_priority: 0.6 image_url: /theme/images/offen-blog-0050-milestone-3.jpg author: Frederik Ring -bottom_cta: Matomo +bottom_cta: matomo # Episode Three — Displaying data diff --git a/homepage/content/pages/legal-notice.md b/homepage/content/pages/legal-notice.md index a6aece4..4f0c52a 100644 --- a/homepage/content/pages/legal-notice.md +++ b/homepage/content/pages/legal-notice.md @@ -16,7 +16,7 @@ E-Mail: [hioffen@posteo.de](mailto:hioffen@posteo.de) Internet address: [www.offen.dev](https://www.offen.dev/) ### License -The content of this website itself is licensed under the [Creative Commons Attribution 4.0 International (CC BY 4.0) License](https://creativecommons.org/licenses/by/4.0/){: target="_blank"}, and the underlying source code used to format and display that content is licensed under the [GNU Affero General Public License v3.0](https://github.com/offen/website/blob/development/LICENSE). +The content of this website itself is licensed under the [Creative Commons Attribution 4.0 International (CC BY 4.0) License](https://creativecommons.org/licenses/by/4.0/){: target="_blank"}, and the underlying source code used to format and display that content is licensed under the [GNU Affero General Public License v3.0](https://github.com/offen/website/blob/development/LICENSE){: target="_blank"}. ### Graphics and Image Sources NLNet Logo [https://nlnet.nl/logo/](https://nlnet.nl/logo/){: target="_blank"}