Merge pull request #1528 from gethinode/develop

feat: enable customization of content blocks rendering
Merge branch 'main' into develop
2025-10-17 15:03:20 +00:00 · 2025-08-06 14:27:38 +02:00 · 2025-08-06 14:18:01 +02:00 · 2025-08-06 14:17:34 +02:00 · 2025-08-06 09:13:55 +02:00 · 2025-08-06 08:58:47 +02:00
9 changed files with 322 additions and 292 deletions
--- a/assets/js/modal.js
+++ b/assets/js/modal.js
@@ -0,0 +1,6 @@
+document.addEventListener('hide.bs.modal', function (event) {
+  // Remove the focus from the active element
+  if (document.activeElement) {
+    document.activeElement.blur()
+  }
+})
--- a/exampleSite/hugo_stats.json
+++ b/exampleSite/hugo_stats.json
@@ -642,11 +642,11 @@
      "docs",
      "documentation",
      "dropdown-nav-0",
-      "dropdown-panel-3db1162c8e923c363f53cdd77b3941dd",
-      "dropdown-panel-3eb793f32a8332bf0f1580c4e0ee1af9",
-      "dropdown-panel-a63cbde071d2b7909cdc915a407fc84a",
-      "dropdown-panel-f3fb705824de1effb0fde452a156be28",
-      "dropdown-panel-ff2a4aaf767d9d92977e27a5929980db",
+      "dropdown-panel-1fc243c4b5ad24b4cffa6cf051aa6720",
+      "dropdown-panel-614a5456d60a677001aadb3af61a05e2",
+      "dropdown-panel-bcd9ad2a497bbdf189c8730eb6b9b56e",
+      "dropdown-panel-d0230f64802bba090b5743302d1e23f1",
+      "dropdown-panel-da2692e92f2f512a892fe75378113ea4",
      "elements-type",
      "entity-relationship-diagram",
      "example",
@@ -664,11 +664,11 @@
      "fab-medium",
      "fab-whatsapp",
      "fab-x-twitter",
-      "faq-fbb18b868ab666e41e781424cfa7856e",
-      "faq-fbb18b868ab666e41e781424cfa7856e-heading-faq-fbb18b868ab666e41e781424cfa7856e",
-      "faq-fbb18b868ab666e41e781424cfa7856e-item-0",
-      "faq-fbb18b868ab666e41e781424cfa7856e-item-1",
-      "faq-fbb18b868ab666e41e781424cfa7856e-item-2",
+      "faq-5ea6070f0b28af63133c8703bfe706cb",
+      "faq-5ea6070f0b28af63133c8703bfe706cb-heading-faq-5ea6070f0b28af63133c8703bfe706cb",
+      "faq-5ea6070f0b28af63133c8703bfe706cb-item-0",
+      "faq-5ea6070f0b28af63133c8703bfe706cb-item-1",
+      "faq-5ea6070f0b28af63133c8703bfe706cb-item-2",
      "fas-1",
      "fas-2",
      "fas-3",
@@ -760,11 +760,11 @@
      "nav-0-btn-1",
      "nav-0-btn-2",
      "nav-nav-0",
-      "nav-panel-3db1162c8e923c363f53cdd77b3941dd",
-      "nav-panel-3eb793f32a8332bf0f1580c4e0ee1af9",
-      "nav-panel-a63cbde071d2b7909cdc915a407fc84a",
-      "nav-panel-f3fb705824de1effb0fde452a156be28",
-      "nav-panel-ff2a4aaf767d9d92977e27a5929980db",
+      "nav-panel-1fc243c4b5ad24b4cffa6cf051aa6720",
+      "nav-panel-614a5456d60a677001aadb3af61a05e2",
+      "nav-panel-bcd9ad2a497bbdf189c8730eb6b9b56e",
+      "nav-panel-d0230f64802bba090b5743302d1e23f1",
+      "nav-panel-da2692e92f2f512a892fe75378113ea4",
      "navbar",
      "navbar-0-collapse",
      "navbar-mode",
