Merge pull request 'Layout-Verbesserungen' (#201) from cantortechnik/gcg-website:master into master

Reviewed-on: https://git.cantorgymnasium.de/gcg/gcg-website/pulls/201

assets/js/script.js

@@ -1,33 +1,7 @@
 (function ($) {
   'use strict';
 
-  // Preloader js
-  $(window).on('load', function () {
-    $('.preloader').fadeOut(100);
-    if ($('header').offset().top > 10) {
-      $('.top-header').addClass('hide');
-      $('.navigation').addClass('nav-bg');
-      $('.navigation').css('margin-top','-'+height+'px');
-    } else {
-      $('.top-header').removeClass('hide');
-      if (!$('#top-banner').length) {
-        $('.navigation').removeClass('nav-bg');
-      }
-      $('.navigation').css('margin-top','-'+0+'px');
-    }
-    if ($('#top-banner').length) {
-      $('.navigation').addClass('nav-bg');
-      $('.hero-section').addClass('hs-banner');
-      $('.page-title-section').addClass('pts-banner');
-    } else {
-      $('.navigation').removeClass('nav-bg');
-      $('.hero-section').removeClass('hs-banner');
-      $('.page-title-section').removeClass('pts-banner');
-    }
-  });
-
-  // Sticky Menu
-  $(window).scroll(function () {
+  function adaptHeight () {
     var height = $('.top-header').innerHeight();
     if ($('header').offset().top > 10) {
       $('.top-header').addClass('hide');
@@ -40,9 +14,25 @@
       }
       $('.navigation').css('margin-top','-'+0+'px');
     }
+  }
+
+  // Preloader js
+  $(window).on('load', function () {
+    $('.preloader').fadeOut(100);
+    adaptHeight();
+    if ($('#top-banner').length) {
+      $('.navigation').addClass('nav-bg');
+      $('.hero-section').addClass('hs-banner');
+      $('.page-title-section').addClass('pts-banner');
+    } else {
+      $('.navigation').removeClass('nav-bg');
+      $('.hero-section').removeClass('hs-banner');
+      $('.page-title-section').removeClass('pts-banner');
+    }
   });
 
-
+  // Sticky Menu
+  $(window).scroll(adaptHeight);
 
   // Background-media
   $('[data-background]').each(function () {
@@ -60,8 +50,8 @@
     infinite: true,
     arrows: true,
     fade: true,
-    prevArrow: '<button type=\'button\' class=\'prevArrow\'><i class=\'mdi mdi-chevron-left\'></i></button>',
-    nextArrow: '<button type=\'button\' class=\'nextArrow\'><i class=\'mdi mdi-chevron-right\'></i></button>',
+    prevArrow: '<button type=\'button\' class=\'prevArrow\'><i class=\'mdi mdi-chevron-left arrowIcon\'></i></button>',
+    nextArrow: '<button type=\'button\' class=\'nextArrow\'><i class=\'mdi mdi-chevron-right arrowIcon\'></i></button>',
     dots: true
   });
   $('.hero-slider').slickAnimation();

assets/scss/_typography.scss

@@ -31,7 +31,7 @@ h1, .h1{
 }
 
 h2, .h2{
-  font-size: 40px;
+  font-size: 35px;
   @include mobile {
     font-size: 30px;
   }

assets/scss/templates/_slider.scss

@@ -37,6 +37,10 @@
     right: 0;
   }
 
+  .arrowIcon {
+    font-size: 40px;
+  }
+
   .slick-dots {
     position: absolute;
     left: 0;

content/german/termine/_index.md

@@ -59,7 +59,7 @@ events:
   - enddate: 2022-11-03T23:00:00.000Z
     date: 2022-10-24T13:22:08.641Z
     title: Herbstferien
-    location: nicht in der Schule
+    location: 
   - enddate: ""
     date: 2022-11-08T14:23:14.581Z
     title: Zweite Runde der Internationalen Physikolympiade
@@ -135,7 +135,7 @@ events:
   - enddate: 2023-01-05T06:00:00.000Z
     date: 2022-12-21T14:55:18.525Z
     title: Weihnachtsferien
-    location: nicht in der Schule
+    location: 
   - enddate: 2023-01-20T05:00:00.000Z
     date: 2023-01-16T14:57:43.479Z
     title: Spezialistenlager Mathematik und Physik der Klassen 8 - 11
@@ -147,7 +147,7 @@ events:
   - enddate: 2023-02-03T04:00:00.000Z
     date: 2023-01-27T14:59:49.571Z
     title: Skilager Klasse 11
-    location: " "
+    location: 
   - enddate: 2023-02-03T05:00:00.000Z
     date: 2023-01-30T15:01:48.171Z
     title: Modulkurs Chemie Klasse 11
@@ -163,7 +163,7 @@ events:
   - enddate: 2023-02-11T07:00:00.000Z
     date: 2023-02-06T15:07:19.620Z
     title: Winterferien
-    location: nicht in der Schule
+    location: 
   - enddate: 2023-02-17T04:00:00.000Z
     date: 2023-02-13T15:08:20.930Z
     title: Modulkurs Chemie der 12. Klassen
@@ -256,7 +256,7 @@ events:
   - enddate: 2023-04-08T06:00:00.000Z
     date: 2023-04-03T14:21:05.216Z
     title: Osterferien
-    location: nicht in der Schule
+    location: 
   - enddate: ""
     date: 2023-03-22T15:21:08.979Z
     title: Landeschemieolympiade
@@ -284,7 +284,7 @@ events:
   - enddate: 2023-05-18T22:00:00.000Z
     date: 2023-05-15T14:21:10.514Z
     title: Pfingstferien
-    location: nicht in der Schule
+    location:
   - enddate: ""
     date: 2023-05-23T14:21:10.753Z
     title: Verpflichtende Zentrale Klassenarbeit Deutsch der 6. Klassen
@@ -300,7 +300,7 @@ events:
   - date: 2023-05-30T16:40:01.000+02:00
     enddate: ""
     title: Lehrer-Präventionstag
-    location: " "
+    location: 
   - date: 2023-06-01T16:41:16.000+02:00
     enddate: ""
     title: Sportfest mit Spendenlauf
@@ -308,7 +308,7 @@ events:
   - enddate: 2023-06-09T02:00:00.000Z
     date: 2023-06-05T15:44:26.521Z
     title: Klassenfahrtswochen der Klassen 7 und 10
-    location: nicht in der Schule
+    location: 
   - enddate: 2023-06-16T05:00:00.000Z
     date: 2023-06-13T15:44:26.948Z
     title: Mitteldeutsche Regionalrunde der Chemieolympiade
@@ -336,11 +336,11 @@ events:
   - enddate: 2023-06-30T03:00:00.000Z
     date: 2023-06-27T15:44:28.388Z
     title: Ökopraktikum der 11. Klassen
-    location: " "
+    location: 
   - date: 2023-06-28T16:45:21.000+02:00
     enddate: ""
     title: '"Der Puppenspieler" - Theaterprojekt der Klasse 10'
-    location: " "
+    location: 
   - enddate: ""
     date: 2023-06-29T13:00:28.876Z
     title: Ausgabe der Reifezeugnisse
@@ -352,11 +352,11 @@ events:
   - enddate: ""
     date: 2023-07-03T15:44:29.868Z
     title: Exkursionstag der Klassen 5 und 6
-    location: " "
+    location:
   - enddate: ""
     date: 2023-07-03T15:44:30.356Z
     title: Sozialer Tag der Klassen 7-11
-    location: Georg-Cantor-Gymnasium
+    location: 
   - date: 2023-07-04T16:55:45.000+02:00
     enddate: ""
     title: Mannschaftswettbewerb Chemie Klasse 10
@@ -364,11 +364,11 @@ events:
   - enddate: ""
     date: 2023-07-04T15:44:30.803Z
     title: Exkursionstag der Klassen 7-11
-    location: " "
+    location:
   - enddate: ""
     date: 2023-07-04T15:44:31.329Z
     title: Sozialer Tag der Klassen 5-6
-    location: Georg-Cantor-Gymnasium
+    location: 
   - enddate: ""
     date: 2023-07-05T15:54:47.837Z
     title: Letzter Schultag - Ausgabe der Zeugnisse zum Schuljahresende
@@ -376,5 +376,5 @@ events:
   - enddate: 2023-08-16T04:00:00.000Z
     date: 2023-07-06T15:54:48.476Z
     title: Sommerferien
-    location: nicht in der Schule
+    location:
 ---

data/de/homepage.yml

@@ -17,9 +17,9 @@ slider:
       animation_in: left
       animation_out: right
       button:
-        enable: false
-        label: ""
-        link: ""
+        enable: true
+        label: Über uns
+        link: about
     - content: Schule mit dem Gütesiegel "Begabungsfördernde Schule"
       animation_in: left
       animation_out: right

layouts/index.html

@@ -224,12 +224,25 @@
 
       {{ range first 3 $events }}
       <li class="d-md-table mb-4 w-100 border-bottom hover-shadow">
-        <div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-4 termin-tc"><span class="h2 d-block">{{ time.Format "2" .date}}</span> <span class="d-block">{{ time.Format "Jan 2006" .date}}</span> {{ with .enddate }} <br> bis {{ time.Format "2 Jan 2006" . }} {{end}}</div>
-        <div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
-          <p href="{{ .Permalink }}" class="h4 mb-3 d-block">{{ .title }}</p>
-          <p class="mb-0">{{ .summary | truncate 100 }}</p>
+        <div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc">
+          <span class="h2 d-block">{{ time.Format "2" .date}}</span>
+          <span class="d-block">{{ time.Format "Jan 2006" .date}}</span>
+          {{ with .enddate }}
+            <br>
+            bis {{ time.Format "2 Jan 2006" . }}
+          {{ end }}
         </div>
-        <div class="d-md-table-cell text-right pr-0 pr-md-4 p-2"><p><i class="mdi mdi-map-marker-radius text-primary mr-2"></i>{{ .location | markdownify }}</p></div>
+        <div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
+          <p class="h4 mb-0 d-block">{{ .title }}</p>
+        </div>
+        {{ with .location }}
+        <div class="d-md-table-cell text-right pr-0 pr-md-4 p-2 vertical-align-middle">
+          <p>
+            <i class="mdi mdi-map-marker-radius-outline icon-s text-primary mr-2"></i>
+            {{ . | markdownify }}
+          </p>
+        </div>
+        {{ end }}
       </li>
       {{ end }}
 

layouts/partials/header.html

@@ -51,6 +51,9 @@
               <div class="dropdown-menu">
                 {{ range .Children }}
                 <a class="dropdown-item text-uppercase" href="{{ .URL | absLangURL }}" target="{{ if .Params.External }}_blank{{ else }}_self{{end}}">{{ .Name }}</a>
+                {{ if .Params.separator }}
+                  <hr>
+                {{ end }}
                 {{ end }}
               </div>
             </li>

layouts/termine/list.html

@@ -7,12 +7,25 @@
         <ul class="list-unstyled">
           {{ range .Params.events }}
           <li class="d-md-table mb-4 w-100 border-bottom hover-shadow">
-            <div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc"><span class="h2 d-block">{{ time.Format "2" .date}}</span> <span class="d-block">{{ time.Format "Jan 2006" .date}}</span> {{ with .enddate }} <br> bis {{ time.Format "2 Jan 2006" . }} {{end}}</div>
-            <div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
-              <p href="{{ .Permalink }}" class="h4 mb-3 d-block">{{ .title }}</p>
-              <p class="mb-0">{{ .summary | truncate 100 }}</p>
+            <div class="d-md-table-cell text-center p-4 bg-primary text-white mb-4 mb-md-0 termin-tc">
+              <span class="h2 d-block">{{ time.Format "2" .date}}</span>
+              <span class="d-block">{{ time.Format "Jan 2006" .date}}</span>
+              {{ with .enddate }}
+                <br>
+                bis {{ time.Format "2 Jan 2006" . }}
+              {{ end }}
             </div>
-            <div class="d-md-table-cell text-right pr-0 pr-md-4 p-2"><p><i class="mdi mdi-map-marker-radius-outline icon-s text-primary mr-2"></i>{{ .location | markdownify }}</p></div>
+            <div class="d-md-table-cell px-4 vertical-align-middle mb-4 mb-md-0 p-2">
+              <p class="h4 mb-0 d-block">{{ .title }}</p>
+            </div>
+            {{ with .location }}
+            <div class="d-md-table-cell text-right pr-0 pr-md-4 p-2 vertical-align-middle">
+              <p>
+                <i class="mdi mdi-map-marker-radius-outline icon-s text-primary mr-2"></i>
+                {{ . | markdownify }}
+              </p>
+            </div>
+            {{ end }}
           </li>
           {{ end }}
         </ul>

static/admin/config.yml

@@ -475,8 +475,7 @@ collections:
               - {label: "Titel", name: "title", widget: "string", required: true}
               - {label: "Datum/Startdatum", name: "date", widget: "datetime",  required: true, date_format: "dd.MM.yyyy", time_format: false, format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX"}
               - {label: "Enddatum", name: "enddate", widget: "datetime",  required: false, date_format: "dd.MM.yyyy", time_format: false, format: "yyyy-MM-dd'T'HH:mm:ss.SSSXXX", default: ""}
-              - {label: "Ort", name: "location", widget: "string", required: true}
-              - {label: "Beschreibung", name: "summary", widget: "string", required: false}
+              - {label: "Ort", name: "location", widget: "string", required: false}
             required: false
       - name: "forms-index"
         label: "Dokumente und Formulare"