Merge branch 'docdock' into 'master'

change folder structure for docdock theme

See merge request !47

README.md

-_index.md
\ No newline at end of file

_header.md

+---
+title: logo placeholder
+---
+
+{{< rawhtml >}}
+<a class="baselink" href="/">card10</a>
+{{< /rawhtml >}}
+

_index.md

@@ -11,19 +11,19 @@ It features an ECG sensor, Bluetooth Low Energy, an optical pulse sensor, a comp
 
 # News
 ## rC3 is coming!
-What role(s) can play card10 in a distributed, remote conference? Brainstorming about connectivity, functionalities, interactions: [card10 at rC3](/en/card10_at_rc3)
+What role(s) can play card10 in a distributed, remote conference? Brainstorming about connectivity, functionalities, interactions: [card10 at rC3](/events/card10_at_rc3)
 
 ## Firmware Update: Okra (as of 2020-02-02)
-It is very easy to [update your card10 firmware](/en/firmwareupdate) with just a USB-C cable. The update instructions
+It is very easy to [update your card10 firmware](/firmware/firmwareupdate) with just a USB-C cable. The update instructions
 also contain a list of the existing firmware releases.
 
-### [Getting started](/en/gettingstarted) 
-You just received your card10, what now? The [Getting started](/en/gettingstarted) page has some advice how to assemble and use the card10.
+### [Getting started](/tutorials/gettingstarted) 
+You just received your card10, what now? The [Getting started](/tutorials/gettingstarted) page has some advice how to assemble and use the card10.
 
-### [First interhacktions](/en/firstinterhacktions)
+### [First interhacktions](/interhacktions/firstinterhacktions)
 After playing around with card10 a bit, you want to learn how to write your own software. Even if you have never programmed before, it is super easy to make some LEDs blink on card10 :)
 
-### [tl;dr](/en/tldr)
+### [tl;dr](/faq/tldr)
 Spare me the details just give me the links to the docs!
 
 ### Community
@@ -31,16 +31,16 @@ Spare me the details just give me the links to the docs!
   - mirrored to [Matrix](https://en.wikipedia.org/wiki/Matrix_(protocol)) (mirror): [`#card10badge:asra.gr`](https://matrix.to/#/#card10badge:asra.gr)
   - [GitLab: `https://git.card10.badge.events.ccc.de`](https://git.card10.badge.events.ccc.de/explore/groups/)
 
-You can [browse](https://git.card10.badge.events.ccc.de/card10/logix) this wiki's source and [read more](/en/gitlab) about our GitLab instance.
+You can [browse](https://git.card10.badge.events.ccc.de/card10/logix) this wiki's source and [read more](/firmware/gitlab) about our GitLab instance.
 
 ### Social Media
   - [`@card10badge@chaos.social`](https://chaos.social/@card10badge)
   - [`twitter.com/card10badge`](https://twitter.com/card10badge)
 
-### [FAQ](/en/faq)
+### [FAQ](/faq)
 
 ### Events
-  - Events [archive](en/events).
+  - Events [archive](/events).
 
 
 ### News Archive
@@ -52,7 +52,7 @@ Our assembly is here: [c3nav](https://36c3.c3nav.de/l/card10/@0,491.08,374.33,5)
 Please stop by at any time :)
 
 
-We are working on a workshop schedule and post it on the [workshop page](/en/workshops/)
+We are working on a workshop schedule and post it on the [workshop page](/events/workshops/)
 
 ## Camp was wonderful, see you at 36C3
 if you still have a voucher (white or blue), bring it to congress and you might be able to redeem it against one of the card10s we are reparing in the meantime.
@@ -60,6 +60,6 @@ if you still have a voucher (white or blue), bring it to congress and you might
 No sale of card10s!
 
 ## Got a card10 you don't use or need one for your next project?
-The card10 exchange point is [here](/en/card10exchange)
+The card10 exchange point is [here](/other/card10exchange)
 
 

app.md

-### App
-
-Apps for android and apple devices are being made.
\ No newline at end of file

app/_index.md

@@ -13,13 +13,13 @@ title: Companion App
 
 ## We need really help, please follow us [here](developing)
 
-# Android / F-Droid releases
+## Android / F-Droid releases
 
 You can find the latest release of the Companion App in the F-Droid repository:
 
 [Companion App for the card10 Chaos Communication Camp badge](https://f-droid.org/app/de.ccc.events.badge.card10)
 
-# iOS Testflight builds
+## iOS Testflight builds
 
 **[https://testflight.apple.com/join/oqZhY70M](https://testflight.apple.com/join/oqZhY70M)**
 

de/.gitkeep

-

de/_index.md

----
-title: Deutsch
----
-## card10-Ausgabe: Du kannst ab jetzt weiße Gutscheine gegen card10s beim card10 assembly tauschen.
-## Aktuelle Firmware-Version: card10s werden mit dem aktuellen Release "Asparagus" verteilt.
-Es ist sehr einfach, deine [card10 firmware zu updaten](/de/firmwareupdate) indem du ein USB-C-Kabel benutzt. Die Update-Anleitung hat auch eine Liste mit existierenden Firmware-Versionen.
-
-# card10
-
-Willkommen im card10 Wiki. Du kannst diese Wikiquelle [browsen](https://git.card10.badge.events.ccc.de/card10/logix) mehr über unsere Gitlab-Instanz [lesen](/de/gitlab).
-
-**card10** ist der Name für das Badge des [Chaos Communication Camp](https://events.ccc.de/camp/2019/wiki/Main_Page). 
-
-### [Los geht's](/de/gettingstarted) 
-Du hast gerade dein card10 empfangen. Was jetzt? Die [los geht's](/de/gettingstarted) Seite hat ein bisschen Hilfe wie du das card10 zusammen baust und benutzt.
-
-### [Erste Interhacktionen](/de/firstinterhacktions)
-Nachdem du ein bisschen mit card10 herumgespielt hast, willst du lernen, wie du deine eigene Software schreiben kannst. Auch wenn du noch nie programmiert hast, ist es super einfach, ein paar LEDs auf card10 zum blinken zu bringen :)
-
-### [tl;dr](/de/tldr)
-Erspar mir die Details, gib mir einfach die Links zur Doku!
-
-## Übersicht
-
-[![Bild des card10 badge](media/ECKyISOXsAYDJZl.jpg)](media/ECKyISOXsAYDJZl.jpg)
->
-> Hallo, mein Name ist card10
-
-### Community
-  - [IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat): [`freenode.net#card10badge`](ircs://chat.freenode.net:6697/card10badge)
-  - oder [Matrix](https://en.wikipedia.org/wiki/Matrix_(protocol)) (mirror): [`#card10badge:asra.gr`](https://matrix.to/#/#card10badge:asra.gr)
-  - [GitLab: `https://git.card10.badge.events.ccc.de`](https://git.card10.badge.events.ccc.de/explore/groups/)
-
-### Social Media
-  - [`@card10badge@chaos.social`](https://chaos.social/@card10badge)
-  - [`twitter.com/card10badge`](https://twitter.com/card10badge)
-
-### [FAQ](/de/faq)
-<!--- Bitte auch zu de/events.md hinzufügen-->
-
-### Events
-  - Dauernd:
-     - **card10 reparieren/löten/firmware/etc.**: card10 village (R8):
-       - Firmware-Arbeit: Bitte bring deinen Laptop mit einem Klon des Firmware Git-Repos und der [toolchain](firmware.card10.badge.events.ccc.de/how-to-build.html)
-

de/firmwareupdate.md

-## Asparagus
-Ab Tag 1, 18:00
-Asparagus ist die firmware, die auf den card10s geladen ist, die an Tag 1 ab 18 Uhr ausgegeben wurden.
-Den Link zur aktuellen Firmware findest du [auf der englischen Seite für Firmware-Updates](https://card10.badge.events.ccc.de/en/firmwareupdate/)
-
-# Das Firmware-Release auf deinem card10 updaten
-* lade die aktuelle Firmware `.zip` Datei auf deinen Computer herunter
-* extrahiere sie
-* setze dein card10 in den [USB storage modus](/de/gettingstarted#usb-storage)
-* Kopiere die Dateien, die du gerade extrahiert hast, in den Hauptordner
-* wirf dein Gerät aus (wenn du das auf der Kommandozeile unter Linux tust, vergiss das `sync` nicht)
-* Schalte dein card10 aus und wieder an.
-

en/_index.md

----
-title: English
----
-# English part of this wiki

en/announcements/2019-06-04-gitlab-server.md

----
-title: New GitLab Server
-date: 2019-06-04
-type: blog
----
-
-We moved from our [Hamburg GitLab](https://gitlab.hamburg.ccc.de/card10/) to:
-
-> [`https://git.card10.badge.events.ccc.de`](https://git.card10.badge.events.ccc.de/explore/groups/)
-
-1. Please be aware this hosting is a work in progress. If you encounter any issues please let us know on Matrix or IRC (see below).
-2. We are aware and working on GDPR compliance, for progress you can track this [issue](https://git.card10.badge.events.ccc.de/card10/meta/issues/1)
-3. Social-Sign-On (Twitter, Github, ...) is coming soon

en/announcements/_index.md

-<!-- ---
-title: Announcements
---- -->
-- [2019-06-04 New Gitlab Server](2019-06-04-gitlab-server)

en/userguide/ecg.md

----
-title: "5: ECG usage"
----
-
-

en/userguide/watch.md

----
-title: "4: Watch usage"
----
-
-

en/events.md → events/_index.md

 ---
 title: Events
+weight: 50
 ---
 <!-- Please keep ongoing and current events in sync with _index.md -->
 - Upcoming:
-  - card10 [workout in Berlin](/en/workouts/berlin-2019-11-09): xHain, Sat-Sun, November 9th to 10th, 2019
+  - card10 [workout in Berlin](/events/workouts/berlin-2019-11-09): xHain, Sat-Sun, November 9th to 10th, 2019
 
 
 <!-- past events, please remove any events you move here from _index.md to keep the home page clean -->
@@ -20,4 +21,4 @@ title: Events
   - CCCamp 2019 Badge at #eh19 (easterhegg2019): [Description](https://conference.c3w.at/eh19/talk/DA7KTT/), [Recording](https://media.ccc.de/search/?q=CCCamp+Badge+Talk)
   - **card10 [talk](https://fahrplan.events.ccc.de/camp/2019/Fahrplan/events/10365.html)**: Curie Wed 21.08. 12:00
   - **card10 firmware workshop**: card10 village (R8), Sun 18.08. 16:00
-  - card10 [workout in Berlin](/en/workouts/berlin-2019-10-03): xHain, Thurs-Sun, October 3rd to 6th, 2019
+  - card10 [workout in Berlin](/events/workouts/berlin-2019-10-03): xHain, Thurs-Sun, October 3rd to 6th, 2019

en/userguide/cases.md → events/workouts/_index.md

 ---
-title: "6: Cases"
+title: Workouts
 ---
 
-
+.