jekyll-theme-zer0 1.24.0 → 1.26.0

data/_includes/components/theme-info.html

@@ -1,26 +1,30 @@
+{% comment %} Feature: ZER0-021 {% endcomment %}
 <!--
   ===================================================================
   THEME INFO - Compact Theme and Build Information
   ===================================================================
-  
+
   File: theme-info.html
   Path: _includes/components/theme-info.html
   Purpose: Display compact theme version and system information
-  
+
   Dependencies:
   - site.remote_theme or site.theme configuration
   - Jekyll's site.github metadata
+
+  Note: environment (Prod/Dev) is shown by env-switcher.html in the
+  same Site tab — not duplicated here.
   ===================================================================
 -->
 
 <div class="theme-info-compact">
   <div class="row g-2">
-    
+
     <!-- Theme -->
     <div class="col-12">
       <div class="d-flex align-items-center justify-content-between p-2 bg-body-tertiary rounded">
         <div class="d-flex align-items-center">
-          <i class="bi bi-palette text-primary me-2"></i>
+          <i class="bi bi-palette text-primary me-2" aria-hidden="true"></i>
           <span class="fw-medium small">Theme</span>
         </div>
         <div>
@@ -28,7 +32,7 @@
             {% assign theme_parts = site.remote_theme | split: "/" %}
             <a href="https://github.com/{{ site.remote_theme }}" target="_blank" rel="noopener" class="text-decoration-none">
               <code class="text-info">{{ theme_parts[1] }}</code>
-              <i class="bi bi-box-arrow-up-right ms-1 small"></i>
+              <i class="bi bi-box-arrow-up-right ms-1 small" aria-hidden="true"></i>
             </a>
           {% elsif site.theme %}
             <code>{{ site.theme }}</code>
@@ -39,8 +43,8 @@
         </div>
       </div>
     </div>
-    
-    <!-- Jekyll & Environment -->
+
+    <!-- Jekyll & Last Build -->
     <div class="col-6">
       <div class="p-2 bg-body-tertiary rounded text-center">
         <small class="text-body-secondary d-block">Jekyll</small>
@@ -49,56 +53,43 @@
     </div>
     <div class="col-6">
       <div class="p-2 bg-body-tertiary rounded text-center">
-        <small class="text-body-secondary d-block">Environment</small>
-        <span class="badge {% if jekyll.environment == 'production' %}bg-success{% else %}bg-warning text-dark{% endif %}">
-          {{ jekyll.environment | capitalize }}
-        </span>
-      </div>
-    </div>
-    
-    <!-- Build Time -->
-    <div class="col-12">
-      <div class="d-flex align-items-center justify-content-between p-2 bg-body-tertiary rounded">
-        <div class="d-flex align-items-center">
-          <i class="bi bi-clock-history text-secondary me-2"></i>
-          <span class="small text-body-secondary">Last Build</span>
-        </div>
-        <code class="small">{{ site.time | date: "%Y-%m-%d %H:%M %Z" }}</code>
+        <small class="text-body-secondary d-block">Last Build</small>
+        <code class="small">{{ site.time | date: "%b %d, %H:%M" }}</code>
       </div>
     </div>
-    
+
     {% if site.repository %}
     <!-- Repository -->
     <div class="col-12">
       <div class="d-flex align-items-center justify-content-between p-2 bg-body-tertiary rounded">
         <div class="d-flex align-items-center">
-          <i class="bi bi-git text-danger me-2"></i>
+          <i class="bi bi-git text-danger me-2" aria-hidden="true"></i>
           <span class="small text-body-secondary">Repository</span>
         </div>
         <a href="https://github.com/{{ site.repository }}" target="_blank" rel="noopener" class="text-decoration-none small">
           {{ site.repository }}
-          <i class="bi bi-box-arrow-up-right ms-1"></i>
+          <i class="bi bi-box-arrow-up-right ms-1" aria-hidden="true"></i>
         </a>
       </div>
     </div>
     {% endif %}
-    
+
     <!-- Quick Links -->
     <div class="col-12 mt-2">
       <div class="d-flex flex-wrap gap-2 justify-content-center">
         {% if site.remote_theme %}
         <a href="https://github.com/{{ site.remote_theme }}/blob/main/CHANGELOG.md" target="_blank" rel="noopener" class="btn btn-sm btn-outline-secondary">
