fenton-jekyll-boilerplate 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eb6a36141efac9ebe7f0670c51c3a6f8f6b5418b987f8c8690923ec310c0b14
-  data.tar.gz: e55728ed07589138ffc7099a6dadf4c9926f560590954adb4d283da6c93ff423
+  metadata.gz: 24baa59c2c4906b3070f0707dfd96b27e6dec1b249b4450b285b8ddd04bafde2
+  data.tar.gz: '059859afc1cd21a7c046d135001ffc391e2d80baf6be2f095eab46a7abf09189'
 SHA512:
-  metadata.gz: 4bc3dfc6ba2e9a290d130e0057bf1b5731ae4748442ab031419327842a3c9836dfe2440246912e6004cf2ecab764634b602c7a65e4d7eb65ce50685bdbc38323
-  data.tar.gz: c10a24863d143d5cd4737efa0b0d2e21ce7542e0441275157a9e31781a034e2c232dd942d329004ba84fbb138384b7e7bb224248dd9be1eebf90220a0ae87ae9
+  metadata.gz: b55521d33500ad548a419fb85bec040fbf100a57b4350a25970a3cba0e61b2008fc93e65a733e9e9b69ee4bd9f502a275c7d7655914149180133650be3156b9c
+  data.tar.gz: 151e8c5a96bfa7ab6be798dbcc3a835b1b697bdce4365b218dd28ea8aab4284791674721f3b7c02103cf0b49540d4e2e6ca23e78be75721c83e8cc3da2b502f0

data/_data/language.yaml

@@ -7,6 +7,14 @@
 # If you are running Jekyll v4.3.0 or higher, you don't need this file in your site
 # as it will be read from the theme's _data folder
 
+aria:
+  breadcrumbs:
+    en: Breadcrumb
+  site_navigation:
+    en: Site Navigation
+  paging:
+    en: Paging
+
 skiplinks:
   skip_to_navigation:
     en: Skip to navigation

data/_includes/breadcrumbs.html

@@ -1,19 +1,22 @@
-<nav class="site-breadcrumbs">
+{%- assign current_url = page.url | remove: 'index.html' %}
+<nav class="site-breadcrumbs" aria-label="{{ 'aria' | t: 'breadcrumbs' }}">
     <ol vocab="http://schema.org/" typeof="BreadcrumbList">
        {%- for crumb in breadcrumbs %} 
-       {%- if forloop.last %}
-       <li property="itemListElement" typeof="ListItem">
-          <span property="name">{{ crumb.title }}</span>
-          <meta property="position" content="{{ crumb.position }}" />
-       </li>
-       {%- continue %}
-       {%- endif %}
+         {%- if forloop.last %}
+      <li property="itemListElement" typeof="ListItem">
+         <a property="item" typeof="WebPage" href="{{ crumb.url | relative_url }}" aria-current="page">
+            <span property="name">{{ crumb.title }}</span>
+            <meta property="position" content="{{ crumb.position }}" />
+         </a>
+      </li>
+         {%- else %}
        <li property="itemListElement" typeof="ListItem">
           <a property="item" typeof="WebPage" href="{{ crumb.url | relative_url }}">
              <span property="name">{{ crumb.title }}</span>
              <meta property="position" content="{{ crumb.position }}" />
           </a>
        </li>
+         {%- endif %}
        {%- endfor %}
     </ol>
   </nav>

data/_includes/head.html

@@ -22,6 +22,7 @@
 	<link rel="alternate" href="{{ "/sitemap.xml" | prepend: site.baseurl }}" type="application/rss+xml" />
 	<link rel="stylesheet" href="{{ "/assets/css/vars.css" | prepend: site.baseurl }}" />
 	<link rel="stylesheet" href="{{ "/assets/css/main.css" | prepend: site.baseurl }}" />
