From 050147635f318212a271bdf3d6a32333f9fcf4b8 Mon Sep 17 00:00:00 2001 From: jan Date: Thu, 29 Aug 2024 14:37:41 +0200 Subject: [PATCH] trainings: new label --- site/assets/scss/layouts/_trainings.scss | 5 ++ site/content/de/trainings/_index.md | 5 ++ site/hugo_stats.json | 22 ++------ site/i18n/de.toml | 6 +++ site/i18n/en.toml | 6 +++ site/layouts/index.html | 8 ++- site/layouts/partials/box-training-small.html | 17 +++--- site/layouts/partials/box-training.html | 15 +++--- .../partials/content-journal-small.html | 2 +- site/layouts/partials/content-journal.html | 2 +- .../partials/content-story-testimonial.html | 2 +- site/layouts/trainings/list.html | 52 +++++++++++++++---- site/layouts/trainings/single.html | 29 ----------- 13 files changed, 97 insertions(+), 74 deletions(-) diff --git a/site/assets/scss/layouts/_trainings.scss b/site/assets/scss/layouts/_trainings.scss index 791302a..08176fd 100644 --- a/site/assets/scss/layouts/_trainings.scss +++ b/site/assets/scss/layouts/_trainings.scss @@ -1,3 +1,8 @@ +.label-new { + top: -1em; + left: 1em; +} + // Filter .btn-filter { diff --git a/site/content/de/trainings/_index.md b/site/content/de/trainings/_index.md index 6460708..90f4683 100644 --- a/site/content/de/trainings/_index.md +++ b/site/content/de/trainings/_index.md @@ -10,6 +10,11 @@ header: title: "Trainings" lead: "Wir eröffnen neue Zugänge zu Cloud Native und Open Source." +headerimages: + img1 : "images/trainings/ACEND_Adventure_Eishoele@2x.jpg" + img2 : "images/trainings/ACEND_Jeremy@2x.jpg" + img3 : "images/trainings/ACEND_CodeA@2x.jpg" + filtertitle: "Das passende Training für dich" categories: ["Kubernetes", "Delivery CI/CD", "Ergänzende Trainings", "Programming"] diff --git a/site/hugo_stats.json b/site/hugo_stats.json index 126afec..e652d8c 100644 --- a/site/hugo_stats.json +++ b/site/hugo_stats.json @@ -97,7 +97,6 @@ "border-1", "border-bottom", "border-top", - "box", "box-anmelden", "box-training", "btn", @@ -120,7 +119,6 @@ "claim", "close", "col", - "col-1", "col-10", "col-11", "col-6", @@ -170,17 +168,14 @@ "d-flex", "d-inline-block", "d-inline-blockme-2", - "d-lg-block", "d-lg-none", "d-md-block", - "d-md-flex", "d-md-inline", "d-md-none", "d-none", "datenschutz", "delivery-ci-cd", "duration", - "eine-entdeckungsreise-durch-die-welt-der-eleganten-programmierung", "email", "entry-content", "erg%C3%A4nzende-trainings", @@ -198,7 +193,6 @@ "flex-shrink-0me-2", "flickity-button", "flickity-prev-next-button", - "float-right", "footer-banner", "footer-section", "form-control", @@ -232,7 +226,6 @@ "img-container_", "img-fluid", "img-fluidme-2", - "img-fluidme-md-2", "impressum", "inner", "inner-content", @@ -243,6 +236,7 @@ "kontakt", "kubernetes", "kubevirt", + "label-new", "language-switcher", "lazyload", "lead-article", @@ -270,14 +264,11 @@ "mb-lg-16", "mb-lg-20", "mb-lg-32", - "mb-lg-4", - "mb-lg-6", "mb-lg-8", "mb-md-5", "mb-minus", "mc-field-group", "me-1", - "me-12", "me-2", "me-3", "me-4", @@ -286,8 +277,6 @@ "me-auto", "me-lg-0", "me-lg-12", - "me-md-1", - "me-md-2", "me-md-5", "memberships", "microservices", @@ -389,7 +378,6 @@ "programming", "prometheus", "ps-4", - "ps-5", "ps-lg-0", "ps-lg-3", "ps-lg-4", @@ -407,7 +395,7 @@ "pt-md-4", "px-0", "px-10", - "px-16", + "px-2", "px-3", "px-4", "px-5", @@ -417,6 +405,7 @@ "px-lg-20", "px-lg-6", "py-0", + "py-1", "py-10", "py-16", "py-2", @@ -425,6 +414,7 @@ "py-5", "py-8", "py-lg-16", + "py-lg-32", "py-lg-4", "py-lg-6", "py-lg-8", @@ -457,7 +447,6 @@ "tekton", "terraform", "testimonial", - "testimonial-", "testimonial-carousel", "text-center", "text-end", @@ -467,7 +456,6 @@ "title", "toggler-icon", "top-0", - "top-1", "trainings", "transition-fade", "ueber-uns", @@ -490,7 +478,6 @@ "AC_Icon_Master_Pfade_AC_Icon_Wallet", "AC_Icon_Pfeil_Rechts_RGB_Schwarz", "AC_Icon_Pfeil_Rechts_RGB_Schwarz-Copy", - "AC_Icon_Uhr_RGB_Schwarz", "AC_Icon_Ziel_RGB_Schwarz", "Combined-Shape", "Fill-1", @@ -556,7 +543,6 @@ "icon/Sprechblase", "icon/Team", "icon/Twitter", - "icon/Uhr", "icon/Wallet", "icon/Ziel", "ihre-rechte", diff --git a/site/i18n/de.toml b/site/i18n/de.toml index afef3a0..1b9f597 100644 --- a/site/i18n/de.toml +++ b/site/i18n/de.toml @@ -4,9 +4,15 @@ other = "Anmelden" [readMore] other = "Mehr erfahren" +[continueReading] +other = "Weiterlesen" + [trainingsangebot] other = "Trainingsangebot" +[new] +other = "Neu" + [personen] other = "Personen" diff --git a/site/i18n/en.toml b/site/i18n/en.toml index ac3b926..d1288f7 100644 --- a/site/i18n/en.toml +++ b/site/i18n/en.toml @@ -4,9 +4,15 @@ other = "Register" [readMore] other = "Discover" +[continueReading] +other = "Continue reading" + [trainingsangebot] other = "Training Offer" +[new] +other = "New" + [personen] other = "Individuals" diff --git a/site/layouts/index.html b/site/layouts/index.html index c3f6c8e..0be7772 100644 --- a/site/layouts/index.html +++ b/site/layouts/index.html @@ -100,8 +100,8 @@