-          <i class="bi bi-journal-text me-1"></i>Changelog
+          <i class="bi bi-journal-text me-1" aria-hidden="true"></i>Changelog
         </a>
         <a href="https://github.com/{{ site.remote_theme }}#readme" target="_blank" rel="noopener" class="btn btn-sm btn-outline-secondary">
-          <i class="bi bi-book me-1"></i>Docs
+          <i class="bi bi-book me-1" aria-hidden="true"></i>Docs
         </a>
         {% endif %}
         <a href="https://jekyllrb.com/docs/" target="_blank" rel="noopener" class="btn btn-sm btn-outline-secondary">
-          <i class="bi bi-gem me-1"></i>Jekyll
+          <i class="bi bi-gem me-1" aria-hidden="true"></i>Jekyll
         </a>
       </div>
     </div>
-    
+
   </div>
 </div>

data/_includes/components/theme-preview-gallery.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-065 {% endcomment %}
 <!--
   Theme Preview — component gallery for live skin / mode testing.
   Pair with theme-controls-bar.html and theme-customizer.js.

data/_includes/content/backlinks.html

@@ -1,3 +1,4 @@
+{% comment %} Features: ZER0-044, ZER0-059 {% endcomment %}
 {%- comment -%}
   ===================================================================
   BACKLINKS — Pages that wiki-link or markdown-link to the current page

data/_includes/content/giscus.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-035 {% endcomment %}
 <!--
   giscus.html — GitHub Discussions comment system
   ===============================================

data/_includes/content/intro.html

@@ -1,13 +1,14 @@
 <!--
   file: _includes/content/intro.html
-  description: Enhanced intro section with share, edit, and Copilot agent session buttons
+  description: Enhanced intro section with share, edit, and improve/report buttons
   path: _includes/content/intro.html
   features:
     - Responsive share dropdown with multiple social platforms
     - Edit on GitHub quick link
-    - Copilot Agent dropdown: select a prompt template to pre-fill a GitHub issue
-    - Issue body includes prompt template + page context + environment details
-    - Prompts sourced from _data/prompts.yml
+    - "Improve" button — opens the page-feedback widget (capture type + description
+      + live page context + console logs → GitHub issue). Progressive enhancement:
+      it is a real link to the issue form, upgraded by assets/js/page-feedback.js.
+      See _includes/components/page-feedback.html.
     - Responsive flex layout: full-width content block, frosted metadata footer with reading time and action buttons
     - Balanced padding and typography hierarchy via bd-intro-* classes
     - Metadata row: author, dates, category, difficulty, tags, view source
@@ -271,64 +272,21 @@
       </ul>
     </div>
 
