Date: Mon, 30 Mar 2026 08:18:47 +0000 From: Fernando Apeste=?utf-8?Q?gu=C3=ADa?= <fernape@FreeBSD.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org Subject: git: 2f8978c9b6 - main - Revert "[website]: Remove deprecated elements" Message-ID: <69ca31e7.1e26d.1b9b8c0d@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/doc/commit/?id=2f8978c9b607a6b4d42c9f01adc2ab99401084bf commit 2f8978c9b607a6b4d42c9f01adc2ab99401084bf Author: Fernando ApesteguĂa <fernape@FreeBSD.org> AuthorDate: 2026-03-30 08:18:29 +0000 Commit: Fernando ApesteguĂa <fernape@FreeBSD.org> CommitDate: 2026-03-30 08:18:29 +0000 Revert "[website]: Remove deprecated elements" This reverts commit e4e43c2e67951051cacece80a1a19b7bdd878ecd. --- website/themes/beastie/layouts/404.html | 2 +- .../themes/beastie/layouts/_partials/advisories.html | 2 +- .../layouts/_partials/commercial-consulting.html | 4 ++-- .../layouts/_partials/commercial-hardware.html | 4 ++-- .../beastie/layouts/_partials/commercial-isp.html | 4 ++-- .../beastie/layouts/_partials/commercial-misc.html | 4 ++-- .../layouts/_partials/commercial-software.html | 4 ++-- .../beastie/layouts/_partials/errata-notices.html | 2 +- website/themes/beastie/layouts/_partials/events.html | 4 ++-- website/themes/beastie/layouts/_partials/news.html | 4 ++-- website/themes/beastie/layouts/_partials/press.html | 4 ++-- .../_shortcodes/get-event-last-year-info.html | 2 +- .../layouts/_shortcodes/get-usergroups-info.html | 2 +- website/themes/beastie/layouts/commercial/list.html | 2 +- .../themes/beastie/layouts/commercial/single.html | 2 +- website/themes/beastie/layouts/events/list.html | 6 +++--- website/themes/beastie/layouts/events/list.ics | 2 +- website/themes/beastie/layouts/events/rss.xml | 2 +- website/themes/beastie/layouts/events/single.html | 6 +++--- website/themes/beastie/layouts/index.html | 20 ++++++++++---------- website/themes/beastie/layouts/list.html | 2 +- website/themes/beastie/layouts/list.ics | 2 +- website/themes/beastie/layouts/news/list.html | 6 +++--- website/themes/beastie/layouts/news/rss.xml | 2 +- website/themes/beastie/layouts/news/single.html | 6 +++--- website/themes/beastie/layouts/press/list.html | 6 +++--- website/themes/beastie/layouts/press/rss.xml | 2 +- website/themes/beastie/layouts/press/single.html | 6 +++--- website/themes/beastie/layouts/security/list.html | 6 +++--- website/themes/beastie/layouts/security/rss.xml | 4 ++-- website/themes/beastie/layouts/security/single.html | 6 +++--- website/themes/beastie/layouts/single.html | 2 +- 32 files changed, 66 insertions(+), 66 deletions(-) diff --git a/website/themes/beastie/layouts/404.html b/website/themes/beastie/layouts/404.html index 90ae0228e1..cc3361e7c4 100755 --- a/website/themes/beastie/layouts/404.html +++ b/website/themes/beastie/layouts/404.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" "about" "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" "about" "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap"> diff --git a/website/themes/beastie/layouts/_partials/advisories.html b/website/themes/beastie/layouts/_partials/advisories.html index 33238ba8c6..b9eab4285b 100644 --- a/website/themes/beastie/layouts/_partials/advisories.html +++ b/website/themes/beastie/layouts/_partials/advisories.html @@ -1,5 +1,5 @@ {{ $advisoriesCounter := 0 }} -{{ with hugo.Data.security.advisories }} +{{ with .Site.Data.security.advisories }} {{ range (sort .advisories "date" "desc") }} {{ if lt $advisoriesCounter 4 }} <p> diff --git a/website/themes/beastie/layouts/_partials/commercial-consulting.html b/website/themes/beastie/layouts/_partials/commercial-consulting.html index 313fdbc848..5d959a5ef2 100644 --- a/website/themes/beastie/layouts/_partials/commercial-consulting.html +++ b/website/themes/beastie/layouts/_partials/commercial-consulting.html @@ -2,10 +2,10 @@ {{ $consultingVendorsData := "" }} {{ if (fileExists $consultingVendorsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $consultingVendorsData = $data.vendors }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $consultingVendorsData = $dataDefaultLanguage.vendors }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/commercial-hardware.html b/website/themes/beastie/layouts/_partials/commercial-hardware.html index 4387def52a..3026998b59 100644 --- a/website/themes/beastie/layouts/_partials/commercial-hardware.html +++ b/website/themes/beastie/layouts/_partials/commercial-hardware.html @@ -2,10 +2,10 @@ {{ $hardwareVendorsData := "" }} {{ if (fileExists $hardwareVendorsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $hardwareVendorsData = $data.vendors }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $hardwareVendorsData = $dataDefaultLanguage.vendors }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/commercial-isp.html b/website/themes/beastie/layouts/_partials/commercial-isp.html index e6e0a5dcc7..8aaaf074af 100644 --- a/website/themes/beastie/layouts/_partials/commercial-isp.html +++ b/website/themes/beastie/layouts/_partials/commercial-isp.html @@ -2,10 +2,10 @@ {{ $ispVendorsData := "" }} {{ if (fileExists $ispVendorsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $ispVendorsData = $data.vendors }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $ispVendorsData = $dataDefaultLanguage.vendors }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/commercial-misc.html b/website/themes/beastie/layouts/_partials/commercial-misc.html index 1332d463af..32423ad919 100644 --- a/website/themes/beastie/layouts/_partials/commercial-misc.html +++ b/website/themes/beastie/layouts/_partials/commercial-misc.html @@ -2,10 +2,10 @@ {{ $miscVendorsData := "" }} {{ if (fileExists $miscVendorsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $miscVendorsData = $data.vendors }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $miscVendorsData = $dataDefaultLanguage.vendors }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/commercial-software.html b/website/themes/beastie/layouts/_partials/commercial-software.html index 490e3d9762..c596ba87d8 100644 --- a/website/themes/beastie/layouts/_partials/commercial-software.html +++ b/website/themes/beastie/layouts/_partials/commercial-software.html @@ -2,10 +2,10 @@ {{ $softwareVendorsData := "" }} {{ if (fileExists $softwareVendorsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $softwareVendorsData = $data.vendors }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $softwareVendorsData = $dataDefaultLanguage.vendors }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/errata-notices.html b/website/themes/beastie/layouts/_partials/errata-notices.html index 73cb6b78e4..a043fbc9ce 100644 --- a/website/themes/beastie/layouts/_partials/errata-notices.html +++ b/website/themes/beastie/layouts/_partials/errata-notices.html @@ -1,5 +1,5 @@ {{ $errataCounter := 0 }} -{{ with hugo.Data.security.errata }} +{{ with .Site.Data.security.errata }} {{ range (sort .notices "date" "desc") }} {{ if lt $errataCounter 2 }} <p> diff --git a/website/themes/beastie/layouts/_partials/events.html b/website/themes/beastie/layouts/_partials/events.html index 291a0407f6..3e7d90bdf0 100644 --- a/website/themes/beastie/layouts/_partials/events.html +++ b/website/themes/beastie/layouts/_partials/events.html @@ -2,10 +2,10 @@ {{ $eventsData := "" }} {{ if (fileExists $eventsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $eventsData = $data }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $eventsData = $dataDefaultLanguage }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/news.html b/website/themes/beastie/layouts/_partials/news.html index 198ff040f9..ce1052fe45 100644 --- a/website/themes/beastie/layouts/_partials/news.html +++ b/website/themes/beastie/layouts/_partials/news.html @@ -2,10 +2,10 @@ {{ $newsData := "" }} {{ if (fileExists $newsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $newsData = $data.news }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $newsData = $dataDefaultLanguage.news }} {{ end }} diff --git a/website/themes/beastie/layouts/_partials/press.html b/website/themes/beastie/layouts/_partials/press.html index 2bf6a38ba0..2cc8b03831 100644 --- a/website/themes/beastie/layouts/_partials/press.html +++ b/website/themes/beastie/layouts/_partials/press.html @@ -8,10 +8,10 @@ {{ $pressData := "" }} {{ if $translatedPressEnabled -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $pressData = $data.press }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $pressData = $dataDefaultLanguage.press }} {{ end }} diff --git a/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html b/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html index 0a5437e19b..14d2e8683a 100644 --- a/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html +++ b/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html @@ -1,6 +1,6 @@ {{ $param := (.Get 0) }} -{{ $eventsData := index hugo.Data hugo.Sites.Default.Language.Lang }} +{{ $eventsData := index .Page.Site.Data .Page.Sites.Default.Language.Lang }} {{ $lastYear := sub (int (now.Format "2006")) 1 }} diff --git a/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html b/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html index 437a0f7f62..b041e9b1c0 100644 --- a/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html +++ b/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html @@ -1,6 +1,6 @@ {{ $param := (.Get 0) }} -{{ $usergroupsData := index hugo.Data hugo.Sites.Default.Language.Lang }} +{{ $usergroupsData := index .Page.Site.Data .Page.Sites.Default.Language.Lang }} <!-- Load usergroups and number of them--> {{ $usergroupsCodes := slice }} diff --git a/website/themes/beastie/layouts/commercial/list.html b/website/themes/beastie/layouts/commercial/list.html index 17d7177425..241b529958 100644 --- a/website/themes/beastie/layouts/commercial/list.html +++ b/website/themes/beastie/layouts/commercial/list.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap"> diff --git a/website/themes/beastie/layouts/commercial/single.html b/website/themes/beastie/layouts/commercial/single.html index 17d7177425..241b529958 100644 --- a/website/themes/beastie/layouts/commercial/single.html +++ b/website/themes/beastie/layouts/commercial/single.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap"> diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html index f4043b61b9..0d00620073 100644 --- a/website/themes/beastie/layouts/events/list.html +++ b/website/themes/beastie/layouts/events/list.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> <div id="feedlinks"> <ul> @@ -20,10 +20,10 @@ {{ $eventsData := "" }} {{ if (fileExists $eventsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $eventsData = $data }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $eventsData = $dataDefaultLanguage }} {{ end }} diff --git a/website/themes/beastie/layouts/events/list.ics b/website/themes/beastie/layouts/events/list.ics index 02d3b709a6..f6adf934ca 100644 --- a/website/themes/beastie/layouts/events/list.ics +++ b/website/themes/beastie/layouts/events/list.ics @@ -2,7 +2,7 @@ BEGIN:VCALENDAR VERSION:2.0 PRODID:-//FreeBSD//events calendar//EN CALSCALE:GREGORIAN -METHOD:PUBLISH{{ $data := index hugo.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }} +METHOD:PUBLISH{{ $data := index .Site.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }} BEGIN:VEVENT UID:{{ .id }} SUMMARY:{{ .name }} diff --git a/website/themes/beastie/layouts/events/rss.xml b/website/themes/beastie/layouts/events/rss.xml index d062c0df6f..aaf582bc6b 100644 --- a/website/themes/beastie/layouts/events/rss.xml +++ b/website/themes/beastie/layouts/events/rss.xml @@ -12,7 +12,7 @@ <link>https://www.FreeBSD.org/events/</link> </image> <atom:link href="https://www.FreeBSD.org/events/feed.xml" rel="self" type="application/rss+xml"/> - {{ $data := index hugo.Data "en" }} + {{ $data := index .Site.Data "en" }} {{ $eventsData := $data }} {{ with $eventsData }} {{ range first 3 (sort .events "year" "desc") }} diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html index f4043b61b9..0d00620073 100644 --- a/website/themes/beastie/layouts/events/single.html +++ b/website/themes/beastie/layouts/events/single.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> <div id="feedlinks"> <ul> @@ -20,10 +20,10 @@ {{ $eventsData := "" }} {{ if (fileExists $eventsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $eventsData = $data }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $eventsData = $dataDefaultLanguage }} {{ end }} diff --git a/website/themes/beastie/layouts/index.html b/website/themes/beastie/layouts/index.html index a14a773595..d5e328a4d1 100755 --- a/website/themes/beastie/layouts/index.html +++ b/website/themes/beastie/layouts/index.html @@ -63,39 +63,39 @@ <ul id="frontreleaseslist"> <li> {{ i18n "production" }}: - <a href={{ index hugo.Data.releases "u-rel150-announce" }}>{{ index hugo.Data.releases "rel150-current" }}</a> + <a href={{ index $.Site.Data.releases "u-rel150-announce" }}>{{ index $.Site.Data.releases "rel150-current" }}</a> </li> <li> {{ i18n "production" }}: - <a href={{ index hugo.Data.releases "u-rel144-announce" }}>{{ index hugo.Data.releases "rel144-current" }}</a> + <a href={{ index $.Site.Data.releases "u-rel144-announce" }}>{{ index $.Site.Data.releases "rel144-current" }}</a> </li> <li> {{ i18n "legacy" }}: - <a href={{ index hugo.Data.releases "u-rel143-announce" }}>{{ index hugo.Data.releases "rel143-current" }}</a> + <a href={{ index $.Site.Data.releases "u-rel143-announce" }}>{{ index $.Site.Data.releases "rel143-current" }}</a> </li> <li> {{ i18n "legacy" }}: - <a href={{ index hugo.Data.releases "u-rel135-announce" }}>{{ index hugo.Data.releases "rel135-current" }}</a> + <a href={{ index $.Site.Data.releases "u-rel135-announce" }}>{{ index $.Site.Data.releases "rel135-current" }}</a> </li> - {{ $betaUpcoming := index hugo.Data.releases "beta-upcoming" }} + {{ $betaUpcoming := index $.Site.Data.releases "beta-upcoming" }} {{ if ne $betaUpcoming "IGNORE" }} <li> {{ i18n "upcoming" }}: - <a href={{ index hugo.Data.releases "u-betarel-schedule" }}>{{ index hugo.Data.releases "betarel-current" }}</a> + <a href={{ index $.Site.Data.releases "u-betarel-schedule" }}>{{ index $.Site.Data.releases "betarel-current" }}</a> </li> {{ end }} - {{ $beta2Upcoming := index hugo.Data.releases "beta2-upcoming" }} + {{ $beta2Upcoming := index $.Site.Data.releases "beta2-upcoming" }} {{ if ne $beta2Upcoming "IGNORE" }} <li> {{ i18n "upcoming" }}: - <a href={{ index hugo.Data.releases "u-betarel2-schedule" }}>{{ index hugo.Data.releases "betarel2-current" }}</a> + <a href={{ index $.Site.Data.releases "u-betarel2-schedule" }}>{{ index $.Site.Data.releases "betarel2-current" }}</a> </li> {{ end }} - {{ $beta3Upcoming := index hugo.Data.releases "beta3-upcoming" }} + {{ $beta3Upcoming := index $.Site.Data.releases "beta3-upcoming" }} {{ if ne $beta3Upcoming "IGNORE" }} <li> {{ i18n "upcoming" }}: - <a href={{ index hugo.Data.releases "u-betarel3-schedule" }}>{{ index hugo.Data.releases "betarel3-current" }}</a> + <a href={{ index $.Site.Data.releases "u-betarel3-schedule" }}>{{ index $.Site.Data.releases "betarel3-current" }}</a> </li> {{ end }} <li> diff --git a/website/themes/beastie/layouts/list.html b/website/themes/beastie/layouts/list.html index 34a62a8dca..286e9ccd5e 100644 --- a/website/themes/beastie/layouts/list.html +++ b/website/themes/beastie/layouts/list.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap"> diff --git a/website/themes/beastie/layouts/list.ics b/website/themes/beastie/layouts/list.ics index 02d3b709a6..f6adf934ca 100644 --- a/website/themes/beastie/layouts/list.ics +++ b/website/themes/beastie/layouts/list.ics @@ -2,7 +2,7 @@ BEGIN:VCALENDAR VERSION:2.0 PRODID:-//FreeBSD//events calendar//EN CALSCALE:GREGORIAN -METHOD:PUBLISH{{ $data := index hugo.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }} +METHOD:PUBLISH{{ $data := index .Site.Data .Sites.Default.Language.Lang }}{{ $eventsData := $data }}{{ with $eventsData }}{{ range (sort .events "year" "desc") }}{{ range (sort .events "startDate" "desc") }} BEGIN:VEVENT UID:{{ .id }} SUMMARY:{{ .name }} diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html index 88c6fad954..3f86c505d4 100644 --- a/website/themes/beastie/layouts/news/list.html +++ b/website/themes/beastie/layouts/news/list.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> <div id="feedlinks"> <ul> @@ -22,10 +22,10 @@ {{ $newsData := "" }} {{ if (fileExists $newsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $newsData = $data.news }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $newsData = $dataDefaultLanguage.news }} {{ end }} diff --git a/website/themes/beastie/layouts/news/rss.xml b/website/themes/beastie/layouts/news/rss.xml index 753e9c3da4..fa369c9fa2 100644 --- a/website/themes/beastie/layouts/news/rss.xml +++ b/website/themes/beastie/layouts/news/rss.xml @@ -12,7 +12,7 @@ <link>https://www.FreeBSD.org/news/</link> </image> <atom:link href="https://www.FreeBSD.org/news/feed.xml" rel="self" type="application/rss+xml"/> - {{ $data := index hugo.Data "en" }} + {{ $data := index .Site.Data "en" }} {{ $newsData := $data.news }} {{ with $newsData.news }} {{ $newsCounter := 0 }} diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html index 88c6fad954..3f86c505d4 100644 --- a/website/themes/beastie/layouts/news/single.html +++ b/website/themes/beastie/layouts/news/single.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> <div id="feedlinks"> <ul> @@ -22,10 +22,10 @@ {{ $newsData := "" }} {{ if (fileExists $newsPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $newsData = $data.news }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $newsData = $dataDefaultLanguage.news }} {{ end }} diff --git a/website/themes/beastie/layouts/press/list.html b/website/themes/beastie/layouts/press/list.html index 966e75e034..d1d5772610 100644 --- a/website/themes/beastie/layouts/press/list.html +++ b/website/themes/beastie/layouts/press/list.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> <div id="feedlinks"> <ul> @@ -21,10 +21,10 @@ {{ $pressData := "" }} {{ if (fileExists $pressPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $pressData = $data.press }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $pressData = $dataDefaultLanguage.press }} {{ end }} diff --git a/website/themes/beastie/layouts/press/rss.xml b/website/themes/beastie/layouts/press/rss.xml index fb3471be2f..f21b03d89f 100644 --- a/website/themes/beastie/layouts/press/rss.xml +++ b/website/themes/beastie/layouts/press/rss.xml @@ -13,7 +13,7 @@ </image> <atom:link href="https://www.FreeBSD.org/press/feed.xml" rel="self" type="application/rss+xml"/> {{ $pressMonthPrev := false }} - {{ $data := index hugo.Data "en" }} + {{ $data := index .Site.Data "en" }} {{ $pressData := $data.press }} {{ with $pressData.press }} {{ $pressCounter := 0 }} diff --git a/website/themes/beastie/layouts/press/single.html b/website/themes/beastie/layouts/press/single.html index 966e75e034..d1d5772610 100644 --- a/website/themes/beastie/layouts/press/single.html +++ b/website/themes/beastie/layouts/press/single.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> <div id="feedlinks"> <ul> @@ -21,10 +21,10 @@ {{ $pressData := "" }} {{ if (fileExists $pressPath) -}} - {{ $data := index hugo.Data $.Language.Lang }} + {{ $data := index .Site.Data $.Language.Lang }} {{ $pressData = $data.press }} {{ else }} - {{ $dataDefaultLanguage := index hugo.Data .Sites.Default.Language.Lang }} + {{ $dataDefaultLanguage := index .Site.Data .Sites.Default.Language.Lang }} {{ $pressData = $dataDefaultLanguage.press }} {{ end }} diff --git a/website/themes/beastie/layouts/security/list.html b/website/themes/beastie/layouts/security/list.html index d8365b9a76..ffdbd8f81e 100644 --- a/website/themes/beastie/layouts/security/list.html +++ b/website/themes/beastie/layouts/security/list.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap"> @@ -23,7 +23,7 @@ </thead> <tbody> {{ if eq $.Params.security "notices" }} - {{ with hugo.Data.security.errata }} + {{ with .Site.Data.security.errata }} {{ range .notices }} <tr> <td class="txtdate">{{ .date }}</td> @@ -33,7 +33,7 @@ {{ end }} {{ end }} {{ if eq $.Params.security "advisories" }} - {{ with hugo.Data.security.advisories }} + {{ with .Site.Data.security.advisories }} {{ range .advisories }} <tr> <td class="txtdate">{{ .date }}</td> diff --git a/website/themes/beastie/layouts/security/rss.xml b/website/themes/beastie/layouts/security/rss.xml index d759324e4e..37dd78fadc 100644 --- a/website/themes/beastie/layouts/security/rss.xml +++ b/website/themes/beastie/layouts/security/rss.xml @@ -12,7 +12,7 @@ <link>https://www.FreeBSD.org/security/</link> </image> <atom:link href="https://www.FreeBSD.org/security/feed.xml" rel="self" type="application/rss+xml"/> - {{ with hugo.Data.security.errata }} + {{ with .Site.Data.security.errata }} {{ $securityCounter := 0 }} {{ range (sort .notices "date" "desc") }} {{ if lt $securityCounter 10 }} @@ -26,7 +26,7 @@ {{ end }} {{ end }} {{ end }} - {{ with hugo.Data.security.advisories }} + {{ with .Site.Data.security.advisories }} {{ $advisoriesCounter := 0 }} {{ range (sort .advisories "date" "desc") }} {{ if lt $advisoriesCounter 10 }} diff --git a/website/themes/beastie/layouts/security/single.html b/website/themes/beastie/layouts/security/single.html index d8365b9a76..ffdbd8f81e 100644 --- a/website/themes/beastie/layouts/security/single.html +++ b/website/themes/beastie/layouts/security/single.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap"> @@ -23,7 +23,7 @@ </thead> <tbody> {{ if eq $.Params.security "notices" }} - {{ with hugo.Data.security.errata }} + {{ with .Site.Data.security.errata }} {{ range .notices }} <tr> <td class="txtdate">{{ .date }}</td> @@ -33,7 +33,7 @@ {{ end }} {{ end }} {{ if eq $.Params.security "advisories" }} - {{ with hugo.Data.security.advisories }} + {{ with .Site.Data.security.advisories }} {{ range .advisories }} <tr> <td class="txtdate">{{ .date }}</td> diff --git a/website/themes/beastie/layouts/single.html b/website/themes/beastie/layouts/single.html index 34a62a8dca..286e9ccd5e 100644 --- a/website/themes/beastie/layouts/single.html +++ b/website/themes/beastie/layouts/single.html @@ -2,7 +2,7 @@ <div id="content"> <div id="sidewrap"> <div id="sidenav"> - {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" hugo.Data "language" $.Site.Language.Lang ) }} + {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }} </div> </div> <div id="contentwrap">home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69ca31e7.1e26d.1b9b8c0d>
