From f5f40320b8f1d562e5b92d3e474a1a3068bfba54 Mon Sep 17 00:00:00 2001
From: Benjamin Bach <benjamin@overtag.dk>
Date: Sat, 1 Apr 2023 23:32:25 +0200
Subject: [PATCH] Add content from current website, add smooth scrolling

---
 content/membership.da.md                      |  6 +++--
 content/services/_index.da.md                 |  6 ++---
 .../datacoop2020/assets/static/css/style.scss |  6 ++++-
 .../datacoop2020/layouts/partials/badges.html | 25 +------------------
 .../datacoop2020/layouts/partials/status.html | 21 ++++++++++++++++
 .../datacoop2020/layouts/services/list.html   |  2 ++
 .../datacoop2020/layouts/services/single.html |  2 ++
 7 files changed, 38 insertions(+), 30 deletions(-)
 create mode 100644 themes/datacoop2020/layouts/partials/status.html

diff --git a/content/membership.da.md b/content/membership.da.md
index 00d7f39..5f45c2c 100644
--- a/content/membership.da.md
+++ b/content/membership.da.md
@@ -6,8 +6,10 @@ title: Bliv medlem
 over foreningens generelle drift og hvordan data skal forvaltes. Dette sker som i en helt klassisk forening i henhold til vores vedtægter på den årlige
 generalforsamling.
 
+Du bør læse vores [vedtægter](/rights/) og især vores [Acceptable Usage Policy (AUP)](https://git.data.coop/data.coop/dokumenter/src/branch/master/Acceptable%20Usage%20Policy.md) inden du melder dig ind. Har du spørgsmål, kan du finde os på [Matrix og IRC](/about/) eller [sende en e-mail til bestyrelsen](mailto:board@data.coop).
+
 Du bliver medlem ved at overføre penge til vores konto og sende en email til
-vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit navn.
+vores kasserer, [reynir@data.coop](mailto:reynir@data.coop), med dit navn.
 
  * Reg. 8401 (Merkur)
  * Kontonr. 1016866 
@@ -16,4 +18,4 @@ vores kasserer, [benjaoming@data.coop](mailto:benjaoming@data.coop), med dit nav
 Årligt kontingent: **300 kr** (dog gerne mere)\
 Nedsat kontingent for studerende/arbejdsløse: **50 kr**
 
-Kontingent-perioden gælder for det år, man melder sig ind i.
+Kontingent-perioden gælder for det foreningsår, man melder sig ind i. Dvs. medlemskab er fortløbende fra betaling af kontingent frem til overstået ordinær generalforsamling.
diff --git a/content/services/_index.da.md b/content/services/_index.da.md
index 0c29fa3..5b13f7c 100644
--- a/content/services/_index.da.md
+++ b/content/services/_index.da.md
@@ -5,10 +5,10 @@ title: Tjenester
 
 Visse tjenester **data.coop** driver er kun for medlemmer, andre er åbne for alle.
 
-Alle tjenester er benævnt med [badges](/badges/), der deklarerer i hvor høj grad den
+Alle tjenester er benævnt med [badges](/services/#badges), der deklarerer i hvor høj grad den
 enkelte tjeneste lever op til [kerneprincipperne defineret i formålsparagraffen
-i vores vedtægter](/_pages/vedtaegter.html#-2-form%C3%A5l).
+i vores vedtægter](/rights/#-2-formål).
 
-Vi har skrevet en definition af [hvad de forskellige badges dækker over](/badges/).
+Vi har skrevet en definition af [hvad de forskellige badges dækker over](/services/#badges).
 
 Klik på hver tjenestes navn for at se detaljer:
diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss
index 9611914..c06f291 100644
--- a/themes/datacoop2020/assets/static/css/style.scss
+++ b/themes/datacoop2020/assets/static/css/style.scss
@@ -55,6 +55,10 @@
     --burger_size       : 45px;
 }
 
+html {
+    scroll-behavior: smooth;
+}
+
 body {
     display             : flex;
     flex-direction      : row;
@@ -107,7 +111,7 @@ main ol, main ul {
 }
 
 main ol li, main ul li {
-    margin              : 0.5rem 0;
+    margin              : 0;
 }
 
 aside {
diff --git a/themes/datacoop2020/layouts/partials/badges.html b/themes/datacoop2020/layouts/partials/badges.html
index 0d7ae93..50a4f22 100644
--- a/themes/datacoop2020/layouts/partials/badges.html
+++ b/themes/datacoop2020/layouts/partials/badges.html
@@ -1,4 +1,4 @@
-<h2>{{ i18n "badges_headline" }}</h2>
+<h2 id="badges">{{ i18n "badges_headline" }}</h2>
 
 <section class="badge-definitions">
 {{/* TODO: This needs to be sensitive to current language */}}
@@ -24,26 +24,3 @@
 
 {{ end }}
 </section>
-
-
-<h2>{{ i18n "status_headline" }}</h2>
-
-<section class="status-definitions">
-{{ range $.Site.Data.badges.da.status.status }}
-
-
-  <div class="badge-icon badge-status badge-status-{{ .css_class }}"></div>
-  <div class="badge-name">{{ title .name }}</div>
-
-  <div class="badge-description">
-    {{- $markdown := .description | markdownify -}}
-
-    {{ if not ( findRE "<[h|p][^>]*>" $markdown ) }}
-        <p>{{ $markdown }}</p>
-    {{ else }}
-        {{ $markdown }}
-    {{ end }}
-  </div>
-
-{{ end }}
-</section>
diff --git a/themes/datacoop2020/layouts/partials/status.html b/themes/datacoop2020/layouts/partials/status.html
new file mode 100644
index 0000000..d7f4072
--- /dev/null
+++ b/themes/datacoop2020/layouts/partials/status.html
@@ -0,0 +1,21 @@
+<h2>{{ i18n "status_headline" }}</h2>
+
+<section class="status-definitions">
+{{ range $.Site.Data.badges.da.status.status }}
+
+
+  <div class="badge-icon badge-status badge-status-{{ .css_class }}"></div>
+  <div class="badge-name">{{ title .name }}</div>
+
+  <div class="badge-description">
+    {{- $markdown := .description | markdownify -}}
+
+    {{ if not ( findRE "<[h|p][^>]*>" $markdown ) }}
+        <p>{{ $markdown }}</p>
+    {{ else }}
+        {{ $markdown }}
+    {{ end }}
+  </div>
+
+{{ end }}
+</section>
diff --git a/themes/datacoop2020/layouts/services/list.html b/themes/datacoop2020/layouts/services/list.html
index d0853af..7bf2a34 100644
--- a/themes/datacoop2020/layouts/services/list.html
+++ b/themes/datacoop2020/layouts/services/list.html
@@ -17,6 +17,8 @@
 
 {{ partial "badges.html" . }}
 
+{{ partial "status.html" . }}
+
 {{- end -}}
 
 
diff --git a/themes/datacoop2020/layouts/services/single.html b/themes/datacoop2020/layouts/services/single.html
index 6ee3023..14a54fe 100644
--- a/themes/datacoop2020/layouts/services/single.html
+++ b/themes/datacoop2020/layouts/services/single.html
@@ -37,4 +37,6 @@
 {{ end }}
 </div>
 
+{{ partial "status.html" . }}
+
 {{- end -}}