Sync dev with master #240

Merged
GCG.Admin (Automatisiert) merged 107 commits from master into dev 2023-09-23 21:18:21 +02:00
22 changed files with 32 additions and 12 deletions
Showing only changes of commit aad78f1f41 - Show all commits

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-8"> <div class="col-lg-8">

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4"> <img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4">
<div class="content text-justify"> <div class="content text-justify">

@ -1,5 +1,6 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
<section class="section"> <section class="section">
<div class="container"> <div class="container">
{{ with .Params.image }} {{ with .Params.image }}
@ -31,5 +32,6 @@
{{ end }} {{ end }}
{{ partial "info" . }} {{ partial "info" . }}
</main>
{{ end }} {{ end }}

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<form <form
action="https://php.cantorgymnasium.de/formtools/process.php" action="https://php.cantorgymnasium.de/formtools/process.php"

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-lg-8 mb-4 mb-lg-0"> <div class="col-lg-8 mb-4 mb-lg-0">

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<div class="content text-justify"> <div class="content text-justify">
{{ .Content }} {{ .Content }}

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
{{ range .Pages }} {{ range .Pages }}
<div class="card mb-4"> <div class="card mb-4">

@ -1,5 +1,6 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
<section class="section"> <section class="section">
<div class="container"> <div class="container">
<div class="text-center"> <div class="text-center">
@ -33,5 +34,6 @@
</div> </div>
</div> </div>
</section> </section>
</main>
{{ end }} {{ end }}

@ -1,5 +1,6 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
{{ partial "header-contest" . }} {{ partial "header-contest" . }}
<section class="section pt-0"> <section class="section pt-0">
@ -12,5 +13,6 @@
</div> </div>
</div> </div>
</section> </section>
</main>
{{ end }} {{ end }}

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<img src="{{ .Params.Image | relURL }}" class="img-fluid w-100 mb-4"> <img src="{{ .Params.Image | relURL }}" class="img-fluid w-100 mb-4">
<div class="content text-justify"> <div class="content text-justify">

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="col-sm-5 mb-4"> <div class="col-sm-5 mb-4">

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<h2 class="mb-4">{{ .Title }}</h2> <h2 class="mb-4">{{ .Title }}</h2>
<div class="content text-justify"> <div class="content text-justify">

@ -1,5 +1,6 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
<section class="section"> <section class="section">
<div class="container"> <div class="container">
<img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4"> <img src="{{ .Params.image | relURL }}" class="img-fluid w-100 mb-4">
@ -29,5 +30,6 @@
</div> </div>
</div> </div>
</section> </section>
</main>
{{ end }} {{ end }}

@ -1,5 +1,7 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
{{ $data := .Site.Data }} {{ $data := .Site.Data }}
{{ if $data.homepage.slider.enable }} {{ if $data.homepage.slider.enable }}
@ -287,4 +289,6 @@
{{ end }} {{ end }}
{{ end }} {{ end }}
</main>
{{ end }} {{ end }}

@ -4,6 +4,7 @@
<script src="https://unpkg.com/leaflet@^1.7.1/dist/leaflet.js"></script> <script src="https://unpkg.com/leaflet@^1.7.1/dist/leaflet.js"></script>
<main data-pagefind-body>
<section class="section pb-0"> <section class="section pb-0">
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@ -61,5 +62,6 @@
}); });
</script> </script>
</div> </div>
</main>
{{ end }} {{ end }}

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<div class="content text-justify"> <div class="content text-justify">
{{ .Content }} {{ .Content }}

@ -1,5 +1,7 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
{{ partial "tile-modals" . }} {{ partial "tile-modals" . }}
</main>
{{ end }} {{ end }}

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<!-- TODO: everything --> <!-- TODO: everything -->
<div class="container"> <div class="container">
{{ if or .Params.cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }} {{ if or .Params.cantorpreisträger (where (where .Site.RegularPages "Title" (print "Abiturienten " .Params.Title ) ) "Type" "=" "abiturienten") }}

@ -1,5 +1,7 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
{{ partial "tile-modals" . }} {{ partial "tile-modals" . }}
</main>
{{ end }} {{ end }}

@ -1,6 +1,6 @@
{{ define "main" }} {{ define "main" }}
<section class="section"> <section class="section" data-pagefind-body>
<div class="container"> <div class="container">
<ul class="list-inline text-center filter-controls mb-4"> <ul class="list-inline text-center filter-controls mb-4">
<li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li> <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>

@ -1,5 +1,6 @@
{{ define "main" }} {{ define "main" }}
<main data-pagefind-body>
{{ partial "header-contest" . }} {{ partial "header-contest" . }}
<section class="section pt-0"> <section class="section pt-0">
@ -14,5 +15,6 @@
</div> </div>
</div> </div>
</section> </section>
</main>
{{ end }} {{ end }}