From 810941f65de67d8a47e27a461daf11c0fede179f Mon Sep 17 00:00:00 2001 From: Jeppe Ernst Date: Thu, 25 Jan 2018 22:35:10 +0100 Subject: [PATCH] added email signup form and CTA --- _config.yml | 4 +- _data/da/common.yml | 3 + _data/en/common.yml | 3 + _includes/ctascale.svg | 1 + _includes/head.html | 3 + _layouts/centered.html | 8 ++ _layouts/indexpage.html | 12 ++ 404.html => _pages/404.html | 1 + index-da.md => _pages/index-da.md | 2 +- index-en.md => _pages/index-en.md | 0 _pages/redirect/redirect-fail-da.md | 8 ++ _pages/redirect/redirect-fail-en.md | 8 ++ _pages/redirect/redirect-success-da.md | 8 ++ _pages/redirect/redirect-success-en.md | 8 ++ _scss/base/_base.scss | 7 +- _scss/module/_indexpage.scss | 161 +++++++++++++++---------- dynamic/signup/index.php | 25 ++++ 17 files changed, 195 insertions(+), 67 deletions(-) create mode 100644 _includes/ctascale.svg create mode 100644 _layouts/centered.html rename 404.html => _pages/404.html (96%) rename index-da.md => _pages/index-da.md (98%) rename index-en.md => _pages/index-en.md (100%) create mode 100644 _pages/redirect/redirect-fail-da.md create mode 100644 _pages/redirect/redirect-fail-en.md create mode 100644 _pages/redirect/redirect-success-da.md create mode 100644 _pages/redirect/redirect-success-en.md create mode 100644 dynamic/signup/index.php diff --git a/_config.yml b/_config.yml index 722825c..21b394d 100644 --- a/_config.yml +++ b/_config.yml @@ -28,8 +28,10 @@ exclude_from_localization: ["assets"] parallel_localization: false # Build settings +permalink: /:title/ markdown: kramdown -exclude: ["README.md", 'Gemfile.lock', 'Gemfile'] +exclude: ["README.md", 'Gemfile.lock', 'Gemfile', "docker-compose.yml"] +include: ["_pages"] plugins: - jekyll-feed diff --git a/_data/da/common.yml b/_data/da/common.yml index 358ed7f..6e5a136 100644 --- a/_data/da/common.yml +++ b/_data/da/common.yml @@ -3,6 +3,9 @@ global: description: >- Den danske totalovervågning er kendt ulovlig, men teleselskaber og politikere er ligeglade. Nu gør vi noget ved det! #ulovligLogning + emailplaceholder: indtast din email + signup: JA! jeg vil gerne holdes opdateret. + ctatext: Hvis du vil hjælpe eller give et bidrag, kan du [trykke her](#wannahelp). langs: da: Dansk en: Engelsk diff --git a/_data/en/common.yml b/_data/en/common.yml index 51ec31c..d85e371 100644 --- a/_data/en/common.yml +++ b/_data/en/common.yml @@ -3,6 +3,9 @@ global: description: >- The Danish states mass surveillance has been ruled illegal, but the telcos and the politicians don't care. Now we are going to do something about it! #ulovligLogning + emailplaceholder: enter your email + signup: Yes! I want to be kept in the loop. + ctatext: If you want to help us or donate to our cause [click here](#wannahelp). langs: da: Danish en: English \ No newline at end of file diff --git a/_includes/ctascale.svg b/_includes/ctascale.svg new file mode 100644 index 0000000..2bf80c5 --- /dev/null +++ b/_includes/ctascale.svg @@ -0,0 +1 @@ +Giv etbidrag! diff --git a/_includes/head.html b/_includes/head.html index 0e88991..0507c20 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -4,6 +4,9 @@ {{ global.title }} + {% if page.redirect %} + + {% endif %} diff --git a/_layouts/centered.html b/_layouts/centered.html new file mode 100644 index 0000000..f495828 --- /dev/null +++ b/_layouts/centered.html @@ -0,0 +1,8 @@ +--- +layout: default +--- +
+
+ {{ content }} +
+
\ No newline at end of file diff --git a/_layouts/indexpage.html b/_layouts/indexpage.html index 0eea13b..e65c2c0 100644 --- a/_layouts/indexpage.html +++ b/_layouts/indexpage.html @@ -1,11 +1,23 @@ --- layout: default --- +{% assign global = site.data.common.global %} {% for section in page.sections %}

{{ section.heading }}

{{ section.content | markdownify }} + {% if section.id == "intro" %} +

{{ global.ctatext | markdownify }}

+ {% include ctascale.svg %} + {% endif %} + {% if section.id == "wannahelp" %} + + {% endif %}
{% endfor %} \ No newline at end of file diff --git a/404.html b/_pages/404.html similarity index 96% rename from 404.html rename to _pages/404.html index c472b4e..40097d8 100644 --- a/404.html +++ b/_pages/404.html @@ -1,5 +1,6 @@ --- layout: default +permalink: /404 ---