From owner-dev-commits-doc-all@freebsd.org Fri Jul 16 22:16:55 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD1E0668A76 for ; Fri, 16 Jul 2021 22:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GRQZb5S3lz3QNS; Fri, 16 Jul 2021 22:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A25E624BCC; Fri, 16 Jul 2021 22:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16GMGt6v041585; Fri, 16 Jul 2021 22:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16GMGt2O041584; Fri, 16 Jul 2021 22:16:55 GMT (envelope-from git) Date: Fri, 16 Jul 2021 22:16:55 GMT Message-Id: <202107162216.16GMGt2O041584@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: e95429614a - main - website/news: Make links unique MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e95429614afa637ee6d05de7cc70290a54e10f78 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 22:16:55 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=e95429614afa637ee6d05de7cc70290a54e10f78 commit e95429614afa637ee6d05de7cc70290a54e10f78 Author: Danilo G. Baio AuthorDate: 2021-07-16 22:07:22 +0000 Commit: Danilo G. Baio CommitDate: 2021-07-16 22:09:19 +0000 website/news: Make links unique Every time a news item is added, the entire chain of links is changed. This adds the old behavior, which counts news items for each day and adds that to the ID. This commit follows e06f3556be --- website/themes/beastie/layouts/news/list.html | 13 ++++++++++--- website/themes/beastie/layouts/news/news.rss.xml | 15 ++++++++++++--- website/themes/beastie/layouts/news/single.html | 13 ++++++++++--- website/themes/beastie/layouts/partials/news.html | 13 +++++++++++-- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html index b4b175fbb0..26409dfdfe 100644 --- a/website/themes/beastie/layouts/news/list.html +++ b/website/themes/beastie/layouts/news/list.html @@ -40,7 +40,8 @@ {{ $yearsMonths = $yearsMonths | uniq }} - {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range $year := seq now.Year 2010 }} {{ range $month := seq 12 1 }} {{ $yearMonth := (printf "%d-%d" $year $month) }} @@ -51,14 +52,20 @@ {{ with $newsData.news }} {{ range (sort .news "date" "desc") }} {{ if eq (dateFormat "2006-1" .date) $yearMonth }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }}

  • - + {{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}: {{ .description | safeHTML }}

    • - {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/news/news.rss.xml b/website/themes/beastie/layouts/news/news.rss.xml index d119936093..f109d6ca67 100644 --- a/website/themes/beastie/layouts/news/news.rss.xml +++ b/website/themes/beastie/layouts/news/news.rss.xml @@ -16,8 +16,16 @@ {{ $newsData := $data.news }} {{ with $newsData.news }} {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range (sort .news "date" "desc") }} {{ if lt $newsCounter 10 }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }} {{ if .title }} @@ -33,12 +41,13 @@ {{ $description }} </description> {{ end }} - <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</link> - <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</guid> + <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</link> + <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</guid> <pubDate>{{ dateFormat "2006-01-02" .date }}</pubDate> </item> + {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} - {{ $newsCounter = add $newsCounter 1 }} {{ end }} {{ end }} </channel> diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html index b4b175fbb0..26409dfdfe 100644 --- a/website/themes/beastie/layouts/news/single.html +++ b/website/themes/beastie/layouts/news/single.html @@ -40,7 +40,8 @@ <!-- Remove duplicates --> {{ $yearsMonths = $yearsMonths | uniq }} - {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range $year := seq now.Year 2010 }} {{ range $month := seq 12 1 }} {{ $yearMonth := (printf "%d-%d" $year $month) }} @@ -51,14 +52,20 @@ {{ with $newsData.news }} {{ range (sort .news "date" "desc") }} {{ if eq (dateFormat "2006-1" .date) $yearMonth }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }} <li> <p class="localized"> - <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"></a> + <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a> <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong> {{ .description | safeHTML }} </p> </li> - {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/partials/news.html b/website/themes/beastie/layouts/partials/news.html index e3fb22646d..23b22fbaa7 100644 --- a/website/themes/beastie/layouts/partials/news.html +++ b/website/themes/beastie/layouts/partials/news.html @@ -11,12 +11,20 @@ {{ with $newsData.news }} {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range (sort .news "date" "desc") }} {{ if lt $newsCounter 6 }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }} <p> <span class="txtdate">{{ dateFormat "2006-01-02" .date }}</span> <br /> - <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"> + <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"> {{ if .title }} {{ $title := replaceRE "<a .*\">" "" .title }} {{ $title = replaceRE "</a>" "" $title }} @@ -28,7 +36,8 @@ {{ end }} </a> </p> + {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} - {{ $newsCounter = add $newsCounter 1 }} {{ end }} {{ end }}