Merge pull request #17 from acend/changes

trainings: new label
acend · Aug 29, 2024 · d469d76 · d469d76
2 parents 3b81f23 + 0501476
commit d469d76
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 74 deletions.
diff --git 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
@@ -10,6 +10,11 @@ header:
   title: "Trainings"
   lead: "Wir eröffnen neue Zugänge zu Cloud Native und Open Source."
 
+headerimages:
+  img1 : "images/trainings/[email protected]"
+  img2 : "images/trainings/[email protected]"
+  img3 : "images/trainings/[email protected]"
+
 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
@@ -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
@@ -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
@@ -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
@@ -100,8 +100,8 @@ <h2  data-scroll  class="mb-4 mb-lg-8 col-lg-4">{{ .title }}</h2>
   {{ end }}
 
 
-  {{ if  $data.homepage.stories.enable }}
-  {{ with  $data.homepage.stories }}
+  {{ if  $data.homepage.journal.enable }}
+  {{ with  $data.homepage.journal }}
 
   <div class="container-fluid  mb-16 mb-lg-32">
       <a class="btn btn-sm btn-outline-primary border-1 mb-2" href="{{ .link }}">{{ .label }}</a>
@@ -116,6 +116,10 @@ <h2  data-scroll  class="mb-4 mb-lg-8 col-lg-4">{{ .title }}</h2>
         {{ partial "content-journal-small" . }}
       {{ end }}
     </div>
+
+    <div class="text-end mt-6 mb-18">
+      <a href="{{ .link }}" class="btn btn-outline-primary  py-3 px-5 ">{{ i18n "readMore" }}</a>
+   </div>
   </div>
   {{ end }}
   {{ end }}

diff --git a/site/layouts/partials/box-training-small.html b/site/layouts/partials/box-training-small.html
@@ -1,22 +1,27 @@
-<div data-scroll class="col box-training  position-relative {{ .Title | urlize}} {{ range $key, $value := .Params.categories }}{{ (replace $value "/" "-") | urlize }} {{ end }} ">
+<div data-scroll class="col box-training   {{ .Title | urlize}} {{ range $key, $value := .Params.categories }}{{ (replace $value "/" "-") | urlize }} {{ end }} ">
 
 
-  <div class="inner border p-4 px-lg-10 py-lg-8 d-flex flex-column h-100">
+
+  <div class="inner border p-4 px-lg-10 py-lg-8 d-flex flex-column h-100 position-relative">
+    {{ if  in .Params.categories "New"  }}
+    <div class="position-absolute label-new bg-primary text-white px-2 py-1 small">{{ i18n "new" }}</div>
+    {{ end }}
+
        <div class="small mb-2">{{  .Params.subtitle  | humanize }}</div>
        <a class="stretched-link" href="{{ .Permalink | safeURL }}">
          <h3 class="mb-4 mb-lg-8">{{ .Title }}</h3>
         </a>
 
         <div class="d-flex mt-auto">
-          <div class="duration small bold mb-3 me-3">
+          <div class="duration small bold me-6 ">
             {{ if .Params.duration }}
-            <svg class="icon icon-sm img-fluid me-md-1" width="64" height="64"  viewBox="0 0 64 64"  xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
+            <svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64"  viewBox="0 0 64 64"  xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
             <span class="nowrap">{{ .Params.duration }}</span>
             {{ end }}
           </div>
-          <div class="costs small bold mb-3">
+          <div class="costs small bold ">
             {{ if .Params.costs }}
