From 4ecb7541584ed3e745f2ac39cf40d5652f9ffe7f Mon Sep 17 00:00:00 2001 From: GoliathLabs Date: Wed, 24 Apr 2024 20:32:03 +0200 Subject: [PATCH 1/5] Re-added: Shop to navbar --- _data/navigation.yml | 2 ++ .../android-chrome-192x192.png\357\200\272Zone.Identifier" | 3 --- .../android-chrome-512x512.png\357\200\272Zone.Identifier" | 3 --- .../favicon/apple-touch-icon.png\357\200\272Zone.Identifier" | 3 --- "assets/favicon/favicon-16x16.png\357\200\272Zone.Identifier" | 3 --- "assets/favicon/favicon-32x32.png\357\200\272Zone.Identifier" | 3 --- "assets/favicon/favicon.ico\357\200\272Zone.Identifier" | 3 --- "assets/favicon/site.webmanifest\357\200\272Zone.Identifier" | 3 --- 8 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 "assets/favicon/android-chrome-192x192.png\357\200\272Zone.Identifier" delete mode 100644 "assets/favicon/android-chrome-512x512.png\357\200\272Zone.Identifier" delete mode 100644 "assets/favicon/apple-touch-icon.png\357\200\272Zone.Identifier" delete mode 100644 "assets/favicon/favicon-16x16.png\357\200\272Zone.Identifier" delete mode 100644 "assets/favicon/favicon-32x32.png\357\200\272Zone.Identifier" delete mode 100644 "assets/favicon/favicon.ico\357\200\272Zone.Identifier" delete mode 100644 "assets/favicon/site.webmanifest\357\200\272Zone.Identifier" diff --git a/_data/navigation.yml b/_data/navigation.yml index 58232470..a9ca4d79 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -7,5 +7,7 @@ main: url: "https://ffmuc.net/wiki" - title: "Spenden" url: "https://ffmuc.net/wiki/doku.php?id=ev:start" + - title: "Shop" + url: "https://freifunk-muenchen.myspreadshop.de/" - title: "Kontakt" url: /kontakt diff --git "a/assets/favicon/android-chrome-192x192.png\357\200\272Zone.Identifier" "b/assets/favicon/android-chrome-192x192.png\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/android-chrome-192x192.png\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip diff --git "a/assets/favicon/android-chrome-512x512.png\357\200\272Zone.Identifier" "b/assets/favicon/android-chrome-512x512.png\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/android-chrome-512x512.png\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip diff --git "a/assets/favicon/apple-touch-icon.png\357\200\272Zone.Identifier" "b/assets/favicon/apple-touch-icon.png\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/apple-touch-icon.png\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip diff --git "a/assets/favicon/favicon-16x16.png\357\200\272Zone.Identifier" "b/assets/favicon/favicon-16x16.png\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/favicon-16x16.png\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip diff --git "a/assets/favicon/favicon-32x32.png\357\200\272Zone.Identifier" "b/assets/favicon/favicon-32x32.png\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/favicon-32x32.png\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip diff --git "a/assets/favicon/favicon.ico\357\200\272Zone.Identifier" "b/assets/favicon/favicon.ico\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/favicon.ico\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip diff --git "a/assets/favicon/site.webmanifest\357\200\272Zone.Identifier" "b/assets/favicon/site.webmanifest\357\200\272Zone.Identifier" deleted file mode 100644 index 34dcdf81..00000000 --- "a/assets/favicon/site.webmanifest\357\200\272Zone.Identifier" +++ /dev/null @@ -1,3 +0,0 @@ -[ZoneTransfer] -ZoneId=3 -ReferrerUrl=C:\Users\goliath\Downloads\favicon_io.zip From 7151930a1134bbef32730a6a3af133c232dcd58d Mon Sep 17 00:00:00 2001 From: GoliathLabs Date: Wed, 24 Apr 2024 20:37:02 +0200 Subject: [PATCH 2/5] add: unterstuetzer --- _pages/home.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_pages/home.md b/_pages/home.md index 6d659d86..92b06f4e 100644 --- a/_pages/home.md +++ b/_pages/home.md @@ -9,6 +9,8 @@ header: actions: - label: " Unser Chat" url: "https://chat.ffmuc.net" + - label: " Unterstützer" + url: "unterstuetzung" excerpt: > Freifunk München ist eine nichtkommerzielle Initiative für den Aufbau freier (Funk-)Netze sowie Kommunikationskanäle. --- From 53c383a7b43ee59cdc77b92673ebe1e6372579eb Mon Sep 17 00:00:00 2001 From: GoliathLabs Date: Wed, 24 Apr 2024 20:40:00 +0200 Subject: [PATCH 3/5] few navbar changes --- _data/navigation.yml | 4 ++++ _pages/home.md | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/_data/navigation.yml b/_data/navigation.yml index a9ca4d79..affe41bf 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,12 +1,16 @@ main: - title: "Mitmachen" url: /mitmachen + - title: "Firmware" + url: "https://firmware.ffmuc.net" - title: "Knotenkarte" url: "https://map.ffmuc.net/" - title: "Wiki" url: "https://ffmuc.net/wiki" - title: "Spenden" url: "https://ffmuc.net/wiki/doku.php?id=ev:start" + - title: "Unterstützer" + url: /unterstuetzung - title: "Shop" url: "https://freifunk-muenchen.myspreadshop.de/" - title: "Kontakt" diff --git a/_pages/home.md b/_pages/home.md index 92b06f4e..6d659d86 100644 --- a/_pages/home.md +++ b/_pages/home.md @@ -9,8 +9,6 @@ header: actions: - label: " Unser Chat" url: "https://chat.ffmuc.net" - - label: " Unterstützer" - url: "unterstuetzung" excerpt: > Freifunk München ist eine nichtkommerzielle Initiative für den Aufbau freier (Funk-)Netze sowie Kommunikationskanäle. --- From 5ebd3ab46c4e75df1246c64b9683215bed287480 Mon Sep 17 00:00:00 2001 From: GoliathLabs Date: Wed, 24 Apr 2024 21:02:26 +0200 Subject: [PATCH 4/5] spendenlink --- spenden.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 spenden.md diff --git a/spenden.md b/spenden.md new file mode 100644 index 00000000..5073f5db --- /dev/null +++ b/spenden.md @@ -0,0 +1,14 @@ +--- +layout: single +title: Spenden +permalink: /spenden/ +--- + + + + +Die Spendenseite findest Du ab sofort "nur noch" in unserem WIKI unter: https://ffmuc.net/wiki/doku.php?id=ev:start From 5515a328cf5337d1093722b30ebc0726bf4a025a Mon Sep 17 00:00:00 2001 From: GoliathLabs Date: Wed, 24 Apr 2024 21:03:55 +0200 Subject: [PATCH 5/5] fix config --- _config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 96f8a45d..a2580c2c 100644 --- a/_config.yml +++ b/_config.yml @@ -140,10 +140,9 @@ sass: # Outputting -permalink: /:categories/:title/ paginate: 5 # amount of posts to show paginate_path: /page:num/ -timezone: # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones +timezone: Europe/Berlin # Plugins (previously gems:) @@ -231,7 +230,6 @@ head_scripts: twitter: username: "freifunkMUC" -timezone: Europe/Berlin # Custom headers webrick: headers: