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

Sync dev with master #235

Merged
GCG.Admin (Automatisiert) merged 12 commits from master into dev 2023-07-31 20:59:19 +02:00
Conversation 0 Commits 12 Files Changed 78 +56 -98
4 changed files with 56 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1af5f54900 - Show all commits

115
layouts/index.html
View File

@ -56,7 +56,7 @@
<div class="container"> <div class="container">
<div class="row align-items-center"> <div class="row align-items-center">
{{ range .logos }} {{ range .logos }}
<div class="col-md-3 col-6 order-1 order-md-2 mt-4"> <div class="col-md-3 col-6 mt-4">
<a href="{{ .link }}" target="_blank" title="{{ .title }}"><img class="img-fluid w-100" src="{{ .image }}"></a> <a href="{{ .link }}" target="_blank" title="{{ .title }}"><img class="img-fluid w-100" src="{{ .image }}"></a>
</div> </div>
{{ end }} {{ end }}
@ -102,33 +102,27 @@
{{ if $data.homepage.blog.enable }} {{ if $data.homepage.blog.enable }}
<section class="section mb-4"> <section class="section mb-4">
<div class="container"> <div class="container">
<div class="row"> <div class="d-flex align-items-center mb-4 justify-content-between">
<div class="col-12"> <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.blog.title }}</h2>
<div class="d-flex align-items-center mb-4 justify-content-between"> <div class="border-top w-100 border-primary d-none d-sm-block"></div>
<h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.blog.title }}</h2> <div>
<div class="border-top w-100 border-primary d-none d-sm-block"></div> <a href="{{ `blog` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
<div>
<a href="{{ `blog` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="row justify-content-center"> <div class="row justify-content-center">
{{ if $data.ausblick.enable }} {{ if $data.ausblick.enable }}
{{ with $data.ausblick }} {{ with $data.ausblick }}
<div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 d-flex align-items-stretch"> <div class="col-lg-4 col-sm-6 mb-4 mb-lg-0 d-flex align-items-stretch">
<div class="card border-info rounded-0 hover-shadow mb-4"> <div class="card border-info rounded-0 hover-shadow mb-2">
<span class="position-absolute top-0 start-0 ms-5 translate-middle p-2 text-bg-info border border-light rounded-pill"> <span class="position-absolute top-0 start-0 ms-5 translate-middle p-2 text-bg-info border border-info rounded-pill">
<i class="mdi mdi-pin me-2">Angeheftet</i> <i class="mdi mdi-pin me-2">Angeheftet</i>
</span> </span>
<img class="card-img-top rounded-0" src="{{ .image | relURL }}" alt="{{ .title }}" onclick="$('#{{ md5 .title }}').modal('show');"> <img class="card-img-top rounded-0" src="{{ .image | relURL }}" alt="{{ .title }}" onclick="$('#{{ md5 .title }}').modal('show');">
<div class="card-body d-flex flex-column"> <div class="card-body d-flex flex-column">
<div class="row mb-2"> <span class="text-truncate mb-2">
<div class="col-12"> <i class="mdi mdi-fountain-pen-tip me-2"></i>
<i class="mdi mdi-fountain-pen-tip me-2"></i> {{ partial "authors" (dict "Site" $.Site "author" .author )}}
{{ partial "authors" (dict "Site" $.Site "author" .author)}} </span>
</div>
</div>
<h4 class="card-title text-truncate" onclick="$('#{{ md5 .title }}').modal('show');">{{ .title }}</h4> <h4 class="card-title text-truncate" onclick="$('#{{ md5 .title }}').modal('show');">{{ .title }}</h4>
<p class="card-text" onclick="$('#{{ md5 .title }}').modal('show');">{{ partial "summary" .content }}</p> <p class="card-text" onclick="$('#{{ md5 .title }}').modal('show');">{{ partial "summary" .content }}</p>
<button type="button" class="btn btn-primary btn-sm mt-auto align-self-start" onclick="$('#{{ md5 .title }}').modal('show');">Mehr anzeigen</button> <button type="button" class="btn btn-primary btn-sm mt-auto align-self-start" onclick="$('#{{ md5 .title }}').modal('show');">Mehr anzeigen</button>
@ -151,25 +145,21 @@
{{ with $data.homepage.success_banner }} {{ with $data.homepage.success_banner }}
<section class="section bg-cover" data-background="{{ .image | absURL }}" id="success"> <section class="section bg-cover" data-background="{{ .image | absURL }}" id="success">
<div class="container"> <div class="container">
<div class="row no-gutters"> <div class="row feature-blocks bg-white justify-content-between">
<div class="col-12"> {{ range .feature_item }}
<div class="row feature-blocks bg-white justify-content-between"> <div class="col-xl-5 mb-xl-5 mb-4">
{{ range .feature_item }} {{ with .image }}
<div class="col-xl-5 mb-xl-5 mb-4"> <img src="{{ . }}" class="mb-xl-4 mb-lg-3 mb-4 feature-icon"></img>
{{ with .image }} {{ end }}
<img src="{{ . }}" class="mb-xl-4 mb-lg-3 mb-4 feature-icon"></img> {{ with .icon }}
{{ end }} <i class="{{ . }} mb-xl-4 mb-lg-3 mb-4 feature-icon"></i>
{{ with .icon }} {{ end }}
<i class="{{ . }} mb-xl-4 mb-lg-3 mb-4 feature-icon"></i> <h3 class="mb-xl-4 mb-lg-3 mb-4">{{ .name | markdownify }}</h3>
{{ end }} <div class="content">
<h3 class="mb-xl-4 mb-lg-3 mb-4">{{ .name | markdownify }}</h3> {{ .content | markdownify }}
<div class="content">
{{ .content | markdownify }}
</div>
</div>
{{ end }}
</div> </div>
</div> </div>
{{ end }}
</div> </div>
</div> </div>
</section> </section>
@ -179,15 +169,11 @@
{{ if $data.homepage.ganztagsangebote.enable }} {{ if $data.homepage.ganztagsangebote.enable }}
<section class="section"> <section class="section">
<div class="container"> <div class="container">
<div class="row"> <div class="d-flex align-items-center mb-4 justify-content-between">
<div class="col-12"> <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.ganztagsangebote.title }}</h2>
<div class="d-flex align-items-center mb-4 justify-content-between"> <div class="border-top w-100 border-primary d-none d-sm-block"></div>
<h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.ganztagsangebote.title }}</h2> <div>
<div class="border-top w-100 border-primary d-none d-sm-block"></div> <a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
<div>
<a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block">Alle anzeigen</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="row justify-content-center"> <div class="row justify-content-center">
@ -197,11 +183,6 @@
</div> </div>
{{ end }} {{ end }}
</div> </div>
<div class="row">
<div class="col-12 text-center">
<a href="{{ `ganztagsangebote` | relURL }}" class="btn btn-sm btn-primary-outline d-sm-none d-inline-block">Alle anzeigen</a>
</div>
</div>
</div> </div>
</section> </section>
{{ end }} {{ end }}
@ -209,18 +190,14 @@
{{ if $data.homepage.cta.enable }} {{ if $data.homepage.cta.enable }}
{{ with $data.homepage.cta }} {{ with $data.homepage.cta }}
<section class="section bg-primary"> <section class="section bg-primary">
<div class="container"> <div class="container text-center">
<div class="row"> <h2 class="text-white mb-0">{{ .title | markdownify }}</h2>
<div class="col-12 text-center"> <h5 class="mb-4 text-white">{{ .subtitle | markdownify }}</h5>
<h2 class="text-white mb-0">{{ .title | markdownify }}</h2> {{ if .button.enable }}
<h5 class="mb-4 text-white">{{ .subtitle | markdownify }}</h5> {{ with .button }}
{{ if .button.enable }} <a href="{{ .link | absURL }}" class="btn btn-secondary text-uppercase">{{ .label }}</a>
{{ with .button }} {{ end }}
<a href="{{ .link | absURL }}" class="btn btn-secondary text-uppercase">{{ .label }}</a> {{ end }}
{{ end }}
{{ end }}
</div>
</div>
</div> </div>
</section> </section>
{{ end }} {{ end }}
@ -233,15 +210,11 @@
{{ if $data.homepage.termine.enable }} {{ if $data.homepage.termine.enable }}
<section class="section bg-body-tertiary"> <section class="section bg-body-tertiary">
<div class="container"> <div class="container">
<div class="row"> <div class="d-flex align-items-center mb-4 justify-content-between">
<div class="col-12"> <h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.termine.title }}</h2>
<div class="d-flex align-items-center mb-4 justify-content-between"> <div class="border-top w-100 border-primary d-none d-sm-block"></div>
<h2 class="mb-0 text-nowrap me-3">{{ $data.homepage.termine.title }}</h2> <div>
<div class="border-top w-100 border-primary d-none d-sm-block"></div> <a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block text-nowrap">Alle anzeigen</a>
<div>
<a href="{{`termine` | relURL }}" class="btn btn-sm btn-primary-outline ms-sm-3 d-none d-sm-block text-nowrap">Alle anzeigen</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="row justify-content-center px-2"> <div class="row justify-content-center px-2">
@ -304,7 +277,7 @@
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="row justify-content-center">
{{ range .logos }} {{ range .logos }}
<div class="col-md-2 col-4 order-1 order-md-2 mb-4"> <div class="col-md-2 col-4 mb-4">
<a href="{{ .link }}" target="_blank" title="{{ .title }}"><img class="img-fluid w-100" src="{{ .image }}"></a> <a href="{{ .link }}" target="_blank" title="{{ .title }}"><img class="img-fluid w-100" src="{{ .image }}"></a>
</div> </div>
{{ end }} {{ end }}

