Änderungen an index, single und list

gruendau · Aug 13, 2023 · 08f232a · 08f232a
1 parent 6d3a338
commit 08f232a
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 125 deletions.
diff --git a/layouts/_OLD/index1.html b/layouts/_OLD/index1.html
@@ -0,0 +1,22 @@
+{{ define "main" }}
+
+<!-- index.html -->
+
+<!-- Menu -->
+<div>
+    {{ partial "menu/menu" . }}
+</div>
+
+<!-- Table of content -->
+<div>
+    {{ partial "toc/toc" . }}
+</div>
+
+<div class="content">
+    {{ partial "content/content-home" . }}
+</div>
+
+{{ end }}
+
+
+
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -4,46 +4,64 @@
 
 <html lang="de">
 
-  <head>
-    {{ partial "head" . }}
-  </head>
+<head>
+  {{ partial "head" . }}
+</head>
 
-  <body>
-
-    <!-- Header -->
-    <header>
-      {{ partial "header" . }}
-    </header>
+<body>
 
-    <main>
+  <!-- Header -->
+  <header>
+    {{ partial "header" . }}
+  </header>
 
-      <!-- Layout für header modes -->
-      {{ partial "header/fixed-header" . }}
-      {{ partial "footer/fixed-footer" . }}
+  <main>
 
-      <!-- Layout anzeigen -->
-      {{ partial "show/layout-base" . }}
+    <!-- Layout für header modes -->
+    {{ partial "header/fixed-header" . }}
+    {{ partial "footer/fixed-footer" . }}
 
-      <!-- Content -->
+    <!-- Layout anzeigen -->
+    {{ partial "show/layout-base" . }}
+
+    <!-- Content -->
+    <!-- Menu -->
+    <aside class="menu">
+      ...menu...
+      {{ partial "menu/menu" . }}
+    </aside>
+
+    <!-- Table of content -->
+    <aside class="toc">
+      ...toc...
+      {{ partial "toc/toc" . }}
+    </aside>
+
+    <div class="content">
+      ...content...
       {{ block "main" . }}{{ end }}
+      <!--
+      {x{ partial "content/content-home" . }}
+      -->
+    </div>
 
-      <!-- Hugo Variablen anzeigen -->
-      {{ if .Site.Params.showHugoVariablesAll }}
-        {{ partial "admin/hugo-variables-all" . }}
-      {{ end }}
+    <!-- Hugo Variablen anzeigen -->
+    {{ if .Site.Params.showHugoVariablesAll }}
+    {{ partial "admin/hugo-variables-all" . }}
+    {{ end }}
 
-    </main>
+  </main>
 
-    <!-- Footer -->
-    <footer>
-      {{ partial "footer" . }}
-    </footer>
+  <!-- Footer -->
+  <footer>
+    {{ partial "footer" . }}
+  </footer>
 
-    <!--
+  <!--
     {{ partial "script-footer" . }}
     -->
 
-  </body>
+</body>
 
 </html>
 

diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -1,63 +1,21 @@
 {{ define "main" }}
 
-<div class="container-fluid px-2">
-    <div class="row">
-        <div class="col">
+<!-- list.html -->
 
-            <!-- Sprungmarke -->
-            <h3 id="top"></h3>
+{{ partial "content/content-list" . }}
 
-            <!-- Layout anzeigen -->
-            {{ partial "show/layout-list" . }}
-
-            <!-- Title, Subtitle -->
-            {{ partial "content/title-subtitle" . }}
-
-            {{ if not .Site.Params.showHugoVariablesAll }}
-                <!-- Content -->
-                {{ .Content }}
-
-                <ul class="posts">
-
-                    {{ range .Data.Pages }}
-                        {{ if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) }}
-                        <li class="post">
-                            <a href="{{ .RelPermalink }}">{{.Title}}</a> 
-                            <!--
-                            <span class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} 
-                                <span class="draft-label">DRAFT</span> 
-                                {{ end }}
-                            </span>
-                            -->
-                        </li>
-                        {{ end }}
-                    {{ end }}
-
-                </ul>
-
-            {{ end }}
-
-            <!-- Sprungmarke -->
-            <h3 id="bottom"></h3>
+{{ end }}
 
-        </div>
-    </div>
-</div>
 
 <!--
     Quelle: 
     https://github.com/athul/archie/blob/master/layouts/_default/list.html
 -->
 
 <!--
-{{ if isset .Data "Term" }}
+{x{ if isset .Data "Term" }}
 <h1>Entries tagged - "{{ .Data.Term }}"</h1>
-{{ else }}
+{x{ else }}
 <h1 class="page-title">All articles</h1>
-{{ end }}
+{x{ end }}
 -->
-
-{{ end }}
-
-
-
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
@@ -2,32 +2,6 @@
 
 <!-- single.html -->
 
