gcg/gcg-website
gcg/gcg-website
1
1
Fork 0
Code Issues 3 Pull Requests Actions Projects 2 Wiki Activity

Sync dev with master #259

Merged
GCG.Admin (Automatisiert) merged 32 commits from master into dev 2024-01-21 14:20:00 +01:00
Conversation 0 Commits 32 Files Changed 53 +110 -136
10 changed files with 110 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a059aae772 - Show all commits

32
assets/css/style.css
View File

@ -688,7 +688,7 @@ link:focus,
color: white;
}
.navbar-expand-lg .navbar-nav .nav-link {
.navbar-expand-xl .navbar-nav .nav-link {
padding: 40px 0px;
}
@ -902,6 +902,17 @@ link:focus,
}
@media (max-width: 991px) {
.feature-blocks {
margin-top: 0;
padding: 50px;
}
.feature-blocks h3 {
font-size: 25px;
}
}
@media (max-width: 1199px) {
.navigation {
background: var(--gcg-color-secondary);
}
@ -915,7 +926,7 @@ link:focus,
background: var(--gcg-color-secondary) !important;
}
.navbar-expand-lg .navbar-nav .nav-link {
.navbar-expand-xl .navbar-nav .nav-link {
padding: 20px;
}
@ -936,17 +947,6 @@ link:focus,
text-align: center;
}
.feature-blocks {
margin-top: 0;
padding: 50px;
}
.feature-blocks h3 {
font-size: 25px;
}
}
@media (max-width: 1199px) {
.feature-blocks {
padding-right: 50px;
padding-left: 50px;
@ -1057,3 +1057,9 @@ link:focus,
vertical-align: -0.125rem;
}
#chart-container {
position: relative;
height: 50vh;
overflow: hidden;
}

82
assets/js/script.js
View File