-	<link rel="stylesheet" href="{{ "/assets/css/code.css" | prepend: site.baseurl }}" defer="defer" />
+	<link rel="stylesheet" href="{{ "/assets/css/code.css" | prepend: site.baseurl }}" media="print" onload="this.media = 'all'" />
+	<noscript><link rel="stylesheet" href="{{ "/assets/css/code.css" | prepend: site.baseurl }}" /></noscript>
     {% include analytics.html %}
 </head>

data/_includes/navigation.html

@@ -1,34 +1,49 @@
-  <nav class="site-nav" id="site-nav">
+  <nav class="site-nav" id="site-nav" aria-label="{{ 'aria' | t: 'site_navigation' }}">
       <h2 class="site-nav-title">{{ 'navigation' | t: 'title' }}</h2>
       <ul>
+      {%- assign current_url = page.url | remove: 'index.html' %}
       {%- assign previous = null %}
       {%- assign regex = '/' | append: site.paginate_page | append: '[0-9]/' %}
       {%- assign main_pages = site.pages | where: 'nav-level', '1' | sort: 'nav-order' -%}
-      {% for page in main_pages %}
-        {%- assign current = page.nav-title | default: page.title %}
+      {% for item in main_pages %}
+        {%- assign current = item.nav-title | default: item.title %}
         {%- if (current != previous) %}
-        {%- assign previous = page.nav-title | default: page.title %}
-        {%- assign sub_pages = site.pages | where: 'nav-level', page.title | sort: 'nav-order' %}
+          {%- assign previous = item.nav-title | default: item.title %}
+
+          {%- assign parent_perma = item.permalink %}
+          {%- assign parent_perma_size = parent_perma | size %}
+          {%- assign sub_pages = '' | split: '' %}
+
+          {%- for p in site.pages %}
+            {%- assign child_perma = p.permalink %}
+            {%- assign child_perma_truncated = child_perma | truncate: parent_perma_size, '' %}
+
+            {%- if p.nav-level != 0 and parent_perma != '/' and child_perma_truncated == parent_perma and child_perma != parent_perma %}
+              {%- assign sub_pages = sub_pages | push: p %}
+            {%- endif %}
+          {%- endfor %}
+
         <li{%- if sub_pages.size > 0 %} class="has-children"{% endif %}>
-          {%- if sub_pages.size > 0 %}
+            {%- assign item_url = item.url | regex_replace: regex,'/' | prepend: site.baseurl %}
+            {%- if sub_pages.size > 0 %}
           <details class="sub-nav">
-            <summary><span>{{ page.nav-section | default: page.nav-title | default: page.title }}</span></summary>
-          {%- else %}
-          <a href="{{ page.url | regex_replace: regex,'/' | prepend: site.baseurl }}">{{ page.nav-title | default: page.title }}</a>
-          {%- endif -%}
-          {% if sub_pages.size > 0 %}
+            <summary><span>{{ item.nav-section | default: item.nav-title | default: item.title }}</span></summary>
+            {%- else %}
+          <a href="{{ item_url }}"{% if item_url == current_url) %} class="current-item" aria-current="page"{% endif %}>{{ item.nav-title | default: item.title }}</a>
+            {%- endif -%}
+            {% if sub_pages.size > 0 %}
             <ul>
               <li>
-                <a href="{{ page.url | regex_replace: regex,'/' | prepend: site.baseurl }}">{{ page.nav-title | default: page.title }}</a>
+                <a href="{{ item_url }}"{% if item_url == current_url) %} class="current-item" aria-current="page"{% endif %}>{{ item.nav-title | default: item.title }}</a>
               </li>
-              {%- for child in sub_pages %}
+              {%- for child in sub_pages | sort: 'nav-order' %}
               <li>
-                <a href="{{ child.url | prepend: site.baseurl }}">{{ child.nav-title | default: child.title }}</a>
+                <a href="{{ child.url | prepend: site.baseurl }}"{% if child.url == current_url) %} class="current-item" aria-current="page"{% endif %}>{{ child.nav-title | default: child.title }}</a>
               </li>
               {%- endfor %}
             </ul>
           </details>
