From owner-dev-commits-doc-all@freebsd.org Fri Jul 16 22:16:54 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 AF456668A75 for ; Fri, 16 Jul 2021 22:16:54 +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 4GRQZZ4c2Hz3Q4M; Fri, 16 Jul 2021 22:16:54 +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 8729124FAD; Fri, 16 Jul 2021 22:16:54 +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 16GMGsUd041561; Fri, 16 Jul 2021 22:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16GMGsPf041560; Fri, 16 Jul 2021 22:16:54 GMT (envelope-from git) Date: Fri, 16 Jul 2021 22:16:54 GMT Message-Id: <202107162216.16GMGsPf041560@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: cafcba7d54 - main - website/events: Fix unique links 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: cafcba7d545f4785028bb7a7e8797efeac3c9d0b 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:54 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=cafcba7d545f4785028bb7a7e8797efeac3c9d0b commit cafcba7d545f4785028bb7a7e8797efeac3c9d0b Author: Danilo G. Baio AuthorDate: 2021-07-16 22:05:18 +0000 Commit: Danilo G. Baio CommitDate: 2021-07-16 22:09:19 +0000 website/events: Fix unique links Every time an event item is added, the entire chain of links is changed. All events already have an exclusive ID, so instead of generating a new reference for each item, point to it. --- website/themes/beastie/layouts/events/events.rss.xml | 2 +- website/themes/beastie/layouts/events/list.html | 3 --- website/themes/beastie/layouts/events/single.html | 3 --- website/themes/beastie/layouts/partials/events.html | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/website/themes/beastie/layouts/events/events.rss.xml b/website/themes/beastie/layouts/events/events.rss.xml index 194a747341..aaf582bc6b 100644 --- a/website/themes/beastie/layouts/events/events.rss.xml +++ b/website/themes/beastie/layouts/events/events.rss.xml @@ -30,7 +30,7 @@ {{ end }} {{ .url }} - {{ .url }} + {{ absLangURL ($.Site.BaseURL) }}events/#{{ .id }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html index 29c1afffd1..8384a25a97 100644 --- a/website/themes/beastie/layouts/events/list.html +++ b/website/themes/beastie/layouts/events/list.html @@ -109,7 +109,6 @@ {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -140,7 +139,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -186,7 +184,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html index 29c1afffd1..8384a25a97 100644 --- a/website/themes/beastie/layouts/events/single.html +++ b/website/themes/beastie/layouts/events/single.html @@ -109,7 +109,6 @@ {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -140,7 +139,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -186,7 +184,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} diff --git a/website/themes/beastie/layouts/partials/events.html b/website/themes/beastie/layouts/partials/events.html index 0852e870cc..b4bdb21ce5 100644 --- a/website/themes/beastie/layouts/partials/events.html +++ b/website/themes/beastie/layouts/partials/events.html @@ -18,7 +18,7 @@

    {{ dateFormat "2006-01-02" .startDate }} - {{ dateFormat "2006-01-02" .endDate }}
    - + {{ .name }}
    {{ if or (.city) (.country) }}({{end}}{{ if .city }}{{ .city }},{{ end }} {{ if .country }}{{ .country }}{{ end }}{{ if or (.city) (.country) }}){{end}}