-    <!-- Copilot Agent Prompt Dropdown -->
-    <div class="dropdown">
-      <button class="btn btn-sm btn-success dropdown-toggle" type="button" id="copilotAgentDropdown" data-bs-toggle="dropdown" aria-expanded="false" title="Open a GitHub issue with a Copilot prompt for this page">
-        <i class="bi bi-robot" aria-hidden="true"></i>
-        <span class="d-none d-sm-inline ms-1">Copilot Agent</span>
-      </button>
-      <ul class="dropdown-menu dropdown-menu-end copilot-agent-menu" aria-labelledby="copilotAgentDropdown">
-        {% assign current_group = "" %}
-        {% for prompt in site.data.prompts %}
-        {% if prompt.group and prompt.group != current_group %}
-        {% unless forloop.first %}<li><hr class="dropdown-divider"></li>{% endunless %}
-        <li><h6 class="dropdown-header">{{ prompt.group }}</h6></li>
-        {% assign current_group = prompt.group %}
-        {% endif %}
-        {% capture issue_title %}[{{ prompt.label }}] {{ page.title }}{% endcapture %}
-        {% capture issue_body %}{{ prompt.body }}
----
-
-## 📄 Page Context
-
-| Field | Value |
-|---|---|
-| **Title** | {{ page.title }} |
-| **URL** | {{ site.url }}{{ page.url }} |
-| **File** | `{{ file_path }}` |
-| **Branch** | `{{ repo_branch }}` |
-| **Layout** | `{{ page.layout }}` |
-| **Collection** | `{{ page.collection }}` |
-| **Author** | {{ page.author | default: site.author.name }} |
-| **Date** | {{ page.date }} |
-| **Last Modified** | {{ page.lastmod }} |
-| **Tags** | {{ page.tags | join: ", " }} |
-| **Categories** | {{ page.categories | join: ", " }} |
-
-## 🔧 Environment
-
-| Field | Value |
-|---|---|
-| **Repository** | `{{ site.repository }}` |
-| **Site URL** | {{ site.url }} |
-| **Jekyll Env** | `{{ jekyll.environment }}` |
-| **Theme** | `{{ site.theme | default: site.remote_theme }}` |
-| **Base URL** | `{{ site.baseurl }}` |
-{% endcapture %}
-        <li>
-          <a class="dropdown-item" href="https://github.com/{{ site.repository }}/issues/new?assignees=copilot&labels=ai-agent&title={{ issue_title | url_encode }}&body={{ issue_body | url_encode }}" target="_blank" rel="noopener noreferrer">
-            <span class="copilot-agent-item">
-              <i class="bi {{ prompt.icon }} copilot-agent-item__icon" aria-hidden="true"></i>
-              <span class="copilot-agent-item__text">
-                <span class="copilot-agent-item__label">{{ prompt.label }}</span>
-                {% if prompt.description %}<small class="copilot-agent-item__desc">{{ prompt.description }}</small>{% endif %}
-              </span>
-            </span>
-          </a>
-        </li>
-        {% endfor %}
-      </ul>
-    </div>
+    <!-- Improve / Report — opens the page-feedback widget (assets/js/page-feedback.js).
+         Progressive enhancement: this is a real link to the issue form, so it
+         works without JavaScript; page-feedback.js intercepts [data-pf-open]
+         clicks and opens the richer capture modal (context + logs + AI) instead. -->
+    {% if site.page_feedback.enabled %}
+    <a class="btn btn-sm btn-success bd-intro-action-link"
+       href="https://github.com/{{ site.repository }}/issues/new?template=page_improvement.yml&labels=page-feedback"
+       data-pf-open
+       target="_blank"
+       rel="noopener noreferrer"
+       title="Report a problem or suggest an improvement for this page">
+      <i class="bi bi-megaphone" aria-hidden="true"></i>
+      <span class="d-none d-sm-inline ms-1">Improve</span>
+    </a>
+    {% endif %}
 
     <!-- Edit on GitHub Button -->
     <a href="https://github.com/{{ site.repository }}/blob/{{ repo_branch }}/{{ file_path }}"

data/_includes/content/jsonld-faq.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-054 {% endcomment %}
 <!--
   ===================================================================
   JSON-LD FAQ SCHEMA - FAQPage Structured Data

data/_includes/content/seo.html

@@ -1,3 +1,4 @@
+{% comment %} Features: ZER0-041, ZER0-054 {% endcomment %}
 <!--
   ===================================================================
   SEO SUPPLEMENT - Additional meta tags not covered by jekyll-seo-tag

data/_includes/content/sitemap.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-042 {% endcomment %}
 <!--
   ===================================================================
   SITEMAP COMPONENT - Comprehensive Site Navigation Index

data/_includes/content/toc.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-037 {% endcomment %}
 {% capture tocWorkspace %}
     {% comment %}
         Copyright (c) 2017 Vladimir "allejo" Jimenez

data/_includes/core/color-mode-init.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-031 {% endcomment %}
 {%- comment -%}
   Component:   color-mode-init
   Path:        _includes/core/color-mode-init.html

data/_includes/core/console-capture.html

