Merge branch 'upstream'

89aed26a · Jeffrey Phillips Freeman · 27e7da60 · f1ad4802 · 89aed26a · 89aed26a
Verified Commit 89aed26a authored 1 year ago by Jeffrey Phillips Freeman
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 * Minor improvement to CSS so `page` types dont get clipped by the menu header.
 * Added a container shortcode for use on `page` types to get left and right
    margins.
+* Adding new sections is now almost completely dynamic and requires much less
+    modification of code. See updated `README.me`.

 ## 1.1.0


--- a/README.md
+++ b/README.md
@@ -12,14 +12,8 @@ just yet.

 ### Renaming

-1. Change the name of the `/layouts/partials/top_list_<section>.html` to the
-new name and edit its content.
 1. Modify `./clean-build.cjs` at the bottom of the file to include the name of
 the new section.
-1. Rename directory `./layouts/<section>` to the name of the new section, or
-    create a new directory using an existing directory as a template.
-1. Edit `./layouts/<section>/list.html` to point to the new section partial
-(first line).
 1. Change or create a new directory for section content under
 `/content/<new_section>`


--- a/layouts/entry/single.html
+++ b/layouts/entry/single.html
-{{ partial "top_single.html" . }}
-{{ partial "body_single.html" . }}
-{{ partial "bottom_single.html" . }}
--- a/layouts/news/list.html
+++ b/layouts/news/list.html
-{{ partial "top_list_news.html" . }}
-{{ partial "body_list.html" . }}
-{{ partial "bottom_list.html" . }}
--- a/layouts/news/single.html
+++ b/layouts/news/single.html
-{{ partial "top_single.html" . }}
-{{ partial "body_single.html" . }}
-{{ partial "bottom_single.html" . }}
--- a/layouts/partials/top_list_generic.html
+++ b/layouts/partials/top_list_generic.html
@@ -5,7 +5,7 @@
    <div class="main-wrapper">
      <header class='subheader'>
        <div class='container'>
-          <h2 class='page-title'> {{ .Title }}
+          <h2 class='page-title'> {{ .Title }}{{ if .Description }} <small>{{ .Description }}</small>{{ end }}
          </h2>
        </div>
      </header>

--- a/layouts/partials/top_list_news.html
+++ b/layouts/partials/top_list_news.html
-{{ partial "head.html" . }}
-<body class="list h-feed">
-  <div>
-    {{ partial "menu.html" . }}
-    <div class="main-wrapper">
-      <header class='subheader'>
-        <div class='container'>
-          <h2 class='page-title'> News <small>For current events in FLEAR and its projects. You can follow this page on the fediverse at @flear@flear.org.</small>
-          </h2>
-        </div>
-      </header>
-      <main class="hfeed container" id="content" role="main">
--- a/layouts/partials/top_list_projects.html
+++ b/layouts/partials/top_list_projects.html
-{{ partial "head.html" . }}
-<body class="list h-feed">
-  <div>
-    {{ partial "menu.html" . }}
-    <div class="main-wrapper">
-      <header class='subheader'>
-        <div class='container'>
-          <h2 class='page-title'> Projects <small>Open source projects past of our incubator for Ham Radio.</small>
-          </h2>
-        </div>
-      </header>
-      <main class="hfeed container" id="content" role="main">
--- a/layouts/partials/top_list_resource.html
+++ b/layouts/partials/top_list_resource.html
-{{ partial "head.html" . }}
-<body class="list h-feed">
-  <div>
-    {{ partial "menu.html" . }}
-    <div class="main-wrapper">
-      <header class='subheader'>
-        <div class='container'>
-          <h2 class='page-title'> Resources <small>services, assistance, information, and other resources to assist the FLOSS Ham community.</small>
-          </h2>
-        </div>
-      </header>
-      <main class="hfeed container" id="content" role="main">
--- a/layouts/partials/top_list_taxonomy.html
+++ b/layouts/partials/top_list_taxonomy.html
@@ -5,7 +5,7 @@
    <div class="main-wrapper">
      <header class='subheader'>
        <div class='container'>
-          <h2 class='page-title'> Categories <small> a listing of all the topics we cover organized in one place.</small>
+          <h2 class='page-title'> Categories <small> A listing of all the topics we cover organized in one place.</small>
          </h2>
        </div>
      </header>

--- a/layouts/projects/list.html
+++ b/layouts/projects/list.html
-{{ partial "top_list_projects.html" . }}
-{{ partial "body_list.html" . }}
-{{ partial "bottom_list.html" . }}
--- a/layouts/projects/single.html
+++ b/layouts/projects/single.html
-{{ partial "top_single.html" . }}
-{{ partial "body_single.html" . }}
-{{ partial "bottom_single.html" . }}
--- a/layouts/resource/list.html
+++ b/layouts/resource/list.html
-{{ partial "top_list_resource.html" . }}
-{{ partial "body_list.html" . }}
-{{ partial "bottom_list.html" . }}
--- a/layouts/resource/single.html
+++ b/layouts/resource/single.html
-{{ partial "top_single.html" . }}
-{{ partial "body_single.html" . }}
-{{ partial "bottom_single.html" . }}