small fixes

This commit is contained in:
teldra 2022-04-10 11:00:14 +02:00
parent 2ea1012c6a
commit f48836ef31
19 changed files with 13 additions and 132 deletions

View File

@ -20,7 +20,7 @@
</div>
{{ block "pagefooter" . -}}{{- end }}
<footer>
{{- partial "contentlayouts/footer" . -}}
{{- partial "snippets/footer" . -}}
</footer>
</div>
</body>

View File

@ -5,12 +5,12 @@
{{ define "content" }}
{{ partial "debug" (dict "context" . "caller" "single_chooser.html")}}
{{ $partial_before := "" }}
{{ $partial := "layout/single/article" }}
{{ $partial := "layout/article" }}
{{ $pic := "true" }}
{{ if eq .Params.tool "generator" }}
{{ $partial = "layout/single/generator" }}
{{ $partial = "layout/generator" }}
{{ else if eq .Params.tool "nottranslated" }}
{{ $partial = "layout/single/nottranslated" }}
{{ $partial = "layout/nottranslated" }}
{{ end }}
<article>
{{ partial $partial (dict "context" . "pic" $pic "content" .Content "partial_before" $partial_before "type" "article") }}

View File

@ -1,51 +0,0 @@
{{ $showmeta := "false" }}
{{ $metas := dict "when" .context.Params.when "price" .context.Params.price "contact" .context.Params.contact "covid"
.context.Params.covid }}
{{ if eq .type "list" }}
{{ $metas = dict "when" .context.Params.when "price" .context.Params.price }}
{{ end }}
{{ partial "contentlayouts/meta.html" $metas }}
{{ $small := "solo" }}
{{ $big := "solo" }}
{{ $img := "" }}
{{ $thumb := "" }}
{{ $placeholder := site.Params.placeholder }}
{{ if ne .context.Section "misc"}}
{{ $img = resources.Get $placeholder }}
{{- $thumb = $img.Resize "1024x" }}
{{ end }}
{{- if or (.context.Resources.ByType "image") (.Summary) ($img) -}}
{{ $small = "multiple_small" }}
{{ $big = "multiple_big" }}
{{ else }}
{{ $small = "multiple_big"}}
{{ end }}
{{- if and (.context.Resources.ByType "image") (ne .context.Section "misc") -}}
{{- $img = index (.context.Resources.ByType "image") 0 -}}
{{- $thumb = $img.Resize "1024x" }}
{{ if ne .context.Content "" }}
{{- $thumb = $img.Resize "2048x" }}
{{ end }}
{{ end }}
<div id="articleinner">
{{ if ne $img "" }}
<div id="articlepicture" class="{{ $small }} borderrad25">
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
<img src="{{- $thumb.Permalink -}}" class="borderrad25" />
{{ if ne .type "list" }}</a>{{ end }}
{{ if eq .type "article" }}{{ .TableOfContents }}{{ end }}
</div>
{{ end }}
{{- if or .context.Content .context.Summary -}}
<div id="articletext" class="{{ $big }}">
{{ if eq .type "contact" }}{{ partial "structure/contact" }}{{ end }}
{{ if eq .type "list" }}{{- .context.Summary -}}{{ else }}{{- .context.Content -}}{{ end }}
{{ if and .context.Truncated (eq .type "list") }}
<div id="readmore">{{- if i18n "readmore" -}}{{- i18n "readmore" -}}{{- else -}}{{- "readmore" -}}{{- end -}}..</div>
{{ end }}
</div>
{{- end }}
</div>

View File

@ -1,23 +0,0 @@
{{ if and .amount (or .paginator .pages) }}
{{ $amount := .amount }}
{{ $pages := "" }}
{{ if .pages }}
{{ $pages = .pages.ByLastmod.Reverse }}
{{ else if .paginator }}
{{ $pages = .paginator.Pages.ByLastmod.Reverse }}
{{ end }}
{{- range first $amount $pages -}}
<article class="articlebgcol1 borderrad25">
<a href="{{- .Permalink -}}">
<div id="articletitle">
<h2>{{- .Title -}}</h2>
</div>
</a>
<a href="{{- .Permalink -}}">
<div id="articlecontent">
{{ partial "contentlayouts/article.html" (dict "context" . "type" "list") }}
</div>
</a>
</article>
{{ end }}
{{ end }}

View File

@ -1,18 +0,0 @@
<div id="articlemeta" style="font-size: smaller;">
{{ if .when }}
<div>{{ .when }}</div>
{{ end }}
{{ if .price }}
{{ if eq .price "free" }}
<div>{{ if i18n "freeentry" }}{{ i18n "freeentry" }}{{ else }}{{ "Free Entry" }}{{ end }}</div>
{{ else }}
<div>{{ if i18n "entry" }}{{ i18n "entry" }}{{ else }}{{ "Entry" }}{{ end }}: {{ .price }}</div>
{{ end }}
{{ end }}
{{ if .contact }}
<div>{{ if i18n "contact" }}{{ i18n "contact" }}{{ else }}{{ "Contact" }}{{ end }} {{ .contact | markdownify }} {{ if i18n "or" }}{{ i18n "or" }}{{ else }}{{ "or" }}{{ end }} {{ site.Params.imprintdata.tel }}</div>
{{ end }}
{{ if .covid }}
<div>Covid: {{ .covid }}</div>
{{ end }}
</div>

