.drone.yml

@@ -5,10 +5,10 @@ steps:
   - name: build
     image: ruby
     commands:
-      - gem install bundler:2.2.22
+      - gem install bundler:1.17.3
       - bundle install
       - bundle exec jekyll build
-
+  
   - name: docker
     image: plugins/docker
     settings:
@@ -24,13 +24,13 @@ steps:
     when:
       branch:
         - master
-  ## Testing turning of Notify i matrix.
+  
-  # - name: notify
+  - name: notify
-  #   image: plugins/matrix
+    image: plugins/matrix
-  #   settings:
+    settings:
-  #     homeserver: https://data.coop
+      homeserver: https://data.coop
-  #     roomid: plKSghHbepWeUEtbHE:data.coop
+      roomid: plKSghHbepWeUEtbHE:data.coop
-  #     username:
+      username: 
-  #       from_secret: matrix_username
+        from_secret: matrix_username
-  #     password:
+      password:
-  #       from_secret: matrix_password
+        from_secret: matrix_password

.gitignore

@@ -4,4 +4,3 @@ _site
 .jekyll-cache
 .sass-cache
 .bundle/
-.vscode

CNAME

@@ -0,0 +1 @@
+cryptohagen.dk

Gemfile

@@ -9,7 +9,7 @@ ruby RUBY_VERSION
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.3.2"
+gem "jekyll", ">= 4.2.0"
 
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
@@ -18,9 +18,8 @@ gem "jekyll", "~> 4.3.2"
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
-   gem "jekyll-feed"
+   gem "jekyll-feed", "~> 0.6"
    gem "jekyll-sitemap"
-   gem "jekyll-sass-converter"
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -1,36 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
+    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 6.0)
+      public_suffix (>= 2.0.2, < 5.0)
     colorator (1.1.0)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.1.7)
-    em-websocket (0.5.3)
+    em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0)
+      http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.16.3)
+    ffi (1.14.2)
     forwardable-extended (2.6.0)
-    http_parser.rb (0.8.0)
+    http_parser.rb (0.6.0)
-    i18n (1.14.1)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.3)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
-      jekyll-sass-converter (>= 2.0, < 4.0)
+      jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.3, >= 2.3.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (>= 0.3.6, < 0.5)
+      mercenary (~> 0.4.0)
       pathutil (~> 0.9)
-      rouge (>= 3.0, < 5.0)
+      rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (>= 1.8, < 4.0)
+      terminal-table (~> 2.0)
-      webrick (~> 1.7)
+    jekyll-feed (0.15.1)
-    jekyll-feed (0.17.0)
       jekyll (>= 3.7, < 5.0)
     jekyll-sass-converter (2.1.0)
       sassc (> 2.0.1, < 3.0)
@@ -38,43 +37,41 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.4.0)
+    kramdown (2.3.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.4)
+    liquid (4.0.3)
-    listen (3.8.0)
+    listen (3.4.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.4)
+    public_suffix (4.0.6)
-    rb-fsevent (0.11.2)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.6)
+    rexml (3.2.4)
-    rouge (4.2.0)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    terminal-table (3.0.2)
+    terminal-table (2.0.0)
-      unicode-display_width (>= 1.1.1, < 3)
+      unicode-display_width (~> 1.1, >= 1.1.1)
-    unicode-display_width (2.5.0)
+    unicode-display_width (1.7.0)
-    webrick (1.8.1)
 
 PLATFORMS
-  x86_64-linux-musl
+  ruby
 
 DEPENDENCIES
-  jekyll (~> 4.3.2)
+  jekyll (>= 4.2.0)
-  jekyll-feed
+  jekyll-feed (~> 0.6)
-  jekyll-sass-converter
   jekyll-sitemap
   tzinfo-data
 
 RUBY VERSION
-   ruby 3.1.1p18
+   ruby 2.6.5p114
 
 BUNDLED WITH
-   2.3.25
+   1.17.3

README.md

@@ -7,9 +7,9 @@ This repo holds the homepage of https://cryptohagen.dk/
 ## Running locally for development:
 
  - Install Docker and docker-compose
- -  Run ``docker compose up``. THis starts a local web server on port 4000 with LiveReload enabled, enabling you to tweak and play without having to F5 your browser.
+ -  Run ``docker-compose up``. THis starts a local web server on port 4000 with LiveReload enabled, enabling you to tweak and play without having to F5 your browser.
 
-If you have changes to `Gemfile`, run ``docker compose run jekyll bundle update``.
+If you have changes to `Gemfile`, run ``docker-compose run jekyll bundle update``.
 
 ## Publishing to cryptohagen.dk
 

_data/events.yml

