From 10d03499555f90715d8c0b2cfab097f437fe83a3 Mon Sep 17 00:00:00 2001 From: Christian Schulzendorff Date: Sun, 20 Feb 2022 20:00:01 +0100 Subject: [PATCH] Restruction --- archetypes/tiles.md | 10 ++ content/posts/DDO-Prototype/index.md | 4 +- content/posts/Exif-Spickzettel/index.md | 4 +- content/posts/Foto-Workflow/index.md | 4 +- content/posts/Pendel-Foto-Leinwand/index.md | 4 +- .../RFduino-Implementation-of-DDO/index.md | 4 +- ...ine.md => dierundestunde-zu-guter-erst.md} | 4 +- content/posts/fow-Foto-Workflow-Tool/index.md | 4 +- .../drs.md => tags/dierundestunde/_index.md} | 3 +- content/tags/kollegenrunde/_index.md | 7 ++ content/tags/myequis/_index.md | 7 ++ content/tags/pendel/_index.md | 8 ++ content/tiles/die-runde-stunde.md | 7 ++ content/tiles/kollegenrunde.md | 3 +- content/tiles/myequis.md | 3 +- content/tiles/pendel.md | 4 +- layouts/index.html | 108 ++++++++---------- layouts/partials/func/count_posts.html | 25 ++++ layouts/partials/tag-cover.html | 29 +++++ layouts/partials/tiles-cover.html | 56 +++++---- layouts/tag/list.html | 70 ++++++++++++ static/style.css | 15 +++ 22 files changed, 281 insertions(+), 102 deletions(-) create mode 100644 archetypes/tiles.md rename content/posts/{drs-online.md => dierundestunde-zu-guter-erst.md} (98%) rename content/{tiles/drs.md => tags/dierundestunde/_index.md} (65%) create mode 100644 content/tags/kollegenrunde/_index.md create mode 100644 content/tags/myequis/_index.md create mode 100644 content/tags/pendel/_index.md create mode 100644 content/tiles/die-runde-stunde.md create mode 100644 layouts/partials/func/count_posts.html create mode 100644 layouts/partials/tag-cover.html create mode 100644 layouts/tag/list.html diff --git a/archetypes/tiles.md b/archetypes/tiles.md new file mode 100644 index 0000000..10019e2 --- /dev/null +++ b/archetypes/tiles.md @@ -0,0 +1,10 @@ ++++ +# A tile is shown on the main page. It represents and external website but can also have an +# blog posts. For this, it must have a corresponding tag. +# It's image is clickable to call external website. +title = "{{ replace .Name "-" " " | title }}" +correspondingTagName = "{{ lower .Name }}" +urlLink = "kollegen.uber.space/{{ lower .Name }}/" +cover = "img/{{ lower .Name }}-logo.png" +coverCredit = "Webseite {{ replace .Name "-" " " | title }}" ++++ \ No newline at end of file diff --git a/content/posts/DDO-Prototype/index.md b/content/posts/DDO-Prototype/index.md index af8dca5..36adf8f 100644 --- a/content/posts/DDO-Prototype/index.md +++ b/content/posts/DDO-Prototype/index.md @@ -3,8 +3,8 @@ title = "DDO Prototype" date = "2014-11-30" author = false cover = "skizze.jpg" -tags = ["programmierung"] -keywords = ["ddo"] +tags = ["ddo"] +keywords = ["programmierung"] description = "DDO - Der Kilometerzähler im Arduion-Derivat." showFullContent = false readingTime = false diff --git a/content/posts/Exif-Spickzettel/index.md b/content/posts/Exif-Spickzettel/index.md index 61289fb..000e62e 100644 --- a/content/posts/Exif-Spickzettel/index.md +++ b/content/posts/Exif-Spickzettel/index.md @@ -3,8 +3,8 @@ title = "Exif Spickzettel" date = "2017-08-09" author = false cover = "icon.jpg" -tags = ["linux"] -keywords = ["spickzettel", ""] +tags = ["spickzettel"] +keywords = ["linux", ""] description = "Von häufig zu setzenden EXIF-Werte und GPS-Tooling" showFullContent = false readingTime = false diff --git a/content/posts/Foto-Workflow/index.md b/content/posts/Foto-Workflow/index.md index fdaa60c..4824466 100644 --- a/content/posts/Foto-Workflow/index.md +++ b/content/posts/Foto-Workflow/index.md @@ -3,8 +3,8 @@ title = "Foto-Workflow" date = "2017-03-04" author = false cover = "icon.jpg" -tags = ["fotografie"] -keywords = ["fow", ""] +tags = ["fow"] +keywords = ["fotografie", ""] description = "Terminal-basierter Workflow der digitalen Bildbearbeitung" showFullContent = false readingTime = false diff --git a/content/posts/Pendel-Foto-Leinwand/index.md b/content/posts/Pendel-Foto-Leinwand/index.md index e2eb4b9..59f595a 100644 --- a/content/posts/Pendel-Foto-Leinwand/index.md +++ b/content/posts/Pendel-Foto-Leinwand/index.md @@ -3,8 +3,8 @@ title = "Pendel Foto Leinwand" date = "2018-05-24" author = false cover = "icon.png" -tags = ["fotografie"] -keywords = ["pendel"] +tags = ["pendel"] +keywords = ["fotografie"] description = "Mit der Kamera unterwegs zur Arbeit und dann das Bild per Skript zum Plugin im Wordpress-Blog hochladen." showFullContent = false readingTime = false diff --git a/content/posts/RFduino-Implementation-of-DDO/index.md b/content/posts/RFduino-Implementation-of-DDO/index.md index 6b4ca37..0d5c082 100644 --- a/content/posts/RFduino-Implementation-of-DDO/index.md +++ b/content/posts/RFduino-Implementation-of-DDO/index.md @@ -3,8 +3,8 @@ title = "RFduino Implementation of DDO" date = "2015-01-15" author = false cover = "icon.png" -tags = ["programmierung"] -keywords = ["ddo", "arduino"] +tags = ["ddo"] +keywords = ["programmierung"] description = "Describes the Coding for the DDO hardware, based on a RFduino board." showFullContent = false readingTime = false diff --git a/content/posts/drs-online.md b/content/posts/dierundestunde-zu-guter-erst.md similarity index 98% rename from content/posts/drs-online.md rename to content/posts/dierundestunde-zu-guter-erst.md index b3f874b..f8c8954 100644 --- a/content/posts/drs-online.md +++ b/content/posts/dierundestunde-zu-guter-erst.md @@ -3,8 +3,8 @@ title = "Die Runde Stunde geht online" date = "2022-02-05" author = false cover = "" -tags = ["fotografie"] -keywords = ["dierundestunde", "blog"] +tags = ["dierundestunde"] +keywords = ["fotografie"] description = "Eine kurze Erläuterung zum Konzept der Website Die Runde Stunde." showFullContent = false readingTime = false diff --git a/content/posts/fow-Foto-Workflow-Tool/index.md b/content/posts/fow-Foto-Workflow-Tool/index.md index cf73953..81d6c79 100644 --- a/content/posts/fow-Foto-Workflow-Tool/index.md +++ b/content/posts/fow-Foto-Workflow-Tool/index.md @@ -3,8 +3,8 @@ title = "Fow Foto Workflow Tool" date = "2017-09-11" author = false cover = "icon.jpg" -tags = ["fotografie"] -keywords = ["fow", ""] +tags = ["fow"] +keywords = ["fotografie", ""] description = "Ein Kommandozeilen-Tool für den digitalen Fotoprozess oder wie man auch bei mehreren Kameras und vielen Fotoprojekten den Überblick behält." showFullContent = false readingTime = false diff --git a/content/tiles/drs.md b/content/tags/dierundestunde/_index.md similarity index 65% rename from content/tiles/drs.md rename to content/tags/dierundestunde/_index.md index 8d7a6cb..90745ac 100644 --- a/content/tiles/drs.md +++ b/content/tags/dierundestunde/_index.md @@ -1,6 +1,7 @@ +++ -title = "3 Die Runde Stunde" +title = "Die Runde Stunde" urlLink = "kollegen.uber.space/dierundestunde/" cover = "img/drs-logo.png" coverCredit = "Besuche Die Runde Stunde" +description = "Unterwegs im R15" +++ \ No newline at end of file diff --git a/content/tags/kollegenrunde/_index.md b/content/tags/kollegenrunde/_index.md new file mode 100644 index 0000000..5f60478 --- /dev/null +++ b/content/tags/kollegenrunde/_index.md @@ -0,0 +1,7 @@ ++++ +title = "Kollegenrunde" +urlLink = "kollegen.uber.space/kollegenrunde/" +cover = "img/kollegenrunde-logo.png" +coverCredit = "Webseite der Kollegenrunde" +description = "Der Kollege lädt ein" ++++ \ No newline at end of file diff --git a/content/tags/myequis/_index.md b/content/tags/myequis/_index.md new file mode 100644 index 0000000..87def93 --- /dev/null +++ b/content/tags/myequis/_index.md @@ -0,0 +1,7 @@ ++++ +title = "My Equis" +urlLink = "kollegen.uber.space/japp/myequis" +cover = "img/myequis-logo.png" +coverCredit = "Besuche My Equis" +description = "In der Fahrrad-Werkstatt" ++++ \ No newline at end of file diff --git a/content/tags/pendel/_index.md b/content/tags/pendel/_index.md new file mode 100644 index 0000000..874a678 --- /dev/null +++ b/content/tags/pendel/_index.md @@ -0,0 +1,8 @@ ++++ +title = "Pendel" +urlLink = "earls5.uber.space/pendel/" +cover = "img/pendel-logo.png" +coverCredit = "Pendel" +description = "Leinwand durch Raum und Zeit!" ++++ + diff --git a/content/tiles/die-runde-stunde.md b/content/tiles/die-runde-stunde.md new file mode 100644 index 0000000..57242b2 --- /dev/null +++ b/content/tiles/die-runde-stunde.md @@ -0,0 +1,7 @@ ++++ +title = "Die Runde Stunde" +correspondingTagName = "dierundestunde" +urlLink = "kollegen.uber.space/dierundestunde/" +cover = "img/drs-logo.png" +coverCredit = "Besuche Die Runde Stunde" ++++ \ No newline at end of file diff --git a/content/tiles/kollegenrunde.md b/content/tiles/kollegenrunde.md index e6c05b0..8c0fa8a 100644 --- a/content/tiles/kollegenrunde.md +++ b/content/tiles/kollegenrunde.md @@ -1,5 +1,6 @@ +++ -title = "2 Kollegenrunde" +title = "Kollegenrunde" +correspondingTagName = "Kollegenrunde" urlLink = "kollegen.uber.space/kollegenrunde/" cover = "img/kollegenrunde-logo.png" coverCredit = "Webseite der Kollegenrunde" diff --git a/content/tiles/myequis.md b/content/tiles/myequis.md index fb75f6c..a86b887 100644 --- a/content/tiles/myequis.md +++ b/content/tiles/myequis.md @@ -1,5 +1,6 @@ +++ -title = "3 My Equis" +title = "My Equis" +correspondingTagName = "myequis" urlLink = "kollegen.uber.space/japp/myequis" cover = "img/myequis-logo.png" coverCredit = "Besuche My Equis" diff --git a/content/tiles/pendel.md b/content/tiles/pendel.md index 4e78da4..c2897a6 100644 --- a/content/tiles/pendel.md +++ b/content/tiles/pendel.md @@ -1,7 +1,9 @@ +++ -title = "1 Pendel" +title = "Pendel" +correspondingTagName = "pendel" urlLink = "earls5.uber.space/pendel/" cover = "img/pendel-logo.png" coverCredit = "Die Pendel-Website" +description = "Leinwand durch Raum und Zeit" +++ diff --git a/layouts/index.html b/layouts/index.html index b7a920d..71b15a2 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -7,73 +7,63 @@ {{ $PageContext := . }} {{ if .IsHome }} - {{ $PageContext = .Site }}
- {{ range (where $PageContext.RegularPages "Type" "tiles") }} + {{ range where $PageContext.Site.RegularPages "Type" "tiles" }} + + {{ $count := partial "func/count_posts.html" ( dict "context" . "term" .Params.CorrespondingTagName ) }} +
- {{ partial "tiles-cover.html" . }} +
+ + {{if .Params.Cover }} + + + {{ .Title | plainify | default + + {{ else }} + + + + {{ .Title | plainify | default " " }} + + {{ end }} + + {{ if gt $count 0 }} +
+ + #{{ .Params.CorrespondingTagName | plainify }} ({{ $count }}) +
+ {{ end }} + +
- {{ end }} + + {{ end }}
- {{ end }} - -
- {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }} - {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }} - - {{ $PageContext := . }} - {{ if .IsHome }} - {{ $PageContext = .Site }} - {{ end }} - {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} - - {{ range $paginator.Pages }} -
-