@@ -773,36 +773,36 @@
      "navigation",
      "notification",
      "overview",
-      "panel-3db1162c8e923c363f53cdd77b3941dd-0",
-      "panel-3db1162c8e923c363f53cdd77b3941dd-1",
-      "panel-3db1162c8e923c363f53cdd77b3941dd-2",
-      "panel-3db1162c8e923c363f53cdd77b3941dd-btn-0",
-      "panel-3db1162c8e923c363f53cdd77b3941dd-btn-1",
-      "panel-3db1162c8e923c363f53cdd77b3941dd-btn-2",
-      "panel-3eb793f32a8332bf0f1580c4e0ee1af9-0",
-      "panel-3eb793f32a8332bf0f1580c4e0ee1af9-1",
-      "panel-3eb793f32a8332bf0f1580c4e0ee1af9-2",
-      "panel-3eb793f32a8332bf0f1580c4e0ee1af9-btn-0",
-      "panel-3eb793f32a8332bf0f1580c4e0ee1af9-btn-1",
-      "panel-3eb793f32a8332bf0f1580c4e0ee1af9-btn-2",
-      "panel-a63cbde071d2b7909cdc915a407fc84a-0",
-      "panel-a63cbde071d2b7909cdc915a407fc84a-1",
-      "panel-a63cbde071d2b7909cdc915a407fc84a-2",
-      "panel-a63cbde071d2b7909cdc915a407fc84a-btn-0",
-      "panel-a63cbde071d2b7909cdc915a407fc84a-btn-1",
-      "panel-a63cbde071d2b7909cdc915a407fc84a-btn-2",
-      "panel-f3fb705824de1effb0fde452a156be28-0",
-      "panel-f3fb705824de1effb0fde452a156be28-1",
-      "panel-f3fb705824de1effb0fde452a156be28-2",
-      "panel-f3fb705824de1effb0fde452a156be28-btn-0",
-      "panel-f3fb705824de1effb0fde452a156be28-btn-1",
-      "panel-f3fb705824de1effb0fde452a156be28-btn-2",
-      "panel-ff2a4aaf767d9d92977e27a5929980db-0",
-      "panel-ff2a4aaf767d9d92977e27a5929980db-1",
-      "panel-ff2a4aaf767d9d92977e27a5929980db-2",
-      "panel-ff2a4aaf767d9d92977e27a5929980db-btn-0",
-      "panel-ff2a4aaf767d9d92977e27a5929980db-btn-1",
-      "panel-ff2a4aaf767d9d92977e27a5929980db-btn-2",
+      "panel-1fc243c4b5ad24b4cffa6cf051aa6720-0",
+      "panel-1fc243c4b5ad24b4cffa6cf051aa6720-1",
+      "panel-1fc243c4b5ad24b4cffa6cf051aa6720-2",
+      "panel-1fc243c4b5ad24b4cffa6cf051aa6720-btn-0",
+      "panel-1fc243c4b5ad24b4cffa6cf051aa6720-btn-1",
+      "panel-1fc243c4b5ad24b4cffa6cf051aa6720-btn-2",
+      "panel-614a5456d60a677001aadb3af61a05e2-0",
+      "panel-614a5456d60a677001aadb3af61a05e2-1",
+      "panel-614a5456d60a677001aadb3af61a05e2-2",
+      "panel-614a5456d60a677001aadb3af61a05e2-btn-0",
+      "panel-614a5456d60a677001aadb3af61a05e2-btn-1",
+      "panel-614a5456d60a677001aadb3af61a05e2-btn-2",
+      "panel-bcd9ad2a497bbdf189c8730eb6b9b56e-0",
+      "panel-bcd9ad2a497bbdf189c8730eb6b9b56e-1",
+      "panel-bcd9ad2a497bbdf189c8730eb6b9b56e-2",
+      "panel-bcd9ad2a497bbdf189c8730eb6b9b56e-btn-0",
+      "panel-bcd9ad2a497bbdf189c8730eb6b9b56e-btn-1",
+      "panel-bcd9ad2a497bbdf189c8730eb6b9b56e-btn-2",
+      "panel-d0230f64802bba090b5743302d1e23f1-0",
+      "panel-d0230f64802bba090b5743302d1e23f1-1",
+      "panel-d0230f64802bba090b5743302d1e23f1-2",
+      "panel-d0230f64802bba090b5743302d1e23f1-btn-0",
+      "panel-d0230f64802bba090b5743302d1e23f1-btn-1",
+      "panel-d0230f64802bba090b5743302d1e23f1-btn-2",
+      "panel-da2692e92f2f512a892fe75378113ea4-0",
+      "panel-da2692e92f2f512a892fe75378113ea4-1",
+      "panel-da2692e92f2f512a892fe75378113ea4-2",
+      "panel-da2692e92f2f512a892fe75378113ea4-btn-0",
+      "panel-da2692e92f2f512a892fe75378113ea4-btn-1",
+      "panel-da2692e92f2f512a892fe75378113ea4-btn-2",
      "persona",
      "pie-chart",
      "pills",
