Merge branch 'World-Wide-JUGs:master' into master

FDelporte · Sep 15, 2023 · 7690236 · 7690236
2 parents 32bea24 + a363d07
commit 7690236
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/_jugs/BelgianJUG.md b/_jugs/BelgianJUG.md
@@ -3,6 +3,7 @@ name:     "Belgian Java User Group"
 country:  Belgium
 website:  https://www.meetup.com/belgian-java-user-group
 twitter:  BeJUG
+mastodon: https://foojay.social/@BeJUG
 location: 50.846816259061896, 4.352442201048654
 founded_date: 1996-01-01
 ---
diff --git a/_jugs/BrusselsJUG.md b/_jugs/BrusselsJUG.md
@@ -3,6 +3,7 @@ name:     "Brussels Java User Group"
 country:  Belgium
 website:  http://www.brujug.be/
 twitter:  BruJUG
+mastodon: https://foojay.social/@brujug
 location: 50.849594, 4.364084
 founded_date: 2010-03-01
 ---
diff --git a/_jugs/CentralOhioJUG.md b/_jugs/CentralOhioJUG.md
@@ -0,0 +1,10 @@
+---
+name:     "Central Ohio Java User Group (COJUG)"
+country:  USA
+website:  http://www.cojug.org/
+location: 39.99664182204378, -83.0739151554613
+founded_date: 1995-01-01
+twitter: 
+contact: [email protected]
+youtube:  https://www.youtube.com/@cojug
+---
diff --git a/_jugs/ChicagoJUG.md b/_jugs/ChicagoJUG.md
@@ -0,0 +1,9 @@
+---
+name:     "Chicago Java User’s Group"
+country:  USA
+website:  https://www.meetup.com/ChicagoJUG/
+twitter:  cjug
+mastodon: https://foojay.social/@ChicagoJUG
+location: 41.87964294558547, -87.63584297206118
+founded_date: 2013-01-01
+---
diff --git a/index.html b/index.html
@@ -19,11 +19,17 @@
         <li>
             <article><p>
                 <h2>{{ jug.name }}</h2>
-                Location: {{ jug.location }}<br/>
                 Date founded: {{ jug.founded_date }}<br/>
                 Country: {{ jug.country }}<br/>
-                <a href="{{ jug.website }}">Website</a><br/>
-                <a href="https://twitter.com/{{ jug.twitter }}">Twitter</a></p>
+                {% if jug.website %}
+                    <a href="{{ jug.website }}">Website</a><br/>
+                {% endif %}
+                {% if jug.twitter %}
+                    <a href="https://twitter.com/{{ jug.twitter }}">Twitter</a><br/>
+                {% endif %}
+                {% if jug.mastodon %}
+                    <a href="{{ jug.mastodon }}">Mastodon</a></p>
+                {% endif %}
             </article>
         </li>
     {% endfor %}

diff --git a/map.html b/map.html
@@ -37,9 +37,12 @@
         {% assign longitude = coordinates[0] %}
         {% assign latitude = coordinates[1] %}
         var popup = "<b>{{ jug.name }}</b><br/>" +
-            "<a href='{{ jug.website }}'>Website</a><br/>";
+            "<a href='{{ jug.website }}' target=\"_blank\">Website</a><br/>";
         if ("{{ jug.twitter }}".length > 0) {
-          popup += "<a href='https://twitter.com/{{ jug.twitter }}'>Twitter</a><br/>";
+          popup += "<a href='https://twitter.com/{{ jug.twitter }}' target=\"_blank\">Twitter</a><br/>";
+        }
+        if ("{{ jug.mastodon }}".length > 0) {
+          popup += "<a href='{{ jug.mastodon }}' target=\"_blank\">Mastodon</a><br/>";
         }
         L.marker([{{ longitude }}, {{ latitude }}],{icon: dukeIcon}).addTo(mymap).bindPopup(popup);
     {% endfor %}