diff --git a/content/tools/generator.de.md b/content/tools/generator.de.md index 42124be..ad3e39d 100644 --- a/content/tools/generator.de.md +++ b/content/tools/generator.de.md @@ -48,6 +48,10 @@ forms: group: misc input_type: checkbox name: "Über uns" + - title: lastmod + group: misc + input_type: date + name: "Zurueckdatieren" - title: tags group: misc input_type: mc diff --git a/docs/todo.de b/docs/todo.de index 33e408b..bb21981 100644 --- a/docs/todo.de +++ b/docs/todo.de @@ -2,14 +2,27 @@ todo buha.de - anleitung git proxy fuer tor - eintritt "gegen spende" - covid regel verfeinern -- diskutieren, ob jede aenderung via rss raus soll (lastmod vs einmalig) +- diskutieren, ob jede aenderung via rss raus soll (lastmod vs einmalig) (erstellung und lastmod gt date werden erstellt) - generator form: aus mc ein checkbox machen und kategorien und/oder eventkategorien soloauswaehlbar machen. -- sollte kein bild gefunden werden, wird ein standard bild verwendet. (diskutabel, hat vor und nachteile. man kann aber auch ein pool bereitstellen, je nach kategorie? im generator auswaehlen?) +- sollte kein bild gefunden werden, wird ein standard bild verwendet. ( einen pool fuer bestimmte kategorien) - diskutieren, in welcher reihenfolge artikel angezeigt werden sollen. +- links in content unterstrichen + +- runde ecken? 2px + +- stiftung via prefix filename vom bild. maximale hoehe =s wenigst hohe bild. beim footer + +- generator "nachtrag": lastmod in frontmatter - dokumentiere, das artikel der alten homepage "lastmod" mit demgenau bis ungefaehren datum der damligen erstellung, im frontmatter haben sollten, wann sie erstellt wurden. +- rss: das macht, das nur neue und if (Lastmod = Date) or (Lastmod gt Date.AddDate 0 0 -1) + +- push.sh: pushen optional? commit extra? commit --amend? + +- https://schlomp.space/Bunteshaus/bunteshaus.de/src/branch/main/docs/artikel_formatierung.md#absatz: durcheinander + listen: mit preview: events diff --git a/themes/buha/assets/css/layout.css b/themes/buha/assets/css/layout.css index 0314a50..deea30c 100644 --- a/themes/buha/assets/css/layout.css +++ b/themes/buha/assets/css/layout.css @@ -116,7 +116,7 @@ article { display: flex; flex-direction: column; margin-bottom: 2rem; - padding: 1rem 1rem 1rem 1rem; + padding: 1rem; } #articletext img { @@ -125,8 +125,10 @@ article { width: 80%; } + #articlemeta { margin-bottom: 1rem; + margin-left: 1rem; } #articlemeta div:first-child { @@ -137,7 +139,7 @@ article { #articleinner { display: flex; flex-direction: column-reverse; - margin-top: .5rem; + margin-left: 1rem; } #articletext { diff --git a/themes/buha/layouts/_default/_markup/render-heading.html b/themes/buha/layouts/_default.old/_markup/render-heading.html similarity index 100% rename from themes/buha/layouts/_default/_markup/render-heading.html rename to themes/buha/layouts/_default.old/_markup/render-heading.html diff --git a/themes/buha/layouts/_default/_markup/render-image.html b/themes/buha/layouts/_default.old/_markup/render-image.html similarity index 100% rename from themes/buha/layouts/_default/_markup/render-image.html rename to themes/buha/layouts/_default.old/_markup/render-image.html diff --git a/themes/buha/layouts/_default/archive.html b/themes/buha/layouts/_default.old/archive.html similarity index 100% rename from themes/buha/layouts/_default/archive.html rename to themes/buha/layouts/_default.old/archive.html diff --git a/themes/buha/layouts/_default.old/baseof.html b/themes/buha/layouts/_default.old/baseof.html new file mode 100644 index 0000000..2ad994b --- /dev/null +++ b/themes/buha/layouts/_default.old/baseof.html @@ -0,0 +1,27 @@ + + + {{- partial "structure/head.html" . -}} + {{ block "css" . -}}{{- end }} + +
+
+ {{ partialCached "structure/header" . }} + {{ partial "structure/submenu" . }} +
+
+
+ {{ block "title" . -}}{{- end }} + {{ block "content" . -}}{{- end }} + {{ block "main" . -}}{{- end }} +
+ +
+ {{ block "pagefooter" . -}}{{- end }} + +
+ + diff --git a/themes/buha/layouts/_default/contact.html b/themes/buha/layouts/_default.old/contact.html similarity index 100% rename from themes/buha/layouts/_default/contact.html rename to themes/buha/layouts/_default.old/contact.html diff --git a/themes/buha/layouts/_default/imprint.html b/themes/buha/layouts/_default.old/imprint.html similarity index 100% rename from themes/buha/layouts/_default/imprint.html rename to themes/buha/layouts/_default.old/imprint.html diff --git a/themes/buha/layouts/_default/links.html b/themes/buha/layouts/_default.old/links.html similarity index 100% rename from themes/buha/layouts/_default/links.html rename to themes/buha/layouts/_default.old/links.html diff --git a/themes/buha/layouts/_default/misc.html b/themes/buha/layouts/_default.old/list.html similarity index 100% rename from themes/buha/layouts/_default/misc.html rename to themes/buha/layouts/_default.old/list.html diff --git a/themes/buha/layouts/_default.old/misc.html b/themes/buha/layouts/_default.old/misc.html new file mode 100644 index 0000000..e612da4 --- /dev/null +++ b/themes/buha/layouts/_default.old/misc.html @@ -0,0 +1,12 @@ +{{ define "title" }} +

