Set up taxonomies.

Staacks · Staacks · commit 243ff71b03bc · 2024-12-25T22:58:33.000+01:00
- Add levels, sensors and materials as taxonomies
- Simplify translations to same taxonomy names in all languages while only translating displayed names. (still some work to do here)
- Rename requiredMaterials to materials to fix some problems and simplify URLs
- For now remove root index and only allow for browsing instructions (Might change if section worksheets is added in the future)
- Add template to actually list the results of a taxonomy term
diff --git a/archetypes/en/instruction.md b/archetypes/en/instruction.md
@@ -29,7 +29,7 @@ sensors:  # used by phyphox. Remove those which are not used
   - 'Speaker'
 levels: ['0', '1', '2a', '2b', '3', '6', '7']  # see doc for explanation. Remove everything else
 video: ['no', 'English', 'Localized', 'Silent'] # choose accordingly
-requiredMaterials:
+materials:
   - 'Smartphone only'
   - 'Household items'
   - 'Basic experiment material'
diff --git a/config/_default/hugo.yaml b/config/_default/hugo.yaml
@@ -13,13 +13,6 @@ defaultContentLanguage: en
 languages:
   en:
     contentDir: content/en
-    permalinks:
-      page:
-        instructions: /instructions/:slug/
-
-    taxonomies:
-      category: "categories"
-      tag: "tags"
 
     disabled: false
     languageCode: en-US
@@ -33,17 +26,6 @@ languages:
   de:
     contentDir: content/de
 
-    permalinks:
-      categories: "/:section/:slug"
-      page:
-        instructions: /anleitungen/:slug/
-      section:
-        instructions: /anleitungen/
-
-    taxonomies:
-      category: "Kategorien"
-      tag: "Stichwörter"
-
     disabled: false
     languageCode: de-DE
     languageDirection: ltr
@@ -62,6 +44,14 @@ languages:
 taxonomies:
   category: categories
   tag: tags
+  level: levels
+  sensor: sensors
+  material: materials
+
+disableKinds:
+- home
+
+ignorefiles: "generated/.*"
 
 enableEmoji: true
 markup:
diff --git a/content/de/_index.md b/content/de/_index.md
diff --git a/content/de/instructions/inelastischer-stoss/inelastischer-stoss.md b/content/de/instructions/inelastischer-stoss/inelastischer-stoss.md
@@ -7,13 +7,13 @@ author:
   - Sebastian Staacks
 CreativeCommons: ['BY']
 categories:
-  - 'Mechanik'
+  - 'Mechanics'
 sensors:
-  - 'Mikrofon'
+  - 'Microphone'
 levels: ['2a', '2b', '3', '6']  # see doc for explanation. Remove everything else
 video: ['Localized']
-requiredMaterials:
-  - 'Haushaltsgegenstände'
+materials:
+  - 'Household items'
 tags: # All Tags start upper-case expect for 'phyphox'. This list can be expanded!
   - 'Ball'
   - 'Inelastischer Stoß'
@@ -24,9 +24,7 @@ tags: # All Tags start upper-case expect for 'phyphox'. This list can be expande
 summary: 'Bestimme die Anfangshöhe und die Energiebilanz eines springenden Balls anhand der Zeiten seiner Stoßgeräusche.'
 version: '0.1.0'
 
-#Todo: Sketch of setup, photo of setup, Physics background
 ---
-# Inelastischer Stoß
 
 {{< youtube sqCEo4tj3e4 >}}
 
diff --git a/content/en/_index.md b/content/en/_index.md
diff --git a/content/en/instructions/inelastic-collision/inelastic-collision.md b/content/en/instructions/inelastic-collision/inelastic-collision.md
@@ -1,7 +1,7 @@
 ---
-translationKey: "Inelastic Collision Instruction"
 title: "(In)elastic Collision"
 date: 2024-12-17T11:42:40+01:00
+translationKey: "Inelastic Collision Instruction"
 draft: false
 author: 
   - Sebastian Staacks
@@ -12,7 +12,7 @@ sensors:
   - 'Microphone'
 levels: ['2a', '2b', '3', '6']  # see doc for explanation. Remove everything else
 video: ['English']
-requiredMaterials:
+materials:
   - 'Household items'
 tags: # All Tags start upper-case expect for 'phyphox'. This list can be expanded!
   - 'Ball'
@@ -23,10 +23,7 @@ tags: # All Tags start upper-case expect for 'phyphox'. This list can be expande
   - 'Acoustic Stopwatch'
 summary: 'Determine the initial height and loss of energy of a bouncing ball from the timing of its impact sounds'
 version: '0.1.0'
-
-#Todo: Sketch of setup, photo of setup, Physics background
 ---
-# Inelastic Collision
 
 {{< youtube ikvtPDwV1FE >}}
 
diff --git a/i18n/de.yaml b/i18n/de.yaml
@@ -23,3 +23,15 @@
 - translations: "Übersetzungen"
 - version: "Version"
 - website: "Webseite"
+- levels: "Niveaus"
+- sensors: "Sensoren"
+- Microphone: "Mikrofon"
+- Accelerometer: "Beschleunigungssensor"
+- Magnetometer: "Magnetometer"
+- Gyroscope: "Gyroskop"
+- Pressure: "Druck"
+- requiredMaterials: "Benötigte Materialien"
+- Smartphone only: "Nur Smartphone"
+- Household items: "Haushaltsgegenstände"
+- Basic experiment material: "Experiment-Grundausstattung"
+- Special equipment: "Spezielle Geräte"
diff --git a/i18n/en.yaml b/i18n/en.yaml
@@ -23,3 +23,15 @@
 - translations: "Translations"
 - version: "version"
 - website: "website"