@@ -0,0 +1,89 @@
+{%- comment -%}
+  ===================================================================
+  CONSOLE CAPTURE — early, tiny console/error ring buffer
+  ===================================================================
+
+  File:    console-capture.html
+  Path:    _includes/core/console-capture.html
+  Purpose: Capture a capped, in-memory buffer of console output and
+           uncaught errors, installed HIGH in <head> — before the
+           theme's deferred scripts run — so the page-feedback widget
+           (assets/js/page-feedback.js) can attach the logs and JS
+           errors that led up to a report.
+
+  Renders: only when page_feedback.enabled AND page_feedback.capture_logs.
+
+  Privacy: in-memory only, never persisted, never sent anywhere until the
+           user opens the feedback modal, reviews the captured logs, and
+           chooses to submit. Any single entry is truncated; the buffer is
+           a fixed-size ring (page_feedback.log_limit).
+
+  Depends on: nothing — pure inline ES5, GitHub Pages-safe (no CDN).
+  ===================================================================
+{%- endcomment -%}
+{%- if site.page_feedback.enabled and site.page_feedback.capture_logs -%}
+<script>
+/* page-feedback: early console/error capture — see _includes/core/console-capture.html */
+(function () {
+  "use strict";
+  if (window.__zer0Feedback && window.__zer0Feedback.installed) { return; }
+
+  var LIMIT = {{ site.page_feedback.log_limit | default: 40 | jsonify }};
+  var MAX_ENTRY = 600;      // truncate any single entry so the buffer stays small
+  var start = (window.performance && performance.now) ? null : Date.now();
+
+  var buffer = [];
+  function now() { return start === null ? Math.round(performance.now()) : (Date.now() - start); }
+
+  function stringify(value) {
+    if (typeof value === "string") { return value; }
+    if (value instanceof Error) {
+      return (value.name || "Error") + ": " + (value.message || "") + (value.stack ? "\n" + value.stack : "");
+    }
+    try { return JSON.stringify(value); } catch (e) { return String(value); }
+  }
+
+  function push(level, args) {
+    try {
+      var parts = [];
+      for (var i = 0; i < args.length; i++) { parts.push(stringify(args[i])); }
+      var text = parts.join(" ");
+      if (text.length > MAX_ENTRY) { text = text.slice(0, MAX_ENTRY) + "…"; }
+      buffer.push({ t: now(), level: level, text: text });
+      while (buffer.length > LIMIT) { buffer.shift(); }
+    } catch (e) { /* logging must never break the page */ }
+  }
+
+  // Wrap console methods, preserving passthrough to the real console.
+  if (window.console) {
+    ["log", "info", "warn", "error", "debug"].forEach(function (level) {
+      var original = console[level] ? console[level].bind(console) : null;
+      console[level] = function () {
+        push(level, arguments);
+        if (original) { original.apply(null, arguments); }
+      };
+    });
+  }
+
+  // Uncaught errors and unhandled promise rejections.
+  window.addEventListener("error", function (e) {
+    if (!e) { return; }
+    var where = e.filename ? " (" + e.filename + ":" + (e.lineno || 0) + ":" + (e.colno || 0) + ")" : "";
+    push("error", [(e.message || "Script error") + where]);
+  });
+  window.addEventListener("unhandledrejection", function (e) {
+    var reason = e && e.reason;
+    var msg = reason && reason.message ? reason.message : stringify(reason);
+    push("error", ["Unhandled promise rejection: " + msg]);
+  });
+
+  window.__zer0Feedback = {
+    installed: true,
+    logs: buffer,
+    /** Snapshot the buffer (newest last) for the widget to read. */
+    snapshot: function () { return buffer.slice(); },
+    clear: function () { buffer.length = 0; }
+  };
+})();
+</script>
+{%- endif -%}

data/_includes/core/footer.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-046 {% endcomment %}
 <!--
   ===================================================================
   FOOTER - Comprehensive Site Footer with Branding & Navigation

data/_includes/core/head.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-001 {% endcomment %}
 <!--
   ===================================================================
   HEAD - HTML Document Head Section
@@ -33,6 +34,10 @@
 <!-- Only load in production builds (JEKYLL_ENV=production); the include also guards against dev hostnames -->
 {% if jekyll.environment == "production" %}{% include analytics/google-tag-manager-head.html %}{% endif %}
 
+<!-- Page-feedback: early console/error capture — must run before the theme
+     scripts below so a report can include the logs that led up to it. -->
+{% include core/console-capture.html %}
+
 <!-- ================================ -->
 <!-- JAVASCRIPT LIBRARIES            -->
 <!-- ================================ -->

data/_includes/core/header.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-011 {% endcomment %}
 <!--
   ===================================================================
   HEADER - Main Navigation and Site Header
@@ -64,21 +65,10 @@
             <!-- MOBILE MENU CONTROLS      -->
             <!-- ========================== -->
             
-            <!-- Left Sidebar Toggle - Mobile view only (omit when page.sidebar: false — matches default layout aside) -->
-            {% assign sidebar_nav = nil %}
-            {% if page.sidebar != false %}
-              {% if page.sidebar and page.sidebar.nav %}
-                {% assign sidebar_nav = page.sidebar.nav %}
-              {% endif %}
-            {% endif %}
-            {% assign sidebar_has_content = false %}
-            {% if sidebar_nav %}
-                {% if sidebar_nav == "auto" or sidebar_nav == "categories" %}
-                    {% assign sidebar_has_content = true %}
-                {% elsif site.data.navigation[sidebar_nav] %}
-                    {% assign sidebar_has_content = true %}
-                {% endif %}
-            {% endif %}
+            <!-- Left Sidebar Toggle - Mobile view only. Uses the shared
+                 resolver (navigation/sidebar-config.html) so this gate can
+                 never drift from the default layout's aside. -->
+            {% include navigation/sidebar-config.html %}
 
             {% if sidebar_has_content %}
               {%- comment -%}

