fenton-jekyll-boilerplate 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 796e5046594287e61a04266f801d95941663ae0bd5e30949b3f60eeafbaaa6ee
-  data.tar.gz: c948a2e05d83425390dc3f51cb284f2ecd1b274d4273d78d6d83c687ddc91373
+  metadata.gz: 11581973bf7e6ca7aef4afabb61f30fc637fe23a25ce4915237530770c28b6a1
+  data.tar.gz: cc5759349dfa4bd0af02200b01836181a119081470c11dc762ca8fbada6d0030
 SHA512:
-  metadata.gz: e5be494b5120efc317a8cef43887dcbc196293ad4a5ef0f3405338f930482b3687599f7d0035055e90d4eb3002e5384b694356bb71956287b43207aeae465b89
-  data.tar.gz: 9d65a265d19dc33f7f92d803b9513134231dea45201680617c05cba408e48ff92dc2bfaa327cde139c06018ff066b0856ca3f50ddd193b1cf0c6e288f25faad2
+  metadata.gz: bd76c0783fd77ba3574ff1d4d098f47922157570d9a87a09065ebac17b61d06ff5248275c134c618ffc0a404219e79baa38cd4d9e6f964af1354223f3001603c
+  data.tar.gz: e0aa8f8672db795f8cd2366fc5c56a446cc691c27136927234400e228ce67633d6f78815c1b235da7511fd0e212b969988ca96d5670cf07c3aede886bb535a31

data/_includes/analytics.html

@@ -1,3 +1,3 @@
-<script>
-    // Analytics scripts
-    </script>
+{%- if site.analytics_script -%}
+{{ site.analytics_script }}
+{%- endif -%}

data/_includes/breadcrumbs.html

@@ -1,22 +1,19 @@
 {%- 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 %}
+{%- assign aria_current = '' %}
+  <nav class="site-breadcrumbs" aria-label="{{ 'aria' | t: 'breadcrumbs' }}">
+   <ol vocab="http://schema.org/" typeof="BreadcrumbList">
+   {%- for crumb in breadcrumbs %} 
+      {%- if forloop.last %}
+         {%- assign aria_current = ' aria-current="page"' %}
+      {%- else %}
+         {%- assign aria_current = '' %}
+      {%- endif %}
       <li property="itemListElement" typeof="ListItem">
-         <a property="item" typeof="WebPage" href="{{ crumb.url | relative_url }}" aria-current="page">
+         <a property="item" typeof="WebPage" href="{{ crumb.url | relative_url }}"{{aria_current}}>
             <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>
+   {%- endfor %}
+   </ol>
   </nav>

data/_includes/navigation.html

@@ -1,52 +1,62 @@
+{%- assign current_url = page.url | remove: 'index.html' %}
+{%- assign previous = null %}
+{%- assign page_num_regex = '/' | append: site.paginate_page | append: '[0-9]/' %}
+{%- assign main_pages = site.pages | where: 'nav-level', '1' | sort: 'nav-order' %}
   <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 item in main_pages %}
+      {%- for item in main_pages %}
         {%- assign current = item.nav-title | default: item.title %}
-        {%- if (current != previous) %}
-          {%- assign previous = item.nav-title | default: item.title %}
 
-          {%- assign parent_perma = item.permalink %}
-          {%- assign parent_perma_size = parent_perma | size %}
-          {%- assign sub_pages = '' | split: '' %}
+        {%- comment %}Paging can introduce duplicates{% endcomment %}
+        {%- if current == previous %}
+        {%- continue %}
+        {%- endif %}
 
