From c4855c05aa2cf1679bd033e400306cff312bc14d Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Thu, 13 Jan 2022 18:55:53 -0700 Subject: [PATCH 01/11] document the site.homeUrl property in the UI model; clarify how it differs from site.url and siteRootPath --- docs/modules/ROOT/pages/templates.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/modules/ROOT/pages/templates.adoc b/docs/modules/ROOT/pages/templates.adoc index 8868d7e..9b5e9df 100644 --- a/docs/modules/ROOT/pages/templates.adoc +++ b/docs/modules/ROOT/pages/templates.adoc @@ -36,6 +36,7 @@ s| [[site]]site | site.url | The base URL of the site, if specified in the playbook. +If a site start page is defined, the visitor will be redirected from this location to the start page. | site.path | The pathname (i.e., subpath) of the site.url under which the site is hosted (e.g., /docs). @@ -47,6 +48,9 @@ Can be prepended to `page.url` to create a root-relative URL for a page (e.g., ` | site.title | The title of the site. +| site.homeUrl +| The URL that points directly to the start (aka home) page of the site. + | site.components | A map of all the components in the site, keyed by component name. Properties of each component include name, title, url, latest, and versions. @@ -177,6 +181,7 @@ s| env s| siteRootPath | The relative path to the root of the published site. +If a site start page is defined, the visitor will be redirected from this location to the start page. s| uiRootPath | The relative path to the root directory of the UI. From f9c99e53c5948b4666e98b5b023474b9cafaabb5 Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Thu, 13 Jan 2022 18:58:59 -0700 Subject: [PATCH 02/11] drop check for outdated siteRootUrl property; document using siteRootPath as fallback for site.url --- docs/modules/ROOT/pages/templates.adoc | 1 + src/partials/header-content.hbs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/templates.adoc b/docs/modules/ROOT/pages/templates.adoc index 9b5e9df..d156c0d 100644 --- a/docs/modules/ROOT/pages/templates.adoc +++ b/docs/modules/ROOT/pages/templates.adoc @@ -182,6 +182,7 @@ s| env s| siteRootPath | The relative path to the root of the published site. If a site start page is defined, the visitor will be redirected from this location to the start page. +Can be used as a fallback when a site URL is not set. s| uiRootPath | The relative path to the root directory of the UI. diff --git a/src/partials/header-content.hbs b/src/partials/header-content.hbs index 48fff0a..8a094a4 100644 --- a/src/partials/header-content.hbs +++ b/src/partials/header-content.hbs @@ -1,7 +1,7 @@