data/_includes/navigation/admin-nav.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-050 {% endcomment %}
 <!--
   ===================================================================
   ADMIN NAV — Data-driven sidebar navigation for admin/settings pages

data/_includes/navigation/breadcrumbs.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-040 {% endcomment %}
 {%- comment -%}
   ===================================================================
   BREADCRUMBS — Accessible breadcrumb trail with Schema.org markup

data/_includes/navigation/local-graph-fab.html

@@ -2,15 +2,9 @@
   Local graph FAB trigger — rendered from footer.html so the fixed button
   stays above the footer band. Pair with navigation/local-graph.html (panel).
 {%- endcomment -%}
-{%- assign _effective_sidebar = page.sidebar -%}
-{%- if _effective_sidebar == nil -%}
-  {%- if page.post_type == "featured" or page.post_type == "breaking" -%}
-    {%- assign _effective_sidebar = false -%}
-  {%- else -%}
-    {%- assign _effective_sidebar = true -%}
-  {%- endif -%}
-{%- endif -%}
-{%- if page.local_graph != false and _effective_sidebar != false -%}
+{%- comment -%} Shared visibility resolver — sets sidebar_enabled {%- endcomment -%}
+{%- include navigation/sidebar-config.html -%}
+{%- if page.local_graph != false and sidebar_enabled -%}
 <div id="obsidianLocalGraphFab" class="obsidian-local-graph-fab d-print-none" data-obsidian-local-graph-toggle hidden>
   <button class="btn btn-primary rounded-circle shadow-lg p-0 obsidian-local-graph-toggle"
           type="button"

data/_includes/navigation/local-graph.html

@@ -1,3 +1,4 @@
+{% comment %} Feature: ZER0-045 {% endcomment %}
 {%- comment -%}
   ===================================================================
   LOCAL GRAPH SIDEBAR — collapsible page-scoped graph
@@ -24,15 +25,9 @@
   Configurable depth: `local_graph_depth: 2` in page front matter (default 1).
   ===================================================================
 {%- endcomment -%}
-{%- assign _effective_sidebar = page.sidebar -%}
-{%- if _effective_sidebar == nil -%}
-  {%- if page.post_type == "featured" or page.post_type == "breaking" -%}
-    {%- assign _effective_sidebar = false -%}
-  {%- else -%}
-    {%- assign _effective_sidebar = true -%}
-  {%- endif -%}
-{%- endif -%}
-{%- if page.local_graph != false and _effective_sidebar != false -%}
+{%- comment -%} Shared visibility resolver — sets sidebar_enabled {%- endcomment -%}
+{%- include navigation/sidebar-config.html -%}
+{%- if page.local_graph != false and sidebar_enabled -%}
 {%- assign lg_depth = page.local_graph_depth | default: 1 -%}
 <aside class="offcanvas offcanvas-start obsidian-local-graph-panel"
        tabindex="-1"

data/_includes/navigation/navbar.html

@@ -1,3 +1,4 @@
+{% comment %} Features: ZER0-049, ZER0-055 {% endcomment %}
 <!-- 
     file: navbar.html
     path: /includes/navbar.html

data/_includes/navigation/sidebar-categories.html

