From 810941f65de67d8a47e27a461daf11c0fede179f Mon Sep 17 00:00:00 2001
From: Jeppe Ernst <impala.lowrider@gmail.com>
Date: Thu, 25 Jan 2018 22:35:10 +0100
Subject: [PATCH 1/3] 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 722825c2..21b394dc 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 358ed7f5..6e5a1366 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 51ec31c9..d85e3718 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 00000000..2bf80c53
--- /dev/null
+++ b/_includes/ctascale.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 500 600"><a><g><circle r="250" cy="300" cx="250" fill="#ff4c00" fill-rule="evenodd"/><text y="275.465" x="251.718" style="text-align:center;text-shadow: 3px 3px 0 #d94100;" font-weight="400" font-size="96" font-family="Eczar" text-anchor="middle" fill="#fff"><tspan style="text-align:center" y="275.465" x="251.718">Giv et</tspan><tspan style="text-align:center" y="371.871" x="251.718">bidrag!</tspan></text><animateTransform attributeName="transform" type="translate" values="0 0; 0 -50; 0 0;0 -10; 0 0" begin="0s" dur="0.5s" repeatCount="4"/></g><path d="M230.715 436.685c-2.77 0-5 2.23-5 5v92.858c0 .713.151 1.387.418 2h-34.586a4.988 4.988 0 0 0 0 7.07l54.918 54.918a4.988 4.988 0 0 0 7.07 0l54.918-54.918a4.988 4.988 0 0 0 0-7.07h-34.586a4.991 4.991 0 0 0 .418-2v-92.858c0-2.77-2.23-5-5-5z" fill="#ff4c00" fill-rule="evenodd"/></a></svg>
diff --git a/_includes/head.html b/_includes/head.html
index 0e889914..0507c201 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -4,6 +4,9 @@
   <title>{{ global.title }}</title>
   <link rel="stylesheet" href="{{ site.baseurl }}/assets/style/main.css?{{ site.time | date: '%s' }}">
   <link rel="alternate" type="application/rss+xml" title="RSS Feed for {{ site.name }}" href="{{ site.baseurl }}/feed.xml" />
+  {% if page.redirect %}
+    <meta http-equiv='refresh' content='5;url={% if site.active_lang == site.default_lang %} {{site.url}} {% else %} {{site.url}}/{{ site.active_lang }} {% endif %}' />    
+  {% endif %}
   <meta property="og:type" content="website">
   <meta property="og:image" content="{{ site.url }}/assets/img/og01.png" />
   <meta property="og:url" content="{{ site.url }}" />
diff --git a/_layouts/centered.html b/_layouts/centered.html
new file mode 100644
index 00000000..f495828a
--- /dev/null
+++ b/_layouts/centered.html
@@ -0,0 +1,8 @@
+---
+layout: default
+---
+<section class="centered">
+	<div class="content">
+		{{ content }}
+	</div>
+</section>
\ No newline at end of file
diff --git a/_layouts/indexpage.html b/_layouts/indexpage.html
index 0eea13b8..e65c2c05 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 id="{{ section.id }}" class="{% cycle 'odd', 'even' %}">
 	<h1>{{ section.heading }}</h1>
 	<div class="paragraphs">
 		{{ section.content | markdownify }}