2
layouts/partials/info.html
View File

@ -10,7 +10,7 @@
<div class="col-lg-6 col-sm-8"> <div class="col-lg-6 col-sm-8">
<div class="bg-white p-5"> <div class="bg-white p-5">
<h2 class="mb-4">{{ .title }}</h2> <h2 class="mb-4">{{ .title }}</h2>
<p class="text-justify">{{ .content | markdownify }}</p> <p>{{ .content | markdownify }}</p>
</div> </div>
</div> </div>
</div> </div>

2
layouts/partials/termin.html
View File

@ -6,7 +6,7 @@
{{ with .enddate }}<br>bis {{ time.Format "2 Jan 2006" . }}{{ end }} {{ with .enddate }}<br>bis {{ time.Format "2 Jan 2006" . }}{{ end }}
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div class="card-body h-100 d-flex flex-column justify-content-between"> <div class="card-body h-100 d-flex flex-column justify-content-around">
<h4 class="card-title">{{ .title }}</h4> <h4 class="card-title">{{ .title }}</h4>
{{ with .location }} {{ with .location }}
<div class="card-text"> <div class="card-text">

35
layouts/termine/list.html
View File

@ -2,32 +2,17 @@
<section class="section"> <section class="section">
<div class="container"> <div class="container">
<div class="row"> <ul class="list-inline text-center filter-controls mb-4">
<div class="col-12"> <li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li>
<div class="row gta-cat"> <li class="list-inline-item m-3 text-uppercase" data-filter="upcoming">Anstehend</li>
<div class="col-12"> <li class="list-inline-item m-3 text-uppercase" data-filter="past">Vergangen</li>
<ul class="list-inline text-center filter-controls mb-5"> </ul>
<li class="list-inline-item m-3 text-uppercase active" data-filter="all">Alle</li> <div class="filtr-container row">
<li class="list-inline-item m-3 text-uppercase" data-filter="upcoming">Anstehend</li> {{ range .Params.events }}
<li class="list-inline-item m-3 text-uppercase" data-filter="past">Vergangen</li> <div class="filtr-item col-12" data-category="{{ if or (ge (.date | time.AsTime).Unix now.Unix) (and .enddate (ge (.enddate | time.AsTime).Unix now.Unix)) }}upcoming{{else}}past{{end}}" data-time="{{.date}}">
</ul> {{ partial "termin" . }}
</div>
</div>
<noscript>
<style>
.gta-cat {
display: none;
}
</style>
</noscript>
<div class="filtr-container">
{{ range .Params.events }}
<div class="mb-2 mt-2 col-12 filtr-item" data-category="{{ if or (ge (.date | time.AsTime).Unix now.Unix) (and .enddate (ge (.enddate | time.AsTime).Unix now.Unix)) }}upcoming{{else}}past{{end}}" data-time="{{.date}}">
{{ partial "termin" . }}
</div>
{{ end }}
</div>
</div> </div>
{{ end }}
</div> </div>
</div> </div>
</section> </section>