Merge pull request #31 from portableant/events-pelagios

Add events section
pelagios · Apr 17, 2024 · 0bbac69 · 0bbac69
2 parents fa8ba6b + 9fd56b9
commit 0bbac69
Show file tree

Hide file tree

Showing 22 changed files with 430 additions and 86 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 _site/
 .sass-cache/
+.idea/
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,16 @@
 source 'https://rubygems.org'
 
-gem 'jekyll'
-gem 'jekyll-sitemap' 
+gem "jekyll", "~> 3.9.0"
+gem "kramdown", ">= 2.4.0"
+gem "kramdown-parser-gfm"
+
+group :jekyll_plugins do
+  gem 'jekyll-sitemap'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Performance-booster for watching directories on Windows
+gem "wdm", "~> 0.1.0" if Gem.win_platform?
+gem "webrick", "~> 1.7.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,70 +1,73 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.7)
-    em-websocket (0.5.1)
+    concurrent-ruby (1.2.3)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.16.3)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.6.0)
-    i18n (1.8.5)
+    http_parser.rb (0.8.0)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (3.9.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
-      i18n (~> 1.0)
-      jekyll-sass-converter (~> 2.0)
+      i18n (>= 0.7, < 2)
+      jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
-      kramdown-parser-gfm (~> 1.0)
+      kramdown (>= 1.17, < 3)
       liquid (~> 4.0)
-      mercenary (~> 0.4.0)
+      mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 3.0)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
-    jekyll-sass-converter (2.1.0)
-      sassc (> 2.0.1, < 3.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
     jekyll-sitemap (1.4.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.1)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.2.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    mercenary (0.4.0)
+    mercenary (0.3.6)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.5)
-    rb-fsevent (0.10.4)
+    public_suffix (5.0.5)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.4)
-    rouge (3.22.0)
+    rexml (3.2.6)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (1.7.0)
+    sass (3.7.4)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    webrick (1.7.0)
 
 PLATFORMS
-  ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
-  jekyll
+  jekyll (~> 3.9.0)
   jekyll-sitemap
+  kramdown (>= 2.4.0)
+  kramdown-parser-gfm
+  tzinfo-data
+  webrick (~> 1.7.0)
 
 BUNDLED WITH
-   1.17.3
+   2.3.3
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,5 @@
 name: Pelagios Network
 markdown: kramdown
-#theme: jekyll-theme-cayman
 permalink: pretty
 
 collections_dir: content
@@ -11,6 +10,8 @@ collections:
     output: true
   partners:
     output: false
+  events:
+    output: true
 
 sass:
   style: compact # possible values: nested expanded compact compressed

diff --git a/_includes/map.html b/_includes/map.html
@@ -0,0 +1,22 @@
+{% if page.lat && page.lon %}
+    <h2>Venue map</h2>
+    <div id="map" style="width: 100%; height: 500px;"></div>
+    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY=" crossorigin="" />
+    <script src="https://unpkg.com/[email protected]/dist/leaflet.js" integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo=" crossorigin=""></script>
+    <script type="text/javascript">
+        // Get the latitude and longitude from the page metadata
+        var lat = {{page.lat}};
+        var lon = {{page.lon}};
+        // Create a map centered at a specific latitude and longitude
+        var map = L.map('map', {dragging: false, minZoom: 17, maxZoom: 19}).setView([lat, lon], 18);
+        // Set up the OSM layer
+        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
+            maxZoom: 19,
+            attribution: 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'
+        }).addTo(map);
+        // Add a marker at the same location
+        var marker = L.marker([lat, lon]).addTo(map);
+        // Optionally, add a popup to the marker
+        marker.bindPopup("<b>Historic England HQ London</b>").openPopup();
+    </script>
+{% endif %}
diff --git a/_layouts/events.html b/_layouts/events.html
@@ -0,0 +1,22 @@
+---
+layout: default
+---
+<div class="breadcrumb">
+  <a href="/events/">Events</a><span>&#8202;&mdash; </span>
+</div>
+<div class="activity">
+  <h1> {{ page.title }} </h1>
+  <div class="main-image"><img src="{{ page.image }}" width="100%"/></div>
+
+</div>
+
+<p class="csauth">By {{ page.author }}</p>
+
+<div class="case_study">
+  {{ content }}
+</div>
+
+{% include map.html %}
+
+
+
diff --git a/_sass/_button.scss b/_sass/_button.scss
@@ -0,0 +1,25 @@
+button {
+  display: inline-block;
+  outline: 0;
+  cursor: pointer;
+  border: none;
+  padding: 0 56px;
+  height: 45px;
+  line-height: 45px;
+  border-radius: 7px;
+  font-weight: 400;
+  font-size: 16px;
+  background: #572c8d;
+  color: #ffffff;
+  box-shadow: 0 4px 14px 0 rgb(0, 0, 0);
+  transition: background 0.2s ease, color 0.2s ease, box-shadow 0.2s ease;
+
+  :hover {
+    color: #d5c5c5;
+    box-shadow: 0 6px 20px rgb(93, 93, 93);
+  }
+}
+button a {
+  color: #ffffff;
+  text-decoration: none;
+}
diff --git a/_sass/_case-study.scss b/_sass/_case-study.scss
@@ -118,39 +118,38 @@
 }
 .case-study--teaser{
   &:nth-of-type(1) {
-    width: 319px;
-    height: 218px;
+    width: 300px;
+    height: 300px;
     .case-study--title {
       background: $sea-green-1;
     }
   }
   &:nth-of-type(2) {
-    width: 322px;
-    height: 250px;
+    width: 300px;
+    height: 300px;
     .case-study--title {
       background: $sea-green-2;
     }
   }
   &:nth-of-type(3) {
-    width: 230px;
-    height: 205px;
+    width: 300px;
+    height: 300px;
     align-self: flex-start;
-    margin-left: 89px;
     .case-study--title {
       background: $sea-green-2;
     }
   }
   &:nth-of-type(4) {
-    width: 170px;
-    height: 260px;
+    width: 300px;
+    height: 300px;
     align-self: flex-start;
     .case-study--title {
       background: $sea-green-3;
     }
   }
   &:nth-of-type(5) {
-    width: 280px;
-    height: 235px;
+    width: 300px;
+    height: 300px;
     align-self: flex-start;
     margin-right: 0;
     .case-study--title {