+		{% if section.id == "intro" %}
+			<p class="ctaTxt">{{ global.ctatext | markdownify }}</p>
+			<a href="#wannahelp" class="cta">{% include ctascale.svg %}</a>
+		{% endif %}
+		{% if section.id == "wannahelp" %}
+		 <form class="signup" action="https://ulovliglogning.dk/dynamic/signup/" method="post">
+		 	<input type="email" required="true" placeholder="{{ global.emailplaceholder }}" name="email">
+		 	<input type="text" name="lang" value="{{ site.active_lang }}" class="hidden">
+		 	<input type="submit" name="submit" value="{{ global.signup }}">
+		 </form>
+		{% endif %}
 	</div>
 </section>
 {% 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 c472b4ea..40097d81 100644
--- a/404.html
+++ b/_pages/404.html
@@ -1,5 +1,6 @@
 ---
 layout: default
+permalink: /404
 ---
 
 <style type="text/css" media="screen">
diff --git a/index-da.md b/_pages/index-da.md
similarity index 98%
rename from index-da.md
rename to _pages/index-da.md
index fff829b0..54686070 100644
--- a/index-da.md
+++ b/_pages/index-da.md
@@ -30,7 +30,7 @@ sections:
   - id: wannahelp
     heading: Jeg vil hjælpe!
     content: |
-      Hvis du har lyst til at hjælpe, kan du kontakte [Rasmus Malver](https://twitter.com/rasmusmalver) på [Twitter](https://twitter.com/rasmusmalver) eller på [sms/signal](sms:+4526809424).
+      Hvis du har lyst til at hjælpe, kan du kontakte [Rasmus Malver](https://twitter.com/rasmusmalver) på [Twitter](https://twitter.com/rasmusmalver) eller på [sms/signal](sms:+4526809424). Du kan også følge foreningen på [Twitter](https://twitter.com/ulovliglogning). Eller skrive dig op til vores nyhedsbrev herunder.
 
       Økonomiske bidrag kan indbetales så anonymt som muligt på konto <span class="donate">5042 1165817 (IBAN DK6850420001165817 / SWIFT JYBADKKK)</span>. Vær sød at skrive <span class="donate">RASMA.0001</span> i beskedfeltet. Selvom vi har indsamlet 100.000 kr, og dermed har nået det første del-mål, har vi stadig brug for støtte.
 
diff --git a/index-en.md b/_pages/index-en.md
similarity index 100%
rename from index-en.md
rename to _pages/index-en.md
diff --git a/_pages/redirect/redirect-fail-da.md b/_pages/redirect/redirect-fail-da.md
new file mode 100644
index 00000000..b813219c
--- /dev/null
+++ b/_pages/redirect/redirect-fail-da.md
@@ -0,0 +1,8 @@
+---
+title: signup
+permalink: /redirect/fail/
+redirect: true
+lang: da
+layout: centered
+---
+Øv! noget gik galt! prøv igen, eller kontakt os på [Twitter](https://twitter.com/ulovliglogning)
\ No newline at end of file
diff --git a/_pages/redirect/redirect-fail-en.md b/_pages/redirect/redirect-fail-en.md
new file mode 100644
index 00000000..9ecacb59
--- /dev/null
+++ b/_pages/redirect/redirect-fail-en.md
@@ -0,0 +1,8 @@
+---
+title: signup
+permalink: /redirect/fail/
+redirect: true
+lang: en
+layout: centered
+---
+Damn! something went wrong :( try again or contact us on [Twitter](https://twitter.com/ulovliglogning)
\ No newline at end of file
diff --git a/_pages/redirect/redirect-success-da.md b/_pages/redirect/redirect-success-da.md
new file mode 100644
index 00000000..26c0a338
--- /dev/null
+++ b/_pages/redirect/redirect-success-da.md
@@ -0,0 +1,8 @@
+---
+title: signup
+permalink: /redirect/success/
+redirect: true
+lang: da
+layout: centered
+---
+Tak! du er nu skrevet op til vores nyhedsbrev!
\ No newline at end of file
diff --git a/_pages/redirect/redirect-success-en.md b/_pages/redirect/redirect-success-en.md
new file mode 100644
index 00000000..97038b07
--- /dev/null
+++ b/_pages/redirect/redirect-success-en.md
@@ -0,0 +1,8 @@
+---
+title: signup
+permalink: /redirect/success/
+redirect: true
+lang: en
+layout: centered
+---
+Thank you! You are now signed up for our newsletter!
\ No newline at end of file
diff --git a/_scss/base/_base.scss b/_scss/base/_base.scss
index 5253374d..bc1aef3a 100644
--- a/_scss/base/_base.scss
+++ b/_scss/base/_base.scss
@@ -15,6 +15,10 @@ footer {
     color: #AAA;
 }
 
+.hidden {
+    display: none !important;
+}
+
 .langSwitcher {
     display: inline-block;
     position: absolute;
@@ -32,9 +36,10 @@ footer {
     box-shadow: none;
     border-radius: 3px;
     margin-right: 5px;
+    box-shadow: inset 0 50px 0 rgba(0, 0, 0, 0.35);
 }
 .langSwitcher a.activeLang {
-    box-shadow: inset 0 50px 0 rgba(0, 0, 0, 0.35);
+    box-shadow: none;
 }
 .langSwitcher a:last-child{
     margin-right: 0;
diff --git a/_scss/module/_indexpage.scss b/_scss/module/_indexpage.scss
index 96a74c47..b80bfd9e 100644
--- a/_scss/module/_indexpage.scss
+++ b/_scss/module/_indexpage.scss
@@ -1,73 +1,106 @@
 section {
-	min-height: 100vh;
-	position: relative;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
+    min-height: 100vh;
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
 
-	background-color: $background-primary;
-	background-image: linear-gradient(
-		to left bottom, 
-		$background-primary 49%, 
-		$background-alternative 50%
-	);
-	background-size: 100% 30px;
-	background-repeat: no-repeat;
-	background-position: bottom;
+    background-color: $background-primary;
+    background-image: linear-gradient(
+        to left bottom, 
+        $background-primary 49%, 
+        $background-alternative 50%
+    );
+    background-size: 100% 30px;
+    background-repeat: no-repeat;
+    background-position: bottom;
 
-	&:nth-of-type(even) {
-		background-color: $background-alternative;
-		background-image: linear-gradient(
-			to left bottom, 
-			$background-alternative 49%, 
-			$background-primary 50%
-		);
-	}
-	&:last-of-type {
-		background-image: none;
-	}
+    &:nth-of-type(even) {
+        background-color: $background-alternative;
+        background-image: linear-gradient(
+            to left bottom, 
+            $background-alternative 49%, 
+            $background-primary 50%
+        );
+    }
+    &:last-of-type {
+        background-image: none;
+    }
+}
+
+
+.cta{display:none;}
+@media screen and (min-width: 1200px) and (orientation:landscape){
+    #intro{position:relative;}
+    .cta{display:inline;position:absolute;left:5%;bottom:15%;
+    height:auto;width:200px;box-shadow:none;}
+    .ctaTxt{display:none;}
+}
+
+
+.signup {
+    input {
+        display: block;
+        width: 90%;
+        margin: 0 auto;
+        border-radius: 0;
+        border: none;
+        padding: 5px 0;
+        height: 2rem;
+        text-align: center;
+        font-size: 1rem;
+    }
+    input[type="text"] {
+
+    }
+    input[type="submit"] {
+        cursor: pointer;
+        color: #FFF;
+        background: darken($background-alternative, 20);
+        border-bottom: 2px solid darken($background-alternative, 25);
+    }
 }
 
 section {
-	.paragraphs {
-		margin-bottom: 3rem;
-		h3, p {
-			max-width: 600px;
-			font-family: 'Roboto', sans-serif;
-		}
-		p + h3 {
-			margin-top: 50px;
-		}
-	}
+    .paragraphs {
+        margin-bottom: 3rem;
+        h3, p {
+            max-width: 600px;
+            font-family: 'Roboto', sans-serif;
+        }
+        p + h3 {
+            margin-top: 50px;
+        }
+    }
 
-	&#intro {
-		h1 {
-			margin: 8rem 0 3rem;
-		}
-	}
+    &#intro {
+        h1 {
+            margin: 8rem 0 3rem;
+        }
+    }
 
-	&#faq {
-		.paragraphs {
-			column-count: unset;
-		}
-		ul {
-			list-style-type: none;
-			li {
-				display: block;
-				margin: 4rem 300px 0 0;
-				&:nth-child(even) {
-					margin: 4rem 0 0 300px;
-				}
-				@media screen and (max-width: $screen-phone) {
-					&, &:nth-child(even) {
-						margin: 4rem 0 0;
-					}
-				}
-				&:first-child {
-					margin-top: 0;
-				}
-			}
-		}
-	}
+    &#faq {
+        .paragraphs {
+            column-count: unset;
+        }
+        ul {
+            list-style-type: none;
+            li {
+                display: block;
+                margin: 4rem 300px 0 0;
+                &:nth-child(even) {
+                    margin: 4rem 0 0 300px;
+                }
+                @media screen and (max-width: $screen-phone) {
+                    &, &:nth-child(even) {
+                        margin: 4rem 0 0;
+                    }
+                }
+                &:first-child {
+                    margin-top: 0;
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/dynamic/signup/index.php b/dynamic/signup/index.php
new file mode 100644
index 00000000..86114f26
--- /dev/null
+++ b/dynamic/signup/index.php
@@ -0,0 +1,25 @@
+<?php
+
+$email = $_POST["email"];
+$lang = $_POST["lang"];
+
+ $to = "ulovliglogning@protonmail.com";
+ $subject = "signup";
+ $body = "email: ".$email."\nlang: ".$lang;
+ if (mail($to, $subject, $body)) {
+	if ($lang == "da") {
+		$redirect = "https://ulovliglogning.dk/redirect/success/"
+	} else {
+	 	$redirect = "https://ulovliglogning.dk/".$lang."/redirect/success/"
+	}
+ } else {
+	if ($lang == "da") {
+		$redirect = "https://ulovliglogning.dk/redirect/fail/"
+	} else {
+	 	$redirect = "https://ulovliglogning.dk/".$lang."/redirect/fail/"
+	}
+ }
+
+ header('Location: '.$redirect);
+ die();
+ ?>
\ No newline at end of file

From 8f447cc201d77f49dad044c36975660a5dbb860d Mon Sep 17 00:00:00 2001
From: Jeppe Ernst <impala.lowrider@gmail.com>
Date: Thu, 25 Jan 2018 22:38:55 +0100
Subject: [PATCH 2/3] f*cking ;;;;;;;;;;;,'s

---
 dynamic/signup/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dynamic/signup/index.php b/dynamic/signup/index.php
index 86114f26..8c695954 100644
--- a/dynamic/signup/index.php
+++ b/dynamic/signup/index.php
@@ -8,15 +8,15 @@ $lang = $_POST["lang"];
  $body = "email: ".$email."\nlang: ".$lang;
  if (mail($to, $subject, $body)) {
 	if ($lang == "da") {
-		$redirect = "https://ulovliglogning.dk/redirect/success/"
+		$redirect = "https://ulovliglogning.dk/redirect/success/";
 	} else {
-	 	$redirect = "https://ulovliglogning.dk/".$lang."/redirect/success/"
+	 	$redirect = "https://ulovliglogning.dk/".$lang."/redirect/success/";
 	}
  } else {
 	if ($lang == "da") {
-		$redirect = "https://ulovliglogning.dk/redirect/fail/"
+		$redirect = "https://ulovliglogning.dk/redirect/fail/";
 	} else {
-	 	$redirect = "https://ulovliglogning.dk/".$lang."/redirect/fail/"
+	 	$redirect = "https://ulovliglogning.dk/".$lang."/redirect/fail/";
 	}
  }
 

From 91b08e3b6f285dd897f879ae73f4b55f05287911 Mon Sep 17 00:00:00 2001
From: Jeppe Ernst <impala.lowrider@gmail.com>
Date: Thu, 25 Jan 2018 22:40:23 +0100
Subject: [PATCH 3/3] using the svg with view box from includes instead

---
 assets/img/cta.svg | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 assets/img/cta.svg

diff --git a/assets/img/cta.svg b/assets/img/cta.svg
deleted file mode 100644
index 8def57a5..00000000
--- a/assets/img/cta.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="600" width="500"><a><g><circle r="250" cy="300" cx="250" fill="#ff4c00" fill-rule="evenodd"/><text y="275.465" x="251.718" style="text-align:center;text-shadow: 5px 5px 0 #d94100;" font-weight="400" font-size="96" font-family="Eczar" text-anchor="middle" fill="#fff"><tspan style="text-align:center" y="275.465" x="251.718">Giv et</tspan><tspan style="text-align:center" y="371.871" x="251.718">bidrag!</tspan></text><animateTransform attributeName="transform" type="translate" values="0 0; 0 -50; 0 0;0 -10; 0 0" begin="0s" dur="0.5s" repeatCount="4"/></g><path d="M230.715 436.685c-2.77 0-5 2.23-5 5v92.858c0 .713.151 1.387.418 2h-34.586a4.988 4.988 0 0 0 0 7.07l54.918 54.918a4.988 4.988 0 0 0 7.07 0l54.918-54.918a4.988 4.988 0 0 0 0-7.07h-34.586a4.991 4.991 0 0 0 .418-2v-92.858c0-2.77-2.23-5-5-5z" fill="#ff4c00" fill-rule="evenodd"/></a></svg>