View File

@ -1,29 +0,0 @@
{{ $name := .context.Title }}
{{ $title := lower .context.Title }}
{{ range $taxonomyname, $taxonomy := .context.Site.Taxonomies }}
{{ if eq $title $taxonomyname }}
{{ range $key, $value := $taxonomy }}
<a href="{{ printf "%s" $key }}">{{ $key }}</a>
{{ end }}
{{ end }}
{{ end }}
{{ if and site.Params.debug false }}
{{ range $taxonomyname, $taxonomy := .context.Site.Taxonomies }}
<li><a href="/{{ $taxonomyname | urlize }}">{{ $taxonomyname }}</a>
<ul>
{{ range $key, $value := $taxonomy }}
<li> {{ $key }} </li>
<ul>
{{ range $value.Pages }}
<li hugo-nav="{{ .RelPermalink}}"><a href="{{ .Permalink}}"> {{ .LinkTitle }} </a> </li>
{{ end }}
</ul>
{{ end }}
</ul>
</li>
{{ end }}
{{ end }}

View File

@ -20,7 +20,7 @@
</a>
<a href="{{- .Permalink -}}">
<div id="articlecontent">
{{ partial "layout/single/article" (dict "context" . "type" "list" "pic" "true") }}
{{ partial "layout/article" (dict "context" . "type" "list" "pic" "true") }}
</div>
</a>
</article>

View File

@ -19,6 +19,7 @@
{{ partial "snippets/article_metadata" $metas }}
<div id="articleinner">
{{- if and (.context.Resources.ByType "image") (eq .pic "true") -}}
{{ $resize := "500x" }}
{{- $img := index (.context.Resources.ByType "image") 0 -}}
{{- $thumb := index (.context.Resources.ByType "image") 0 -}}
{{ if ne .context.Content "" }}
@ -26,6 +27,7 @@
{{ else if eq .type "list" }}
{{- $thumb = $img.Resize "500x" }}
{{ end }}
{{- $thumb = $img.Resize $resize }}
<div id="articlepicture" class="{{ $small }}" >
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}<a href="{{- $img.Permalink -}}">{{ end }}
<img src="{{- $thumb.Permalink -}}" class="borderrad4px" />
@ -64,6 +66,6 @@
{{ define "sidebar" }}
{{ if ne .Type "tools" }}
{{- partial "contentlayouts/menu.html" . }}
{{- partial "snippets/menu" . }}
{{ end }}
{{ end }}

View File

@ -9,7 +9,7 @@
</div>
<noscript><p><b>Bitte aktiviere Javascript, sonst funktioniert der Generator nicht.</b></p></noscript>
{{ if (index .context.Params.forms 0) }}
{{ partial "layout/single/generator/form" (dict "context" .context "form" 0) }}
{{ partial "layout/generator/form" (dict "context" .context "form" 0) }}
{{ end }}
</article>

View File

@ -14,7 +14,7 @@
{{ if and .group (not (in $group .group))}}
<div class="margin_top_1rem">
{{ if i18n (singularize .group) }}{{ i18n (singularize .group) }}{{ else }}{{ humanize .group }}{{ end }}
{{ partial "layout/single/generator/expand" (dict "name" (printf "%sgroup" .group)) }}
{{ partial "layout/generator/expand" (dict "name" (printf "%sgroup" .group)) }}
</div>
{{ $group = $group | append .group }}
{{ end }}
@ -71,7 +71,7 @@
<div class="margin_top_1rem {{- if .group }} visibleIf" data-visibleif-rule="{{ .group }}group == 'true'"{{ else }}"{{ end }} style="flex-direction: column;">
<div class="{{- if .group }}margin_left_1rem{{ end }}">
{{ .name }}
{{ if ne .expanded true }}{{ partial "layout/single/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}}
{{ if ne .expanded true }}{{ partial "layout/generator/expand" (dict "name" (printf "%scat" $in0)) }}{{ end }}{{- if .required -}}{{- " *" -}}{{- end -}}
</div>

View File

@ -1,2 +1,2 @@
{{ partial "contentlayouts/menu.html" . }}
{{ partial "snippets/menu" . }}

View File

@ -2,7 +2,7 @@
<details>
<summary style="list-style: none; text-align: right;">Menü ☰</summary>
<p>
{{ partial "contentlayouts/menu.html" . }}
{{ partial "snippets/menu" . }}
</p>
</details>
</div>