@ -1,4 +1,4 @@
(function ($) {
(($) => {
'use strict';
// adapt header to height
@ -18,7 +18,7 @@
}
// load scripts
$(window).on('load', function () {
$(window).on('load', () => {
$('.preloader').fadeOut(100);
adaptHeight();
if ($('#top-banner').length) {
@ -48,12 +48,9 @@
});
// venobox popup
$(document).ready(function () {
new VenoBox({
selector: '.vb-video',
spinner: 'grid'
});
new VenoBox({
$(document).ready(() => {
$('.vb-video').venobox({ spinner: 'grid' });
$('.vb-gallery').venobox({
selector: '.vb-gallery',
numeration: true,
infinigall: true,
@ -64,48 +61,73 @@
});
// filter
$(document).ready(function () {
$(document).ready(() => {
if ($('.filter-container').length != 0) {
const shuffleInstance = new Shuffle($('.filter-container'), {
itemSelector: '.filter-item',
sizer: '.filter-sizer', // could also be a selector: '.js-shuffle-sizer'
sizer: '.filter-sizer',
delimiter: ','
});
$('.filter-controls li').on('click', function () {
$('.filter-controls li').on('click',() => {
$('.filter-controls li').removeClass('active');
$(this).addClass('active');
shuffleInstance.filter($(this).data('filter'))
});
}
});
// count up
function counter() {
// counter
$(window).on('scroll', () => {
var oTop;
if ($('.count').length !== 0) {
oTop = $('.count').offset().top - window.innerHeight;
}
if ($(window).scrollTop() > oTop) {
$('.count').each(function () {
var $this = $(this),
countTo = $this.attr('data-count');
$({
countNum: $this.text()
}).animate({
countNum: countTo
}, {
$('.count').each(() => {
var $this = $(this), countTo = $this.attr('data-count');
$({ countNum: $this.text() }).animate(
{ countNum: countTo },
{
duration: 1000,
easing: 'swing',
step: function () {
$this.text(Math.floor(this.countNum));
},
complete: function () {
$this.text(this.countNum);
}
step: () => $this.text(Math.floor(this.countNum)),
complete: () => $this.text(this.countNum)
});
});
}
}
$(window).on('scroll', function () {
counter();
});
$(window).on('DOMContentLoaded', () => {
if (window.PagefindUI != undefined) {
new window.PagefindUI({
element: "#search",
translations: {
placeholder: "Suchen...",
zero_results: "Leider konnten keine Ergebnisse zu [SEARCH_TERM] gefunden werden",
clear_search: "Löschen"
}
});
$('#pagefind-search').on('shown.bs.modal', () => {
$('.pagefind-ui__search-input').focus();
});
}
});
// enable matomo analytics
var _paq = window._paq = window._paq || [];
_paq.push(["setDoNotTrack", true]);
_paq.push(["disableCookies"]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(() => {
var u="https://analytics.cantorgymnasium.de/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '1']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
new LazyLoad();
})(jQuery);

6
config.yml
View File

@ -34,12 +34,14 @@ params:
- https://assets.cantorgymnasium.de/bootstrap/v5/css/bootstrap.min.css
- https://assets.cantorgymnasium.de/slick/v1.8/slick.css
- https://assets.cantorgymnasium.de/venobox/v2/dist/venobox.min.css
- https://assets.cantorgymnasium.de/fonts/fira/fira.css
- https://assets.cantorgymnasium.de/fonts/ubuntu/ubuntu.css
- https://assets.cantorgymnasium.de/fonts/fira/fira.min.css
- https://assets.cantorgymnasium.de/fonts/ubuntu/ubuntu.min.css
- /pagefind/pagefind-ui.css
js:
- https://assets.cantorgymnasium.de/bootstrap/v5/js/bootstrap.bundle.min.js
- https://assets.cantorgymnasium.de/slick/v1.8/slick.min.js
- https://assets.cantorgymnasium.de/lazyload/v17/dist/lazyload.min.js
- /pagefind/pagefind-ui.js
head_js:
- https://assets.cantorgymnasium.de/jquery/v3.7/jquery.min.js
- https://assets.cantorgymnasium.de/venobox/v2/dist/venobox.min.js

2
content/blog/einladung-weihnachtskonzert-2023.md
View File

@ -2,7 +2,7 @@
title: Einladung Weihnachtskonzert 2023
date: 2023-11-04T23:10:45.890+01:00
draft: false
image: /media/gcgweihnachten.png
image: /media/blog/weihnachten.webp
author:
- herr-berger
categories:

9
content/chronikseiten/abiturdurchschnitte.md
View File

@ -10,15 +10,8 @@ type: pages
aliases:
- /schulchronik/pages/abiturdurchschnitte
---
<script src="https://assets.cantorgymnasium.de/echarts/v5/echarts.min.js"></script>
<style>
#chart-container {
position: relative;
height: 50vh;
overflow: hidden;
}
</style>
<script src="https://assets.cantorgymnasium.de/echarts/v5/echarts.min.js"></script>
<div id="chart-container"></div>
<script>
var dom = document.getElementById("chart-container");

7
content/chronikseiten/schuelerzahlen.md
View File

@ -6,13 +6,6 @@ aliases:
- /schulchronik/pages/schülerzahlen
---
<script src="https://assets.cantorgymnasium.de/echarts/v5/echarts.min.js"></script>
<style>
#chart-container {
position: relative;
height: 50vh;
overflow: hidden;
}
</style>
<div id="chart-container"></div>
<script>

41
layouts/partials/footer.html
View File

@ -67,46 +67,5 @@
<script src="{{ . | absURL }}"></script>
{{ end }}
<script src="/pagefind/pagefind-ui.js" type="text/javascript"></script>
<script>
($ => {
$(window).on('DOMContentLoaded', () => {
new PagefindUI({
element: "#search",
translations: {
placeholder: "Suchen...",
zero_results: "Leider konnten keine Ergebnisse zu [SEARCH_TERM] gefunden werden",
clear_search: "Löschen"
}
});
$('#pagefind-search').on('shown.bs.modal', () => {
$('.pagefind-ui__search-input').focus();
});
});
})(jQuery);
</script>
<script>
var _paq = window._paq = window._paq || [];
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
_paq.push(["setDoNotTrack", true]);
_paq.push(["disableCookies"]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="https://analytics.cantorgymnasium.de/";
_paq.push(['setTrackerUrl', u+'matomo.php']);
_paq.push(['setSiteId', '1']);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
})();
</script>
{{ $script := resources.Get "js/script.js" | minify }}
<script src="{{ $script.Permalink }}"></script>
<script>
new LazyLoad();
</script>

25
layouts/partials/head.html
View File

@ -17,9 +17,16 @@
<link rel="shortcut icon" href="{{ `media/favicon.png` | absURL }}" type="image/x-icon">
<link rel="icon" href="{{ `media/favicon.png` | absURL }}" type="image/x-icon">
{{ if eq .Page.RelPermalink "/" }}
<link rel="preload" fetchpriority="high" as="image" href="/media/home/banner.webp" type="image/webp">
{{ else }}
<link rel="preload" fetchpriority="high" as="image" href="/media/titelbild.webp" type="image/webp">
{{ end }}
{{ range .Site.Params.plugins.head_js }}
<script src="{{ . | absURL }}" type="text/javascript"></script>
{{ end }}
<!-- jquery passive listener fixes -->
<script>
jQuery.event.special.touchstart = {
@ -44,24 +51,6 @@
};
</script>
<link href="/pagefind/pagefind-ui.css" rel="stylesheet">
{{ partial "opengraph" . }}
{{ partial "twitter" . }}
{{ if eq .Page.RelPermalink "/" }}
<link rel="preload" fetchpriority="high" as="image" href="/media/home/banner.webp" type="image/webp">
{{ else }}
<link rel="preload" fetchpriority="high" as="image" href="/media/titelbild.webp" type="image/webp">
{{ end }}
</head>
<div id="pagefind-search" class="modal fade" data-pagefind-ignore>
<div class="modal-dialog modal-xl modal-dialog-scrollable modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-body">
<div id="search"></div>
</div>
</div>
</div>
</div>

12
layouts/partials/header.html
View File

@ -32,7 +32,7 @@
{{ end }}
<div class="navigation w-100">
<div class="container">
<nav class="navbar navbar-expand-lg navbar-dark p-0">
<nav class="navbar navbar-expand-xl navbar-dark p-0">
<a class="navbar-brand" href="{{ .Site.BaseURL | relURL }}"><img height="60"
src="{{ .Site.Params.logo | absURL }}" class="py-2" alt="{{ .Site.Title }}"></a>
@ -98,3 +98,13 @@
{{ end }}
{{ end }}
{{ end }}
<div id="pagefind-search" class="modal fade" data-pagefind-ignore>
<div class="modal-dialog modal-xl modal-dialog-scrollable modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-body">
<div id="search"></div>
</div>
</div>
</div>
</div>

4
static/admin/previews/page-previews/styles.js
View File

@ -1,7 +1,7 @@
const PreviewStyles = [
"https://assets.cantorgymnasium.de/bootstrap/v5/css/bootstrap.min.css",
"https://assets.cantorgymnasium.de/fonts/fira/fira.css",
"https://assets.cantorgymnasium.de/fonts/ubuntu/ubuntu.css",
"https://assets.cantorgymnasium.de/fonts/fira/fira.min.css",
"https://assets.cantorgymnasium.de/fonts/ubuntu/ubuntu.min.css",
"https://assets.cantorgymnasium.de/fonts/mdi/v7/css/materialdesignicons.min.css",
"/css/style.min.css",
];