Merge branch 'master' of ssh://git.cantorgymnasium.de/gcg/gcg-website

2023-09-19 22:45:08 +02:00 · 2023-09-19 22:45:08 +02:00 · 63c9d1fcc4
commit 63c9d1fcc4
parent 8a69fc788b 6d9b2551a3
4 changed files with 50 additions and 3 deletions
--- a/content/termine/_index.md
+++ b/content/termine/_index.md
@ -8,15 +8,20 @@ events:
    title: Sommerferien
  - date: 2023-08-24T11:00:16.000+02:00
    title: AG-Börse
+    enddate: ""
  - date: 2023-09-12T10:10:18.000+02:00
    title: Projekt "Red Hand Day - Alltag von Kindersoldaten" - Übergabe der
      Red-Hand-Mappe an Dr. Karamba Diaby
+    enddate: ""
  - date: 2023-09-13T11:00:16.000+02:00
    title: Jugend-forscht-Tag Klassenstufen 5 und 6
+    enddate: ""
  - date: 2023-09-14T11:00:16.000+02:00
    title: Festveranstaltung zum 35-jährigen Schuljubiläum
+    enddate: ""
  - date: 2023-09-15T11:00:16.000+02:00
    title: Projekttag zum Schuljubiläum
+    enddate: ""
  - date: 2023-09-18T11:00:16.000+02:00
    enddate: 2023-09-19T11:00:16.000+02:00
    title: Schülerratstraining
@ -24,6 +29,7 @@ events:
  - date: 2023-09-19T11:00:16.000+02:00
    title: Bundesrunde Chemieolympiade
    location: Leipzig
+    enddate: ""
  - date: 2023-09-18T11:00:16.000+02:00
    enddate: 2023-09-22T11:00:16.000+02:00
    title: Praktikum Modulkurs der Klassenstufe 12
@ -33,21 +39,27 @@ events:
    title: Elternversammlung
  - date: 2023-09-23T11:00:16.000+02:00
    title: Stadtschulmesse
+    enddate: ""
  - date: 2023-09-25T11:00:16.000+02:00
    title: Chemkids
+    enddate: ""
  - date: 2023-09-26T11:00:16.000+02:00
    title: Mannschaftswettbewerb Biologie der Sekundarstufe II
    location: Georg-Cantor Gymnasium
+    enddate: ""
  - date: 2023-10-02T16:45:22.000+02:00
    title: Ferientag
+    enddate: ""
  - date: 2023-10-10T11:00:16.000+02:00
    enddate: 2023-10-12T11:00:16.000+02:00
    title: Gedenkstättenfahrt Klassenstufe 10
    location: Bernburg
  - date: 2023-10-12T11:00:16.000+02:00
    title: Gesamtkonferenz
+    enddate: ""
  - date: 2023-10-13T11:00:16.000+02:00
    title: Landesphysikolympiade Runde 1
+    enddate: ""
  - date: 2023-10-16T11:00:16.000+02:00
    enddate: 2023-10-30T11:00:16.000+02:00
    title: Herbstferien
@ -60,6 +72,7 @@ events:
    location: Grünheide
  - date: 2023-11-09T11:00:16.000+02:00
    title: Lehrersprechtag
+    enddate: ""
  - date: 2023-11-13T11:00:16.000+02:00
    enddate: 2023-11-20T11:00:16.000+02:00
    title: NaWi-Praktikum Klassenstufe 10
@ -68,44 +81,58 @@ events:
    title: Betriebspraktikum Klassenstufe 9
  - date: 2023-11-14T11:00:16.000+02:00
    title: Internationale Physikolympiade (IPhO) Runde 2
+    enddate: ""
  - date: 2023-11-14T11:00:16.000+02:00
    title: Matheolympiade Runde 2
+    enddate: ""
  - date: 2023-11-21T11:00:16.000+02:00
    title: Physik-Klausur Klassenstufe 10
