From 66db49ae23e26f8cc961806c35999a0b027ce83c Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 26 Jul 2019 12:05:08 +0200 Subject: [PATCH] clean up templates --- homepage/content/pages/deep-dive.md | 14 +----- homepage/content/pages/index.md | 14 +----- homepage/content/pages/opt-out.md | 11 ----- homepage/content/pages/status.md | 14 +----- homepage/pelicanconf.py | 4 +- homepage/theme/static/css/style.css | 10 +++- homepage/theme/templates/base.html | 74 ++++++++++++----------------- homepage/theme/templates/page.html | 57 +++++++++++++++++----- styles/index.css | 2 +- 9 files changed, 91 insertions(+), 109 deletions(-) diff --git a/homepage/content/pages/deep-dive.md b/homepage/content/pages/deep-dive.md index 5389609..e433c64 100644 --- a/homepage/content/pages/deep-dive.md +++ b/homepage/content/pages/deep-dive.md @@ -1,6 +1,7 @@ Title: Deep dive | offen description: offen is a free and open source analytics software for websites and web applications that allows respectful handling of data. save_as: deep-dive/index.html +href: /deep-dive/ ### What is this thing called "my data" and why does seemingly everyone want to get hold of it? @@ -75,18 +76,5 @@ __offen__ is created by [Frederik Ring][frederik-ring]{: target="_blank"} and [H We are happy about any kind of feedback. From *criticism and praise to contributions or support*, everything is welcome. -
-Summary -Status -Contact -
- -
-Get involved -Support us -
- ---- - [hendrik-niefeld]: http://niefeld.com/ [frederik-ring]: https://www.frederikring.com/ diff --git a/homepage/content/pages/index.md b/homepage/content/pages/index.md index 37a414c..784a7be 100644 --- a/homepage/content/pages/index.md +++ b/homepage/content/pages/index.md @@ -1,7 +1,7 @@ Title: Transparent web analytics | offen description: offen is a free and open source analytics software for websites and web applications that allows respectful handling of data. save_as: index.html - +href: / __offen__ is a web analytics software that gives users access to the data they are generating. Not only operators running sites or applications are given able to use the analytics tools, but also *the users themselves are granted access to and ownership of their data*. @@ -10,15 +10,3 @@ Usage metrics come with explanations about their meaning, relevance, usage and p __offen__ treats both users and operators as parties of equal importance. Users can expect full transparency and are encouraged to make *autonomous and informed decisions regarding the use of their data*. Operators are enabled to gain insights while respecting their users' privacy and their data. __offen__ is currently in the early stages of development and is applying for funds to sustain its development. An early alpha version is running on this site: you can visit the [auditorium](https://auditorium-alpha.offen.dev) to access your data. - - -
-Deep dive -Status -Contact -
- -
-Get involved -Support us -
diff --git a/homepage/content/pages/opt-out.md b/homepage/content/pages/opt-out.md index d7e6d76..2452c2d 100644 --- a/homepage/content/pages/opt-out.md +++ b/homepage/content/pages/opt-out.md @@ -9,14 +9,3 @@ This will prevent __offen__ from aggregating the actions you have taken on parti Operators now cannot draw any conclusions from your actions via __offen__. At the same time, however, they *cannot create a better experience* for you and other users. - -
-Summary -Status -Contact -
- -
-Get involved -Support us -
diff --git a/homepage/content/pages/status.md b/homepage/content/pages/status.md index 9544115..07184df 100644 --- a/homepage/content/pages/status.md +++ b/homepage/content/pages/status.md @@ -1,7 +1,7 @@ Title: Status | offen description: offen is a free and open source analytics software for websites and web applications that allows respectful handling of data. save_as: status/index.html - +href: /status/ ### Current status @@ -30,15 +30,3 @@ Our product story is based on three key questions. What makes __offen__ stand ou #### Publicity This product story is the starting point for publicty efforts that will start as soon as a beta version is available. They include own blog posts, forum marketing as well as SEO measures. - - -
-Summary -Deep dive -Contact -
- -
-Get involved -Support us -
diff --git a/homepage/pelicanconf.py b/homepage/pelicanconf.py index cc09651..8a546fb 100644 --- a/homepage/pelicanconf.py +++ b/homepage/pelicanconf.py @@ -39,4 +39,6 @@ TAGS_SAVE_AS = None # keep this for access to page variable DIRECT_TEMPLATES = [] -OFFEN_ACCOUNT_ID = None +GITHUB_ORG = 'https://github.com/offen' +CONTACT_EMAIL = 'mail@offen.dev' +PATREON_URL = 'https://www.patreon.com/bePatron?u=21484999' diff --git a/homepage/theme/static/css/style.css b/homepage/theme/static/css/style.css index dd818cd..3849338 100644 --- a/homepage/theme/static/css/style.css +++ b/homepage/theme/static/css/style.css @@ -1 +1,9 @@ -/** styles specific to homepage +section { +display: flex; +flex-flow: column; +} + +section .footnote { +padding-top: 30px; +order: 100; +} diff --git a/homepage/theme/templates/base.html b/homepage/theme/templates/base.html index 2db1ff1..d7db9e0 100644 --- a/homepage/theme/templates/base.html +++ b/homepage/theme/templates/base.html @@ -2,53 +2,39 @@ -{% block title %}{% endblock %} - - - - - - - - - - - - - - - - - - - -{% if OFFEN_ACCOUNT_ID %} - -{% endif %} - + {% block title %}{% endblock %} + + + + + + + + + + + + + + + + + + + {% if OFFEN_ACCOUNT_ID %} + + {% endif %} +
+
+ + + +
-
- -
- -
- -{% block content %}{% endblock %} - - - -
- + {% block content %}{% endblock %} +
diff --git a/homepage/theme/templates/page.html b/homepage/theme/templates/page.html index 7825043..38da732 100644 --- a/homepage/theme/templates/page.html +++ b/homepage/theme/templates/page.html @@ -1,17 +1,50 @@ {% extends "base.html" %} -{% block title %}{{ page.title }}{% endblock %} +{% block title %} + {{ page.title }} +{% endblock %} {% block content %} - -
-

-offen is a free and open source analytics software for websites and web applications that allows respectful handling of data. -

- -{% block before_content %}{% endblock %} -{% block page_content %}{{ page.content }}{% endblock %} -{% block after_content %}{% endblock %} - -
+
+ {% block before_content %} +

+ offen is a free and open source analytics software for websites and web applications that allows respectful handling of data. +

+ {% endblock %} + {% block page_content %} + {{ page.content }} + {% endblock %} + {% block after_content %} + + {% endblock %} +
{% endblock %} diff --git a/styles/index.css b/styles/index.css index 898da23..1dc6df6 100644 --- a/styles/index.css +++ b/styles/index.css @@ -209,7 +209,7 @@ flex-flow: column wrap; justify-content: space-around; } -.button-wrapper:first-of-type { +.navigation-wrapper { margin: 60px 0 0 0; }