Merge pull request #475 from gethinode/develop

Fix timeline content
Merge branch 'main' into develop
2025-10-17 15:03:20 +00:00 · 2023-08-28 15:56:11 +02:00 · 2023-08-28 15:47:06 +02:00 · 2023-08-28 13:45:44 +00:00 · 2023-08-28 15:41:18 +02:00 · 2023-08-28 13:41:06 +00:00
6 changed files with 37 additions and 8891 deletions
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -97,9 +97,6 @@ home = ["HTML", "RSS", "REDIR"]
  [[module.mounts]]
    source = "content"
    target = "content"
-  [[module.mounts]]
-    source = "data"
-    target = "data"
  [[module.mounts]]
    source = "i18n"
    target = "i18n"
--- a/exampleSite/content/en/blog/bootstrap-elements.md
+++ b/exampleSite/content/en/blog/bootstrap-elements.md
@@ -20,7 +20,7 @@ As an example, the following shortcode displays the full text of an abbreviation

 <!-- markdownlint-disable MD037 -->
 {{< example lang="hugo" >}}
-{{</* abbr html */>}}
+{{</* abbr "CI/CD" */>}}
 {{< /example >}}
 <!-- markdownlint-enable MD037 -->

--- a/exampleSite/data/abbr.yml
+++ b/exampleSite/data/abbr.yml
@@ -6,3 +6,6 @@

 - id: svg
  long: "Scalable Vector Graphics"
+
+- id: ci/cd
+  long: "Continous Integration/Continuous Deployment"
--- a/layouts/shortcodes/timeline.html
+++ b/layouts/shortcodes/timeline.html
@@ -12,6 +12,7 @@
 -->

 {{ $error := false }}
+{{- $page := .Page -}}

 {{- $data := .Get "data" -}}
 {{ if not $data -}}
@@ -59,6 +60,7 @@
 <!-- Inline partial to render icon -->
 {{- define "partials/timeline-panel.html" -}}
    {{- $col := default 6 .col -}}
+    {{- $page := .page -}}
    {{- $content := .content -}}
    {{- $color := .color -}}
    {{- $title := .title -}}
@@ -87,7 +89,7 @@
                    {{ $datestr := (partial "utilities/date.html" (dict "date" $date "format" "long")) -}}
                    <p class="mb-0"><small class="text-body-secondary text-uppercase">{{ $datestr -}}</small></p>
                {{ end }}
-                <p class="mt-3 mb-0">{{ $content | .Page.RenderString }}</p>
+                <p class="mt-3 mb-0">{{ $content | $page.RenderString }}</p>
            </div>
        </div>
    </div>    
@@ -98,11 +100,11 @@
    {{ range $index, $item := $entries }}
        <div class="row timeline timeline-{{ $item.color }} timeline-dot g-0 ">
            {{ if eq (mod $index 2) 1 }}
-                {{ partial "partials/timeline-panel.html" (dict "content" $item.content "color" $item.color "title" $item.title "badge" $item.badge "date" $item.date "url" $item.url "direction" "start") }}
+                {{ partial "partials/timeline-panel.html" (dict "page" $page "content" $item.content "color" $item.color "title" $item.title "badge" $item.badge "date" $item.date "url" $item.url "direction" "start") }}
                {{ partial "partials/timeline-icon.html" (dict "icon" $item.icon "direction" "start") }}
            {{ else }}
                {{ partial "partials/timeline-icon.html" (dict "icon" $item.icon "direction" "end") }}
-                {{ partial "partials/timeline-panel.html" (dict "content" $item.content "color" $item.color "title" $item.title "badge" $item.badge "date" $item.date "url" $item.url "direction" "end") }}
+                {{ partial "partials/timeline-panel.html" (dict "page" $page "content" $item.content "color" $item.color "title" $item.title "badge" $item.badge "date" $item.date "url" $item.url "direction" "end") }}
            {{ end }}
        </div>
        <div class="row timeline g-0 p-3"> </div>