--- a/hugo_stats.json
+++ b/hugo_stats.json
@@ -166,7 +166,6 @@
      "row-cols-1",
      "row-cols-2",
      "row-cols-sm-3",
-      "script",
      "search",
      "search-input",
      "search-suggestions",
--- a/layouts/_partials/head/seo.html
+++ b/layouts/_partials/head/seo.html
@@ -46,7 +46,7 @@
 {{ if eq .Kind "404" -}}
    <meta name="robots" content="noindex, follow">
 {{ else }}
-  {{ with or .Params.robots .Params.meta.robots -}}
+  {{ with or .Params.robots .Params.meta.robots .Site.Params.meta.robots -}}
    <meta name="robots" content="{{ . }}">
  {{ else -}}
    <meta name="robots" content="index, follow">
--- a/layouts/baseof.html
+++ b/layouts/baseof.html
@@ -23,8 +23,9 @@
 {{- /* Define main breakpoint */ -}}
 {{- $.Scratch.Set "breakpoint" (partialCached "utilities/GetBreakpoint.html" .) }}

-{{- /* Render blocks and establish overlay mode */ -}}
+{{- /* Prepare content blocks and establish overlay mode */ -}}
 {{ $blocks := partial "utilities/RenderContentBlocks.html" (dict "page" . "blocks" .Params.content_blocks) }}
+{{ $.Scratch.Set "blocks" $blocks }}
 {{ $overlayMode := $.Scratch.Get "overlayMode" }}

 {{- /* Define base URL */ -}}
@@ -51,7 +52,6 @@
        -}}

        <div id="container" class="main">
-            {{ $blocks }}
            {{ block "main" . }}{{ end -}}
        </div>

--- a/layouts/list.html
+++ b/layouts/list.html
@@ -1,5 +1,8 @@
 {{ define "main" -}}
    {{- $breakpoint := $.Scratch.Get "breakpoint" -}}
+    {{- $blocks := $.Scratch.Get "blocks" -}}
+
+    {{ $blocks | safeHTML }}

    <div class="container-xxl flex-fill p-4 px-xxl-0">
        {{ .Render "body" }}
--- a/layouts/single.html
+++ b/layouts/single.html
@@ -1,4 +1,5 @@
 {{ define "main" -}}
+    {{- $blocks := $.Scratch.Get "blocks" -}}
    {{- $breakpoint := $.Scratch.Get "breakpoint" -}}
    {{- $sidebar := partial "page/sidebar" . -}}
    {{- $toc := partial "page/panel-toc" . -}}
@@ -15,6 +16,8 @@
        </div>
    {{ end }}

+    {{ $blocks | safeHTML }}
+
    <div class="container-xxl flex-fill p-4 px-xxl-0">
        <div class="row row-cols-1 row-cols-{{ $breakpoint.current }}-2 row-cols-{{ $breakpoint.next }}-3">
            <div class="col col-{{ $breakpoint.next }}-2 d-none d-{{ $breakpoint.next }}-block sidebar-overflow sticky-top pt-5">
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
    "autoprefixer": "^10.4.21",
    "cssnano": "^7.1.0",
    "cssnano-preset-advanced": "^7.0.8",