- {{ .Title | markdownify }} -

-
- - {{ .Date.Format "2006-01-02" }} - - {{ with .Params.Author }} - :: {{ . }} - {{ end }} -
+ - {{ if .Params.tags }} - - {{ range .Params.tags }} - # - {{- . -}} -   - {{ end }} - +
+ {{ range $.Site.Taxonomies.tags.ByCount }} + {{ $tag_name := .Name }} + {{ $has_tile := "false" }} + {{ range where $.Site.RegularPages "Type" "tiles" }} + {{ if eq .Params.correspondingTagName $tag_name }} + {{ $has_tile = "true" }} {{ end }} + {{ end }} + {{ if eq $has_tile "false" }} + + #{{ .Name }} ({{ .Count }}) + +   + {{end}} + {{end}} +
- - {{ partial "cover.html" . }} + {{ end }} -
- {{ if .Params.showFullContent }} - {{ .Content }} - {{ else if .Description }} - {{ .Description | markdownify }} - {{ else }} - {{ .Summary | markdownify }} - {{ end }} -
- - {{ if not .Params.showFullContent }} -
- {{ $.Site.Params.ReadMore }} → -
- {{ end }} -
- {{ end }} - {{ partial "pagination.html" . }} -
{{ end }} diff --git a/layouts/partials/func/count_posts.html b/layouts/partials/func/count_posts.html new file mode 100644 index 0000000..d02eef4 --- /dev/null +++ b/layouts/partials/func/count_posts.html @@ -0,0 +1,25 @@ + + + + +{{$term := .term}} +{{$taxo := "tags"}} +{{ $ret := -1 }} + + + +{{ $posts := where .context.Site.Pages "Type" "posts" }} + +{{ $data := newScratch }} + + +{{ $data.Set "tagCounter" 0 }} + +{{ range $posts}} + {{ if in .Params.tags $term }} + {{ $data.Add "tagCounter" 1 }} + {{ end }} +{{ end }} +{{ $ret = $data.Get "tagCounter" }} + +{{ return $ret }} diff --git a/layouts/partials/tag-cover.html b/layouts/partials/tag-cover.html new file mode 100644 index 0000000..106d791 --- /dev/null +++ b/layouts/partials/tag-cover.html @@ -0,0 +1,29 @@ +{{- $cover := false -}} +{{- $autoCover := default $.Site.Params.autoCover false }} +{{- if index .Params "cover" -}} + {{- if .Resources.GetMatch .Params.Cover }} + {{- $cover = (.Resources.GetMatch .Params.Cover).RelPermalink -}} + {{- else -}} + {{- $cover = absURL .Params.Cover -}} + {{- end -}} +{{- else if $.Site.Params.AutoCover -}} + {{- if (not .Params.Cover) -}} + {{- if .Resources.GetMatch "cover.*" -}} + {{- $cover = (.Resources.GetMatch "cover.*").RelPermalink -}} + {{- end -}} + {{- end -}} +{{- end -}} + +{{ if .Params.urlLink }} + {{if $cover -}} + +
+ + {{ .Title | plainify | default + {{ .Params.urlLink }} + +
+ {{- end }} +{{- end }} diff --git a/layouts/partials/tiles-cover.html b/layouts/partials/tiles-cover.html index 5b36939..4960d0f 100644 --- a/layouts/partials/tiles-cover.html +++ b/layouts/partials/tiles-cover.html @@ -1,25 +1,31 @@ -{{- $cover := false -}} -{{- $autoCover := default $.Site.Params.autoCover false }} - -{{- if index .Params "cover" -}} - {{- if .Resources.GetMatch .Params.Cover }} - {{- $cover = (.Resources.GetMatch .Params.Cover).RelPermalink -}} - {{- else -}} - {{- $cover = absURL .Params.Cover -}} - {{- end -}} -{{- else if $.Site.Params.AutoCover -}} - {{- if (not .Params.Cover) -}} - {{- if .Resources.GetMatch "cover.*" -}} - {{- $cover = (.Resources.GetMatch "cover.*").RelPermalink -}} - {{- end -}} - {{- end -}} -{{- end -}} - -{{if $cover -}} - - - {{ .Title | plainify | default - -{{- end }} +{{ range where .Site.RegularPages "Type" "tiles" }} + +{{ $count := partial "func/count_posts.html" ( dict "context" . "term" .Params.CorrespondingTagName ) }} + +
+ + {{if .Params.Cover }} + + + {{ .Title | plainify | default + + {{ else }} + + + + {{ .Title | plainify | default " " }} + + {{ end }} + +
+ {{ if gt $count 0 }} + + #{{ .Params.CorrespondingTagName | plainify }} ({{ $count }}) + {{ end }} +
+ +
+ +{{ end }} \ No newline at end of file diff --git a/layouts/tag/list.html b/layouts/tag/list.html new file mode 100644 index 0000000..3400959 --- /dev/null +++ b/layouts/tag/list.html @@ -0,0 +1,70 @@ +{{ define "main" }} +
+
+
+ {{ if .Description }} + {{ .Description | markdownify }} + {{ end }} +

{{ .Title | markdownify }}

+
+
+ + {{ if .Params.tags }} + + {{ range .Params.tags }} + #{{ . }}  + {{ end }} + + {{ end }} + {{ partial "tag-cover.html" . }} + +
+ {{ $isntDefault := not (or (eq (trim $.Site.Params.contentTypeName " ") "posts") (eq (trim $.Site.Params.contentTypeName " ") "")) }} + {{ $contentTypeName := cond $isntDefault (string $.Site.Params.contentTypeName) "posts" }} + + {{ $PageContext := . }} + {{ if .IsHome }} + {{ $PageContext = .Site }} + {{ end }} + {{ $paginator := .Paginate (where $PageContext.RegularPages "Type" $contentTypeName) }} + + {{ range $paginator.Pages }} +
+

+ {{ .Title | markdownify }} +

+
+ + {{ .Date.Format "2006-01-02" }} + + {{ with .Params.Author }} + :: {{ . }} + {{ end }} +
+ + {{ partial "cover.html" . }} + + +
+ {{ if .Params.showFullContent }} + {{ .Content }} + {{ else if .Description }} + {{ .Description | markdownify }} + {{ else }} + {{ .Summary | markdownify }} + {{ end }} +
+ + {{ if not .Params.showFullContent }} +
+ {{ $.Site.Params.ReadMore }} → +
+ {{ end }} +
+ {{ end }} + {{ partial "pagination.html" . }} +
+ + +{{ end }} diff --git a/static/style.css b/static/style.css index d35b047..0de0855 100644 --- a/static/style.css +++ b/static/style.css @@ -1,3 +1,4 @@ + .flexing { box-sizing: border-box; } @@ -21,4 +22,18 @@ .flex-container { flex-direction: column; } +} + +.headerimage{ + width: 100px; + +} + +.transparentbackgroud{ + background: transparent; +} + + +.nodeco{ + text-decoration: none; } \ No newline at end of file