From 7043648bde954b07c06e698addd34dbc604c03a3 Mon Sep 17 00:00:00 2001
From: Marc Horne <me@marcushorne.com>
Date: Thu, 22 Jun 2017 14:49:11 +0200
Subject: [PATCH 1/5] [#41] Changed hover affect on resource boxes

---
 site/layouts/partials/resources.html | 5 -----
 site/static/css/creative.css         | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/site/layouts/partials/resources.html b/site/layouts/partials/resources.html
index 7e756d2..344d2bf 100644
--- a/site/layouts/partials/resources.html
+++ b/site/layouts/partials/resources.html
@@ -11,11 +11,6 @@
                         {{ if and .category .title }}
                             <div class="resources-box-caption">
                                 <div class="resources-box-caption-content">
-                                    {{ with .category }}
-                                        <div class="resource-category text-faded">
-                                            {{ . }}
-                                        </div>
-                                    {{ end }}
                                     {{ with .title }}
                                         <div class="resource-name">
                                             {{ . }}
diff --git a/site/static/css/creative.css b/site/static/css/creative.css
index 0f71ccb..36d65df 100644
--- a/site/static/css/creative.css
+++ b/site/static/css/creative.css
@@ -357,8 +357,7 @@ header .header-content .header-content-inner p {
     height: 100%;
     text-align: center;
     color: #fff;
-    opacity: 0;
-    background: rgba(76, 189, 56, .9);
+    background: rgba(0, 0, 0, .4);
     -webkit-transition: all .35s;
     -moz-transition: all .35s;
     transition: all .35s;
@@ -389,7 +388,7 @@ header .header-content .header-content-inner p {
 }
 
 .resources-box:hover .resources-box-caption {
-    opacity: 1;
+    background: rgba(76, 189, 56, .9);
 }
 
 @media(min-width:768px) {

From eb5817ad0609c7b131da56112c375309b290acb5 Mon Sep 17 00:00:00 2001
From: Marc Horne <me@marcushorne.com>
Date: Thu, 22 Jun 2017 16:22:29 +0200
Subject: [PATCH 2/5] [#40] Allow user to open a modal box by defining it in
 the URL

---
 site/data/de/resources/1-PublicAdmin.yaml |  1 +
 site/data/de/resources/2-Public.yaml      |  1 +
 site/data/de/resources/3-Action.yaml      |  1 +
 site/data/de/resources/4-News.yaml        |  1 +
 site/data/de/resources/5-FOI.yaml         |  1 +
 site/data/de/resources/6-Press.yaml       |  1 +
 site/data/en/resources/1-PublicAdmin.yaml |  1 +
 site/data/en/resources/2-Public.yaml      |  1 +
 site/data/en/resources/3-Action.yaml      |  1 +
 site/data/en/resources/4-News.yaml        |  1 +
 site/data/en/resources/5-FOI.yaml         |  1 +
 site/data/en/resources/6-Press.yaml       |  1 +
 site/layouts/partials/modals.html         |  2 +-
 site/layouts/partials/resources.html      |  2 +-
 site/static/js/creative.js                | 24 +++++++++++++++++++++++
 15 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/site/data/de/resources/1-PublicAdmin.yaml b/site/data/de/resources/1-PublicAdmin.yaml
index 4168114..cd04ba8 100644
--- a/site/data/de/resources/1-PublicAdmin.yaml
+++ b/site/data/de/resources/1-PublicAdmin.yaml
@@ -2,6 +2,7 @@ modalID: 1
 title: Leitfaden für die öffentliche Verwaltung
 date: 2014-07-05
 img: 1.jpg
+modalName: guideForPublicAdministration
 category: Public Money, Public Code
 description:  "<p>GERMAN Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.</p>
 
diff --git a/site/data/de/resources/2-Public.yaml b/site/data/de/resources/2-Public.yaml
index 5d2c507..4c28096 100644
--- a/site/data/de/resources/2-Public.yaml
+++ b/site/data/de/resources/2-Public.yaml
@@ -2,5 +2,6 @@ modalID: 2
 title: Leitfaden für die Öffentlichkeit
 date: 2014-07-06
 img: 2.jpg
+modalName: guideForGeneralPublic
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/3-Action.yaml b/site/data/de/resources/3-Action.yaml
index 7c0c8b2..66d72fa 100644
--- a/site/data/de/resources/3-Action.yaml
+++ b/site/data/de/resources/3-Action.yaml
@@ -2,5 +2,6 @@ modalID: 3
 title: Werde aktiv!
 date: 2014-07-07
 img: 3.jpg
+modalName: takeAction
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/4-News.yaml b/site/data/de/resources/4-News.yaml
index 9460841..9c34b85 100644
--- a/site/data/de/resources/4-News.yaml
+++ b/site/data/de/resources/4-News.yaml
@@ -2,5 +2,6 @@ modalID: 4
 title: Neuigkeiten
 date: 2014-07-09
 img: 4.jpg
+modalName: latestNews
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/5-FOI.yaml b/site/data/de/resources/5-FOI.yaml
index 05a6ea9..d236fde 100644
--- a/site/data/de/resources/5-FOI.yaml
+++ b/site/data/de/resources/5-FOI.yaml
@@ -2,5 +2,6 @@ modalID: 5
 title: Informationsfreiheit
 date: 2014-07-08
 img: 5.jpg
+modalName: freedomOfInformation
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/6-Press.yaml b/site/data/de/resources/6-Press.yaml
index c3b6af1..c3bde92 100644
--- a/site/data/de/resources/6-Press.yaml
+++ b/site/data/de/resources/6-Press.yaml
@@ -2,5 +2,6 @@ modalID: 6
 title: Presse
 date: 2014-07-10
 img: 6.jpg
+modalName: pressInformation
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/1-PublicAdmin.yaml b/site/data/en/resources/1-PublicAdmin.yaml
index 436d9f2..d0c313c 100644
--- a/site/data/en/resources/1-PublicAdmin.yaml
+++ b/site/data/en/resources/1-PublicAdmin.yaml
@@ -2,6 +2,7 @@ modalID: 1
 title: Guide for Public Administration
 date: 2014-07-05
 img: 1.jpg
+modalName: guideForPublicAdministration
 category: Public Money, Public Code
 description:  "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.</p>
 
diff --git a/site/data/en/resources/2-Public.yaml b/site/data/en/resources/2-Public.yaml
index dfbbcaa..1c141f8 100644
--- a/site/data/en/resources/2-Public.yaml
+++ b/site/data/en/resources/2-Public.yaml
@@ -2,5 +2,6 @@ modalID: 2
 title: Guide for general public
 date: 2014-07-06
 img: 2.jpg
+modalName: guideForGeneralPublic
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/3-Action.yaml b/site/data/en/resources/3-Action.yaml
index 9ffa144..5a2bcd6 100644
--- a/site/data/en/resources/3-Action.yaml
+++ b/site/data/en/resources/3-Action.yaml
@@ -2,5 +2,6 @@ modalID: 3
 title: Take Action!
 date: 2014-07-07
 img: 3.jpg
+modalName: takeAction
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/4-News.yaml b/site/data/en/resources/4-News.yaml
index d54ae26..269136a 100644
--- a/site/data/en/resources/4-News.yaml
+++ b/site/data/en/resources/4-News.yaml
@@ -2,5 +2,6 @@ modalID: 4
 title: Latest News
 date: 2014-07-09
 img: 4.jpg
+modalName: latestNews
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/5-FOI.yaml b/site/data/en/resources/5-FOI.yaml
index 25d4bad..b7519b1 100644
--- a/site/data/en/resources/5-FOI.yaml
+++ b/site/data/en/resources/5-FOI.yaml
@@ -2,5 +2,6 @@ modalID: 5
 title: Freedom of Information
 date: 2014-07-08
 img: 5.jpg
+modalName: freedomOfInformation
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/6-Press.yaml b/site/data/en/resources/6-Press.yaml
index 5859eb0..5e8947c 100644
--- a/site/data/en/resources/6-Press.yaml
+++ b/site/data/en/resources/6-Press.yaml
@@ -2,5 +2,6 @@ modalID: 6
 title: Press information
 date: 2014-07-10
 img: 6.jpg
+modalName: pressInformation
 category: Public Money, Public Code
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/layouts/partials/modals.html b/site/layouts/partials/modals.html
index e82e7ed..66f200c 100644
--- a/site/layouts/partials/modals.html
+++ b/site/layouts/partials/modals.html
@@ -1,7 +1,7 @@
 {{ "<!-- RESOURCES MODALS -->" | safeHTML }}
 {{ $data := index .Site.Data .Site.Language.Lang }}
 {{ range $data.resources }}
-<div class="resources-modal modal fade" id="resourcesModal{{ .modalID }}" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="resources-modal modal fade" id="{{ .modalName }}" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-content">
         <div class="close-modal" data-dismiss="modal">
             <div class="lr">
diff --git a/site/layouts/partials/resources.html b/site/layouts/partials/resources.html
index 344d2bf..69d260b 100644
--- a/site/layouts/partials/resources.html
+++ b/site/layouts/partials/resources.html
@@ -6,7 +6,7 @@
         <div class="row no-gutter">
             {{ range $data.resources }}
                 <div class="col-lg-4 col-sm-6">
-                    <a href="#resourcesModal{{ .modalID }}" class="resources-box resources-link" data-toggle="modal">
+                    <a href="#{{ .modalName }}" class="resources-box resources-link" data-toggle="modal">
                         <img src="/img/resources/{{ .img }}" class="img-responsive" alt="">
                         {{ if and .category .title }}
                             <div class="resources-box-caption">
diff --git a/site/static/js/creative.js b/site/static/js/creative.js
index 2a38861..dbd3934 100644
--- a/site/static/js/creative.js
+++ b/site/static/js/creative.js
@@ -46,3 +46,27 @@
     new WOW().init();
 
 })(jQuery); // End of use strict
+
+
+/* 
+* This function allows you to open a modal box by defining it in the URL
+* e.g. https://localhost:1313/#resourcesModal1
+*/
+(function() {
+    if (window.location.href.indexOf('#') > -1) {
+      var modalID = window.location.href.split('#')[1];
+      var modal = document.getElementById(modalID);
+      
+      modal.className += ' in';
+      modal.style.display = 'block';
+      
+      var closeButtons = document.getElementsByClassName('close-modal');
+      
+      for(var i = 0; i < closeButtons.length; i++) {
+        closeButtons[i].onclick = function() {
+          modal.style.display = 'none';
+          modal.className -= ' in';
+        };
+      }
+    }
+})();

From bb3e440a9b2c6f9eb9982edab484b4a8abf578b9 Mon Sep 17 00:00:00 2001
From: Marc Horne <me@marcushorne.com>
Date: Thu, 22 Jun 2017 17:16:09 +0200
Subject: [PATCH 3/5] [#41] Fixed scrolling bug

---
 site/static/css/modals.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site/static/css/modals.css b/site/static/css/modals.css
index 21af63e..f3f169b 100644
--- a/site/static/css/modals.css
+++ b/site/static/css/modals.css
@@ -16,6 +16,8 @@ body {
   margin: 0 auto;
 }
 
+.modal { overflow-y: scroll }
+
 .resources-modal .modal-content {
   padding: 50px 0;
   min-height: 100%;

From d192ec6546f459439be41de5b7236e7a2a57b0bd Mon Sep 17 00:00:00 2001
From: Marc Horne <me@marcushorne.com>
Date: Thu, 22 Jun 2017 17:16:38 +0200
Subject: [PATCH 4/5] Removed categories and renamed modelName to shortLink

---
 site/config.toml                          |  1 -
 site/data/de/resources/1-PublicAdmin.yaml |  3 +--
 site/data/de/resources/2-Public.yaml      |  3 +--
 site/data/de/resources/3-Action.yaml      |  3 +--
 site/data/de/resources/4-News.yaml        |  3 +--
 site/data/de/resources/5-FOI.yaml         |  3 +--
 site/data/de/resources/6-Press.yaml       |  3 +--
 site/data/en/resources/1-PublicAdmin.yaml |  3 +--
 site/data/en/resources/2-Public.yaml      |  3 +--
 site/data/en/resources/3-Action.yaml      |  3 +--
 site/data/en/resources/4-News.yaml        |  3 +--
 site/data/en/resources/5-FOI.yaml         |  3 +--
 site/data/en/resources/6-Press.yaml       |  3 +--
 site/layouts/partials/modals.html         | 22 +++++-----------------
 site/layouts/partials/resources.html      |  4 ++--
 site/static/js/creative.js                |  2 +-
 16 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/site/config.toml b/site/config.toml
index 34ecb6f..dbdb52e 100644
--- a/site/config.toml
+++ b/site/config.toml
@@ -80,7 +80,6 @@ DefaultContentLanguage = "en"
 [params.resources.modal]
   client = "Client"
   date = "Date"
-  category = "Category"
   buttonText = "Close"
 
 # Sign section
diff --git a/site/data/de/resources/1-PublicAdmin.yaml b/site/data/de/resources/1-PublicAdmin.yaml
index cd04ba8..510a33f 100644
--- a/site/data/de/resources/1-PublicAdmin.yaml
+++ b/site/data/de/resources/1-PublicAdmin.yaml
@@ -2,8 +2,7 @@ modalID: 1
 title: Leitfaden für die öffentliche Verwaltung
 date: 2014-07-05
 img: 1.jpg
-modalName: guideForPublicAdministration
-category: Public Money, Public Code
+shortLink: guideForPublicAdministration
 description:  "<p>GERMAN Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.</p>
 
 <p>Vivamus massa mauris, blandit eu ante nec, pretium accumsan risus. Sed malesuada eu elit sit amet feugiat. Morbi a neque lorem. In rutrum ante nisl. Aliquam dapibus tempor libero eget elementum. Donec vitae odio sed ligula dictum malesuada. Fusce vitae facilisis turpis. Vivamus congue dolor lobortis, rutrum nibh at, pulvinar eros.</p>
diff --git a/site/data/de/resources/2-Public.yaml b/site/data/de/resources/2-Public.yaml
index 4c28096..576e832 100644
--- a/site/data/de/resources/2-Public.yaml
+++ b/site/data/de/resources/2-Public.yaml
@@ -2,6 +2,5 @@ modalID: 2
 title: Leitfaden für die Öffentlichkeit
 date: 2014-07-06
 img: 2.jpg
-modalName: guideForGeneralPublic
-category: Public Money, Public Code
+shortLink: guideForGeneralPublic
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/3-Action.yaml b/site/data/de/resources/3-Action.yaml
index 66d72fa..be4705c 100644
--- a/site/data/de/resources/3-Action.yaml
+++ b/site/data/de/resources/3-Action.yaml
@@ -2,6 +2,5 @@ modalID: 3
 title: Werde aktiv!
 date: 2014-07-07
 img: 3.jpg
-modalName: takeAction
-category: Public Money, Public Code
+shortLink: takeAction
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/4-News.yaml b/site/data/de/resources/4-News.yaml
index 9c34b85..fa58b5a 100644
--- a/site/data/de/resources/4-News.yaml
+++ b/site/data/de/resources/4-News.yaml
@@ -2,6 +2,5 @@ modalID: 4
 title: Neuigkeiten
 date: 2014-07-09
 img: 4.jpg
-modalName: latestNews
-category: Public Money, Public Code
+shortLink: latestNews
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/5-FOI.yaml b/site/data/de/resources/5-FOI.yaml
index d236fde..0bb09fd 100644
--- a/site/data/de/resources/5-FOI.yaml
+++ b/site/data/de/resources/5-FOI.yaml
@@ -2,6 +2,5 @@ modalID: 5
 title: Informationsfreiheit
 date: 2014-07-08
 img: 5.jpg
-modalName: freedomOfInformation
-category: Public Money, Public Code
+shortLink: freedomOfInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/6-Press.yaml b/site/data/de/resources/6-Press.yaml
index c3bde92..d2a8ee8 100644
--- a/site/data/de/resources/6-Press.yaml
+++ b/site/data/de/resources/6-Press.yaml
@@ -2,6 +2,5 @@ modalID: 6
 title: Presse
 date: 2014-07-10
 img: 6.jpg
-modalName: pressInformation
-category: Public Money, Public Code
+shortLink: pressInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/1-PublicAdmin.yaml b/site/data/en/resources/1-PublicAdmin.yaml
index d0c313c..15fdf45 100644
--- a/site/data/en/resources/1-PublicAdmin.yaml
+++ b/site/data/en/resources/1-PublicAdmin.yaml
@@ -2,8 +2,7 @@ modalID: 1
 title: Guide for Public Administration
 date: 2014-07-05
 img: 1.jpg
-modalName: guideForPublicAdministration
-category: Public Money, Public Code
+shortLink: guideForPublicAdministration
 description:  "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.</p>
 
 <p>Vivamus massa mauris, blandit eu ante nec, pretium accumsan risus. Sed malesuada eu elit sit amet feugiat. Morbi a neque lorem. In rutrum ante nisl. Aliquam dapibus tempor libero eget elementum. Donec vitae odio sed ligula dictum malesuada. Fusce vitae facilisis turpis. Vivamus congue dolor lobortis, rutrum nibh at, pulvinar eros.</p>
diff --git a/site/data/en/resources/2-Public.yaml b/site/data/en/resources/2-Public.yaml
index 1c141f8..1faa456 100644
--- a/site/data/en/resources/2-Public.yaml
+++ b/site/data/en/resources/2-Public.yaml
@@ -2,6 +2,5 @@ modalID: 2
 title: Guide for general public
 date: 2014-07-06
 img: 2.jpg
-modalName: guideForGeneralPublic
-category: Public Money, Public Code
+shortLink: guideForGeneralPublic
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/3-Action.yaml b/site/data/en/resources/3-Action.yaml
index 5a2bcd6..424f05e 100644
--- a/site/data/en/resources/3-Action.yaml
+++ b/site/data/en/resources/3-Action.yaml
@@ -2,6 +2,5 @@ modalID: 3
 title: Take Action!
 date: 2014-07-07
 img: 3.jpg
-modalName: takeAction
-category: Public Money, Public Code
+shortLink: takeAction
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/4-News.yaml b/site/data/en/resources/4-News.yaml
index 269136a..1703828 100644
--- a/site/data/en/resources/4-News.yaml
+++ b/site/data/en/resources/4-News.yaml
@@ -2,6 +2,5 @@ modalID: 4
 title: Latest News
 date: 2014-07-09
 img: 4.jpg
-modalName: latestNews
-category: Public Money, Public Code
+shortLink: latestNews
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/5-FOI.yaml b/site/data/en/resources/5-FOI.yaml
index b7519b1..d4ce3f5 100644
--- a/site/data/en/resources/5-FOI.yaml
+++ b/site/data/en/resources/5-FOI.yaml
@@ -2,6 +2,5 @@ modalID: 5
 title: Freedom of Information
 date: 2014-07-08
 img: 5.jpg
-modalName: freedomOfInformation
-category: Public Money, Public Code
+shortLink: freedomOfInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/6-Press.yaml b/site/data/en/resources/6-Press.yaml
index 5e8947c..45e55b2 100644
--- a/site/data/en/resources/6-Press.yaml
+++ b/site/data/en/resources/6-Press.yaml
@@ -2,6 +2,5 @@ modalID: 6
 title: Press information
 date: 2014-07-10
 img: 6.jpg
-modalName: pressInformation
-category: Public Money, Public Code
+shortLink: pressInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/layouts/partials/modals.html b/site/layouts/partials/modals.html
index 66f200c..d28fdfd 100644
--- a/site/layouts/partials/modals.html
+++ b/site/layouts/partials/modals.html
@@ -1,7 +1,7 @@
 {{ "<!-- RESOURCES MODALS -->" | safeHTML }}
 {{ $data := index .Site.Data .Site.Language.Lang }}
 {{ range $data.resources }}
-<div class="resources-modal modal fade" id="{{ .modalName }}" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="resources-modal modal fade" id="{{ .shortLink }}" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-content">
         <div class="close-modal" data-dismiss="modal">
             <div class="lr">
@@ -23,23 +23,11 @@
                         {{ with .description }}
                             <p>{{ . | markdownify }}</p>
                         {{ end }}
-                        {{ if or .client .date .category }}
+                        {{ if .date }}
                             <ul class="list-inline item-details">
-                                {{ if .client }}
-                                    <li>{{ with $.Site.Params.resources.modal.client }}{{.}}: {{ end }}
-                                        <strong><a href="{{ with .clientLink }}{{ . }}{{ else }}#{{ end }}">{{ .client }}</a></strong>
-                                    </li>
-                                {{ end }}
-                                {{ if .date }}
-                                    <li>{{ with $.Site.Params.resources.modal.date }}{{.}}: {{ end }}
-                                        <strong><a href="#">{{ .date }}</a></strong>
-                                    </li>
-                                {{ end }}
-                                {{ if .category }}
-                                    <li>{{ with $.Site.Params.resources.modal.category }}{{.}}: {{ end }}
-                                        <strong><a href="#">{{ .category }}</a></strong>
-                                    </li>
-                                {{ end }}
+                                <li>{{ with $.Site.Params.resources.modal.date }}{{.}}: {{ end }}
+                                    <strong><a href="#">{{ .date }}</a></strong>
+                                </li>
                             </ul>
                         {{ end }}
                     </div>
diff --git a/site/layouts/partials/resources.html b/site/layouts/partials/resources.html
index 69d260b..435c12b 100644
--- a/site/layouts/partials/resources.html
+++ b/site/layouts/partials/resources.html
@@ -6,9 +6,9 @@
         <div class="row no-gutter">
             {{ range $data.resources }}
                 <div class="col-lg-4 col-sm-6">
-                    <a href="#{{ .modalName }}" class="resources-box resources-link" data-toggle="modal">
+                    <a href="#{{ .shortLink }}" class="resources-box resources-link" data-toggle="modal">
                         <img src="/img/resources/{{ .img }}" class="img-responsive" alt="">
-                        {{ if and .category .title }}
+                        {{ if .title }}
                             <div class="resources-box-caption">
                                 <div class="resources-box-caption-content">
                                     {{ with .title }}
diff --git a/site/static/js/creative.js b/site/static/js/creative.js
index dbd3934..aa91412 100644
--- a/site/static/js/creative.js
+++ b/site/static/js/creative.js
@@ -65,7 +65,7 @@
       for(var i = 0; i < closeButtons.length; i++) {
         closeButtons[i].onclick = function() {
           modal.style.display = 'none';
-          modal.className -= ' in';
+          modal.classList.remove('in');
         };
       }
     }

From 60411cf0cb8ef7ef1f731cd722ca9ba1715a86b6 Mon Sep 17 00:00:00 2001
From: "max.mehl" <max.mehl@fsfe.org>
Date: Sat, 24 Jun 2017 00:43:42 +0200
Subject: [PATCH 5/5] change date layout and remove date field from static
 resources

---
 site/data/de/resources/1-PublicAdmin.yaml | 2 +-
 site/data/de/resources/2-Public.yaml      | 2 +-
 site/data/de/resources/3-Action.yaml      | 2 +-
 site/data/de/resources/4-News.yaml        | 2 +-
 site/data/de/resources/5-FOI.yaml         | 2 +-
 site/data/de/resources/6-Press.yaml       | 2 +-
 site/data/en/resources/1-PublicAdmin.yaml | 2 +-
 site/data/en/resources/2-Public.yaml      | 2 +-
 site/data/en/resources/3-Action.yaml      | 2 +-
 site/data/en/resources/4-News.yaml        | 2 +-
 site/data/en/resources/5-FOI.yaml         | 2 +-
 site/data/en/resources/6-Press.yaml       | 2 +-
 site/layouts/partials/modals.html         | 4 ++--
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/site/data/de/resources/1-PublicAdmin.yaml b/site/data/de/resources/1-PublicAdmin.yaml
index 510a33f..7010030 100644
--- a/site/data/de/resources/1-PublicAdmin.yaml
+++ b/site/data/de/resources/1-PublicAdmin.yaml
@@ -1,6 +1,6 @@
 modalID: 1
 title: Leitfaden für die öffentliche Verwaltung
-date: 2014-07-05
+date: 
 img: 1.jpg
 shortLink: guideForPublicAdministration
 description:  "<p>GERMAN Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.</p>
diff --git a/site/data/de/resources/2-Public.yaml b/site/data/de/resources/2-Public.yaml
index 576e832..d12222e 100644
--- a/site/data/de/resources/2-Public.yaml
+++ b/site/data/de/resources/2-Public.yaml
@@ -1,6 +1,6 @@
 modalID: 2
 title: Leitfaden für die Öffentlichkeit
-date: 2014-07-06
+date: 
 img: 2.jpg
 shortLink: guideForGeneralPublic
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/3-Action.yaml b/site/data/de/resources/3-Action.yaml
index be4705c..66d7719 100644
--- a/site/data/de/resources/3-Action.yaml
+++ b/site/data/de/resources/3-Action.yaml
@@ -1,6 +1,6 @@
 modalID: 3
 title: Werde aktiv!
-date: 2014-07-07
+date: 
 img: 3.jpg
 shortLink: takeAction
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/4-News.yaml b/site/data/de/resources/4-News.yaml
index fa58b5a..54c892d 100644
--- a/site/data/de/resources/4-News.yaml
+++ b/site/data/de/resources/4-News.yaml
@@ -1,6 +1,6 @@
 modalID: 4
 title: Neuigkeiten
-date: 2014-07-09
+date: 
 img: 4.jpg
 shortLink: latestNews
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/5-FOI.yaml b/site/data/de/resources/5-FOI.yaml
index 0bb09fd..d89ae3f 100644
--- a/site/data/de/resources/5-FOI.yaml
+++ b/site/data/de/resources/5-FOI.yaml
@@ -1,6 +1,6 @@
 modalID: 5
 title: Informationsfreiheit
-date: 2014-07-08
+date: 
 img: 5.jpg
 shortLink: freedomOfInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/de/resources/6-Press.yaml b/site/data/de/resources/6-Press.yaml
index d2a8ee8..6ba93d1 100644
--- a/site/data/de/resources/6-Press.yaml
+++ b/site/data/de/resources/6-Press.yaml
@@ -1,6 +1,6 @@
 modalID: 6
 title: Presse
-date: 2014-07-10
+date: 
 img: 6.jpg
 shortLink: pressInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/1-PublicAdmin.yaml b/site/data/en/resources/1-PublicAdmin.yaml
index 15fdf45..89c86e9 100644
--- a/site/data/en/resources/1-PublicAdmin.yaml
+++ b/site/data/en/resources/1-PublicAdmin.yaml
@@ -1,6 +1,6 @@
 modalID: 1
 title: Guide for Public Administration
-date: 2014-07-05
+date: 
 img: 1.jpg
 shortLink: guideForPublicAdministration
 description:  "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse iaculis molestie nisl, dapibus viverra nisl vehicula eu. Phasellus a lorem vel felis dignissim varius. Aenean et porta velit. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Aenean sodales augue eu lorem vestibulum luctus. Nunc bibendum sapien id ligula tempor, at tincidunt orci dignissim. Nam convallis, tortor nec bibendum ultrices, erat turpis vehicula enim, sit amet dictum leo urna non ante. Aenean fermentum finibus nibh, quis ultricies ipsum maximus vitae.</p>
diff --git a/site/data/en/resources/2-Public.yaml b/site/data/en/resources/2-Public.yaml
index 1faa456..e0986e8 100644
--- a/site/data/en/resources/2-Public.yaml
+++ b/site/data/en/resources/2-Public.yaml
@@ -1,6 +1,6 @@
 modalID: 2
 title: Guide for general public
-date: 2014-07-06
+date: 
 img: 2.jpg
 shortLink: guideForGeneralPublic
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/3-Action.yaml b/site/data/en/resources/3-Action.yaml
index 424f05e..f8107f7 100644
--- a/site/data/en/resources/3-Action.yaml
+++ b/site/data/en/resources/3-Action.yaml
@@ -1,6 +1,6 @@
 modalID: 3
 title: Take Action!
-date: 2014-07-07
+date: 
 img: 3.jpg
 shortLink: takeAction
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/4-News.yaml b/site/data/en/resources/4-News.yaml
index 1703828..72d3734 100644
--- a/site/data/en/resources/4-News.yaml
+++ b/site/data/en/resources/4-News.yaml
@@ -1,6 +1,6 @@
 modalID: 4
 title: Latest News
-date: 2014-07-09
+date: 
 img: 4.jpg
 shortLink: latestNews
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/5-FOI.yaml b/site/data/en/resources/5-FOI.yaml
index d4ce3f5..bad5645 100644
--- a/site/data/en/resources/5-FOI.yaml
+++ b/site/data/en/resources/5-FOI.yaml
@@ -1,6 +1,6 @@
 modalID: 5
 title: Freedom of Information
-date: 2014-07-08
+date: 
 img: 5.jpg
 shortLink: freedomOfInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/data/en/resources/6-Press.yaml b/site/data/en/resources/6-Press.yaml
index 45e55b2..2dd51d6 100644
--- a/site/data/en/resources/6-Press.yaml
+++ b/site/data/en/resources/6-Press.yaml
@@ -1,6 +1,6 @@
 modalID: 6
 title: Press information
-date: 2014-07-10
+date: 
 img: 6.jpg
 shortLink: pressInformation
 description: Lorem ipsum dolor sit amet, consectetur adipisicing elit. Vel enim aliquid dicta ullam in repellendus amet perspiciatis adipisci architecto obcaecati sit voluptas ipsam, deleniti neque placeat tenetur cum tempore velit.
diff --git a/site/layouts/partials/modals.html b/site/layouts/partials/modals.html
index d28fdfd..a0897f5 100644
--- a/site/layouts/partials/modals.html
+++ b/site/layouts/partials/modals.html
@@ -25,8 +25,8 @@
                         {{ end }}
                         {{ if .date }}
                             <ul class="list-inline item-details">
-                                <li>{{ with $.Site.Params.resources.modal.date }}{{.}}: {{ end }}
-                                    <strong><a href="#">{{ .date }}</a></strong>
+                                <li><strong>{{ with $.Site.Params.resources.modal.date }}{{.}}</strong>: {{ end }}
+                                    {{ .date }}
                                 </li>
                             </ul>
                         {{ end }}