-    "hugo-bin": "0.145.1",
+    "hugo-bin": "0.145.2",
    "purgecss-whitelister": "^2.4.0"
  },
  "devDependencies": {
@@ -87,7 +87,7 @@
    "commitizen": "^4.3.1",
    "cpy-cli": "^5.0.0",
    "cz-conventional-changelog": "^3.3.0",
-    "eslint": "^9.31.0",
+    "eslint": "^9.32.0",
    "husky": "^9.1.7",
    "markdownlint-cli2": "^0.18.1",
    "neostandard": "^0.12.2",
@@ -98,7 +98,7 @@
    "rimraf": "^6.0.1",
    "semantic-release": "^24.2.7",
    "shx": "^0.4.0",
-    "stylelint": "^16.22.0",
+    "stylelint": "^16.23.0",
    "stylelint-config-standard-scss": "^15.0.1"
  },
  "optionalDependencies": {
Author	SHA1	Message	Date
Mark Dumay	408799c3e2	Merge pull request #1528 from gethinode/develop feat: enable customization of content blocks rendering	2025-08-06 14:27:38 +02:00
Mark Dumay	7b4a46121c	Merge branch 'main' into develop	2025-08-06 14:18:01 +02:00
Mark Dumay	7af4c37c88	feat: enable customization of content blocks rendering	2025-08-06 14:17:34 +02:00
Mark Dumay	9cc7174030	Merge pull request #1527 from gethinode/develop Develop	2025-08-06 09:13:55 +02:00
Mark Dumay	f8de99173f	feat: enable global site robots config	2025-08-06 08:58:47 +02:00
Mark Dumay	68f7b466fb	fix: improve aria handling of modal messages	2025-08-06 08:58:27 +02:00
github-actions[bot]	3a9a57cc5d	Merge pull request #1526 from gethinode/dependabot/npm_and_yarn/stylelint-16.23.0 build(deps-dev): bump stylelint from 16.22.0 to 16.23.0	2025-07-29 14:07:10 +00:00
dependabot[bot]	f3c264ead2	build(deps-dev): bump stylelint from 16.22.0 to 16.23.0 Bumps [stylelint](https://github.com/stylelint/stylelint) from 16.22.0 to 16.23.0. - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.22.0...16.23.0) --- updated-dependencies: - dependency-name: stylelint dependency-version: 16.23.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-29 13:59:51 +00:00
github-actions[bot]	1dd2971893	Merge pull request #1525 from gethinode/dependabot/npm_and_yarn/eslint-9.32.0 build(deps-dev): bump eslint from 9.31.0 to 9.32.0	2025-07-28 18:04:51 +00:00
dependabot[bot]	7ac6b89ece	build(deps-dev): bump eslint from 9.31.0 to 9.32.0 Bumps [eslint](https://github.com/eslint/eslint) from 9.31.0 to 9.32.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.31.0...v9.32.0) --- updated-dependencies: - dependency-name: eslint dependency-version: 9.32.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-28 17:59:30 +00:00
github-actions[bot]	458e8fb605	Merge pull request #1524 from gethinode/dependabot/npm_and_yarn/hugo-bin-0.145.2 build(deps): bump hugo-bin from 0.145.1 to 0.145.2	2025-07-28 17:54:34 +00:00
dependabot[bot]	b268c1bad0	build(deps): bump hugo-bin from 0.145.1 to 0.145.2 Bumps [hugo-bin](https://github.com/fenneclab/hugo-bin) from 0.145.1 to 0.145.2. - [Release notes](https://github.com/fenneclab/hugo-bin/releases) - [Commits](https://github.com/fenneclab/hugo-bin/compare/v0.145.1...v0.145.2) --- updated-dependencies: - dependency-name: hugo-bin dependency-version: 0.145.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-07-28 17:49:07 +00:00