-<div class="container-fluid px-2">
-    <div class="row">
-        <div class="col">
-
-            <!-- Sprungmarke -->
-            <h3 id="top"></h3>
-
-            <!-- Layout anzeigen -->
-            {{ partial "show/layout-single" . }}
-
-
-            <!-- Title, Subtitle -->
-            {{ partial "content/title-subtitle" . }}
-
-            {{ if not .Site.Params.showHugoVariablesAll }}
-                <!-- Content -->
-                {{ .Content }}
-            {{ end }}
-
-            {{ .Page.TableOfContents }}
-
-            <!-- Sprungmarke -->
-            <h3 id="bottom"></h3>
-
-        </div>
-    </div>
-</div>
+{{ partial "content/content-single" . }}
 
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
@@ -2,18 +2,7 @@
 
 <!-- index.html -->
 
-<!-- Menu -->
-<div>
-    {{ partial "menu/menu" . }}
-</div>
+{{ partial "content/content-home" . }}
 
-<!-- Table of content -->
-<div>
-    {{ partial "toc/toc" . }}
-</div>
+{{ end }}
 
-<div class="content">
-    {{ partial "content/content" . }}
-</div>
-
-{{ end }}
diff --git a/layouts/partials/content/content.html → layouts/partials/content/content-home.html b/layouts/partials/content/content.html → layouts/partials/content/content-home.html
@@ -1,4 +1,4 @@
-<!-- partial content.html -->
+<!-- partial content-home.html -->
 
 <div class="container-fluid">
     <div class="row">
@@ -18,7 +18,6 @@ <h3 id="top"></h3>
 
            <!-- Content -->
            <div class="text">
-        {{ .TableOfContents }}
            {{ .Content }}
            </div>
 

diff --git a/layouts/partials/content/content-list.html b/layouts/partials/content/content-list.html
@@ -0,0 +1,45 @@
+<!-- partial content-list.html -->
+
+<div class="container-fluid px-2">
+    <div class="row">
+        <div class="col">
+
+            <!-- Sprungmarke -->
+            <h3 id="top"></h3>
+
+            <!-- Layout anzeigen -->
+            {{ partial "show/layout-list" . }}
+
+            <!-- Title, Subtitle -->
+            {{ partial "content/title-subtitle" . }}
+
+            {{ if not .Site.Params.showHugoVariablesAll }}
+                <!-- Content -->
+                {{ .Content }}
+
+                <ul class="posts">
+
+                    {{ range .Data.Pages }}
+                        {{ if (not (in (.Site.Params.excludedTypes | default (slice "page")) .Type)) }}
+                        <li class="post">
+                            <a href="{{ .RelPermalink }}">{{.Title}}</a> 
+                            <!--
+                            <span class="meta">{{ dateFormat "Jan 2, 2006" .Date }}{{ if .Draft }} 
+                                <span class="draft-label">DRAFT</span> 
+                                {{ end }}
+                            </span>
+                            -->
+                        </li>
+                        {{ end }}
+                    {{ end }}
+
+                </ul>
+
+            {{ end }}
+
+            <!-- Sprungmarke -->
+            <h3 id="bottom"></h3>
+
+        </div>
+    </div>
+</div>
diff --git a/layouts/partials/content/content-single.html b/layouts/partials/content/content-single.html
@@ -0,0 +1,40 @@
+<!-- partial content-single.html -->
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col">
+
+            <!-- Sprungmarke -->
+            <h3 id="top"></h3>
+
+            <!-- Layout anzeigen -->
+            {{ partial "show/layout-single" . }}
+
+            <!-- Navigation -->
+            {{ partial "navigation-buttons" }}
+
+
+            <!-- Title, Subtitle -->
+            {{ partial "content/title-subtitle" . }}
+
+            <!-- Content -->
+            <div class="text">
+                {{ .Content }}
+            </div>
+
+            <!--
+            {x{ if not .Site.Params.showHugoVariablesAll }}
+                {x{ .Content }}
+            {x{ end }}
+            -->
+
+            <!--
+            {x{ .Page.TableOfContents }}
+            -->
+
+            <!-- Sprungmarke -->
+            <h3 id="bottom"></h3>
+
+        </div>
+    </div>
+</div>
diff --git a/layouts/partials/menu/menu.html b/layouts/partials/menu/menu.html
@@ -1,6 +1,6 @@
 <!-- layout/partials: menu -->
 
-<aside class="menu">
+
 
     <div class="container-fluid">
         <div class="row">
@@ -20,4 +20,3 @@
         </div>
     </div>
 
-</aside>
diff --git a/layouts/partials/toc/toc.html b/layouts/partials/toc/toc.html
@@ -1,6 +1,6 @@
 <!-- layout/partials: toc -->
 
-<aside class="toc">
+
 
     <div class="container-fluid">
         <div class="row">
@@ -11,9 +11,7 @@
                     {{ partial "toc/title" . }}
                 </div>
 
-                {{ .Page.TableOfContents }}
-
-                <!-- Menu -->
+                <!-- Table of content -->
                 <div class="toc toc-content">
                     {{ partial "toc/content" . }}
                 </div>
@@ -22,4 +20,3 @@
         </div>
     </div>
 
-</aside>
diff --git 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;
 }