From 8feaa4cabc8b2d0e375047231b7760cb7332c967 Mon Sep 17 00:00:00 2001 From: poolitzer Date: Thu, 19 Oct 2023 19:41:13 +0200 Subject: [PATCH] rework index --- data/people.yml | 8 +-- hugo.yaml | 6 +- i18n/de.toml | 14 ++++- i18n/en.toml | 18 ++++-- layouts/index.html | 144 ++++++++++----------------------------------- 5 files changed, 65 insertions(+), 125 deletions(-) diff --git a/data/people.yml b/data/people.yml index a9b9541..c2b651d 100644 --- a/data/people.yml +++ b/data/people.yml @@ -6,11 +6,11 @@ role: board email: fabia.giovanazzi@newpipe-ev.de img: fabio_giovanazzi.png -- name: Tjorven Rubach +- name: Thjorven Rubach role: board - email: tjorven.rubach@me.eu - img: tjorven_rubach.png + email: thjorven.rubach@me.eu + img: thjorven_rubach.png - name: Fynn Godau role: treasurer email: fynn.godau@newpipe-ev.de - img: fynn_godau.png \ No newline at end of file + img: fynn_godau.png diff --git a/hugo.yaml b/hugo.yaml index 475c590..0443f8f 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -134,6 +134,10 @@ menu: url_en: /en/become-a-member/ url_de: /de/mitglied-werden/ weight: 40 + - identifier: blog + url: /posts/ + weight: 60 + about: - identifier: foundation name: Foundation @@ -150,7 +154,7 @@ menu: url_de: /de/ueber/vorstand/ weight: 20 - identifier: documents - name: Dokuments + name: Documents url: /about/documents/ params: url_en: /en/about/documents/ diff --git a/i18n/de.toml b/i18n/de.toml index 9137592..b5acca1 100644 --- a/i18n/de.toml +++ b/i18n/de.toml @@ -5,6 +5,7 @@ become-a-member = "Mitglied werden" documents = "Dokumente" categories = "Kategorien" dropdown = "Dropdown" +blog = "Blog" contact = "Kontakt" appearance = "Aussehen" comments = "Kommentare" @@ -16,8 +17,17 @@ forename = "Vorname" surname = "Nachname" email = "E-Mail" -moto = "Supporting privacy and open source software" -index_description = "NewPipe e.V. ist eine gemeinnützige Organisation, die sich für die Förderung von Datenschutz und Open-Source-Software einsetzt. Wir sind die Organisation hinter NewPipe, einer freien Medien-App für Android." +moto = "Unterstützt Privatsphäre und quelloffene Software" +index_description = "NewPipe e.V. ist eine gemeinnützige Organisation, welche Technologie unterstützt (insbesondere freie und quelloffene), die Nutzung von digitalen Medien vereinfacht und Zugang zu diesen verbessert." +index_about = "Über uns" +index_about_text = "Willst du mehr über uns lernen? Drück hier:" +index_member = "Werde Mitglied" +index_member_text = "Du möchtest Mitglied werden? Drück hier:" +block_header = "Von unserem Blog" +block_description = "Hier kannst du Neuigkeiten über den Verein lesen. Auf Englisch (sorry)." +email_header = "Bleib auf dem Neusten" +email_description = "Wenn du eine E-Mail bekommen willst, wenn wir einen neuen Blogpost veröffentlichen, kannst du hier deine E-Mail addresse eintragen." +email_button = "Eintragen" foundation = "Verein" board = "Vorstand" diff --git a/i18n/en.toml b/i18n/en.toml index 2c45e43..a42a980 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -2,9 +2,10 @@ prose = "Prose" about = "About" home = "Home" become-a-member = "Become a member" -documents = "documents" +documents = "Documents" catergories = "Categories" dropdown = "Dropdown" +blog = "Blog" contact = "Contact" appearance = "Appearance" comments = "Comments" @@ -17,10 +18,19 @@ surname = "Surname" email = "Email" moto = "Supporting privacy and open source software" -index_description = "NewPipe e.V. is a non-profit organization that aims to empower users to take back control of their data and to protect their privacy when using Android devices." +index_description = "NewPipe e.V. is a non-profit organization which support technology (especially free and open source one), which enables using digital media and improves access to it." +index_about = "About us" +index_about_text = "Do you want to learn more about us? Press here:" +index_member = "Become a member" +index_member_text = "Do you want to become a member? Press here:" +block_header = "From the blog" +block_description = "Here you can read about recent news regarding our association." +email_header = "Stay Up to Date" +email_description = "If you want to receive an email when we publish a new blog post, you can subscribe here." +email_button = "Subscribe" -foundation = "foundation" -board = "board" +foundation = "Foundation" +board = "Board" treasurer = "treasurer" secretary = "secretary" diff --git a/layouts/index.html b/layouts/index.html index 0700640..9c71459 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -7,7 +7,7 @@

{{ .Site.Title }}

-

{{ T "moto" }}

@@ -33,40 +33,40 @@

-
- -
-
- {{ $p1image := resources.Get .Site.Params.P1.Image }} - {{ with $p1image }} - {{ with .Resize (printf "%dx%d webp q90" .Width .Height) }} - P1 - {{ end }} - {{ end }} +
+
+

+ {{ T "index_about" }} +

+
+
+

+ {{ T "index_about_text" }} +

+
+ +
+

- {{ .Site.Params.P1.Heading }} + {{ T "index_member" }}

- {{ range .Site.Params.P1.Content }}

- {{ .text }} + {{ T "index_member_text" }}

- {{ end }} +
+ +
@@ -74,86 +74,6 @@
- - - - - - -
@@ -162,13 +82,11 @@

- {{ .Site.Params.P4.Heading }} + {{ T "block_header" }}

- {{ range .Site.Params.P4.Content }}

- {{ .text }} + {{ T "block_description" }}

- {{ end }}
@@ -246,13 +164,11 @@

- {{ .Site.Params.P5.Heading }} + {{ T "email_header" }}

- {{ range .Site.Params.P5.Content }}

- {{ .text }} + {{ T "email_description" }}

- {{ end }}
@@ -261,7 +177,7 @@
@@ -272,4 +188,4 @@ {{ end }} -{{ end }} \ No newline at end of file +{{ end }}