{{ if i18n .Section }}{{ i18n .Section }}{{ else }}{{ "Misc" }}{{ end }}

+{{ end }} + +{{ define "main" }} + {{ partial "debug" (dict "context" . ) }} +
+ {{ range .Pages }} + {{ .Name }}
+ {{ end }} +
+{{ end }} diff --git a/themes/buha/layouts/_default/news.html b/themes/buha/layouts/_default.old/news.html similarity index 100% rename from themes/buha/layouts/_default/news.html rename to themes/buha/layouts/_default.old/news.html diff --git a/themes/buha/layouts/_default/newsletter.html b/themes/buha/layouts/_default.old/newsletter.html similarity index 100% rename from themes/buha/layouts/_default/newsletter.html rename to themes/buha/layouts/_default.old/newsletter.html diff --git a/themes/buha/layouts/_default.old/rss.xml b/themes/buha/layouts/_default.old/rss.xml new file mode 100644 index 0000000..fdf2e42 --- /dev/null +++ b/themes/buha/layouts/_default.old/rss.xml @@ -0,0 +1,75 @@ +{{- $pages := where (where .Site.RegularPages "Permalink" "!=" .Permalink) "Type" "in" .Site.Params.searchSections -}} +{{- $title := lower .Title -}} +{{- if eq $title "events" -}} + {{- $pages = where $pages ".Params.when" "ne" nil -}} +{{- end -}} +{{- $limit := .Site.Config.Services.RSS.Limit -}} +{{- if ge $limit 1 -}} +{{- $pages = $pages | first $limit -}} +{{- end -}} +{{- $pages = $pages.ByLastmod.Reverse -}} +{{- printf "" | safeHTML }} + + + {{ .Site.Title }} + {{ .Permalink }} + Aktuelles von {{ .Site.Title }} + Hugo -- gohugo.io{{ with .Site.LanguageCode }} + {{.}}{{end}}{{ with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Author.email }} + {{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}}{{ with .Site.Copyright }} + {{.}}{{end}}{{ if not .Date.IsZero }} + {{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}{{ end }} + {{- with .OutputFormats.Get "RSS" -}} + {{ printf "" .Permalink .MediaType | safeHTML }} + {{- end -}} + {{ range where $pages "Type" "in" .Site.Params.searchSections }} + {{ $when := .Params.when }} + {{ $about := .Params.about }} + {{ $covid := .Params.covid }} + {{ $contact := .Params.contact }} + {{ $price := .Params.price }} + {{ $featured := .Params.featured }} + {{ $categories := slice }} + {{ range .Params.categories }} + {{ $categories = $categories | append . }} + {{ end }} + {{ $events := slice }} + {{ range .Params.events }} + {{ $events = $events | append . }} + {{ end }} + {{ $tags := slice }} + {{ range .Params.tags }} + {{ $tags = $tags | append . }} + {{ end }} + {{ $images := slice }} + {{ range .Resources.ByType "image" }} + {{ $images = $images | append . }} + {{ end }} + {{ $hash := slice $when $about $categories $events $covid $contact $price $featured $tags .Date .Lastmod .Title .Content }} + {{ $hash = delimit $hash ", " }} + {{ $hash = md5 $hash }} + + + {{ .Title }} + {{ .Permalink }} + {{ .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }} + {{ with .Site.Author.email }}{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}{{end}} + {{ .Permalink }}-{{ $hash }} + + {{- $c := replace .Content "%s

%s" $when $c -}} + {{- end -}} + {{- $img := index (.Resources.ByType "image") 0 -}} + {{- with $img -}} + {{- $img := .Resize "640x" -}} + {{- $c = printf "%s" $c $img.Permalink $img.Width $img.Height -}} + {{- end -}} + {{- printf "" $c | safeHTML -}} + + + + {{ end }} + + diff --git a/themes/buha/layouts/_default.old/single.html b/themes/buha/layouts/_default.old/single.html new file mode 100644 index 0000000..3f35aa2 --- /dev/null +++ b/themes/buha/layouts/_default.old/single.html @@ -0,0 +1,46 @@ +{{ define "title" }} + {{ $name := .Title }} + {{ if lower $name | i18n }} + {{ $name = lower $name | i18n }} + {{ end }} +

{{ $name }}

+{{ end }} + +{{ define "main" }} + {{ partial "debug" (dict "context" . "caller" "single.html" )}} +
+ {{ if eq .Type "tools" }} +
+ {{ $tool := printf "misc/%s" .Params.tool }} + {{ partial $tool . }} +
+ {{ else }} +
+ {{ partial "contentlayouts/article.html" (dict "context" . "type" "article") }} +
+ {{ end }} +{{ end }} + +{{ define "pagefooter" }} + {{ if and (ne .Section "misc") (eq .Type "tools") }} +
+
+ {{ if i18n "created" }}{{ i18n "created" }}{{ else }}{{ "Created" }}{{ end }}
+ {{ .Date | time.Format ":date_full" }} +
+ {{ if ne .Date .Lastmod }} +
+ {{ if i18n "lastmod" }}{{ i18n "lastmod" }}{{ else }}{{ "Last modification" }}{{ end }}
+ {{ .Lastmod | time.Format ":date_full" }} +
+ {{ end }} +
+ {{ end }} +{{ end }} + + +{{ define "sidebar" }} + {{ if ne .Type "tools" }} + {{- partial "contentlayouts/menu.html" . }} + {{ end }} +{{ end }} diff --git a/themes/buha/layouts/_default/taxonomy.html b/themes/buha/layouts/_default.old/taxonomy.html similarity index 100% rename from themes/buha/layouts/_default/taxonomy.html rename to themes/buha/layouts/_default.old/taxonomy.html diff --git a/themes/buha/layouts/_default/baseof.html b/themes/buha/layouts/_default/baseof.html index 2ad994b..08990cf 100644 --- a/themes/buha/layouts/_default/baseof.html +++ b/themes/buha/layouts/_default/baseof.html @@ -11,8 +11,8 @@
{{ block "title" . -}}{{- end }} + {{ block "calc" . -}}{{- end }} {{ block "content" . -}}{{- end }} - {{ block "main" . -}}{{- end }}