@@ -1,145 +1,18 @@
-
+- danish_title: "Søndag d. 27. juni 2021"
-# - danish_title: "Søndag d. 28. januar 2024"
+  danish_text: "Søndag d. 27. Juni fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder. Myndighederne foreskriver 'kørekort modellen' - dvs. at det forventes at den enkelte selv har styr på sine COVID test/vacciner for at være med."
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
+  english_title: "Sunday May 30th 2021"
-#   danish_text_extra: "Oplæg: Jesper Lund ca. kl 14"
+  english_text: "#Cryptohagen at Café Mellemrummet is on again this Sunday the. 27th June from 13 to 17. Come by for a chat and a nice cup of coffee. Remember to have a valid Covid passport before you show up."
-#   english_title: "Sunday January 28th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: "presentation: Jesper Lund ca. kl 14"
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 25. februar 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday February 25th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 31. marts 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday March 31th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 28. april 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: "Omkring kl. 14. Oplæg om #opensource løsning i #ChromeBook sagaen af Tobias/Semaphor om #OSCampus. (ca. 1/3 af kommunerne vil nu have en #opensource løsning)"
-#   english_title: "Sunday April 28th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: "Around 14:00. Presentation on #opensource solution in the #ChromeBook saga by Tobias/Semaphor about #OSCampus. (approx. 1/3 of municipalities now want an #opensource solution)"
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 26. maj 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday May 26th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: false
-
-
-# - danish_title: "Søndag d. 30. juni 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday June 30th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 28. juli 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday July 28th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: false
-
-# - danish_title: "Søndag d. 25. august 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: "Nyt EU-parlament og snart også nye EU kommisærer <br>Omkring kl. 14: Hvad foregår der i EU/DG-HOME Going dark HLG (High Level Group) gruppen, <br>oplæg af Jesper Lund (IT-politisk forening og EdRi) <br>#chatcontrol #kryptering"
-#   english_title: "Sunday Augnust 25th 2024"
-#   english_text: "#Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: "New EU Parliament and soon also new EU Commissioners <br>Around 14:00: What's going on in the EU/DG-HOME Going Dark HLG (High Level Group) group, <br>presentation by Jesper Lund (IT-political association and EdRi) <br>#chatcontrol #encryption"
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 29. september 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday September 29th 2024"
-#   english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: true
-
-# - danish_title: "Søndag d. 27. oktober 2024"
-#   danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-#   danish_text_extra: ""
-#   english_title: "Sunday October 27th 2024"
-#   english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-#   english_text_extra: ""
-#   time: "13:00-17:00"
-#   current: true
-
-- danish_title: "Søndag d. 24. november 2024"
-  danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-  danish_text_extra: "Traditionen tro, omkring klokken 14:00 \"Tor - State of the Onion\" med Alex "
-  english_title: "Sunday November 24th 2024"
-  english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-  english_text_extra: "True to tradition, around 14:00 \"Tor - State of the Onion\" with Alex"
   time: "13:00-17:00"
   current: true
-
+- danish_title: "Søndag d. 25. juli 2021"
-- danish_title: "Søndag d. 29. december 2024"
+  danish_text: "Følg med på Twitter, IRC eller Matrix for opdateringer vedr. Covid-19 situationen i relation til Cryptohagen."
-  danish_text: "LUKKET juleferie."
+  english_title: "Sunday July 25th 2021"
-  danish_text_extra: ""
+  english_text: "Follow along on Twitter, IRC or Matrix for updates regarding the Covid-19 situation and Cryptohagen."
-  english_title: "Sunday December 29th 2024"
-  english_text: "CLOSED Christmas hollyday."
-  english_text_extra: ""
   time: "13:00-17:00"
   current: false
-
+- danish_title: "Søndag d. 30. august 2021"
-- danish_title: "Søndag d. 26. januar 2025"
+  danish_text: "Følg med på Twitter, IRC eller Matrix for opdateringer vedr. Covid-19 situationen i relation til Cryptohagen."
-  danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
+  english_title: "Sunday August 30th 2021"
-  danish_text_extra: ""
+  english_text: "Follow along on Twitter, IRC or Matrix for updates regarding the Covid-19 situation and Cryptohagen."
-  english_title: "Sunday January 26th 2025"
-  english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-  english_text_extra: ""
   time: "13:00-17:00"
   current: false
-
-- danish_title: "Søndag d. 23. februar 2025"
-  danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-  danish_text_extra: ""
-  english_title: "Sunday February 23th 2025"
-  english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-  english_text_extra: ""
-  time: "13:00-17:00"
-  current: false
-
-- danish_title: "Søndag d. 30. marts 2025"
-  danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-  danish_text_extra: ""
-  english_title: "Sunday March 30th 2025"
-  english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-  english_text_extra: ""
-  time: "13:00-17:00"
-  current: false
-
-- danish_title: "Søndag d. 27. april 2025"
-  danish_text: "Fra kl. 13 til 17 er der igen #cryptohagen på Café Mellemrummet. Kom ned og sig hej, drik en kop lækker kaffe, og få en sludder."
-  danish_text_extra: ""
-  english_title: "Sunday April 27th 2025"
-  english_text: "Cryptohagen at Café Mellemrummet is on again. From 1 PM to 5 PM. Come by for a chat and get yourself a nice cup of coffee"
-  english_text_extra: ""
-  time: "13:00-17:00"
-  current: false