-          {%- for p in site.pages %}
-            {%- assign child_perma = p.permalink %}
-            {%- assign child_perma_truncated = child_perma | truncate: parent_perma_size, '' %}
+        {%- comment %}Hierarchy and selected items are determined based on URL{% endcomment %}
+        {%- assign previous = item.nav-title | default: item.title %}
+        {%- assign parent_perma = item.permalink %}
+        {%- assign parent_perma_size = parent_perma | size %}
+        {%- assign sub_pages = '' | split: '' %}
+        {%- assign current_url_truncated = current_url | truncate: parent_perma_size, '' %}
+        
+        {%- comment %}Find matching child pages by path{% endcomment %}
+        {%- for potential_sub_page in site.pages %}
+          {%- assign child_perma = potential_sub_page.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 %}
+          {%- if potential_sub_page.nav-level != 0 and parent_perma != '/' and child_perma_truncated == parent_perma and child_perma != parent_perma %}
+            {%- assign sub_pages = sub_pages | push: potential_sub_page %}
+          {%- endif %}
+        {%- endfor %}
 
         <li{%- if sub_pages.size > 0 %} class="has-children"{% endif %}>
-            {%- assign item_url = item.url | regex_replace: regex,'/' | prepend: site.baseurl %}
-            {%- if sub_pages.size > 0 %}
-          <details class="sub-nav">
+          {%- assign item_url = item.url | regex_replace: page_num_regex,'/' | prepend: site.baseurl %}
+
+          {%- comment %}Details added if child pages exist{% endcomment %}
+          {%- if sub_pages.size > 0 %}
+          <details class="sub-nav"{% if current_url_truncated == parent_perma %} open="open"{% endif %}>
             <summary><span>{{ item.nav-section | default: item.nav-title | default: item.title }}</span></summary>
-            {%- else %}
+          {%- 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 %}
+          {%- endif -%}
+
+          {%- comment %}Child pages list, parent injected as first item{% endcomment %}
+          {%- assign sub_pages_sorted = sub_pages | sort: 'nav-order' %}
+          {% if sub_pages.size > 0 %}
             <ul>
               <li>
                 <a href="{{ item_url }}"{% if item_url == current_url) %} class="current-item" aria-current="page"{% endif %}>{{ item.nav-title | default: item.title }}</a>
               </li>
-              {%- assign sub_pages_sorted = sub_pages | sort: 'nav-order' %}
-              {%- for child in sub_pages_sorted %}
+            {%- for child in sub_pages_sorted %}
               <li>
                 <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 %}
+            {%- endfor %}
             </ul>
           </details>
-            {%- endif %}
+          {%- endif %}
         </li>
-        {%- endif %}
       {%- endfor %}
       </ul>
     </nav>

data/assets/js/main.js

@@ -1,6 +1,5 @@
 // @ts-check
 
-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';
@@ -8,11 +7,9 @@ import { addMobileNavigation } from './modules/nav-mobile.js';
 import { addIntersectionObserver } from './modules/animation.js';
 import { qsa } from './modules/query.js';
 
-setNavigationTree('details.sub-nav');
-setClickableBlocks();
-
 const resizedEventName = addResizedEvent();
 
+setClickableBlocks();
 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');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fenton-jekyll-boilerplate
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Steve Fenton
@@ -75,7 +75,6 @@ files:
 - assets/js/modules/click-blocks.js
 - assets/js/modules/events.js
 - assets/js/modules/focus.js
-- assets/js/modules/nav-expand.js
 - assets/js/modules/nav-mobile.js
 - assets/js/modules/nav-sticky.js
 - assets/js/modules/query.js

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

@@ -1,28 +0,0 @@
-// @ts-check
-
-import { qs, qsa } from './query.js';
-
-/**
- * Sets the navigation based on the current page
- * 
- * Example: You have a navigation tree with an "About" page with several child items.
- * When the user is on the "About" page, or any child pages, the navigation should
- * be automatically expanded so the user can orient themselves within the site.
- * 
- * @param {string} className 
- */
- function setNavigationTree(className) {
-    const site = document.location.origin;
-    const location = document.location.pathname;
-
-    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');
-        }
-    });
-}
-
-export { setNavigationTree };