From nobody Sat Jan 29 21:03:11 2022 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 12E54198D003 for ; Sat, 29 Jan 2022 21:03:12 +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 4JmRcb6DBgz4RHg; Sat, 29 Jan 2022 21:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643490191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lLdqksr+3DJQHGlFW00zW6bOxvIpY9nzPQSftzbxSic=; b=r5cDRjmfOIas3OzWnlgIasfCafenN2XmYlJlW7+VPZXFcagjf/vvn9q4GOVfw3g8ChZpH8 9ezec3/8xGT03oEFFkJ3be2qmelqWjACoezMeQPJ/ZLbMoUvAAXaguUIgm/kI3LBnlZW/F pv6hssyxb9a5vtkWFcKd2z6Gnq4Jl/YUzyvhTuyX7gqfDA/50FPCSKYz3StTxiriWxR+Fq Xk/8OYlgtlPRAzBCspGP7RIq8RCg7LFAIiBIsSfMH9rKjWEy6A4hlRyPAwrKYSwY9IzhKw C8KSWmKSmtaujJisayIADGAlBonEnr2uoNBMIWklDSAk6Zy0d+NnoxD67nyXEQ== 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 B58471C572; Sat, 29 Jan 2022 21:03:11 +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 20TL3Blq033512; Sat, 29 Jan 2022 21:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20TL3BL4033511; Sat, 29 Jan 2022 21:03:11 GMT (envelope-from git) Date: Sat, 29 Jan 2022 21:03:11 GMT Message-Id: <202201292103.20TL3BL4033511@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 7fe378266a - main - Fix problems with links and CSS in offline mode List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fe378266af5031be31ccc562b6e0580dc18d51a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643490191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lLdqksr+3DJQHGlFW00zW6bOxvIpY9nzPQSftzbxSic=; b=d6GjlG7iPbkMzo5pgm7TJASCKixKusS387spu6sToZ8iVXgw+aITRle+X5cuUyvGwsFu1c qj4e0D/A2sOd4NBLb70NCr7jHsx7Tqei8eOMJwenEULp662nSnBL8YXkR2tpBtS1E0ehZw gzNWqePO/rPt5xPXtWkzPXgDw6WkZOOZv+RxivYJBODQq05EU+ASrUBYtMTagT3cYMkM7b /zYff52jnfBCRhW8qW+OM2D7aD5e8SBU9ZUnCf4eKRmwPbwKUo391tq6fUzkWlW/QiQ+dA VE+C5+8g4G5uq2E0v6TxDWVKUHAQa3K0y7wIDhZYc8+VhtzullUi2tCCERTCyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643490191; a=rsa-sha256; cv=none; b=LpDzSLBjDQQCdoGvi+0dQ/xN0dwB5QEtMyaNXmuowGJkEn80Pv65hQg2mQJytRFDVhKCyZ RFlv2GVbeTROLx49IIvEJVje2NBqE08UbAWchQ/K4kklCsqGfuQl3mc7SpX26UN2KUdRmd cvqt7GMBHt+2Fn+KNWKSObrH7Lf+4GwlgKgT2uhDajHDUW7uKsAX/cujuvosHmR+nY80cY zjgrJFOSX/of+NwmEECUscb93pR4yzWvbLTeHG+r5TTiLO1NgYupJxHe94u2ODH7LZRrmD VJySobBw+6T07t0OfA8DCAs9NgsMk89iTlNF9bwoj4xTZejEiKn+i4Xv+QtTzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=7fe378266af5031be31ccc562b6e0580dc18d51a commit 7fe378266af5031be31ccc562b6e0580dc18d51a Author: Sergio Carlavilla Delgado AuthorDate: 2022-01-29 21:02:15 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2022-01-29 21:02:15 +0000 Fix problems with links and CSS in offline mode Reported by: dbaio@ --- documentation/config/offline/config.toml | 13 ++-- .../themes/beastie/layouts/books/list.html | 42 ++++++------ .../themes/beastie/layouts/books/single.html | 42 ++++++------ .../themes/beastie/layouts/partials/menu.html | 23 +++++-- .../beastie/layouts/partials/site-footer.html | 14 ++-- .../themes/beastie/layouts/partials/site-head.html | 79 ++++++++++++---------- .../beastie/layouts/partials/site-header.html | 16 +++-- 7 files changed, 132 insertions(+), 97 deletions(-) diff --git a/documentation/config/offline/config.toml b/documentation/config/offline/config.toml index f359e2ad7e..653ef5b279 100644 --- a/documentation/config/offline/config.toml +++ b/documentation/config/offline/config.toml @@ -1,6 +1,6 @@ # FreeBSD documentation -baseURL = "localhost" +baseURL = "" title = "FreeBSD Documentation Portal" copyright = "BSD 2-clause 'Simplified' License" defaultContentLanguage = "en" @@ -11,6 +11,7 @@ disableKinds = [ "taxonomy", "term", "RSS", "sitemap", "robotsTXT", "404" ] authors = [ "carlavilla@FreeBSD.org" ] ignoreFiles = [ "chapter.adoc$", "contrib-386bsd.adoc$", "contrib-additional.adoc$", "contrib-committers.adoc$", "contrib-corealumni.adoc$", "contrib-develalumni.adoc$", "contrib-develinmemoriam.adoc$", "contrib-portmgralumni.adoc$", "books.adoc$", "\\.po$" ] enableRobotsTXT = true +relativeURLs = true [params] websiteURL = "https://www.FreeBSD.org" @@ -29,11 +30,11 @@ enableRobotsTXT = true urls = [".*"] [markup.asciidocExt] - extensions = ["man-macro", "inter-document-references-macro", "cross-document-references-macro", "sectnumoffset-treeprocessor", "packages-macro", "git-macro"] - [markup.asciidocExt.attributes] - env-beastie = true - isOnline = false - skip-front-matter = true + extensions = ["man-macro", "inter-document-references-macro", "cross-document-references-macro", "sectnumoffset-treeprocessor", "packages-macro", "git-macro"] + [markup.asciidocExt.attributes] + env-beastie = true + isOnline = false + skip-front-matter = true [outputs] home = [ "HTML" ] diff --git a/documentation/themes/beastie/layouts/books/list.html b/documentation/themes/beastie/layouts/books/list.html index 7b0998acce..d4df934989 100644 --- a/documentation/themes/beastie/layouts/books/list.html +++ b/documentation/themes/beastie/layouts/books/list.html @@ -41,15 +41,17 @@

{{ i18n "toc" }}

{{ .TableOfContents }} - {{ if .Params.add_split_page_link }} -
- [ {{ i18n "split-html" }} / {{ i18n "single-html" }} ] -
+ {{ if $.Site.Params.isOnline }} + {{ if .Params.add_split_page_link }} +
+ [ {{ i18n "split-html" }} / {{ i18n "single-html" }} ] +
+ {{ end }} + {{ if .Params.add_single_page_link }} +
+ [ {{ i18n "split-html" }} / {{ i18n "single-html" }} ] +
{{ end }} - {{ if .Params.add_single_page_link }} -
- [ {{ i18n "split-html" }} / {{ i18n "single-html" }} ] -
{{ end }}
{{ .Content }} @@ -61,7 +63,7 @@
{{ if $.Site.Params.isOnline }} - {{ i18n "prev" }} + {{ i18n "prev" }} {{ else }} {{ $pathSectionsPrev := split .Params.Prev "/" }} @@ -79,25 +81,25 @@
- {{ i18n "home" }} + {{ if $.Site.Params.isOnline }} + {{ i18n "home" }} + {{ else }} + {{ i18n "home" }} + {{ end }}
{{ if .Params.next }}