+    enddate: ""
  - date: 2023-11-23T11:00:16.000+02:00
    title: '"Tag der Justiz" für Schüler der Sozialkundekurse Klassenstufe 10'
+    enddate: ""
  - date: 2023-11-25T11:00:16.000+02:00
    title: Tag der offenen Tür
+    enddate: ""
  - date: 2023-11-28T21:48:04.000+01:00
    title: Landeswettbewerb Latein (Lateinkurse Kl. 11 und 12)
    location: Aula
+    enddate: ""
  - date: 2023-11-29T11:00:16.000+02:00
    title: Geschichtsexkursion Klassenstufe 12 (Hr. Dr. Krause)
+    enddate: ""
  - date: 2023-12-01T11:00:16.000+02:00
    title: Fahrt in den Bundestag der Sozialkundekurse Klassenstufe 11
    location: Berlin
+    enddate: ""
  - date: 2023-12-01T11:00:16.000+02:00
    title: Geografie-Exkursion für Geografiekurse Klassenstufe 11
    location: Halle
+    enddate: ""
  - date: 2023-12-01T11:00:16.000+02:00
    title: Internationale Chemieolympiade (ICho)
+    enddate: ""
  - date: 2023-12-06T11:00:16.000+02:00
    enddate: 2023-12-08T11:00:16.000+02:00
    title: Musikfahrt
    location: Naumburg
  - date: 2023-12-11T11:00:16.000+02:00
    title: Wechsel des Kurshalbjahres im Abiturjahrgang
+    enddate: ""
  - date: 2023-12-13T11:00:16.000+02:00
    title: Generalprobe Weihnachtskonzert
    location: Ulrichskirche
+    enddate: ""
  - date: 2023-12-15T11:00:16.000+02:00
    title: Weihnachtskonzert
    location: Ulrichskirche
+    enddate: ""
  - date: 2023-12-21T11:00:16.000+02:00
    enddate: 2024-01-03T11:00:16.000+02:00
    title: Weihnachtsferien
  - date: 2024-01-11T11:00:16.000+02:00
    title: Fachbereichskonferenzen der sprachlich-literarisch-künstlerischen Fächer
+    enddate: ""
  - date: 2024-01-12T11:00:16.000+02:00
    enddate: 2024-01-19T11:00:16.000+02:00
    title: Ski-Kompaktkurs Klassenstufe 11
@ -122,6 +149,7 @@ events:
    location: Hochschule Merseburg
  - date: 2024-02-02T11:00:16.000+02:00
    title: Halbjahreszeugnisverleihung
+    enddate: ""
  - date: 2024-02-05T11:00:16.000+02:00
    enddate: 2024-02-10T11:00:16.000+02:00
    title: Winterferien
@ -131,9 +159,11 @@ events:
    location: Hochschule Merseburg
  - date: 2024-02-14T11:00:16.000+02:00
    title: verpflichtende Vergleichsarbeit Naturwissenschaften für Klassenstufe 8
+    enddate: ""
  - date: 2024-02-15T11:00:16.000+02:00
    title: Fachbereichskonferenzen der gesellschaftswissenschaftlichen Fächer und
      Sport
+    enddate: ""
  - date: 2024-02-19T11:00:16.000+02:00
    enddate: 2024-03-22T11:00:16.000+02:00
    title: verpflichtende Vergleichsarbeit Mathematik für Klassenstufe 8 (online)
@ -147,44 +177,58 @@ events:
  - date: 2024-03-07T11:00:16.000+02:00
    title: Landesphysikolympiade
    location: Magdeburg
+    enddate: ""
  - date: 2024-03-07T11:00:16.000+02:00
    title: Cantorpreisverleihung
+    enddate: ""
  - date: 2024-03-13T11:00:16.000+02:00
    title: Landeschemieolympiade
    location: Schulpforta