+- levels: "levels"
+- sensors: "sensors"
+- Microphone: "Microphone"
+- Accelerometer: "Accelerometer"
+- Magnetometer: "Magnetometer"
+- Gyroscope: "Gyroscope"
+- Pressure: "Druck"
+- requiredMaterials: "required materials"
+- Smartphone only: "Smartphone only"
+- Household items: "Household items"
+- Basic experiment material: "Basic experiment material"
+- Special equipment: "Special equipment"
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -1,3 +1,3 @@
 {{- define "main" -}}
   {{- .Content -}}
-{{- end -}}
+{{- end -}}
diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
@@ -0,0 +1,7 @@
+{{ define "main" }}
+  <h1>{{ .Title }}</h1>
+  {{ .Content }}
+  {{ range .Pages }}
+    <h2><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h2>
+  {{ end }}
+{{ end }}
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
@@ -0,0 +1,20 @@
+{{ define "main" }}
+  <h1>{{ .Title }}</h1>
+  {{ .Content }}
+
+<div class="instructions">
+    <div aria-labelledby="message" role="region">
+        <ol class="instructions">
+            {{ range .Pages }}
+            <li>
+                <h4><a href="{{ .RelPermalink }}">{{- .LinkTitle -}}</a></h4>
+                {{- .Date | time.Format ":date_medium" -}}&nbsp;-&nbsp;{{- i18n "version" -}}:&nbsp;{{- .Param "version" -}}<hr/>
+                <div class="summary"> {{- .Summary -}} </div>
+            </li>
+            {{- end -}}
+        </ol>
+    </div>
+</div>
+
+{{ end }}
+
diff --git a/layouts/instructions/list.html b/layouts/instructions/list.html
@@ -2,6 +2,9 @@
 <h2>{{- i18n "overview" -}}&nbsp;{{- i18n "instructions" -}}</h2>
 
 {{- partial "categories.html" . -}}
+{{- partial "levels.html" . -}}
+{{- partial "sensors.html" . -}}
+{{- partial "materials.html" . -}}
 
 {{ $pages := where site.RegularPages "Type" "instructions" }}
 {{ $paginator := .Paginate $pages }}
@@ -24,4 +27,4 @@ <h4><a href="{{ .RelPermalink }}">{{- .LinkTitle -}}</a></h4>
     </div>
 </div>
 
-{{- end -}}
+{{- end -}}
diff --git a/layouts/instructions/term.html b/layouts/instructions/term.html
@@ -0,0 +1,7 @@
+{{ define "main" }}
+  <h1>{{ .Title }}</h1>
+  {{ .Content }}
+  {{ range .Pages }}
+    <h2><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h2>
+  {{ end }}
+{{ end }}
diff --git a/layouts/partials/levels.html b/layouts/partials/levels.html
@@ -0,0 +1,12 @@
+<div class="levels">
+    <h3>{{- i18n "levels" -}}</h3>
+    <ul>
+        {{ $levels := slice }}
+        {{ range .Site.RegularPages }}
+        {{ $levels = $levels | append .Params.levels }}
+        {{ end }}
+        {{ range $level := $levels | uniq | sort }}
+        <li><a href="{{ "/levels/" | relLangURL }}{{ $level | urlize }}">{{ $level }}</a></li>
+        {{ end }}
+    </ul>
+</div>
diff --git a/layouts/partials/materials.html b/layouts/partials/materials.html
@@ -0,0 +1,12 @@
+<div class="requiredMaterials">
+    <h3>{{- i18n "requiredMaterials" -}}</h3>
+    <ul>
+        {{ $materials := slice }}
+        {{ range .Site.RegularPages }}
+        {{ $materials = $materials | append .Params.materials }}
+        {{ end }}
+        {{ range $material := $materials | uniq | sort }}
+        <li><a href="{{ "/materials/" | relLangURL }}{{ $material | urlize }}">{{ i18n $material }}</a></li>
+        {{ end }}
+    </ul>
+</div>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
@@ -1,6 +1,5 @@
 <nav class="CategoryNav">
   <ul>
-    <li><a href="/{{ .Lang }}/">{{- i18n "home" -}}</a></li>
     <li><a href="{{ relref . "instructions" }}">{{- i18n "instructions" -}}</a></li>
   </ul>
 </nav>
@@ -16,4 +15,4 @@
     </ul>
   </nav>
   <hr/>
-{{- end -}}
+{{- end -}}
diff --git a/layouts/partials/sensors.html b/layouts/partials/sensors.html
@@ -0,0 +1,12 @@
+<div class="sensors">
+    <h3>{{- i18n "sensors" -}}</h3>
+    <ul>
+        {{ $sensors := slice }}
+        {{ range .Site.RegularPages }}
+        {{ $sensors = $sensors | append .Params.sensors }}
+        {{ end }}
+        {{ range $sensor := $sensors | uniq | sort }}
+        <li><a href="{{ "/sensors/" | relLangURL }}{{ $sensor | urlize }}">{{ $sensor }}</a></li>
+        {{ end }}
+    </ul>
+</div>
diff --git a/layouts/partials/taglist.html b/layouts/partials/taglist.html
@@ -24,4 +24,4 @@
 
 {{ range $i, $e := $.Site.Taxonomies.categories -}}
 <a href='{{ "/" | relLangURL }}{{ . | urlize }}'>{{ $e | humanize }}</a>
-{{- end -}}
+{{- end -}}