{{ .title }}

{{ end }} - {{ if $data.homepage.stories.enable }} - {{ with $data.homepage.stories }} + {{ if $data.homepage.journal.enable }} + {{ with $data.homepage.journal }}
{{ .label }} @@ -116,6 +116,10 @@

{{ .title }}

{{ partial "content-journal-small" . }} {{ end }}
+ +
+ {{ i18n "readMore" }} +
{{ end }} {{ end }} diff --git a/site/layouts/partials/box-training-small.html b/site/layouts/partials/box-training-small.html index aef97b1..61d0a30 100644 --- a/site/layouts/partials/box-training-small.html +++ b/site/layouts/partials/box-training-small.html @@ -1,22 +1,27 @@ -
+
-
+ +
+ {{ if in .Params.categories "New" }} +
{{ i18n "new" }}
+ {{ end }} +
{{ .Params.subtitle | humanize }}

{{ .Title }}
-
+
{{ if .Params.duration }} - + {{ .Params.duration }} {{ end }}
-
+
{{ if .Params.costs }} - + {{ .Params.costs }} {{ end }}
diff --git a/site/layouts/partials/box-training.html b/site/layouts/partials/box-training.html index 0d22536..679a16d 100644 --- a/site/layouts/partials/box-training.html +++ b/site/layouts/partials/box-training.html @@ -1,7 +1,10 @@ -
+
+
+ {{ if in .Params.categories "New" }} +
{{ i18n "new" }}
+ {{ end }} -
@@ -14,15 +17,15 @@

{{ .Title }}

{{ .Params.abstract }}

-
+
{{ if .Params.duration }} - + {{ .Params.duration }} {{ end }}
-
+
{{ if .Params.costs }} - + {{ .Params.costs }} {{ end }}
diff --git a/site/layouts/partials/content-journal-small.html b/site/layouts/partials/content-journal-small.html index f2b6dfb..cbc36ec 100644 --- a/site/layouts/partials/content-journal-small.html +++ b/site/layouts/partials/content-journal-small.html @@ -39,7 +39,7 @@

{{ .Title }}

{{ end }} - Weiterlesen + {{ i18n "continueReading" }}
diff --git a/site/layouts/partials/content-journal.html b/site/layouts/partials/content-journal.html index 057b7b1..ddb89a3 100644 --- a/site/layouts/partials/content-journal.html +++ b/site/layouts/partials/content-journal.html @@ -46,7 +46,7 @@

{{ .Title }}

{{ end }} - Weiterlesen + {{ i18n "continueReading" }}
diff --git a/site/layouts/partials/content-story-testimonial.html b/site/layouts/partials/content-story-testimonial.html index 28c1074..80357e8 100644 --- a/site/layouts/partials/content-story-testimonial.html +++ b/site/layouts/partials/content-story-testimonial.html @@ -29,7 +29,7 @@

«{{ .Params.person.quote | markdownify }}»

- Weiterlesen + {{ i18n "continueReading" }}
diff --git a/site/layouts/trainings/list.html b/site/layouts/trainings/list.html index ebd6005..85cf26b 100644 --- a/site/layouts/trainings/list.html +++ b/site/layouts/trainings/list.html @@ -1,22 +1,54 @@ {{ define "main" }} -{{ with .Params.header }} - {{ partial "page-header.html" . }} -{{ end }} +
+
+
+ {{ with .Params.header }} +

{{ .title | markdownify }}

+ {{ with .lead }} +
{{ . | markdownify }}
+ {{ end }} + {{ end }} +
+ -
+
+ +
+
+
+ {{ with .Params.headerimages }} +
+ {{ partial "img-srcset.html" (dict "img" .img1 "size" 200 "lazy" false) }} +
+
+ {{ partial "img-srcset.html" (dict "img" .img2 "size" 600 "lazy" false) }} +
+
+ {{ partial "img-srcset.html" (dict "img" .img3 "size" 300 "lazy" false) }} +
+ {{ end }} +
+ +
+ +
+
+
+ - {{ with .Content }} -
- {{ . }} + + +
+

{{ .Params.filtertitle }}

+ {{ .Content }}
- {{ end }} -
+
+

{{ i18n "topics" }}

-

{{ .Params.filtertitle }}

diff --git a/site/layouts/trainings/single.html b/site/layouts/trainings/single.html index 79ced55..febffac 100644 --- a/site/layouts/trainings/single.html +++ b/site/layouts/trainings/single.html @@ -1,36 +1,7 @@ {{ define "main" }} -
-
-
- {{ with .Params.headerimages }} -
- {{ partial "img-srcset.html" (dict "img" .img1 "size" 200 "lazy" false) }} -
-
- {{ partial "img-srcset.html" (dict "img" .img2 "size" 600 "lazy" false) }} -
-
- {{ partial "img-srcset.html" (dict "img" .img3 "size" 300 "lazy" false) }} -
- {{ end }} -
- -
-
-
- - {{.Params.duration }} -
-
{{ i18n "trainingsangebot" }}
-

{{.Params.title }}

- {{ if .Params.subtitle}}
{{ .Params.subtitle | humanize }}
{{ end }} -
-
-
-