_data/strings.yml

@@ -10,8 +10,6 @@ menu_item_2_da: "Hvornår"
 menu_item_2_en: "When"
 menu_item_3_da: "Hvor"
 menu_item_3_en: "Where"
-menu_code_da: "Adfærdskodeks"
-menu_code_en: "Code of Conduct"
 
 section_who_title_da: "Hvad er det?"
 section_who_title_en: "What is it?"
@@ -28,4 +26,3 @@ section_where_title_en: "We are here:"
 section_where_address_da: "Adresse"
 section_where_address_en: "Address"
 
-

_layouts/base.html

@@ -1,9 +1,9 @@
 {% assign title = 'title_' | append: page.language %}
 
+{% assign menu_tagline = 'menu_tagline_' | append: page.language %}
 {% assign menu_item_1 = 'menu_item_1_' | append: page.language %}
 {% assign menu_item_2 = 'menu_item_2_' | append: page.language %}
 {% assign menu_item_3 = 'menu_item_3_' | append: page.language %}
-{% assign menu_item_4 = 'menu_item_4_' | append: page.language %}
 
 {% assign section_events_title = 'section_events_title_' | append: page.language %}
 {% assign section_events_time = 'section_events_time_' | append: page.language %}
@@ -11,16 +11,13 @@
 {% assign section_where_title = 'section_where_title_' | append: page.language %}
 {% assign section_where_address = 'section_where_address_' | append: page.language %}
 
-{% assign menu_code = 'menu_code_' | append: page.language %}
-
 {% capture section_who %}{% include who_{{page.language}}.md %}{% endcapture %}
-{% capture section_code %}{% include code_{{page.language}}.md %}{% endcapture %}
 
 
 <!DOCTYPE html>
 <html>
   <head>
-    <meta charset="utf-8"> 
+    <meta charset="utf-8">
     <title>{{ site.data.strings[title] }}</title>
     <link rel="stylesheet" href="/assets/css/cryptohagen.css" />
 
@@ -36,30 +33,7 @@
 
     <nav class="navbar navbar-static-top navbar-fixed-top cryptohagen-navbar">
       <div class="navbar-brand pull-xs-right">
-
+        {{ site.data.strings[menu_tagline] }}
-          {% if page.language == 'da' %}
-              <a class="nav-link" href="code.html">{{ site.data.strings[menu_code] }}</a>
-              <a href="index_en.html" alt="English">
-                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="24" height="12" style="margin: 13px 0 0 13px;">
-                  <clipPath id="t">
-                    <path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
-                  </clipPath>
-                  <path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
-                  <path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
-                  <path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
-                  <path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
-                  <path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
-                  </svg>
-              </a>
-          {% else %}
-              <a class="nav-link" href="code_en.html">{{ site.data.strings[menu_code] }}</a>
-              <a href="index.html" alt="Danish">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="18" viewBox="1 1 37 28" style="margin: 10px 0 0 13px;">
-                      <rect width="40" height="30" fill="#C60C30"/>
-                      <g stroke="#fff" stroke-width="4"><line x1="15" y1="0" x2="15" y2="30"/><line x1="0" y1="15" x2="40" y2="15"/></g>
-                  </svg>
-              </a>
-          {% endif %}     
       </div>
       <a class="navbar-brand" href="/">
         Cryptohagen
@@ -68,26 +42,46 @@
         <li class="nav-item active">
           <a class="nav-link" href="#">{{ site.data.strings[menu_item_1] }}</a>
         </li>
-        
-        <li class="nav-item">
-          <a class="nav-link" href="#where">{{ site.data.strings[menu_item_3] }}</a>
-        </li>
-
         <li class="nav-item active">
           <a class="nav-link" href="#when">{{ site.data.strings[menu_item_2] }}</a>
         </li>
-        
+        <li class="nav-item">
+          <a class="nav-link" href="#where">{{ site.data.strings[menu_item_3] }}</a>
+        </li>
         <li class="nav-item">
           <a class="nav-link" href="#links">Links</a>
         </li>
