From ba414b0015f7ae3c69526be0395e3d1bd0f9eb24 Mon Sep 17 00:00:00 2001 From: Marek Krug Date: Thu, 27 Feb 2025 00:21:42 +0100 Subject: [PATCH] new images, new content, new theme almost finished --- {static => assets}/img/cccb-im-winter.jpg | Bin config/_default/hugo.toml | 31 ++++ config/_default/languages.de.toml | 14 +- config/_default/menus.de.toml | 23 ++- config/_default/params.toml | 30 ++-- content/page/anfahrt.md | 2 +- content/page/bastelabend.md | 4 +- content/page/beitragsordnung.md | 2 +- content/page/calendar.md | 3 +- content/page/chaosradio.md | 2 +- content/page/clubdiscordia.md | 4 +- content/page/cms.md | 2 +- content/page/datengarten.md | 4 +- content/page/fotos.md | 38 ++++- content/page/mastodon.md | 2 +- ...gliedschaft.md => mitgliedschaft-infos.md} | 4 +- content/page/openwrt.md | 4 +- content/page/satzung.md | 2 +- content/page/spieleabend.md | 4 +- content/page/subbotnik.md | 4 +- layouts/_default/baseof.calendar.html | 1 + layouts/_default/list.calendar.html | 21 +++ layouts/_default/list.xml.html | 12 ++ layouts/_default/single.calendar.html | 21 +++ layouts/datengarten/single.html | 16 +- layouts/events/single.html | 16 ++ layouts/page/single.ics | 2 +- old_config.yaml.txt | 140 +++++++++--------- .../img/club/27479845037_9e4ece985c-thumb.jpg | Bin 82116 -> 0 bytes .../img/club/27480379957_c09e86189b-thumb.jpg | Bin 68979 -> 0 bytes .../img/club/27481915157_3cde02aaa3-thumb.jpg | Bin 54487 -> 0 bytes .../img/club/27481933907_f240f4232d-thumb.jpg | Bin 83664 -> 0 bytes .../img/club/27481964727_04959aa83b-thumb.jpg | Bin 74933 -> 0 bytes .../img/club/27481969187_a23cf0c7ab-thumb.jpg | Bin 114506 -> 0 bytes .../img/club/28476390838_3684d048ef-thumb.jpg | Bin 71261 -> 0 bytes .../img/club/28476394828_1ed64af4f5-thumb.jpg | Bin 103068 -> 0 bytes .../img/club/40542196560_f22e53153c-thumb.jpg | Bin 67974 -> 0 bytes .../img/club/40544370280_1703903e06-thumb.jpg | Bin 74198 -> 0 bytes .../img/club/41447101455_c6ace71115-thumb.jpg | Bin 73446 -> 0 bytes .../img/club/41447109945_3ab5a6e7ef-thumb.jpg | Bin 68746 -> 0 bytes .../img/club/41627141884_48e4bb4dec-thumb.jpg | Bin 78859 -> 0 bytes .../img/club/41627160174_4d494549a2-thumb.jpg | Bin 142369 -> 0 bytes .../img/club/41629042814_df533c84e0-thumb.jpg | Bin 48897 -> 0 bytes .../img/club/42300970272_667569d239-thumb.jpg | Bin 106454 -> 0 bytes .../img/club/42301473062_cdcea7912f-thumb.jpg | Bin 72462 -> 0 bytes .../img/club/42301482072_7092c55ef0-thumb.jpg | Bin 100605 -> 0 bytes .../img/club/42303237782_7107fcf7c7-thumb.jpg | Bin 64968 -> 0 bytes .../img/club/42303241962_665df39b87-thumb.jpg | Bin 49432 -> 0 bytes .../img/club/42303247602_56716d8704-thumb.jpg | Bin 146274 -> 0 bytes .../img/club/42349449581_3c634b4245-thumb.jpg | Bin 68006 -> 0 bytes .../img/club/42349465201_9fff7450d4-thumb.jpg | Bin 80911 -> 0 bytes .../img/club/42349973551_9f1a404c0f-thumb.jpg | Bin 71451 -> 0 bytes .../img/club/42350001481_48a8be981e-thumb.jpg | Bin 110033 -> 0 bytes .../img/club/42351605711_6d40412b75-thumb.jpg | Bin 62244 -> 0 bytes static/img/club/Kochen_in_der_CCCB_Küche.jpg | Bin 0 -> 2956417 bytes static/img/club/dorfromantik-im-cccb.jpg | Bin 0 -> 2255575 bytes 56 files changed, 288 insertions(+), 120 deletions(-) rename {static => assets}/img/cccb-im-winter.jpg (100%) rename content/page/{mitgliedschaft.md => mitgliedschaft-infos.md} (98%) create mode 100644 layouts/_default/baseof.calendar.html create mode 100644 layouts/_default/list.calendar.html create mode 100644 layouts/_default/list.xml.html create mode 100644 layouts/_default/single.calendar.html create mode 100644 layouts/events/single.html delete mode 100644 static/img/club/27479845037_9e4ece985c-thumb.jpg delete mode 100644 static/img/club/27480379957_c09e86189b-thumb.jpg delete mode 100644 static/img/club/27481915157_3cde02aaa3-thumb.jpg delete mode 100644 static/img/club/27481933907_f240f4232d-thumb.jpg delete mode 100644 static/img/club/27481964727_04959aa83b-thumb.jpg delete mode 100644 static/img/club/27481969187_a23cf0c7ab-thumb.jpg delete mode 100644 static/img/club/28476390838_3684d048ef-thumb.jpg delete mode 100644 static/img/club/28476394828_1ed64af4f5-thumb.jpg delete mode 100644 static/img/club/40542196560_f22e53153c-thumb.jpg delete mode 100644 static/img/club/40544370280_1703903e06-thumb.jpg delete mode 100644 static/img/club/41447101455_c6ace71115-thumb.jpg delete mode 100644 static/img/club/41447109945_3ab5a6e7ef-thumb.jpg delete mode 100644 static/img/club/41627141884_48e4bb4dec-thumb.jpg delete mode 100644 static/img/club/41627160174_4d494549a2-thumb.jpg delete mode 100644 static/img/club/41629042814_df533c84e0-thumb.jpg delete mode 100644 static/img/club/42300970272_667569d239-thumb.jpg delete mode 100644 static/img/club/42301473062_cdcea7912f-thumb.jpg delete mode 100644 static/img/club/42301482072_7092c55ef0-thumb.jpg delete mode 100644 static/img/club/42303237782_7107fcf7c7-thumb.jpg delete mode 100644 static/img/club/42303241962_665df39b87-thumb.jpg delete mode 100644 static/img/club/42303247602_56716d8704-thumb.jpg delete mode 100644 static/img/club/42349449581_3c634b4245-thumb.jpg delete mode 100644 static/img/club/42349465201_9fff7450d4-thumb.jpg delete mode 100644 static/img/club/42349973551_9f1a404c0f-thumb.jpg delete mode 100644 static/img/club/42350001481_48a8be981e-thumb.jpg delete mode 100644 static/img/club/42351605711_6d40412b75-thumb.jpg create mode 100644 static/img/club/Kochen_in_der_CCCB_Küche.jpg create mode 100644 static/img/club/dorfromantik-im-cccb.jpg diff --git a/static/img/cccb-im-winter.jpg b/assets/img/cccb-im-winter.jpg similarity index 100% rename from static/img/cccb-im-winter.jpg rename to assets/img/cccb-im-winter.jpg diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml index f34314e..c48a71e 100644 --- a/config/_default/hugo.toml +++ b/config/_default/hugo.toml @@ -5,6 +5,8 @@ theme = "blowfish" # UNCOMMENT THIS LINE baseURL = "https://berlin.ccc.de/" defaultContentLanguage = "de" +RelativeURLs = true +CanonifyURLs = true pluralizeListTitles = "true" # hugo function useful for non-english languages, find out more in https://gohugo.io/getting-started/configuration/#pluralizelisttitles @@ -35,8 +37,37 @@ enableEmoji = true filename = 'sitemap.xml' priority = 0.5 +[permalinks] + post = "/post/:year/:month/:day/:title/" + [outputs] home = ["HTML", "RSS", "JSON"] + section = ["HTML", "Calendar", "RSS", "XML"] + page = ["HTML", "Calendar"] + +# Output Formats Configuration +[outputFormats.Calendar] + mediaType = "text/calendar" + baseName = "index" + isPlainText = true + notAlternative = true + +[outputFormats.XML] + mediaType = "application/xml" + baseName = "index" + isPlainText = true + +[outputFormats.RSS] + mediaType = "application/rss+xml" + +# Media Types Configuration +[mediaTypes] + [mediaTypes."text/calendar"] + suffixes = ["ics"] + [mediaTypes."application/rss"] + suffixes = ["rss"] + [mediaTypes."application/xml"] + suffixes = ["xml"] [related] threshold = 0 diff --git a/config/_default/languages.de.toml b/config/_default/languages.de.toml index b800338..c2cc251 100644 --- a/config/_default/languages.de.toml +++ b/config/_default/languages.de.toml @@ -9,15 +9,18 @@ title = "Chaos Computer Club Berlin" isoCode = "de" rtl = false dateFormat = "January 2, 2006" - logo = "img/avatar-CCCB-Logo.png" - secondaryLogo = "img/avatar-CCCB-Logo.png" + DateForm = "30.12.2006" + logo = "img/logo.png" + # secondaryLogo = "img/avatar-CCCB-Logo.png" description = "Willkommen! Wir sind ein Erfa-Kreis des Chaos Computer Club e.V. und die örtliche Niederlassung des CCC in Berlin." copyright = "CCC-BY" + selfHosted = true + mainSections = ["post", "datengarten"] [params.author] # name = "Your name here" email = "mail2025@berlin.ccc.de" - # image = "img/logo.png" + image = "img/logo.png" # imageQuality = 96 headline = "Willkommen! Wir sind ein Erfa-Kreis des Chaos Computer Club e.V. und die örtliche Niederlassung des CCC in Berlin." # bio = "A little bit about you" @@ -35,8 +38,8 @@ title = "Chaos Computer Club Berlin" # { facebook = "https://facebook.com/username" }, # { flickr = "https://www.flickr.com/photos/username/" }, # { foursquare = "https://foursquare.com/username" }, -# { github = "https://github.com/username" }, -# { gitlab = "https://gitlab.com/username" }, + { github = "https://github.com/cccb/" }, + { gitlab = "https://git.berlin.ccc.de/explore/repos" }, # { google = "https://www.google.com/" }, # { hashnode = "https://username.hashnode.dev" }, # { instagram = "https://instagram.com/username" }, @@ -46,6 +49,7 @@ title = "Chaos Computer Club Berlin" # { lastfm = "https://lastfm.com/user/username" }, # { linkedin = "https://linkedin.com/in/username" }, { mastodon = "https://chaos.social/@clubdiscordia" }, + { irc = "https://webirc.hackint.org/#ircs://irc.hackint.org/#cccb" }, # { medium = "https://medium.com/username" }, # { microsoft = "https://www.microsoft.com/" }, # { orcid = "https://orcid.org/userid" }, diff --git a/config/_default/menus.de.toml b/config/_default/menus.de.toml index 4542be5..53f1159 100644 --- a/config/_default/menus.de.toml +++ b/config/_default/menus.de.toml @@ -16,24 +16,23 @@ # weight = 10 [[main]] - name = "verein" + name = "Verein" pageRef = "verein" weight = 200 [[main]] - name = "veranstaltungen" + name = "Veranstaltungen" pageRef = "veranstaltungen" weight = 300 [[main]] - name = "News" - pageRef = "post" - + name = "Mitgliedschaft" + pageRef = "mitgliedschaft" weight = 400 [[main]] - name = "Impressum" - pageRef = "page/impressum/" + name = "News" + pageRef = "post" weight = 500 # -- Footer Menu -- @@ -50,3 +49,13 @@ name = "Categories" pageRef = "categories" weight = 20 + +[[footer]] + name = "Impressum" + pageRef = "impressum" + weight = 500 + +[[footer]] + name = "Privacy" + pageRef = "datenschutz" + weight = 600 \ No newline at end of file diff --git a/config/_default/params.toml b/config/_default/params.toml index 3e11aef..4aa04cd 100644 --- a/config/_default/params.toml +++ b/config/_default/params.toml @@ -22,8 +22,8 @@ disableImageOptimization = false disableTextInHeader = false backgroundImageWidth = 1200 -defaultBackgroundImage = "/img/cccb-im-winter.jpg" # used as default for background images -defaultFeaturedImage = "img/avatar-CCCB-Logo.png" # used as default for featured images in all articles +# defaultBackgroundImage = "/img/cccb-im-winter.jpg" # used as default for background images +defaultFeaturedImage = "/img/avatar-CCCB-Logo.png" # used as default for featured images in all articles # highlightCurrentMenuArea = true # smartTOC = true @@ -46,9 +46,9 @@ forgejoDefaultServer = "https://v8.next.forgejo.org" layout = "background" # valid options: page, profile, hero, card, background, custom homepageImage = "img/cccb-im-winter.jpg" # used in: hero, and card showRecent = true - showRecentItems = 5 + showRecentItems = 8 showMoreLink = true - showMoreLinkDest = "/posts/" + showMoreLinkDest = "/post/" cardView = false cardViewScreenWidth = false layoutBackgroundBlur = false # only used when layout equals background @@ -58,27 +58,27 @@ forgejoDefaultServer = "https://v8.next.forgejo.org" showViews = false showLikes = false showDateOnlyInArticle = false - showDateUpdated = false - showAuthor = true - # showAuthorBottom = false + showDateUpdated = true + showAuthor = false + showAuthorBottom = true showHero = false # heroStyle = "basic" # valid options: basic, big, background, thumbAndBackground layoutBackgroundBlur = true # only used when heroStyle equals background or thumbAndBackground layoutBackgroundHeaderSpace = true # only used when heroStyle equals background - showBreadcrumbs = false + showBreadcrumbs = true showDraftLabel = true - showEdit = false - # editURL = "https://github.com/username/repo/" + showEdit = true + editURL = "https://github.com/cccb/www/tree/staging/content/" editAppendPath = true seriesOpened = false showHeadingAnchors = true - showPagination = true + showPagination = false invertPagination = false showReadingTime = true - showTableOfContents = false + showTableOfContents = true # showRelatedContent = false # relatedContentLimit = 3 - showTaxonomies = false + showTaxonomies = true showAuthorsBadges = false showWordCount = true # sharingLinks = [ "linkedin", "twitter", "bluesky", "mastodon", "reddit", "pinterest", "facebook", "email", "whatsapp", "telegram"] @@ -113,6 +113,10 @@ forgejoDefaultServer = "https://v8.next.forgejo.org" showLikes = false showTableOfContents = false cardView = false + category = "categories" + series = "series" + tag = "tags" + [term] showHero = false diff --git a/content/page/anfahrt.md b/content/page/anfahrt.md index b948f5a..c68ca98 100644 --- a/content/page/anfahrt.md +++ b/content/page/anfahrt.md @@ -3,7 +3,7 @@ title: "Anfahrt" date: 2018-05-17T23:04:10+02:00 menu: main: - parent: "verein" + parent: "Verein" --- # Allgemeine Hinweise diff --git a/content/page/bastelabend.md b/content/page/bastelabend.md index 47de654..29e4f08 100644 --- a/content/page/bastelabend.md +++ b/content/page/bastelabend.md @@ -7,8 +7,10 @@ dtend: 20250118T230000 rrule: "FREQ=MONTHLY;BYDAY=1SA,3SA;WKST=MO" menu: main: - parent: "veranstaltungen" + parent: "Veranstaltungen" --- +![Lötkolben im CCCB](/img/club/27481933907_f240f4232d.jpg) + **Jeden 1. und 3. Samstag im Monat ist ab 17 Uhr Bastelabend im Club.** Wenn ihr neu seid und den CCCB zum ersten Mal besuchen wollt, kommt am besten an einem Donnerstag zum [Club Discordia](/page/clubdiscordia/), da samstags nicht immer genug Leute da sind, um euch zu empfangen. Generell sind aber alle herzlich eingeladen, an den Spieleabenden vorbeizukommen. \ No newline at end of file diff --git a/content/page/beitragsordnung.md b/content/page/beitragsordnung.md index 09ca00a..6eb1a0e 100644 --- a/content/page/beitragsordnung.md +++ b/content/page/beitragsordnung.md @@ -4,7 +4,7 @@ subtitle: "Chaos Computer Club Berlin / CCC(B) e.V." date: 2020-01-19T10:00:00+02:00 menu: main: - parent: "verein" + parent: "Mitgliedschaft" --- _Stand: 19. Januar 2020_ diff --git a/content/page/calendar.md b/content/page/calendar.md index ddeec34..2bc48d9 100644 --- a/content/page/calendar.md +++ b/content/page/calendar.md @@ -4,8 +4,9 @@ subtitle: "Der Kalender des CCCB" date: 2025-02-26T10:00:00+02:00 menu: main: - parent: "verein" + parent: "Verein" --- +![Ein Schild im CCCB mit der Aufschrift "Closed at Night"](/img/club/42303247602_56716d8704.jpg)