-            <svg class="icon icon-sm img-fluid me-md-1" width="64" height="64"  viewBox="0 0 64 64"  xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
+            <svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="icon/Wallet" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="AC_Icon_Master_Pfade_AC_Icon_Wallet" transform="translate(6 7)" fill="#010101" fill-rule="nonzero"><path d="M48 16H36.08a10.73 10.73 0 0 0 .9-4.09H48v-4H36.35A11 11 0 0 0 15.62 8H6a6 6 0 0 0-6 6v36h40v-4H4V19.65A6 6 0 0 0 6 20h42v26h-4v4h8V16h-4zM26 4.6a7 7 0 0 1 7 7 6.94 6.94 0 0 1-1.56 4.4H20.56A6.94 6.94 0 0 1 19 11.6a7 7 0 0 1 7-7zM4 14a2 2 0 0 1 2-2h9a10.86 10.86 0 0 0 .9 4H6a2 2 0 0 1-2-2z" id="Shape"/></g></g></svg>
             <span class="nowrap">{{ .Params.costs }}</span>
             {{ end }}
           </div>

diff --git a/site/layouts/partials/box-training.html b/site/layouts/partials/box-training.html
@@ -1,7 +1,10 @@
-<div data-scroll class="col-lg-6 box-training  position-relative {{ .Title | urlize}} {{ range $key, $value := .Params.categories }}{{ (replace $value "/" "-") | urlize }} {{ end }} ">
+<div data-scroll class="col-lg-6 box-training  {{ .Title | urlize}} {{ range $key, $value := .Params.categories }}{{ (replace $value "/" "-") | urlize }} {{ end }} ">
 
+  <div class="inner border p-4 px-lg-10 py-lg-8 d-flex flex-column h-100 position-relative">
+  {{ if  in .Params.categories "New"  }}
+  <div class="position-absolute label-new bg-primary text-white px-2 py-1 small">{{ i18n "new" }}</div>
+  {{ end }}
 
-  <div class="inner border p-4 px-lg-10 py-lg-8 d-flex flex-column h-100">
     <div class="row">
 
      <div class="col-lg-5">
@@ -14,15 +17,15 @@ <h3  class="mb-0">{{ .Title }}</h3>
         <p class="small mb-4 mb-lg-8">{{ .Params.abstract }}</p>
 
         <div class="d-flex">
-          <div class="duration small bold mb-3">
+          <div class="duration small bold me-6 ">
             {{ if .Params.duration }}
-            <svg class="icon icon-sm img-fluid me-md-2" width="64" height="64"  viewBox="0 0 64 64"  xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
+            <svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64"  viewBox="0 0 64 64"  xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
             <span class="nowrap">{{ .Params.duration }}</span>
             {{ end }}
           </div>
-          <div class="costs small bold mb-3">
+          <div class="costs small bold ">
             {{ if .Params.costs }}
-            <svg class="icon icon-sm img-fluid me-md-2" width="64" height="64"  viewBox="0 0 64 64"  xmlns="http://www.w3.org/2000/svg"><g fill="#000" fill-rule="nonzero"><path d="M30 19v15h15v-4H34V19z"/><path d="M32 7C18.193 7 7 18.193 7 32s11.193 25 25 25c.67 0 1.34 0 2-.09V48h-4v4.9c-10.768-1.017-19.002-10.046-19.026-20.862-.023-10.816 8.173-19.88 18.937-20.943 10.763-1.063 20.574 6.223 22.667 16.835C54.67 38.54 48.36 49.007 38 52.11v4.16c12.27-3.032 20.347-14.745 18.82-27.292C55.29 16.43 44.64 6.998 32 7z"/></g></svg>
+            <svg class="icon icon-sm img-fluid flex-shrink-0" width="64" height="64" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="icon/Wallet" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="AC_Icon_Master_Pfade_AC_Icon_Wallet" transform="translate(6 7)" fill="#010101" fill-rule="nonzero"><path d="M48 16H36.08a10.73 10.73 0 0 0 .9-4.09H48v-4H36.35A11 11 0 0 0 15.62 8H6a6 6 0 0 0-6 6v36h40v-4H4V19.65A6 6 0 0 0 6 20h42v26h-4v4h8V16h-4zM26 4.6a7 7 0 0 1 7 7 6.94 6.94 0 0 1-1.56 4.4H20.56A6.94 6.94 0 0 1 19 11.6a7 7 0 0 1 7-7zM4 14a2 2 0 0 1 2-2h9a10.86 10.86 0 0 0 .9 4H6a2 2 0 0 1-2-2z" id="Shape"/></g></g></svg>
             <span class="nowrap">{{ .Params.costs }}</span>
             {{ end }}
           </div>

