chore: GDPR updates and ad updates

0x-r4bbit · 0x-r4bbit · commit 156fe5fe43bd · 2018-07-25T10:46:24.000+02:00
diff --git a/_includes/newsletter-subscriber.html b/_includes/newsletter-subscriber.html
@@ -1,11 +1,12 @@
 <div class="thtrm-subscriber">
   <h3>Get updates on new articles and trainings.</h3>
-  <p>Join over 1400 other developers who get our content first.</p>
+  <p>Join over 2400 other developers who get our content first.</p>
   <form action="//thoughtram.us8.list-manage.com/subscribe/post?u=dfbb1507fbced5a20d9dc5698&amp;id=731f22cdca" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" target="_blank" novalidate>
     <label for="mce-EMAIL"></label>
     <input type="email" value="" name="EMAIL" placeholder="Your email address..." required>
     <div style="position: absolute; left: -5000px;"><input type="text" name="b_dfbb1507fbced5a20d9dc5698_731f22cdca" tabindex="-1" value=""></div>
     <input type="submit" value="Subscribe" name="subscribe" class="thtrm-cta thtrm-cta--small">
   </form>
+  <p class="thtrm-form__info-text">Information on the performance measurement included in the consent, the use of the mail service provider MailChimp and on the logging of the registration and your rights of revocation can be found in our <a href="https://thoughtram.io/imprint.html" title="Privacy Statement">data protection declaration</a>.</p>
 </div>
 
diff --git a/_includes/public-training-ad.html b/_includes/public-training-ad.html
@@ -1,6 +1,6 @@
 <section class="thtrm-ad thtrm-section thtrm-section--is-promo is-sticky">
   <img width="100" src="/images/angular2-shield-inverse.svg">
-  <h3 class="thtrm-section-headline">Angular Master Class at Shopware</h3>
+  <h3 class="thtrm-section-headline">Angular Master Class in Las Palmas</h3>
   <p class="thtrm-section-text">Join our upcoming public training!</p>
-  <a href="https://amc-shopware.eventbrite.com?aff=blogAd" title="Angular Master Class at Shopware" id="event-cta" class="thtrm-layout-divider-cta">Get a ticket <strong>&rarr;</strong></a>
+  <a href="https://www.codecamps.com/aiff4/" title="Angular Master Class in Las Palmas" id="event-cta" class="thtrm-layout-divider-cta">Get a ticket <strong>&rarr;</strong></a>
 </section>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -35,6 +35,24 @@
 
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}" type="text/css">
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.css" />
+    <script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"></script>
+    <script>
+    window.addEventListener("load", function(){
+    window.cookieconsent.initialise({
+      "palette": {
+        "popup": {
+          "background": "#eee",
+          "text": "#5c7291"
+        },
+        "button": {
+          "background": "#4c91a7",
+          "text": "#ffffff"
+        }
+      },
+      "theme": "edgeless"
+    })});
+    </script>
   </head>
   <body class="thtrm-blog">
     <!-- Add your site or app content here -->
diff --git a/_layouts/post.html b/_layouts/post.html
@@ -83,15 +83,16 @@ <h2 class="thtrm-banner-text">{{page.title}}</h2>
       </div>
       <div class="thtrm-constraint thtrm-constraint--slim">
 
+        {% include public-training-ad.html %}
         <div class="thtrm-article">
-          {% include machinelabs-course-ad.html %}
 
           {{ content }}
 
           {% include demos-and-videos.html post=page %}
+        
+          {% include machinelabs-course-ad.html %}
         </div>
 
-        {% include public-training-ad.html %}
         {% include newsletter-subscriber.html %}
 
         <div class="thtrm-social-links">
diff --git a/_layouts/website.html b/_layouts/website.html
@@ -40,6 +40,24 @@
 
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}" type="text/css">
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.css" />
+    <script src="//cdnjs.cloudflare.com/ajax/libs/cookieconsent2/3.1.0/cookieconsent.min.js"></script>
+    <script>
+    window.addEventListener("load", function(){
+    window.cookieconsent.initialise({
+      "palette": {
+        "popup": {
+          "background": "#eee",
+          "text": "#5c7291"
+        },
+        "button": {
+          "background": "#4c91a7",
+          "text": "#ffffff"
+        }
+      },
+      "theme": "edgeless"
+    })});
+    </script>
   </head>
   <body itemscope itemtype="http://schema.org/WebPage" class="thtrm-home">
     <!-- Add your site or app content here -->
diff --git a/_sass/_thtrm-subscriber.scss b/_sass/_thtrm-subscriber.scss
@@ -38,6 +38,23 @@
     font-size: 15px;
   }
 
+  .thtrm-form__info-text {
+    font-size: 0.8em;
+    font-weight: normal;
+    max-width:  500px;
+    color: #aaa;
+    margin: auto;
+    margin-top: 1em;
+
+    a {
+      text-decoration: underline;
+      color: #aaa;
+      &:after {
+        display: none;
+      }
+    }
+  }
+
   .thtrm-cta { margin-top: 0; }
 
   input[type="email"] {
@@ -70,3 +87,4 @@
     }
   }
 }
+