-        
+        <li>
+            {% if page.language == 'da' %}
+                <a href="index_en.html" alt="English">
+                    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="24" height="12" style="margin: 13px 0 0 13px;">
+                    <clipPath id="t">
+                      <path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
+                    </clipPath>
+                    <path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
+                    <path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
+                    <path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
+                    <path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
+                    <path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
+                    </svg>
+                </a>
+            {% else %}
+                <a href="index.html" alt="Danish">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="18" viewBox="1 1 37 28" style="margin: 10px 0 0 13px;">
+                        <rect width="40" height="30" fill="#C60C30"/>
+                        <g stroke="#fff" stroke-width="4"><line x1="15" y1="0" x2="15" y2="30"/><line x1="0" y1="15" x2="40" y2="15"/></g>
+                    </svg>
+                </a>
+            {% endif %}
+
+        </li>
       </ul>
     </nav>
     
     <section id="logo">
       <div class="container">
         <div class="row">
-          <div class="col-md-10">
+          <div class="col-md-8">
       	    <img src="assets/logo/logo.png" />
           </div>
         </div>
@@ -97,11 +91,45 @@
     <section id="intro">
       <div class="container">
         <div class="row">
-          <div class="col-md-10">
+          <div class="col-md-8">
             {{ section_who | markdownify }}
-          
+            </div>
-      	    <img src="assets/logo/cryto.jpg" width="750"/>  
           </div>
+      </div>
+    </section>
+
+    <section id="when">
+        <div class="container">
+        <h1>{{ site.data.strings[section_events_title] }}</h1>
+        <hr>
+
+        <div class="card-columns">
+
+            {% for event in site.data.events %}
+            <div class="card card-inverse {% if event.current %}card-primary{% else %}card-info{% endif %}">
+              <div class="card-block">
+                <h4 class="card-title">
+                  {% if page.language == "en" %}
+                    {{ event.english_title }}
+                  {% else %}
+                    {{ event.danish_title }}
+                  {% endif %}
+                </h4>
+                <p class="card-text">
+                  {% if page.language == "en" %}
+                    {{ event.english_text }}
+                  {% else %}
+                    {{ event.danish_text }}
+                  {% endif %}
+                </p>
+                <p class="card-text">
+                  <strong>{{ site.data.strings[section_events_time] }}</strong><br />
+                  {{ event.time }}
+                </p>
+              </div>
+            </div>
+            {% endfor %}
+
         </div>
       </div>
     </section>
@@ -111,14 +139,6 @@
 
           <h1>{{ site.data.strings[section_where_title] }}</h1>
           <hr>
-          <p>
-            <address>
-              <strong>{{ site.data.strings[section_where_address] }}</strong><br />
-                <a href="https://www.ms.dk/mellemrummet">Cafe Mellemrummet</a><br />
-                Ravnsborggade 11<br />
-                2200 København Nørrebro
-            </address>
-          </p>
 
           <div id="Map" style="height:250px"></div>
           <script src="/assets/openlayers/ol.js" type="text/javascript"></script>
@@ -160,53 +180,20 @@
                 interactions: [], // No dragging or other funny biz
               });
           </script>
+
+            <p>
+            <address>
+              <strong>{{ site.data.strings[section_where_address] }}</strong><br />
+                <a href="https://www.ms.dk/mellemrummet">Cafe Mellemrummet</a><br />
+                Ravnsborggade 11<br />
+                2200 København Nørrebro
+            </address>
+          </p>
+
         </div>
 
     </section>
 
-    <section id="when">
-      <div class="container">
-      <h1>{{ site.data.strings[section_events_title] }}</h1>
-      <hr>
-
-      <div class="card-columns">
-
-          {% for event in site.data.events %}
-          <div class="card card-inverse {% if event.current %}card-primary{% else %}card-info{% endif %}">
-            <div class="card-block">
-              <h4 class="card-title">
-                {% if page.language == "en" %}
-                  {{ event.english_title }}
-                {% else %}
-                  {{ event.danish_title }}
-                {% endif %}
-              </h4>
-              <p class="card-text">
-                {% if page.language == "en" %}
-                  {{ event.english_text }}
-                {% else %}
-                  {{ event.danish_text }}
-                {% endif %}
-              </p>
-              <p class="card-text">
-                {% if page.language == "en" %}
-                  {{ event.english_text_extra }}
-                {% else %}
-                  {{ event.danish_text_extra }}
-                {% endif %}
-              </p>
-              <p class="card-text">
-                <strong>{{ site.data.strings[section_events_time] }}</strong><br />
-                {{ event.time }}
-              </p>
-            </div>
-          </div>
-          {% endfor %}
-
-      </div>
-    </div>
-  </section>
-
     <section id="links">
       <div class="container">
 

_layouts/code.html