diff --git a/site/layouts/partials/content-journal-small.html b/site/layouts/partials/content-journal-small.html
@@ -39,7 +39,7 @@ <h3 class="h4 mb-6">{{ .Title }}</h3>
           {{ end }}
 
           <a class="stretched-link  ms-auto mt-lg-auto" href="{{ .Permalink | safeURL }}">
-            Weiterlesen
+            {{ i18n "continueReading" }}
           </a> 
         </div>
      </div>

diff --git a/site/layouts/partials/content-journal.html b/site/layouts/partials/content-journal.html
@@ -46,7 +46,7 @@ <h2  class="h3 mb-6">{{ .Title }}</h2>
           {{ end }}
 
           <a class="stretched-link  ms-auto mt-lg-auto" href="{{ .Permalink | safeURL }}">
-            Weiterlesen
+            {{ i18n "continueReading" }}
           </a> 
         </div>
      </div>

diff --git a/site/layouts/partials/content-story-testimonial.html b/site/layouts/partials/content-story-testimonial.html
@@ -29,7 +29,7 @@
         <p class="quote">«{{ .Params.person.quote  | markdownify }}»</p>
 
         <a class="stretched-link_" href="{{ .Permalink | safeURL }}">
-         Weiterlesen
+          {{ i18n "continueReading" }}
         </a> 
 
        </div>

diff --git 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 }}
+<div class="container-fluid mb-8 mb-lg-16">
+  <div class="row ">
+  <div class="col-lg-6">
+    {{ with .Params.header }}
+    <h1 class="h4 mb-5">{{ .title | markdownify }}</h1>
+    {{ with .lead }}
+        <div class="h1 lead-big mb-0">{{ . | markdownify }}</div>
+    {{ end }}
+    {{ end }}
+  </div>
+
 
 
-  <div class="container-fluid mb-16 mb-lg-32">
+   <div class="col-lg-6 ">
+
+     <div class="main-carousel py-16 py-lg-32">
+       <div  class="carousel-cell container p-0 py-5">
+         <div class="d-flex images">
+           {{ with .Params.headerimages }}
+           <div class="img-container mt-5" id="l1">
+             {{ partial "img-srcset.html" (dict "img" .img1 "size" 200 "lazy" false) }}
+            </div>
+            <div class="img-container" id="l2">
+              {{ partial "img-srcset.html" (dict "img" .img2 "size" 600 "lazy" false) }}
+            </div>
+            <div class="img-container align-self-end mb-5" id="l3">
+              {{ partial "img-srcset.html" (dict "img" .img3 "size" 300 "lazy" false) }}
+            </div>
+            {{ end }}
+          </div>
+
+        </div>
+
+        </div>
+      </div>
+  </div>
+
 
-    {{ with .Content }}
-    <div class="col-lg-8 offset-lg-1 mb-8 mb-lg-16">
-      {{ . }}
+
+
+  <div class="col-lg-8 offset-lg-1 mb-8 mb-lg-16">
+      <h2 class="h3 mb-4 mb-lg-8">{{ .Params.filtertitle }}</h2>
+      {{ .Content }}
     </div>
-    {{ end }}
 
-      <div class="row my-5">
+      <div class="row">
         <div class="col-lg-11 offset-lg-1">
+          <h2 class="h4 bold">{{ i18n "topics" }}</h2>
           <div class="d-flex border-top  py-3">
-            <h2 class="h4 bold">{{ .Params.filtertitle }}</h2>
            <!-- <button class="btn btn-filter btn-resetms-auto">Reset</button> -->
           </div>
             <div class="filterlist mb-8 " >