From 3f03d76c41405c9b0f96974c96754c0ee76b13f8 Mon Sep 17 00:00:00 2001
From: Mattias de Hollander <m.dehollander@nioo.knaw.nl>
Date: Wed, 13 Feb 2019 16:41:51 +0100
Subject: [PATCH] Use modal for event details

---
 _includes/modals.html              | 13 +++++++------
 _includes/portfolio_grid.html      |  6 +++---
 _layouts/default.html              |  1 +
 _posts/1977-01-01-myEvent.markdown |  2 +-
 _posts/2077-01-01-myEvent.markdown |  4 +++-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/_includes/modals.html b/_includes/modals.html
index 7002f6dcf..f2de4b93b 100644
--- a/_includes/modals.html
+++ b/_includes/modals.html
@@ -17,21 +17,22 @@ <h2>{{ post.title }}</h2>
                             {% if post.img %}
                               <img src="img/portfolio/{{ post.img }}" class="img-responsive img-centered" alt="{{ post.alt }}">
                             {% endif %}
-                            <p>{{ post.description }}</p>
+                            <p>{{ post.text }}</p>
                             <ul class="list-inline item-details">
-                                <li>Client:
-                                    <strong><a href="http://startbootstrap.com">{{ post.client }}</a>
+                                <li>Location:
+                                    <strong>{{ post.location }}</a>
                                     </strong>
                                 </li>
                                 <li>Date:
-                                    <strong><a href="http://startbootstrap.com">{{ post.project-date }}</a>
+                                    <strong><a href="http://startbootstrap.com">{{ post.date | date: "%-d %B %Y"}}</a>
                                     </strong>
                                 </li>
-                                <li>Service:
-                                    <strong><a href="http://startbootstrap.com">{{ post.category }}</a>
+                                <li>Time:
+                                    <strong><a href="http://startbootstrap.com">{{post.startTime | date:"%r"}}</a>
                                     </strong>
                                 </li>
                             </ul>
+                            {{ post.content }}
                             <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> Close</button>
                         </div>
                     </div>
diff --git a/_includes/portfolio_grid.html b/_includes/portfolio_grid.html
index 176c4819a..fef62c3f4 100644
--- a/_includes/portfolio_grid.html
+++ b/_includes/portfolio_grid.html
@@ -21,8 +21,8 @@ <h3 class="section-subheading text-muted">{{site.data[site.language].eventsSubhe
                   {% if postyear > nowyear or postday >= nowday and postyear >= nowyear %}
                     {% assign isEvent = 1 %}
                     <li>
-                      <a class='eventTitle' href="{{ post.link }}">{{ post.title }}, {{ post.location }}, {{ post.date | date: "%-d %B %Y"}}, {{post.startTime | date:"%r"}} </a>
-                      <div class='eventSub'><a href="https://mozillascience.github.io/study-group-orientation/3.4-add-event.html">{{ post.text }}</a></div>
+                       <a class='eventTitle' href="#portfolioModal{{ post.modal-id }}" class="portfolio-link" data-toggle="modal">{{ post.title }}, {{ post.location }}, {{ post.date | date: "%-d %B %Y"}}, {{post.startTime | date:"%r"}} </a>
+                      <div class='eventSub'>{{ post.text }}</div>
                     </li>
                   {% endif %}
                 {% endfor %}
@@ -59,7 +59,7 @@ <h3 class="section-subheading text-muted">{{site.data[site.language].eventsSubhe
                           {% assign nowday = nowday | minus: 2 %}
                           {% if postyear < nowyear or postday < nowday and postyear == nowyear %}
                             <li>
-                              <a class='eventTitle' href="{{ post.link }}">{{ post.title }}, {{ post.location }}, {{ post.date | date: "%-d %B %Y"}}, {{post.startTime | date:"%r"}} </a>
+                              <a class='eventTitle' href="#portfolioModal{{ post.modal-id }}" class="portfolio-link" data-toggle="modal">{{ post.title }}, {{ post.location }}, {{ post.date | date: "%-d %B %Y"}}, {{post.startTime | date:"%r"}} </a>
                               <div class='eventSub'>{{ post.text }}</div>
                             </li>
                           {% endif %}
diff --git a/_layouts/default.html b/_layouts/default.html
index d16cc334e..ea0e84b73 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -12,6 +12,7 @@
     {% include contact.html %}
     {% include team.html %}
     {% include footer.html %}
+    {% include modals.html %}
     {% include js.html %}
 
     </body>
diff --git a/_posts/1977-01-01-myEvent.markdown b/_posts/1977-01-01-myEvent.markdown
index 60928f822..71ec8dc9e 100644
--- a/_posts/1977-01-01-myEvent.markdown
+++ b/_posts/1977-01-01-myEvent.markdown
@@ -1,10 +1,10 @@
 ---
 title: Make Your First Event
+modal-id: 2
 text: In order to make your first event, follow the instructions here.
 location: Your Location
 link: https://github.com/mozillascience/studyGroup#how-to-set-up-your-own-mozilla-study-group-website
 date: 1977-01-01
 startTime: '20:00'
 endTime: '21:00'
-
 ---
diff --git a/_posts/2077-01-01-myEvent.markdown b/_posts/2077-01-01-myEvent.markdown
index 40f904497..d80983603 100644
--- a/_posts/2077-01-01-myEvent.markdown
+++ b/_posts/2077-01-01-myEvent.markdown
@@ -1,10 +1,12 @@
 ---
 title: Make Your First Event
+modal-id: 1
 text: In order to make your first event, follow the instructions here.
 location: Your Location
 link: https://github.com/mozillascience/studyGroup#how-to-launch-a-new-event
 date: 2077-01-01
 startTime: '20:00'
 endTime: '21:00'
-
 ---
+
+Give more details on the event here