@@ -1,105 +0,0 @@
-{% assign title = 'title_' | append: page.language %}
-
-{% assign menu_item_1 = 'menu_item_1_' | append: page.language %}
-{% assign menu_item_2 = 'menu_item_2_' | append: page.language %}
-{% assign menu_item_3 = 'menu_item_3_' | append: page.language %}
-{% assign menu_item_4 = 'menu_item_4_' | append: page.language %}
-
-{% assign section_events_title = 'section_events_title_' | append: page.language %}
-{% assign section_events_time = 'section_events_time_' | append: page.language %}
-
-{% assign section_where_title = 'section_where_title_' | append: page.language %}
-{% assign section_where_address = 'section_where_address_' | append: page.language %}
-
-{% assign menu_code = 'menu_code_' | append: page.language %}
-
-{% capture section_who %}{% include who_{{page.language}}.md %}{% endcapture %}
-{% capture section_code %}{% include code_{{page.language}}.md %}{% endcapture %}
-
-
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"> 
-    <title>{{ site.data.strings[title] }}</title>
-    <link rel="stylesheet" href="/assets/css/cryptohagen.css" />
-
-    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:site" content="@cryptohagen">
-    <meta name="twitter:creator" content="@cryptohagen">
-    <meta name="twitter:title" content="Cryptohagen - Lær om privatliv og digitalt selvforsvar">
-    <meta name="twitter:description" content="Cryptohagen er et månedligt meetup i København for folk, der er interesserede i digitalt privatliv, overvågning og at lære om de nyeste teknikker og værktøjer til at beskytte sig online.">
-    <meta name="twitter:image" content="https://www.cryptohagen.dk/assets/logo/logo.png">
-
-  </head>
-  <body>
-
-    <nav class="navbar navbar-static-top navbar-fixed-top cryptohagen-navbar">
-      <div class="navbar-brand pull-xs-right">
-        
-        <a class="nav-link" href="code.html">{{ site.data.strings[menu_code] }}</a>
-
-          {% if page.language == 'da' %}
-              <a href="index_en.html" alt="English">
-                  <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="24" height="12" style="margin: 13px 0 0 13px;">
-                  <clipPath id="t">
-                    <path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
-                  </clipPath>
-                  <path d="M0,0 v30 h60 v-30 z" fill="#00247d"/>
-                  <path d="M0,0 L60,30 M60,0 L0,30" stroke="#fff" stroke-width="6"/>
-                  <path d="M0,0 L60,30 M60,0 L0,30" clip-path="url(#t)" stroke="#cf142b" stroke-width="4"/>
-                  <path d="M30,0 v30 M0,15 h60" stroke="#fff" stroke-width="10"/>
-                  <path d="M30,0 v30 M0,15 h60" stroke="#cf142b" stroke-width="6"/>
-                  </svg>
-              </a>
-          {% else %}
-              <a href="index.html" alt="Danish">
-                  <svg xmlns="http://www.w3.org/2000/svg" width="24" height="18" viewBox="1 1 37 28" style="margin: 10px 0 0 13px;">
-                      <rect width="40" height="30" fill="#C60C30"/>
-                      <g stroke="#fff" stroke-width="4"><line x1="15" y1="0" x2="15" y2="30"/><line x1="0" y1="15" x2="40" y2="15"/></g>
-                  </svg>
-              </a>
-          {% endif %}     
-      </div>
-      <a class="navbar-brand" href="/">
-        Cryptohagen
-      </a>
-      <ul class="nav navbar-nav">
-        <li class="nav-item active">
-          <a class="nav-link" href="#">{{ site.data.strings[menu_item_1] }}</a>
-        </li>
-        
-        <li class="nav-item">
-          <a class="nav-link" href="#where">{{ site.data.strings[menu_item_3] }}</a>
-        </li>
-
-        <li class="nav-item active">
-          <a class="nav-link" href="#when">{{ site.data.strings[menu_item_2] }}</a>
-        </li>
-        
-        <li class="nav-item">
-          <a class="nav-link" href="#links">Links</a>
-        </li>
-        
-      </ul>
-    </nav>
-
-    <section id="intro">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-8">
-            {{ section_code | markdownify }}
-            </div>
-        </div>
-      </div>
-    </section>
-
-  
-    <footer>
-      <div class="container">
-        <small>Generously hosted by <a href="https://data.coop">data.coop<img src="assets/logo/DataCoop_Logo.png" /></a>  | <a href="https://git.data.coop/cryptohagen.dk/website">Source code</a> | Site built: {{ "now" | date: "%Y-%m-%d %H:%M" }} UTC | Jekyll {{ jekyll.version }}</small>
-      </div>
-    </footer>
-
-  </body>
-</html>

_sass/bootstrap/scss/_card.scss

@@ -28,10 +28,6 @@
   margin-bottom: 0;
 }
 
-.card-text-extra:last-child {
-  margin-bottom: 0;
-}
-
 // .card-actions {
 //   padding: $card-spacer-y $card-spacer-x;
 