@@ -114,7 +116,7 @@
    {{ range $index, $item := $entries }}
        <div class="row timeline-sm timeline-{{ $item.color }} timeline-dot g-0">
            {{ partial "partials/timeline-icon.html" (dict "icon" $item.icon "direction" "end" "col" 3) }}
-            {{ partial "partials/timeline-panel.html" (dict "content" $item.content "color" $item.color "title" $item.title "badge" $item.badge "date" $item.date "url" $item.url "direction" "end" "col" 9) }}
+            {{ partial "partials/timeline-panel.html" (dict "page" $page "content" $item.content "color" $item.color "title" $item.title "badge" $item.badge "date" $item.date "url" $item.url "direction" "end" "col" 9) }}
        </div>
        <div class="row timeline-sm g-0 p-3"> </div>
    {{ end }}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@gethinode/hinode",
-  "version": "0.19.0-alpha2",
+  "version": "0.19.0-alpha3",
  "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
  "keywords": [
    "hugo",
@@ -70,13 +70,13 @@
    "autoprefixer": "^10.4.15",
    "cssnano": "^6.0.1",
    "cssnano-preset-advanced": "^6.0.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
    "eslint-config-standard": "^17.1.0",
    "eslint-plugin-import": "^2.28.1",
    "eslint-plugin-n": "^16.0.2",
    "eslint-plugin-promise": "^6.1.1",
    "hugo-bin": "^0.113.0",
-    "markdownlint-cli2": "^0.9.0",
+    "markdownlint-cli2": "^0.9.2",
    "npm-run-all": "^4.1.5",
    "postcss-cli": "^10.1.0",
    "purgecss-whitelister": "^2.4.0",
Author	SHA1	Message	Date
Mark Dumay	df017d9d5d	Merge pull request #475 from gethinode/develop Fix timeline content	2023-08-28 15:56:11 +02:00
Mark Dumay	9c0ea3e564	Merge branch 'main' into develop	2023-08-28 15:47:06 +02:00
github-actions[bot]	eb5d4b3dec	Merge pull request #477 from gethinode/dependabot/npm_and_yarn/eslint-8.48.0 Bump eslint from 8.47.0 to 8.48.0	2023-08-28 13:45:44 +00:00
Mark Dumay	8de7ad2d82	Merge branch 'main' into develop	2023-08-28 15:41:18 +02:00
dependabot[bot]	96fb918b7a	Bump eslint from 8.47.0 to 8.48.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.47.0 to 8.48.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/v8.47.0...v8.48.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-28 13:41:06 +00:00
github-actions[bot]	d2e81917d3	Merge pull request #476 from gethinode/dependabot/npm_and_yarn/markdownlint-cli2-0.9.2 Bump markdownlint-cli2 from 0.9.0 to 0.9.2	2023-08-28 13:40:10 +00:00
dependabot[bot]	020e11a06c	Bump markdownlint-cli2 from 0.9.0 to 0.9.2 Bumps [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) from 0.9.0 to 0.9.2. - [Changelog](https://github.com/DavidAnson/markdownlint-cli2/blob/main/CHANGELOG.md) - [Commits](https://github.com/DavidAnson/markdownlint-cli2/compare/v0.9.0...v0.9.2) --- updated-dependencies: - dependency-name: markdownlint-cli2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-28 13:34:18 +00:00
Mark Dumay	8470b4f809	Merge branch 'main' into develop	2023-08-28 14:50:11 +02:00
mark	12f29b765d	Bump package release	2023-08-28 14:49:23 +02:00
mark	4bf56b9c99	Fix rendering of timeline content	2023-08-28 14:48:11 +02:00
mark	584a51a5bf	Use quoted abbr example	2023-08-28 14:47:41 +02:00
mark	e36858d1e1	Exclude abbr data from mounts	2023-08-28 14:47:22 +02:00