-          {%- endif %}
+            {%- endif %}
         </li>
         {%- endif %}
       {%- endfor %}

data/_layouts/author.html

@@ -2,6 +2,7 @@
 layout: default
 ---
 <main id="site-main">
+  <article>
     <header>
 	    <h1>{{ page.name }}</h1>
     </header>
@@ -36,4 +37,5 @@ layout: default
         {%- endfor %}
         </ul>
     </div>
+  </article>
   </main>

data/_layouts/page.html

@@ -2,10 +2,12 @@
 layout: default
 ---
   <main id="site-main">
+    <article>
       <header>
           <h1>{{ page.title }}</h1>
       </header>
       <div>
           {{ content }}
       </div>
+    </article>
     </main>

data/_layouts/post.html

@@ -2,6 +2,7 @@
 layout: default
 ---
   <main id="site-main">
+    <article>
       <header>
         <h1>{{ page.title }}</h1>
       </header>
@@ -18,7 +19,7 @@ layout: default
         <img src="/{{ author.picture }}" alt="{{ author.name }}" class="author-image" />
             {%- endif %}
             {%- capture data -%}
-            <a href="{{ site.url }}{{ site.baseurl }}/author/{{ author.username }}/">{{ author.name }}</a>
+            <a href="{{ site.url }}{{ site.baseurl }}/authors/{{ author.username }}/">{{ author.name }}</a>
             {%- endcapture %}
             {%- assign authordata = authordata | push: data %}
           {%- endif %}
@@ -34,4 +35,5 @@ layout: default
       <div>
           {{ content }}
       </div>
+    </article>
     </main>

data/_layouts/search.html

@@ -7,7 +7,7 @@ layout: default
       </header>
       <div>
         {{ content }}
-        <form method="GET" action="{{ site.search_fallback_url }}" id="site-search" class="site-search note" autocomplete="off">
+        <form method="GET" action="{{ site.search_fallback_url }}" role="search" id="site-search" class="site-search note" autocomplete="off">
           <fieldset>
             <input type="hidden" name="{{ site.search_fallback_site }}" value="{{ site.url | prepend: 'site:' }}" />
               <div>

data/assets/css/main.css