@@ -285,7 +281,7 @@
 
 @include media-breakpoint-up(sm) {
   .card-columns {
-    column-count: 1;
+    column-count: 3;
     column-gap: 1.25rem;
 
     .card {

_sections/code_da.md

@@ -1,25 +0,0 @@
-# Adfærdskodeks
-<i>(Code of Conduct)</i>
-
-Vi er forpligtede til at gøre #cryptohagen til et inkluderende og indbydende forum for alle. 
-Den vigtigste regel er: Vær åben og empatisk overfor hinanden.
-
-Desværre er teknologibegivenheder berygtede for chikane. Vi har derfor lavet nogle grundregler – for at gøre det klart, at chikane eller diskriminerende adfærd ikke er acceptabelt. Alle skal kunne føle sig trygge ved at deltage i #cryptohagen.
-
-Alle, der deltager i #cryptohagen, er forpligtede til at overholde vores adfærdskodeks (Code of Conduct) ved arrangementer og på alle onlinekanaler. 
-
-Specifikke regler:
-- Vi tager afstand fra homofobisk, transfobisk, sexistisk, racistisk og anden fordomsfuld adfærd (herunder chikane). 
-- #cryptohagen er et fælles forum, men hver deltagers personlige ”rum” skal respekteres. Hvis du bliver bedt om at lade nogen være i fred, eller om at forlade stedet, må du respektere dette.
-- Nogle deltagere ønsker ikke at blive filmet eller fotograferet. Respekter deres ønsker.
-- Aggressive eller arrogante kommentarer er ikke velkomne – ingen skal være bange for at stille spørgsmål.
-
-Hvis du bryder disse regler, kan vi udelukke dig fra fremtidige #cryptohagen-begivenheder.
-
-Café Mellemrummet, hvor vi mødes i København, er en frivilligt drevet nonprofitcafé. Vi forventer, at du også er åben og empatisk overfor de frivillige i caféen.
-
-Hvis du bliver chikaneret, eller du er vidne til brud på vores adfærdskodeks, skal du kontakte en fra kernegruppen.
-
-Vores adfærdskodeks er baseret på (”lånt” fra) vores venner på Bornhack og deres [adfærdskodeks][bornhackconduct]
-
-[bornhackconduct]:https://bornhack.dk/conduct

_sections/code_en.md

@@ -1,21 +0,0 @@
-# Code of Conduct
-We are committed to making #cryptohagen an inclusive and welcoming get-together for everyone.
-The most important rule is: Be open and empathetic towards each other.
-
-Unfortunately, tech events are notorious for harassment. Thus, we have set up some basic rules to make it clear that harassment or discriminatory behavior will not be tolerated. Everyone should feel safe participating in #cryptohagen.
-
-Everyone participating in #cryptohagen is obliged to comply with our Code of Conduct at events as well as on all online channels. 
-
-Specific rules:
-- We denounce homophobic, transphobic, sexist, racist and other prejudiced behaviour (including harassment). 
-- #cryptohagen is a community, but each participant’s personal ”space” should be respected. If you are asked to leave someone alone, or to leave the place, then respect this. 
-- Some participants do not want to be filmed or photographed. Respect their wishes. 
-- Aggressive or arrogant comments are not welcome – no one should be afraid to ask questions.
-
-If you break these rules, we may exclude you from future #cryptohagen events.
-
-Café Mellemrummet, where we meet in Copenhagen, is a volunteer-run nonprofit café. We expect that you are open and empathetic towards the volunteers in the café as well. If you are being harassed, or if you witness a breach of our Code of Conduct, please contact someone from the core group.
-
-Our Code of Conduct is based on (”borrowed” from) our friends at Bornhack and their [Code of Conduct][bornhackconduct]
-
-[bornhackconduct]:https://bornhack.dk/conduct

_sections/who_da.md

@@ -1,62 +1,38 @@
-# Hvad er det?
+# Hvad er det
-Cryptohagen er et hyggeligt og uformelt forum, som har fokus på digital
-privatlivsbeskyttelse. Cryptohagen er for alle, der bruger nettet i en eller anden form.
-Vi er et ”friendly community”, hvor der er plads til at vende tanker og idéer om
-privatliv, sikkerhed på nettet, kryptering og lignende emner. Alle er velkomne.
 
-Vi kan hjælpe dig med små og store spørgsmål, som handler om
+---
-privatlivs-beskyttelse på nettet. Vi kan også hjælpe dig i gang med at bruge nogle af
+Cryptohagen er en stribe uformelle og hyggelige sammenkomster som 
-de populære og anerkendte sikkerhedsværktøjer på din smartphone og på din
+afholdes i København hver sidste søndag i måneden.
-computer. Alt det kan vi tale sammen om, når vi ses. Så kan vi tage udgangspunkt i
-dine konkrete behov.
 
-Vi mødes i på Café Mellemrummet i København den sidste søndag i måneden. 
+Der afholdes lignende arrangementer i [Aarhus][cryptoaarhus].
-Caféen er en frivilligt drevet nonprofitcafé. Vi forventer, at du også er åben og empatisk overfor de frivillige i caféen.
-Der afholdes lignende arrangementer i [Aarhus][cryptoaarhus]. 
 
-Så kom og sig hej til os, drik en kop kaffe, og få en sludder. Spørg efter Thomas, Rolf, Ove eller Helle. Det eneste, du skal have med, er godt humør og ønsket om at lære nogle rare mennesker at kende i et afslappet miljø.
+## Hvem er det for
 
-Af og til inviterer vi en oplægsholder, eller vi opdaterer hinanden om ny viden. Vi
+Arrangementet er for alle, der bruger internettet i en eller anden
-laver også en årlig event om Tor Project og andre anonyme browsere (baseret på
+form.
-State of the Onion).
 
-Cryptohagen interagerer som et community med [Bornhack][bornhack], [data.coop][data.coop], [Labitat][labitat] og [IT-Politisk Forening][itpolitiskforening].
+- Du er måske studerende, og skal søge oplysninger eller lave research om følsomme emner
+- Måske lever du i et problematisk parforhold og vil kunne søge hjælp
+  og oplysning, uden at din partner bliver gjort opmærksom på det
+- En journalist, der har brug for værktøjer til,
+  at beskytte en kilde
+- Eller du er måske en kommende whistleblower
 
-[#Cryptohagen][cryptohagen] og [#Cryptoaarhus][cryptoaarhus] var blandt de nominerede til den danske [Libre-prisen 2024][libraprisen].
+Der vil være tidspunkter hvor alle har behov for, at kunne bevæge sig
+rundt på nettet eller kommunikere med andre, uden at nogen 'lytter
+med'. Også dig, der til hverdag ikke mener, du har noget at skjule.
 
-Læs vores [adfærdskodeks][adfærdskodeks].
+Vi sidder en flok nørder og er klar til at hjælpe dig i gang med, at bruge nogle af de populære og anerkendte sikkerhedsværktøjer; både på din smartphone og på din computer med udgangspunkt i dit behov. Men alt det tager vi en snak om, når vi ses.
 
-# Hvem er du?
+## Hvem er det også for
-Der vil være tidspunkter, hvor du har brug for at kunne bevæge dig rundt på nettet
+Cryptohagen er også et ’friendly community’ hvor der er plads til at vende tanker og idéer om privatliv, sikkerhed på nettet og kryptering – eller noget helt tredie.
-eller kommunikere med andre, uden at nogen ”lytter med”. Det gælder også dig, som
-ikke mener, du har noget at skjule.
 
-Måske hører du til på et af disse niveauer:
+Så kom ned og sig hej, drik en kop lækker kaffe, og få en sludder. Det eneste, du skal have med er godt humør og ønsket om at lære nogle rare mennesker at kende i et afslappet miljø.
-- Du er studerende og skal søge oplysninger eller lave research om følsomme emner.
-- Du er i et problematisk parforhold og vil kunne søge hjælp og oplysninger, uden at din partner bliver opmærksom på det.
-- Du er en kommende whistleblower.
-- Du er blevet hacket.
-
-Vi kan hjælpe dig på alle niveauer. Vi er ikke modstandere af digitaliseringen, men
-værdsætter retten til privatliv – også på nettet.
 
 ## Kom i kontakt
-Vi er på [Mastodonkonto][mastodon] / [Kom på mastodon][joinmastodon]
 
-Den bedste måde, du kan kontakte os, er at komme og hilse på os den sidste
+Vi har en [Twitterkonto][twitter]. Du er velkommen til, at skrive til os der. Vi er flere med adgang til kontoen, så vi vil sørge for at svare så hurtigt som muligt.
-søndag i måneden.
+
 
-[cryptohagen]:https://cryptohagen.dk
 [cryptoaarhus]:https://cryptoaarhus.dk
-[adfærdskodeks]:https://cryptohagen.dk/code.html
+[twitter]:https://twitter.com/cryptohagen
-[#where]:https://cryptohagen.dk/#where
-[twitter]:https://twitter.com/cryptohagen
-[mastodon]:https://social.data.coop/@cryptohagen
-[joinmastodon]:https://joinmastodon.org
-[bornhack]:https://bornhack.dk
-[data.coop]:https://data.coop
-[labitat]: https://labitat.dk
-[itpolitiskforening]: https://itpol.dk
-[libraprisen]: https://libre-prisen.dk
-
-

_sections/who_en.md

@@ -1,65 +1,33 @@
-# About us
+# What is it
-Cryptohagen is a cozy and informal community with a focus on digital privacy. Cryptohagen
-is for anyone who uses the Internet in one form or another. We are a ”friendly community”
-where you can share thoughts and ideas about privacy, online safety, encryption, and
-similar topics. Everyone is welcome.
 
-We can help you with many kinds of questions about digital privacy. We can also help you
+---
-get started using some of the popular and recognized security tools on your smartphone
+Cryptohagen is a series of informal get-togethers every last Sunday of the month in Copenhagen.
-and on your computer. We can talk about that when we meet. Your specific needs are our
-starting point.
 
-We get together every last Sunday of the month in Copenhagen at Café Mellemrummet. 
+There is a similar event in [Aarhus][cryptoaarhus]
-The café is a volunteer-run non-profit café. We expect you to be open and empathetic to the volunteers in the café as well. There is a similar event in
-[Aarhus][cryptoaarhus]. 
 
-So come and say hi, have a chat and a good cup of coffee. Ask for Thomas, Rolf,
+## Who is it for
-Ove, or Helle. We’ll have a talk about your specific needs and come up with some ideas to
-help you get started. All you need to bring is a friendly smile and a wish to get to know some
-nice people in a relaxed environment.
 
-Now and then we invite a speaker, or we update each other on new knowledge. We also
+The meetup is for everyone who uses the Internet in one form or
-organize an annual event on Tor Project and other anonymous browsers (based on State of
+another.
-the Onion).
 
-Cryptohagen interacts as a community with [Bornhack][bornhack], [data.coop][data.coop], [Labitat][labitat] and [IT-Politisk Forening][itpolitiskforening].
+- You might be studying and needing to research sensitive topics
+- Perhaps you live in a problematic relationship and need a way to
+  get help without your partner being alerted
+- You may be a journalist and need some tools to help
+  protect a source
+- Or maybe you're a future whistle blower
 
+We can all find ourselves in a situation where we need ways to protect our privacy. We are a friendly group of "nerds" who get together and are ready to start the conversation with you about how you can get better at protecting yourself online. We'll have a talk about your specific needs and come up with some ideas to help you get started.
 
-[#Cryptohagen][cryptohagen] and [#Cryptoaarhus][cryptoaarhus] were among the nominees for the Danish [Libre-prisen 2024 ][libraprisen].
+## What else is Cryptohagen
 
-Read our [Code of Conduct][bornhackconduct].
+Cryptohagen is also a friendly community that provides a space to discuss topics like privacy, online safety and security or encryption or any other subject among like-minded people. 
 
-# Who are you?
+So come on down and say hi, have a chat and a good cup of coffee. All you need to bring is a friendly smile and the wish to get to know some nice people in a relaxed environment.
-Sometimes you need to surf the Internet or communicate with others without anybody
-”listening in”. This also applies to you who think you have nothing to hide.
 
-Maybe you belong at one of these levels:
+## Get in touch
 
-- You are a student and need to research sensitive topics.
+We have a [Twitter account][twitter]. Feel free to write us there, a few of us have access to it so we'll be sure to reply as soon as we can.
-- You are in a problematic relationship and need a way to get help without alerting
-your partner.
-- You may be a future whistleblower.
-- You have been hacked.
-
-We can help you at all the above-mentioned levels. We are not against digitization, but we
-do appreciate the rights of privacy – also on the Internet.
-
-# Get in touch
-We have a [Mastodon account][mastodon] / [Get on mastodon][joinmastodon]
-The best way to get in touch: Come and meet us every last Sunday of the month in
-Copenhagen!
-
-[cryptohagen]:https://cryptohagen.dk
-[cryptoaarhus]:https://cryptoaarhus.dk
-[bornhackconduct]:https://bornhack.dk/conduct
-[adfærdskodeks]:https://cryptohagen.dk/code.html
-[#where]:https://cryptohagen.dk/#where
-[twitter]:https://twitter.com/cryptohagen
-[mastodon]:https://social.data.coop/@cryptohagen
-[joinmastodon]: https://joinmastodon.org/
-[bornhack]:https://bornhack.dk
-[data.coop]:https://data.coop
-[labitat]: https://labitat.dk
-[itpolitiskforening]: https://itpol.dk
-[libraprisen]: https://libre-prisen.dk
 
+[cryptoaarhus]:https://cryptoaarhus.dk/index_en.html
+[twitter]:https://twitter.com/cryptohagen

assets/css/cryptohagen.scss

@@ -26,7 +26,7 @@ $brand-danger:              #B4763C;
 }
 
 body {
-  padding-top: 50px;
+  padding-top: 50px; /* Because of static topbar */
 }
 
 section {
@@ -42,9 +42,9 @@ section {
 
 .card-columns
 {
-  -webkit-column-count: 1;
+  -webkit-column-count: 3;
-  -moz-column-count: 1;
+  -moz-column-count: 3;
-  column-count: 1;
+  column-count: 3;
 }
 
 footer
@@ -56,4 +56,3 @@ footer
     color: #FFF;
   }
 }
-