@@ -1,32 +1,74 @@
-<!-- sidebar-categories.html -->
-{%- assign categories = include.categories | default: site.categories -%}
+{% comment %} Feature: ZER0-008 {% endcomment %}
+{%- comment -%}
+  Component:   sidebar-categories
+  Path:        _includes/navigation/sidebar-categories.html
+  Purpose:     "categories" / "tags" sidebar modes — collapsible taxonomy
+               groups with the posts filed under each term.
+  Params:      taxonomy (string, optional) — "categories" (default) | "tags"
+               categories (map, optional) — explicit term→posts map to render
+                 (back-compat; overrides the taxonomy lookup)
+               title (string, optional) — heading override
+               icon (string, optional) — Bootstrap Icons class override
+  Front matter (page.sidebar hash, all optional):
+               taxonomy — "categories" | "tags" (same as the param)
+               limit    — max posts listed per term (default: all)
+  Depends on:  site.categories / site.tags (posts only — Jekyll does not
+               index collection docs here), Bootstrap 5 collapse,
+               Bootstrap Icons, _sass/core/_sidebar-categories.scss
+  Notes:       Groups containing the current page start expanded. Each term
+               shows a post-count badge.
+{%- endcomment -%}
+{%- assign _type = include.taxonomy | default: page.sidebar.taxonomy | default: "categories" -%}
+{%- if _type == "tags" -%}
+  {%- assign _terms = site.tags -%}
+  {%- assign _heading = include.title | default: "Tags" -%}
+  {%- assign _heading_icon = include.icon | default: "bi-tags" -%}
+  {%- assign _id_prefix = "tag-" -%}
+{%- else -%}
+  {%- assign _terms = site.categories -%}
+  {%- assign _heading = include.title | default: "Categories" -%}
+  {%- assign _heading_icon = include.icon | default: "bi-folder2-open" -%}
+  {%- assign _id_prefix = "cat-" -%}
+{%- endif -%}
+{%- assign _terms = include.categories | default: _terms -%}
+{%- assign _terms = _terms | sort -%}
+{%- assign _limit = page.sidebar.limit -%}
 <div class="sidebar-categories nav-tree nav-tree--categories w-100">
   <h2 class="sidebar-categories-heading h6 text-uppercase text-body-secondary fw-semibold mb-3 d-flex align-items-center gap-2">
-    <i class="bi bi-folder2-open" aria-hidden="true"></i>
-    <span>Categories</span>
+    <i class="bi {{ _heading_icon }}" aria-hidden="true"></i>
+    <span>{{ _heading }}</span>
   </h2>
 
   <ul class="list-unstyled nav-tree-root mb-0">
-    {%- for category in categories -%}
-      {%- assign category_id = category[0] | slugify | prepend: "cat-" -%}
+    {%- for term in _terms -%}
+      {%- assign term_id = term[0] | slugify | prepend: _id_prefix -%}
+      {%- assign term_posts = term[1] -%}
+      {%- assign _active_here = term_posts | where: "url", page.url | size -%}
+      {%- if _active_here > 0 -%}
+        {%- assign _expanded = true -%}
+      {%- else -%}
+        {%- assign _expanded = false -%}
+      {%- endif -%}
       <li class="nav-tree-item sidebar-categories-group" data-depth="0">
-        <button class="btn btn-link nav-tree-toggle sidebar-categories-toggle w-100 d-flex align-items-center text-start collapsed"
+        <button class="btn btn-link nav-tree-toggle sidebar-categories-toggle w-100 d-flex align-items-center text-start{% unless _expanded %} collapsed{% endunless %}"
                 type="button"
                 data-bs-toggle="collapse"
-                data-bs-target="#{{ category_id }}-list"
-                aria-expanded="false"
-                aria-controls="{{ category_id }}-list">
+                data-bs-target="#{{ term_id }}-list"
+                aria-expanded="{{ _expanded }}"
+                aria-controls="{{ term_id }}-list">
           <i class="bi bi-folder sidebar-categories-toggle__icon" aria-hidden="true"></i>
-          <span class="sidebar-categories-toggle__label flex-grow-1">{{ category[0] }}</span>
+          <span class="sidebar-categories-toggle__label flex-grow-1">{{ term[0] }}</span>
+          <span class="badge text-bg-secondary bg-opacity-25 me-1">{{ term[1] | size }}</span>
           <i class="bi bi-chevron-down nav-tree-chevron sidebar-categories-toggle__chevron" aria-hidden="true"></i>
         </button>
 
-        <div class="collapse" id="{{ category_id }}-list">
+        <div class="collapse{% if _expanded %} show{% endif %}" id="{{ term_id }}-list">
           <ul class="list-unstyled nav-tree-children sidebar-categories-posts mb-0">
-            {%- for post in category[1] -%}
+            {%- for post in term_posts -%}
+              {%- if _limit and forloop.index0 >= _limit -%}{%- break -%}{%- endif -%}
               <li class="nav-tree-item" data-depth="1">
                 <a href="{{ post.url | relative_url }}"
-                   class="nav-tree-link sidebar-categories-link d-flex align-items-start rounded text-decoration-none{% if page.url == post.url %} active{% endif %}">
+                   class="nav-tree-link sidebar-categories-link d-flex align-items-start rounded text-decoration-none{% if page.url == post.url %} active{% endif %}"{% if page.url == post.url %} aria-current="page"{% endif %}>
                   <i class="bi bi-file-earmark-text sidebar-categories-link__icon" aria-hidden="true"></i>
                   <span class="sidebar-categories-link__text">{{ post.title }}</span>
                 </a>