config/_default: Generalize web-ring -> web-links

8 files changed, 34 insertions, 34 deletions

diff --git a/assets/css/default.css b/assets/css/default.css
index 3676a08..c7fe04f 100644
--- a/assets/css/default.css
+++ b/assets/css/default.css
@@ -1809,7 +1809,7 @@ gallery-overlay {
   border-color: var(--border);
 }
 
-web-ring,
+web-links,
 [data-kind="home"] author-list,
 [data-kind="term"] author-list,
 [data-kind="taxonomy"] author-list {
@@ -1819,26 +1819,26 @@ web-ring,
   top: 1rem;
 }
 
-web-ring time,
+web-links time,
 micro-author article time {
   display: block;
   color: #444;
   color: var(--fade);
 }
 
-web-ring p:not(:last-child) {
+web-links p:not(:last-child) {
   margin-bottom: 0;
 }
 
-web-ring article:not(:last-child) {
+web-links article:not(:last-child) {
   margin-bottom: 1.5rem;
 }
 
-web-ring aside {
+web-links aside {
   padding: 1rem;
 }
 
-web-ring aside,
+web-links aside,
 author-list aside,
 following-list aside {
   background-color: #f9f9f9;
@@ -1846,14 +1846,14 @@ following-list aside {
   border-radius: 0.5rem;
 }
 
-web-ring aside footer,
+web-links aside footer,
 author-list aside footer,
 following-list aside footer {
   background-color: #fefefe;
   background-color: var(--background);
 }
 
-web-ring,
+web-links,
 author-list,
 following-list,
 gallery-images {
@@ -1861,7 +1861,7 @@ gallery-images {
   display: block;
 }
 
-web-ring > h1,
+web-links > h1,
 author-list > h1,
 gallery-images > h1,
 following-list details {
diff --git a/config/_default/config.json b/config/_default/config.json
index 2f29e53..26ff35b 100644
--- a/config/_default/config.json
+++ b/config/_default/config.json
@@ -236,8 +236,8 @@
       "baseName": "following",
       "mediaType": "text/html"
     },
-    "webring": {
-      "baseName": "webring",
+    "weblinks": {
+      "baseName": "weblinks",
       "mediaType": "text/html"
     }
   },
@@ -259,7 +259,7 @@
       "rss",
       "gallery",
       "following",
-      "webring"
+      "weblinks"
     ],
     "taxonomy": [
       "html",
diff --git a/config/_default/config.toml b/config/_default/config.toml
index 16ca22b..94a3e5b 100644
--- a/config/_default/config.toml
+++ b/config/_default/config.toml
@@ -164,13 +164,13 @@ enableRobotsTXT = true
   [outputFormats.following]
     baseName = "following"
     mediaType = "text/html"
-  [outputFormats.webring]
-    baseName = "webring"
+  [outputFormats.weblinks]
+    baseName = "weblinks"
     mediaType = "text/html"
 
 [outputs]
   home = ["html", "rss", "xslt.rss", "xslt.sitemap", "json", "authors", "authors.section", "sources", "archives", "settings"]
-  section = ["html", "rss", "gallery", "following", "webring"]
+  section = ["html", "rss", "gallery", "following", "weblinks"]
   taxonomy = ["html", "rss"]
   term = ["html", "rss"]
   page = ["html", "plain", "embed"]
diff --git a/config/_default/config.yaml b/config/_default/config.yaml
index 6ba49df..d4ac3b4 100644
--- a/config/_default/config.yaml
+++ b/config/_default/config.yaml
@@ -158,8 +158,8 @@ outputFormats:
   following:
     baseName: following
     mediaType: text/html
-  webring:
-    baseName: webring
+  weblinks:
+    baseName: weblinks
     mediaType: text/html
 
 outputs:
@@ -179,7 +179,7 @@ outputs:
   - rss
   - gallery
   - following
-  - webring
+  - weblinks
   taxonomy:
   - html
   - rss
diff --git a/themes/default/layouts/_default/section.webring.html b/themes/default/layouts/_default/section.weblinks.html
index 78bf4a4..78bf4a4 100644
--- a/themes/default/layouts/_default/section.webring.html
+++ b/themes/default/layouts/_default/section.weblinks.html
diff --git a/themes/default/layouts/partials/navigator-right.html b/themes/default/layouts/partials/navigator-right.html
index c2e6f4c..fb4c59c 100644
--- a/themes/default/layouts/partials/navigator-right.html
+++ b/themes/default/layouts/partials/navigator-right.html
@@ -3,5 +3,5 @@
 {{- if (in (slice "page" "section") .Page.Kind) -}}
   {{- partial "gallery.html" . -}}
   {{- partial "following-list.html" . -}}
-  {{- partial "webring.html" . -}}
+  {{- partial "weblinks.html" . -}}
 {{- end -}}
diff --git a/themes/default/layouts/partials/weblinks.html b/themes/default/layouts/partials/weblinks.html
new file mode 100644
index 0000000..9d04d9e
--- /dev/null
+++ b/themes/default/layouts/partials/weblinks.html
@@ -0,0 +1,15 @@
+{{- $author := partial "function-authors-data.html" . -}}
+{{- $include := print "public/" .Section "/weblinks.html" -}}
+
+<web-links>
+  <h1>Web Links</h1>
+    {{ if and $author.feeds.rss (fileExists $include) }}
+    <aside>
+    {{- (resources.Get $include).Content | safeHTML -}}
+    </aside>
+  {{ else }}
+    <footer>
+      <code>No items found!</code>
+    </footer>
+  {{ end }}
+</web-links>
diff --git a/themes/default/layouts/partials/webring.html b/themes/default/layouts/partials/webring.html
deleted file mode 100644
index 009e2fc..0000000
--- a/themes/default/layouts/partials/webring.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{{- $author := partial "function-authors-data.html" . -}}
-{{- $webring := print "public/" .Section "/webring.html" -}}
-
-<web-ring>
-  <h1>Web Ring</h1>
-    {{ if and $author.feeds.rss (fileExists $webring) }}
-    <aside>
-    {{- (resources.Get $webring).Content | safeHTML -}}
-    </aside>
-  {{ else }}
-    <footer>
-      <code>No items found!</code>
-    </footer>
-  {{ end }}
-</web-ring>