@@ -68,7 +68,7 @@ blockquote {
     padding: 0.1px 1.2em;
     position: relative;
     box-shadow: var(--box-shadow);
-    margin: 1.2em 0;
+    margin: var(--paragraph-margin) 0;
 }
 
 blockquote::after {
@@ -133,18 +133,18 @@ h4, h5, h6 {
 }
 
 hr {
-    border: 0.5px dotted var(--fore);
+    border: 0.5px dashed var(--fore);
     opacity: 0.5;
     width: 80%;
-    margin: 0 auto;
+    margin: var(--paragraph-margin) auto;
 }
 
 img {
     max-width: 100%;
 }
 
-p, main ul, main ol {
-    margin: 1.2em 0;
+p {
+    margin: var(--paragraph-margin) 0;
 }
 
 strong {
@@ -286,6 +286,12 @@ body > footer {
     content: ''
 }
 
+.site-breadcrumbs a[aria-current] {
+    color: var(--fore);
+    text-decoration: none;
+}
+
+
 /* Content Group */
 
 .content-group {
@@ -334,7 +340,7 @@ nav.site-nav li.has-children ul a {
     text-indent: calc(var(--marker-size) * 2);
 }
 
-nav.site-nav .current-item {
+nav.site-nav a[aria-current] {
     font-weight: bold;
 }
 
@@ -373,11 +379,15 @@ main {
 }
 
 main ul, main ol {
-    margin-left: 1.2em;
+    margin: var(--paragraph-margin) 0 var(--paragraph-margin) 1.2rem;
 }
 
-main ul li, main ol li {
-    line-height: 2em;
+main ul ol, main ul ul, main ol ol, main ol ul {
+    margin: 0 0 0 1.2rem;
+}
+
+li::marker {
+    color: var(--fore-headings);
 }
 
 /* Jekyll Post List */
@@ -414,6 +424,11 @@ main ul li, main ol li {
     text-align: center;
 }
 
+.post-paging > * {
+    display: inline-block;
+    padding: 0.3rem;
+}
+
 /* Jekyll Post */
 .post-meta {
     display: flex;
@@ -555,6 +570,21 @@ form.site-search button {
         display: block;
     }
 
+    /* Collapse Paging */
+
+    .post-paging > * {
+        display: none;
+    }
+
+    .post-paging > *:first-child {
+        display: inline-block;
+    }
+    
+    .post-paging > *:last-child {
+        display: inline-block;
+    }
+    
+
     /*  */
     form.site-search div {
         grid-template-columns: repeat(1, auto);

data/assets/css/vars.css

@@ -38,7 +38,8 @@
 
     --block-gap: 2rem;
 
-    --marker-size: 1.2em;
+    --marker-size: 1.2rem;
+    --paragraph-margin: 1.2rem;
 
     --box-shadow: 0 12px 24px -12px rgb(0 0 0 / 80%);
 

data/assets/js/main.js

@@ -1,18 +1,20 @@
 // @ts-check
 
-import { setNavigationTree, setNavigationItem } from './modules/nav-expand.js';
+import { setNavigationTree } from './modules/nav-expand.js';
 import { setClickableBlocks } from './modules/click-blocks.js';
 import { addResizedEvent } from './modules/resizing.js';
 import { addStickyNavigation } from './modules/nav-sticky.js';
 import { addMobileNavigation } from './modules/nav-mobile.js';
 import { addIntersectionObserver } from './modules/animation.js';
+import { qsa } from './modules/query.js';
 
 setNavigationTree('details.sub-nav');
-setNavigationItem('.site-nav a', 'current-item')
-setClickableBlocks('data-destination');
+setClickableBlocks();
 
-var resizedEventName = addResizedEvent();
+const resizedEventName = addResizedEvent();
 
 addStickyNavigation('.site-header', '.site-nav', '.site-nav > ul', resizedEventName);
 addMobileNavigation('.navigation-icon', '.site-nav', resizedEventName);
-addIntersectionObserver('.post-list .list-item, main img, main .note, main blockquote');
+addIntersectionObserver('.post-list .list-item, main img, main .note, main blockquote');
+
+qsa('pre.highlight').forEach((elem) => elem.setAttribute('tabindex', '0'));

data/assets/js/modules/animation.js

@@ -17,25 +17,21 @@ import { qsa } from './query.js';
  */
 function addIntersectionObserver(listItemQuery) {
     function handleIntersection(entries, observer) {
-        for (var entry of entries) {
-            var value = entry.isIntersecting ? 1 : 0;
+        for (let entry of entries) {
+            const value = entry.isIntersecting ? 1 : 0;
             entry.target.style.setProperty('--shown', value);
         }
     }
 
-    var options = {
+    const options = {
         root: null,
         rootMargin: '0px',
         threshold: 0
     };
 
-    var observer = new IntersectionObserver(handleIntersection, options)
+    const observer = new IntersectionObserver(handleIntersection, options)
 
-    var items = qsa(listItemQuery);
-
-    for (var i = 0; i < items.length; i++) {
-        observer.observe(items[i]);
-    }
+    qsa(listItemQuery).forEach((elem) => observer.observe(elem));
 }
 
 export { addIntersectionObserver };

data/assets/js/modules/click-blocks.js

@@ -2,6 +2,8 @@
 
 import { qsa } from './query.js';
 
+const dataAttributeName = 'data-destination';
+
 /**
  * Makes an entire block clickable based on a data-attribute, usually "data-destination"
  * 
@@ -12,23 +14,27 @@ import { qsa } from './query.js';
  * Use clickable blocks to allow keyboard users to tab through the real links, but still
  * capture clicks elsewhere on the block.
  * 
- * @param {string} dataAttributeName
  */
- function setClickableBlocks(dataAttributeName) {
-    var listItems = qsa('[' + dataAttributeName + ']');
-
-    for(var i = 0; i < listItems.length; i++) {
-        var listItem = listItems[i];
+ function setClickableBlocks() {
+    qsa('[' + dataAttributeName + ']').forEach((listItem) => {
         listItem.style.cursor = 'pointer';
-        listItem.addEventListener('click', function (e) {
-            var location = this.getAttribute(dataAttributeName);
+        listItem.addEventListener('click', handleClick);
+    });
+}
+
+/**
+ * Handles the block-level clicks
+ * 
+ * @param {Event} e 
+ * @returns 
+ */
+function handleClick(e) {
+    const location = this.getAttribute(dataAttributeName);
 
-            if (location) {
-                e.preventDefault();
-                document.location = location;
-                return false;
-            }
-        });
+    if (location) {
+        e.preventDefault();
+        document.location = location;
+        return false;
     }
 }
 

data/assets/js/modules/focus.js

@@ -14,7 +14,7 @@ import { qsa } from './query.js';
  * @returns {{first: HTMLElement, last: HTMLElement, all: HTMLElement[]}}
  */
  function getFocusableElement(target) {
-    var focusElements = Array.from(
+    const focusElements = Array.from(
         qsa('a[href], button, input, textarea, select, details,[tabindex]:not([tabindex="-1"])', target)
     ).filter(function(el) {
         return !el.hasAttribute('disabled') && !el.getAttribute('aria-hidden');

data/assets/js/modules/nav-expand.js

@@ -12,40 +12,17 @@ import { qs, qsa } from './query.js';
  * @param {string} className 
  */
  function setNavigationTree(className) {
-    var summaries = qsa(className);
-    var site = document.location.origin;
-    var location = document.location.pathname;
+    const site = document.location.origin;
+    const location = document.location.pathname;
 
-    for (var i = 0; i < summaries.length; i++) {
-        var summary = summaries[i];
-        var anchorElement = /** @type {HTMLAnchorElement} */(qs('a', summary));
-        var address = anchorElement.href.replace(site, '');
+    qsa(className).forEach((summary) => {
+        const anchorElement = /** @type {HTMLAnchorElement} */(qs('a', summary));
+        const address = anchorElement.href.replace(site, '');
 
         if (location.startsWith(address)){
             summary.setAttribute('open', 'open');
         }
-    }
+    });
 }
 
-/**
- * Highlights the current navigation item
- * 
- * @param {string} navQuery 
- * @param {string} selectedClass 
- */
-function setNavigationItem(navQuery, selectedClass) {
-    var anchors = qsa(navQuery);
-    var site = document.location.origin;
-    var location = document.location.pathname;
-
-    for (var j = 0; j < anchors.length; j++) {
-        var anchor = /** @type {HTMLAnchorElement} */ (anchors[j]);
-        var href = anchor.href.replace(site, '');
-
-        if (href === location) {
-            anchor.classList.add(selectedClass);
-        }
-    }
-}
-
-export { setNavigationTree, setNavigationItem };
+export { setNavigationTree };

data/assets/js/modules/nav-mobile.js

@@ -1,6 +1,6 @@
 // @ts-check
 
-import { qs } from './query.js';
+import { qs, qsa } from './query.js';
 import { getFocusableElement, trapFocusForward, trapReverseFocus } from './focus.js';
 
 /**
@@ -15,13 +15,15 @@ import { getFocusableElement, trapFocusForward, trapReverseFocus } from './focus
  * 
  * @param {string} iconSelector 
  * @param {string} navigationSelector 
+ * @param {string} resizedEventName
  */
  function addMobileNavigation(iconSelector, navigationSelector, resizedEventName) {
-    var icon = qs(iconSelector);
-    var originalIcon = icon.innerHTML;
-    var overlay = document.createElement('div');
-    var dataOpen = 'data-open';
+    const icon = qs(iconSelector);
+    const originalIcon = icon.innerHTML;
+    const overlay = document.createElement('div');
+    const dataOpen = 'data-open';
 
+    // Focus trap (forwards the tab / shift-tab back to the menu)
     icon.addEventListener('keydown', function(e) { 
         if (icon.getAttribute(dataOpen) === dataOpen) {
             var focusElements = getFocusableElement(overlay);
@@ -30,6 +32,7 @@ import { getFocusableElement, trapFocusForward, trapReverseFocus } from './focus
         }
     });
 
+    // Opens and closes menu
     function handleIconInteraction() {
         if (icon.dataset.open == dataOpen) {
             closeMobileMenu();
@@ -40,22 +43,25 @@ import { getFocusableElement, trapFocusForward, trapReverseFocus } from './focus
 
     function openMobileMenu(){
         document.body.style.overflow = 'hidden';
-        var navigation = qs(navigationSelector);
         
-        overlay.innerHTML = navigation.outerHTML;
+        overlay.innerHTML = qs(navigationSelector).outerHTML;
         overlay.className = 'overlay';
         overlay.style.display = 'block';
 
+        qsa('[id]', overlay).forEach((elem) => {
+            elem.id = 'overlay__' + elem.id
+        });
+
         // Modal Accessibility
-        var title = qs('.site-nav-title', overlay);
+        const title = qs('.site-nav-title', overlay);
         title.setAttribute('id', 'modal-title');
         title.setAttribute('tabindex', '-1');
         overlay.setAttribute('role', 'dialog');
         overlay.setAttribute('aria-modal', 'true');
-        overlay.setAttribute('aria-labelled-by', 'modal-title');
+        overlay.setAttribute('aria-labelledby', 'modal-title');
 
         // Trap Focus to Visible Overlay
-        var focusElements = getFocusableElement(overlay);
+        const focusElements = getFocusableElement(overlay);
 
         focusElements.first.addEventListener('keydown', function(e) {
             trapReverseFocus(e, icon);
@@ -74,7 +80,7 @@ import { getFocusableElement, trapFocusForward, trapReverseFocus } from './focus
 
         document.body.appendChild(overlay);
         icon.setAttribute(dataOpen, dataOpen);
-        title.focus();
+        focusElements.first.focus();
     }
 
     function closeMobileMenu() {

data/assets/js/modules/nav-sticky.js

@@ -15,14 +15,14 @@ import { qs, qsa } from './query.js';
  */
 function addStickyNavigation(headerSelector, navigationSelector, navigationListSelector, resizedEventName) {
     function setNavigationMode() {
-        var header = qs(headerSelector);
-        var navigation = qs(navigationSelector);
-        var navigationList = qs(navigationListSelector); 
+        const header = qs(headerSelector);
+        const navigation = qs(navigationSelector);
+        const navigationList = qs(navigationListSelector); 
         
-        var buffer = 50;
-        var className = 'sticky';
+        const buffer = 50;
+        const className = 'sticky';
 
-        var dimensions = {
+        const dimensions = {
             browserHeight: window.innerHeight,
             browserWidth: window.innerWidth,
             headerHeight: header.clientHeight,

data/assets/js/modules/query.js

@@ -8,12 +8,12 @@
  * @returns {HTMLElement}
  */
  function qs(query, container) {
-    var target = (container)
+    const target = (container)
         ? container
         : document;
 
     /** @type {HTMLElement | null} */
-    var result = target.querySelector(query);
+    const result = target.querySelector(query);
 
     if (result) {
         return result;
@@ -30,12 +30,12 @@
  * @returns {NodeListOf<any>}
  */
  function qsa(query, container) {
-    var target = (container)
+    const target = (container)
         ? container
         : document;
 
     /** @type {NodeListOf<HTMLElement>} */
-    var result = target.querySelectorAll(query);
+    const result = target.querySelectorAll(query);
     return result;
 }
 

data/assets/js/modules/resizing.js

@@ -15,7 +15,7 @@ var height = window.innerHeight;
  * @returns {string}
  */
  function addResizedEvent() {
-    var debounce = null;
+    let debounce = null;
 
     function resizeEnd(e) {
         window.clearTimeout(debounce);
@@ -23,7 +23,7 @@ var height = window.innerHeight;
     }
 
     function raiseResizeEvent() {
-        var change = {
+        const change = {
             width: window.innerWidth - width,
             height: window.innerHeight - height
         };

data/assets/search/search.json

@@ -2,36 +2,58 @@
 layout: null
 permalink: /search.json
 ---
-{%- assign pages = site.pages | where: 'nav-search', 'true' %}
-{%- assign posts = site.posts | where: 'nav-search', 'true' %}
-{%- assign authors = site.authors | where: 'nav-search', 'true' %}
-[
-  {% for page in pages %}{
-    "title"    : "{{ page.title | escape }}",
-    "category" : "{{ page.category }}",
-    "tags"     : "{{ page.tags | join: ' ' }} {{page.keywords}}",
-    "url"      : "{{ site.baseurl }}{{ page.url }}",
-    "date"     : "{{ page.date }}"
-  }{%- unless forloop.last %},{% endunless %}
-  {%- endfor %}
-  {%- if authors.size > 0 %},{% endif %}
-  {%- for author in authors %}{
-    "title"    : "{{ author.name | escape }}",
-    "category" : "{{ author.category }}",
-    "tags"     : "{{ page.tags | join: ' ' }} {{page.keywords}}",
-    "url"      : "{{ site.baseurl }}{{ author.url }}",
-    "date"     : "{{ author.date }}"
-  }{%- unless forloop.last %},{% endunless %}
-  {%- endfor %}
-  {%- if posts.size > 0 %},{% endif %}
-  {%- for post in posts %}{
-    "title"    : "{{ post.title | escape }}",
-    "category" : "{{ post.category }}",
-    "tags"     : "{{ page.tags | join: ' ' }} {{page.keywords}}",
-    "url"      : "{{ site.baseurl }}{{ post.url }}",
-    "date"     : "{{ post.date }}"
-  }
-  {%- unless forloop.last %},{% endunless %}
-  {%- endfor %}
-]
+{%- assign entries = '' | split:'@' %}
+
+{%- for item in site.pages %}
+{%- assign nav_search = item.nav-search | isnil: true %}
+{% if nav_search and item.title %}
+{%- capture data -%}
+{
+  "title"    : "{{ item.title | escape }}",
+  "category" : "{{ item.category }}",
+  "tags"     : "{{ item.tags | join: ' ' }} {{item.keywords}}",
+  "url"      : "{{ site.baseurl }}{{ item.url }}",
+  "date"     : "{{ item.date }}"
+}
+{%- endcapture %}
+{%- assign entries = entries | push: data %}
+{% endif %}
+{%- endfor %}
 
+{%- for item in site.posts %}
+{%- assign nav_search = item.nav-search | isnil: true %}
+{% if nav_search and item.title %}
+{%- capture data -%}
+{
+  "title"    : "{{ item.title | escape }}",
+  "category" : "{{ item.category }}",
+  "tags"     : "{{ item.tags | join: ' ' }} {{item.keywords}}",
+  "url"      : "{{ site.baseurl }}{{ item.url }}",
+  "date"     : "{{ item.date }}"
+}
+{%- endcapture %}
+{%- assign entries = entries | push: data %}
+{% endif %}
+{%- endfor %}
+
+{%- for item in site.authors %}
+{%- assign nav_search = item.nav-search | isnil: true %}
+{%- if nav_search and item.title %}
+{%- capture data -%}
+{
+  "title"    : "{{ item.name | escape }}",
+  "category" : "{{ item.category }}",
+  "tags"     : "{{ item.tags | join: ' ' }} {{item.keywords}}",
+  "url"      : "{{ site.baseurl }}{{ item.url }}",
+  "date"     : "{{ item.date }}"
+}
+{%- endcapture %}
+{%- assign entries = entries | push: data %}
+{%- endif %}
+{%- endfor %}
+[
+{%- for entry in entries -%}
+{{ entry }}
+{%- unless forloop.last %},{%- endunless -%}
+{%- endfor -%}
+]

data/assets/search/search.md

@@ -6,9 +6,7 @@ date:   2022-09-06
 authors: steve-fenton
 description: Search the website.
 nav-title: Search
-nav-level: 0
 nav-order: 0
-published: true
 nav-sitemap: false
 nav-search: false
 ---

data/assets/sitemap/authors.xml

@@ -7,10 +7,20 @@ permalink: /sitemap/authors.xml
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
                             http://www.sitemaps.org/schemas/sitemap/0.9.xsd">
-{%- assign authors = site.authors | where: 'nav-sitemap','true' %}
-{%- for author in authors %}  <url>
+{%- assign entries = '' | split:'@' %}
+{%- for author in site.authors %}
+  {%- assign nav_sitemap = author.nav-sitemap | isnil: true %}
+  {%- if nav_sitemap and author.title %}
+    {%- capture data -%}
+  <url>
     <loc>{{ site.url }}{{ author.url }}</loc>
     <lastmod>{{ author.date }}</lastmod>
   </url>
+    {%- endcapture %}
+    {%- assign entries = entries | push: data %}
+  {%- endif %}
 {%- endfor %}
+{%- for entry in entries -%}
+  {{ entry }}
+{%- endfor -%}
 </urlset>

data/assets/sitemap/pages.xml

@@ -7,10 +7,20 @@ permalink: /sitemap/pages.xml
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
                             http://www.sitemaps.org/schemas/sitemap/0.9.xsd">
-{%- assign pages = site.pages | where: 'nav-sitemap','true' %}
-{% for page in pages %}  <url>
+{%- assign entries = '' | split:'@' %}
+{%- for page in site.pages %}
+  {%- assign nav_sitemap = page.nav-sitemap | isnil: true %}
+  {%- if nav_sitemap and page.title %}
+    {%- capture data -%}
+  <url>
     <loc>{{ site.url }}{{ page.url }}</loc>
     <lastmod>{{ page.date }}</lastmod>
   </url>
-{% endfor %}
+    {%- endcapture %}
+    {%- assign entries = entries | push: data %}
+  {%- endif %}
+{%- endfor %}
+{%- for entry in entries -%}
+  {{ entry }}
+{%- endfor -%}
 </urlset>

data/assets/sitemap/posts.xml

@@ -7,10 +7,20 @@ permalink: /sitemap/posts.xml
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
                             http://www.sitemaps.org/schemas/sitemap/0.9.xsd">
-{%- assign posts = site.posts | where: 'nav-sitemap','true' %}
-{%- for post in posts %}  <url>
+{%- assign entries = '' | split:'@' %}
+{%- for post in site.posts %}
+  {%- assign nav_sitemap = post.nav-sitemap | isnil: true %}
+  {%- if nav_sitemap and post.title %}
+    {%- capture data -%}
+  <url>
     <loc>{{ site.url }}{{ post.url }}</loc>
     <lastmod>{{ post.date }}</lastmod>
   </url>
+    {%- endcapture %}
+    {%- assign entries = entries | push: data %}
+  {%- endif %}
 {%- endfor %}
+{%- for entry in entries -%}
+  {{ entry }}
+{%- endfor -%}
 </urlset>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fenton-jekyll-boilerplate
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Steve Fenton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-14 00:00:00.000000000 Z
+date: 2022-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll