Skip to content

Commit

Permalink
feat(theme): switch to lotusdocs theme
Browse files Browse the repository at this point in the history
Added theme
Restructured files
Changed configuration
  • Loading branch information
Lino authored and noxilixon committed Jul 30, 2024
1 parent 8f67c80 commit 08c6bee
Show file tree
Hide file tree
Showing 47 changed files with 430 additions and 244 deletions.
2 changes: 1 addition & 1 deletion .github/linters/.eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
ignorePatterns: ["layouts/page/single.json"]
ignorePatterns: ["layouts/page/single.json", "assets/js/bootstrap.js"]
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ public/
resources/_gen/
www/
www-dev/
assets/jsconfig.json
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "themes/ananke"]
path = themes/ananke
url = https://github.com/theNewDynamic/gohugo-theme-ananke.git
[submodule "themes/lotusdocs"]
path = themes/lotusdocs
url = https://github.com/colinwilson/lotusdocs
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The website is built using the static website generator Hugo.

- Clone this repository
- Load submodule with `git submodule init` and `git submodule update`
- Install [Hugo](https://gohugo.io/installation/)
- Install [Hugo](https://gohugo.io/installation/) (>=0.120.0)

## Run for development

Expand Down
4 changes: 2 additions & 2 deletions apache/dev.website.conf
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

DocumentRoot /var/www/berlin.freifunk.net/www-dev

Header set Content-Security-Policy "script-src dev.berlin.freifunk.net"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"
Header set Content-Security-Policy "script-src 'self' 'unsafe-hashes' 'sha256-NPQiAFHfOX//546/pLtrKoVL9QjRuPsCI+6doZczyyI=' 'sha256-Q0IcZn6UWrfGL+BOcG44ffINe7v5Wq/gTHBbunlNOJQ='"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"

<Directory "/var/www/berlin.freifunk.net/www-dev">
Options FollowSymLinks
Expand Down
4 changes: 2 additions & 2 deletions apache/website.conf
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
Header always merge Vary "Accept-Language"
</LocationMatch>

Header set Content-Security-Policy "script-src berlin.freifunk.net"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"
Header set Content-Security-Policy "script-src 'self' 'unsafe-hashes' 'sha256-NPQiAFHfOX//546/pLtrKoVL9QjRuPsCI+6doZczyyI=' 'sha256-Q0IcZn6UWrfGL+BOcG44ffINe7v5Wq/gTHBbunlNOJQ='"
Header set Strict-Transport-Security "max-age=63072000; includeSubDomains"

<Directory "/var/www/berlin.freifunk.net/www">
Options FollowSymLinks
Expand Down
File renamed without changes
30 changes: 30 additions & 0 deletions assets/images/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions assets/js/bootstrap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Overwriting the theme file to activate component
//

// Import the Bootstrap components we want to use.
// See https://github.com/twbs/bootstrap/blob/main/js/index.umd.js
// eslint-disable-next-line import/no-absolute-path
import Tab from '/js/bootstrap/src/tab'
// eslint-disable-next-line import/no-absolute-path
import Dropdown from '/js/bootstrap/src/dropdown'

export default {
Tab,
Dropdown
}
65 changes: 0 additions & 65 deletions config.toml

This file was deleted.

8 changes: 1 addition & 7 deletions content/_index.de.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
---
title: "Freifunk Berlin"
description: "Freifunk Berlin ist eine lokale Initiative mit dem Ziel, ein freies WLAN-Netzwerk über Berlin aufzuspannen und freien Netzzugang anzubieten."
featured_image: '/header.jpg'
---

## Was ist Freifunk?

Die Vision von Freifunk ist die Verbreitung freier Netzwerke, die Demokratisierung der Kommunikationsmedien und die Förderung lokaler Sozialstrukturen. Durch die Vernetzung ganzer Stadtteile wollen wir der digitalen Spaltung entgegenwirken und freie unabhängige Netzwerkstrukturen aufbauen. Konkret hat sich Freifunk zum Ziel gesetzt, offene WLAN-Netze einzurichten und diese miteinander zu verbinden. Dies ermöglicht einen freien Datenverkehr "durch die Luft" in der ganzen Stadt innerhalb des Freifunk-Netzes. Freifunk ist somit eine offene nicht-kommerzielle hierarchielose Initiative für freie Funknetzwerke.
Expand All @@ -14,7 +8,7 @@ Die Vision von Freifunk ist die Verbreitung freier Netzwerke, die Demokratisieru

Die Grundlage von Freifunk bildet ein sogenanntes Mesh-Netzwerk. Alle WLAN-Router im Freifunk-Netz kommunizieren untereinander und bilden ein eigenes Funknetzwerk in der Stadt. Ein Routing-Protokoll ermöglicht, dass jeder Mensch im Freifunk-Netz andere Teilnehmer_innen erreichen und Daten austauschen kann. Manche Knoten sind desweiteren auch direkt mit dem Internet verbunden. So haben alle Menschen im Freifunk-Netz auch direkten Zugriff auf das globale Netz.

{{< img src="adhoc_netz_wikipedia.png" alt="mesh cloud with one node that has internet connection" >}}
{{< img src="images/adhoc_netz_wikipedia.png" alt="mesh cloud with one node that has internet connection" >}}

## Wie kann ich mitmachen?

Expand Down
8 changes: 1 addition & 7 deletions content/_index.en.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
---
title: "Freifunk Berlin"
description: "Freifunk Berlin is a local initiative with the aim of setting up a free WiFi network across Berlin and offering free network access."
featured_image: '/header.jpg'
---

## What is Freifunk?

Freifunk stands for distributing free networks, democratizing media of communication and promoting local social structures. By interconnecting whole neighborhoods, we want to bridge the digital gap and establish a free and independent network infrastructure. More precisely, the aim of Freifunk is installing open wifi networks and interconnecting them. This facilitates free data "air traffic" in the whole city within the Freifunk network. In short, Freifunk is an open, non-commercial, non-hierarchical initiative for free networks.
Expand All @@ -14,7 +8,7 @@ Freifunk stands for distributing free networks, democratizing media of communica

Freifunk's foundation is a so called mesh network. All routers within the Freifunk network can communicate with one another and form their own wifi network. A routing protocol allows for everybody within the Freifunk network to communicate and exchange data with other participants. Some of the nodes within the network are further connected with the Internet. That way, everyone within Freifunk has also a direct access to the global network.

{{< img src="adhoc_netz_wikipedia.png" alt="mesh cloud with one node that has internet connection" >}}
{{< img src="images/adhoc_netz_wikipedia.png" alt="mesh cloud with one node that has internet connection" >}}

## How can I contribute?

Expand Down
5 changes: 0 additions & 5 deletions content/contact.de.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Kontakt"
description: ""
omit_header_text: true
menu:
main:
weight: 7
---

## Treffen
Expand Down
5 changes: 0 additions & 5 deletions content/contact.en.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Contact"
description: ""
omit_header_text: true
menu:
main:
weight: 7
---

## Meetings
Expand Down
5 changes: 0 additions & 5 deletions content/donate.de.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Spenden"
description: ""
omit_header_text: true
menu:
main:
weight: 3
---

## Freifunk in Berlin durch Spenden unterstützen
Expand Down
5 changes: 0 additions & 5 deletions content/donate.en.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Donate"
description: ""
omit_header_text: true
menu:
main:
weight: 3
---

## Support Freifunk in Berlin through donations
Expand Down
5 changes: 0 additions & 5 deletions content/downloads.de.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Downloads"
description: ""
omit_header_text: true
menu:
main:
weight: 5
---

## Freifunk Berlin Downloads
Expand Down
5 changes: 0 additions & 5 deletions content/downloads.en.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Downloads"
description: ""
omit_header_text: true
menu:
main:
weight: 5
---

## Freifunk Berlin Downloads
Expand Down
10 changes: 0 additions & 10 deletions content/impressum.de.md → content/imprint.de.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
---
title: "Impressum"
description: ""
featured_image: ''
omit_header_text: true
description: ''
type: page
menu: footer

---


### Impressum

**Kontakt Freifunk Berlin**
info{at}berlin.freifunk.net

Expand Down
7 changes: 1 addition & 6 deletions content/map.de.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
---
title: "Netzkarte"
description: "Karte der freien WLAN Zugangspunkte von Freifunk Berlin mit genauer Lage. Die WLAN Zugangspunkte sind kostenlos nutzbar, unzensiert und öffentlich zugänglich."
omit_header_text: true
menu:
main:
weight: 2
---

Die [Freifunk Berlin Karte](https://hopglass.berlin.freifunk.net/) zeigt freie WLAN Zugangspunkte mit ihrer genauen Lage. Die WLAN Zugangspunkte sind kostenlos nutzbar, unzensiert und öffentlich zugänglich.

{{< img src="hopglass.png" alt="Es ist eine Karte von Berlin zu sehen. Auf der Karte sind viele kleine Punkte. Die meisten sind blau, einige sind rot. Zwischen manchen der Punkte sind grüne Linien gezogen." link="https://hopglass.berlin.freifunk.net/" width="100%" >}}
{{< img src="images/hopglass.png" alt="Es ist eine Karte von Berlin zu sehen. Auf der Karte sind viele kleine Punkte. Die meisten sind blau, einige sind rot. Zwischen manchen der Punkte sind grüne Linien gezogen." link="https://hopglass.berlin.freifunk.net/" width="100%" >}}

## Statistiken

Expand Down
7 changes: 1 addition & 6 deletions content/map.en.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
---
title: "Network map"
description: "Map of the free WiFi access points from Freifunk Berlin with exact locations. The WiFi access points are free to use, uncensored and publicly accessible."
omit_header_text: true
menu:
main:
weight: 2
---

The [Freifunk Berlin map](https://hopglass.berlin.freifunk.net/) shows free WiFi access points with their exact location. The WiFi access points are free to use, uncensored and publicly accessible.

{{< img src="hopglass.png" alt="You can see a map of Berlin. There are lots of little dots on the map. Most of them are blue, some are red. There are green lines between some of the dots." link="https://hopglass.berlin.freifunk.net/" width="100%" >}}
{{< img src="images/hopglass.png" alt="You can see a map of Berlin. There are lots of little dots on the map. Most of them are blue, some are red. There are green lines between some of the dots." link="https://hopglass.berlin.freifunk.net/" width="100%" >}}

## Statistics

Expand Down
11 changes: 3 additions & 8 deletions content/participate.de.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Mitmachen"
description: ""
omit_header_text: true
menu:
main:
weight: 2
---

## Jede\_r kann mitmachen!
Expand All @@ -24,7 +19,7 @@ Sprich mit deinem Freundeskreis, Geschäftspartner\_innen und allen Menschen die

_Wohnung, Geschäft, Café, Restaurant, Bar ..._

{{< img src="participate_small.png" alt="Person am Laptop mit einem Router auf der Fensterbank" >}}
{{< img src="images/participate_small.png" alt="Person am Laptop mit einem Router auf der Fensterbank" >}}

Du möchtest

Expand All @@ -42,7 +37,7 @@ So kannst du mitmachen

_Balkon, hohes Gebäude, öffentlicher Platz, Park, weitläufiges Gelände ..._

{{< img src="participate_medium.png" alt="Glückliche Personen mit Wlan Empfang am Handy und Laptops" >}}
{{< img src="images/participate_medium.png" alt="Glückliche Personen mit Wlan Empfang am Handy und Laptops" >}}

Du möchtest

Expand All @@ -59,7 +54,7 @@ So kannst du mitmachen

_Dach, Dachgeschoss, hohes Gebäude, öffentliches Gebäude, Rathaus, Kirchturm ..._

{{< img src="participate_big.png" alt="Dächer von Häusern die mit roten Punkten und Linien miteinander verbunden sind um das Mesh-Netz zu symbolisieren" >}}
{{< img src="images/participate_big.png" alt="Dächer von Häusern die mit roten Punkten und Linien miteinander verbunden sind um das Mesh-Netz zu symbolisieren" >}}

Du möchtest

Expand Down
11 changes: 3 additions & 8 deletions content/participate.en.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
---
title: "Participate"
description: ""
omit_header_text: true
menu:
main:
weight: 2
---

## Everybody can participate!
Expand All @@ -24,7 +19,7 @@ Talk to your friends, business partners and everyone who surrounds you and sprea

_Apartment, shop, cafe, restaurant, bar..._

{{< img src="participate_small.png" alt="Person at the laptop with a router on the windowsill" >}}
{{< img src="images/participate_small.png" alt="Person at the laptop with a router on the windowsill" >}}

You want to

Expand All @@ -42,7 +37,7 @@ Here's how you can join in

_Balcony, tall building, public square, park, extensive grounds..._

{{< img src="participate_medium.png" alt="Happy people with WiFi reception on cell phones and laptops" >}}
{{< img src="images/participate_medium.png" alt="Happy people with WiFi reception on cell phones and laptops" >}}

You want to

Expand All @@ -59,7 +54,7 @@ Here's how you can join in

_Roof, attic, tall building, public building, town hall, church tower..._

{{< img src="participate_big.png" alt="Roofs of houses connected with red dots and lines to symbolize the mesh network" >}}
{{< img src="images/participate_big.png" alt="Roofs of houses connected with red dots and lines to symbolize the mesh network" >}}

You want to

Expand Down
Loading

0 comments on commit 08c6bee

Please sign in to comment.