From 08f232a810dd689647a5ec1d13c9b7de6b9eed8e Mon Sep 17 00:00:00 2001 From: volker <101987062+gruendau@users.noreply.github.com> Date: Mon, 14 Aug 2023 00:54:06 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20an=20index,=20single=20und=20?= =?UTF-8?q?list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/_OLD/index1.html | 22 ++++++ layouts/_default/baseof.html | 72 ++++++++++++------- layouts/_default/list.html | 54 ++------------ layouts/_default/single.html | 28 +------- layouts/index.html | 15 +--- .../{content.html => content-home.html} | 3 +- layouts/partials/content/content-list.html | 45 ++++++++++++ layouts/partials/content/content-single.html | 40 +++++++++++ layouts/partials/menu/menu.html | 3 +- layouts/partials/toc/toc.html | 7 +- static/css/main.css | 2 +- 11 files changed, 166 insertions(+), 125 deletions(-) create mode 100644 layouts/_OLD/index1.html rename layouts/partials/content/{content.html => content-home.html} (94%) create mode 100644 layouts/partials/content/content-list.html create mode 100644 layouts/partials/content/content-single.html diff --git a/layouts/_OLD/index1.html b/layouts/_OLD/index1.html new file mode 100644 index 0000000..de6708e --- /dev/null +++ b/layouts/_OLD/index1.html @@ -0,0 +1,22 @@ +{{ define "main" }} + + + + +
+ {{ partial "menu/menu" . }} +
+ + +
+ {{ partial "toc/toc" . }} +
+ +
+ {{ partial "content/content-home" . }} +
+ +{{ end }} + + + diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 011e69a..931334f 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -4,46 +4,64 @@ - - {{ partial "head" . }} - + + {{ partial "head" . }} + - - - -
- {{ partial "header" . }} -
+ -
+ +
+ {{ partial "header" . }} +
- - {{ partial "header/fixed-header" . }} - {{ partial "footer/fixed-footer" . }} +
- - {{ partial "show/layout-base" . }} + + {{ partial "header/fixed-header" . }} + {{ partial "footer/fixed-footer" . }} - + + {{ partial "show/layout-base" . }} + + + + + + + + +
+ ...content... {{ block "main" . }}{{ end }} + +
- - {{ if .Site.Params.showHugoVariablesAll }} - {{ partial "admin/hugo-variables-all" . }} - {{ end }} + + {{ if .Site.Params.showHugoVariablesAll }} + {{ partial "admin/hugo-variables-all" . }} + {{ end }} -
+
- - + + - - + diff --git a/layouts/_default/list.html b/layouts/_default/list.html index b194207..82e5c2e 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,48 +1,11 @@ {{ define "main" }} -
-
-
+ - -

+{{ partial "content/content-list" . }} - - {{ partial "show/layout-list" . }} - - - {{ partial "content/title-subtitle" . }} - - {{ if not .Site.Params.showHugoVariablesAll }} - - {{ .Content }} - -
    - - {{ range .Data.Pages }} - {{ if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) }} -
  • - {{.Title}} - -
    • - {{ end }} - {{ end }} - -
- - {{ end }} - - -

+{{ end }} -
-
-
- -{{ end }} - - - diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 4272299..da52187 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -2,32 +2,6 @@ -
-
-
- - -

- - - {{ partial "show/layout-single" . }} - - - - {{ partial "content/title-subtitle" . }} - - {{ if not .Site.Params.showHugoVariablesAll }} - - {{ .Content }} - {{ end }} - - {{ .Page.TableOfContents }} - - -

- -
-
-
+{{ partial "content/content-single" . }} {{ end }} diff --git a/layouts/index.html b/layouts/index.html index 83dad58..9d52507 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -2,18 +2,7 @@ - -
- {{ partial "menu/menu" . }} -
+{{ partial "content/content-home" . }} - -
- {{ partial "toc/toc" . }} -
+{{ end }} -
- {{ partial "content/content" . }} -
- -{{ end }} \ No newline at end of file diff --git a/layouts/partials/content/content.html b/layouts/partials/content/content-home.html similarity index 94% rename from layouts/partials/content/content.html rename to layouts/partials/content/content-home.html index 5dba67b..eb05eb0 100644 --- a/layouts/partials/content/content.html +++ b/layouts/partials/content/content-home.html @@ -1,4 +1,4 @@ - +
@@ -18,7 +18,6 @@

- {{ .TableOfContents }} {{ .Content }}
diff --git a/layouts/partials/content/content-list.html b/layouts/partials/content/content-list.html new file mode 100644 index 0000000..f9dc9e1 --- /dev/null +++ b/layouts/partials/content/content-list.html @@ -0,0 +1,45 @@ + + +
+
+
+ + +

+ + + {{ partial "show/layout-list" . }} + + + {{ partial "content/title-subtitle" . }} + + {{ if not .Site.Params.showHugoVariablesAll }} + + {{ .Content }} + +
    + + {{ range .Data.Pages }} + {{ if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) }} +
  • + {{.Title}} + +
    • + {{ end }} + {{ end }} + +
+ + {{ end }} + + +

+ +
+
+
\ No newline at end of file diff --git a/layouts/partials/content/content-single.html b/layouts/partials/content/content-single.html new file mode 100644 index 0000000..fd4f595 --- /dev/null +++ b/layouts/partials/content/content-single.html @@ -0,0 +1,40 @@ + + +
+
+
+ + +

+ + + {{ partial "show/layout-single" . }} + + + {{ partial "navigation-buttons" }} + + + + {{ partial "content/title-subtitle" . }} + + +
+ {{ .Content }} +
+ + + + + + +

+ +
+
+
\ No newline at end of file diff --git a/layouts/partials/menu/menu.html b/layouts/partials/menu/menu.html index 6e22c9d..330bb6b 100644 --- a/layouts/partials/menu/menu.html +++ b/layouts/partials/menu/menu.html @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/layouts/partials/toc/toc.html b/layouts/partials/toc/toc.html index 09a9255..03de06a 100644 --- a/layouts/partials/toc/toc.html +++ b/layouts/partials/toc/toc.html @@ -1,6 +1,6 @@ -
- \ No newline at end of file diff --git a/static/css/main.css b/static/css/main.css index 2dd9f43..9391697 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -4,7 +4,7 @@ Color of the background of the website */ body { - background-color: #000000; + background-color: #666666; }