+    enddate: ""
  - date: 2024-03-25T11:00:16.000+02:00
    enddate: 2024-03-30T11:00:16.000+02:00
    title: Osterferien
  - date: 2024-04-18T11:00:16.000+02:00
    title: Känguru-Wettbewerb
+    enddate: ""
  - date: 2024-04-19T11:00:16.000+02:00
    title: Abistreich
+    enddate: ""
  - date: 2024-04-25T11:00:16.000+02:00
    title: Girl's und Boy's Day (Zukunftstag)
+    enddate: ""
  - date: 2024-04-29T11:00:16.000+02:00
    title: Sportfest
    location: Brandbergehalle
+    enddate: ""
  - date: 2024-05-10T11:00:16.000+02:00
    title: flexibler Ferientag
+    enddate: ""
  - date: 2024-05-16T11:00:16.000+02:00
    title: zentrale Klassenarbeit Mathematik für Klassenstufe 6
+    enddate: ""
  - date: 2024-05-21T11:00:16.000+02:00
    enddate: 2024-05-24T11:00:16.000+02:00
    title: Pfingstferien
  - date: 2024-05-31T11:00:16.000+02:00
    title: zentrale Klassenarbeit Englisch für Klassenstufe 6
+    enddate: ""
  - date: 2024-06-04T11:00:16.000+02:00
    enddate: 2024-06-07T11:00:16.000+02:00
    title: Mitteldeutsche Regionalrunde Chemie
    location: Hochschule Merseburg
  - date: 2024-06-06T11:00:16.000+02:00
    title: Versetzungskonferenzen
+    enddate: ""
  - date: 2024-06-14T11:00:16.000+02:00
    title: Schulfest
+    enddate: ""
  - date: 2024-06-14T11:00:16.000+02:00
    title: Ausgabe der Reifezeugnisse
+    enddate: ""
  - date: 2024-06-14T11:00:16.000+02:00
    title: Abi-Ball
+    enddate: ""
  - date: 2024-06-17T11:00:16.000+02:00
    enddate: 2024-06-20T11:00:16.000+02:00
    title: Klassensfahrt Klassenstufen 7 und 10
@ -193,6 +237,7 @@ events:
    title: Ökopraktikum Klassenstufe 11
  - date: 2024-06-21T11:00:16.000+02:00
    title: Ausgabe der Zeugnisse zum Schuljahresende
+    enddate: ""
  - date: 2024-06-24T11:00:16.000+02:00
    enddate: 2024-08-03T11:00:16.000+02:00
    title: Sommerferien
--- a/static/admin/config/collections/blog.js
+++ b/static/admin/config/collections/blog.js
@ -59,7 +59,7 @@ const BlogCollection = {
      widget: "relation",
      collection: "author",
      value_field: "{{slug}}",
-      search_fields: ["{{title}}"],
+      search_fields: ["title"],
      display_fields: ["{{title}}"],
      multiple: true,
      required: true,
@ -98,6 +98,7 @@ const BlogCollection = {
      label: "Tags",
      widget: "list",
      delimiter: ",",
+      required: false
    },
    {
      name: "type",
--- a/static/admin/config/collections/index-pages.js
+++ b/static/admin/config/collections/index-pages.js
@ -214,6 +214,7 @@ const IndexPagesCollection = {
              hint: "Für mehrtägige Veanstaltungen, nur sichtbar wenn eingestellt",
              widget: "datetime",
              required: false,
+              default: "",
              ...DateFormat,
            },
            {
--- a/static/admin/index.html
+++ b/static/admin/index.html
@ -9,12 +9,12 @@
    />
    <link
      rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/@staticcms/app@~3.0.0/dist/main.css"
+      href="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/main.css"
    />
    <title>Static CMS</title>
  </head>
  <body>
-    <script src="https://cdn.jsdelivr.net/npm/@staticcms/app@~3.0.0/dist/static-cms-app.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/@staticcms/app@^3.0.0/dist/static-cms-app.js"></script>
    <script type="module">
      import config from "./config/index.js";
      // imports