From 577a7d29b8266b65410e56eddc09df88894afee8 Mon Sep 17 00:00:00 2001 From: "Yi (Flora) Liu" <39588094+flora8984461@users.noreply.github.com> Date: Mon, 22 Mar 2021 10:33:45 -0400 Subject: [PATCH] initial trial to custom header for sub-sites (#196) * initial trial to custom header for sub-sites Signed-off-by: Yi Liu * add static images Signed-off-by: Yi Liu * add custom header logo in nav-toggle Signed-off-by: Yi Liu * remove unnecessary in gitignore Signed-off-by: Yi Liu * Simplify the code, less vars and less duplications Signed-off-by: Yi Liu * remove unnecessary absURL Signed-off-by: Yi Liu * move fake logo from static to inside exampleSite Signed-off-by: Yi Liu Co-authored-by: Yi Liu Co-authored-by: Martin Lowe --- .gitignore | 2 ++ exampleSite/config/_default/menus.en.toml | 6 +++++ exampleSite/content/subsite-1/_index.md | 9 +++++++ .../subsite-1/subsite-child-1/_index.md | 8 ++++++ ...logo_schooner_color_horizontal_default.png | Bin 0 -> 6154 bytes .../jakartaone_livestream_test_white_logo.svg | 1 + exampleSite/data/subsites_custom_logo.yml | 11 ++++++++ layouts/partials/nav_toggle.html | 17 +++++++++++-- layouts/partials/navbar.html | 24 +++++++++++++++--- 9 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 exampleSite/content/subsite-1/_index.md create mode 100644 exampleSite/content/subsite-1/subsite-child-1/_index.md create mode 100644 exampleSite/content/third-parent/images/fake_logo/jakarta_ee_logo_schooner_color_horizontal_default.png create mode 100644 exampleSite/content/third-parent/images/fake_logo/jakartaone_livestream_test_white_logo.svg create mode 100644 exampleSite/data/subsites_custom_logo.yml diff --git a/.gitignore b/.gitignore index 243fa2a8..4423638b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ /node_modules/ /static/* !/static/js/ +/static/images/vendor/ +!/static/images/fake_logo/ /static/js/solstice.js /exampleSite/public /exampleSite/layouts/robots.txt diff --git a/exampleSite/config/_default/menus.en.toml b/exampleSite/config/_default/menus.en.toml index d2c82746..a789ee68 100644 --- a/exampleSite/config/_default/menus.en.toml +++ b/exampleSite/config/_default/menus.en.toml @@ -53,6 +53,12 @@ weight = 7 parent = "examples" +[[main]] + name = "Subsite Custom Logo" + url = "/subsite-1/" + weight = 8 + parent = "examples" + [[main]] name = "Custom Jumbotron" url = "/custom-jumbotron/" diff --git a/exampleSite/content/subsite-1/_index.md b/exampleSite/content/subsite-1/_index.md new file mode 100644 index 00000000..169f0d48 --- /dev/null +++ b/exampleSite/content/subsite-1/_index.md @@ -0,0 +1,9 @@ +--- +title: "SubSite" +headline: "SubSite" +date: 2018-04-05T16:09:45-04:00 +description: "SubSite" +hide_sidebar: false +--- + +SubSite \ No newline at end of file diff --git a/exampleSite/content/subsite-1/subsite-child-1/_index.md b/exampleSite/content/subsite-1/subsite-child-1/_index.md new file mode 100644 index 00000000..91ebbf96 --- /dev/null +++ b/exampleSite/content/subsite-1/subsite-child-1/_index.md @@ -0,0 +1,8 @@ +--- +title: "SubSite-Child 1" +date: 2018-04-05T16:09:45-04:00 +description: "SubSite-Child 1" +hide_sidebar: false +--- + +SubSite-Child 1 \ No newline at end of file diff --git a/exampleSite/content/third-parent/images/fake_logo/jakarta_ee_logo_schooner_color_horizontal_default.png b/exampleSite/content/third-parent/images/fake_logo/jakarta_ee_logo_schooner_color_horizontal_default.png new file mode 100644 index 0000000000000000000000000000000000000000..a45c0aa72e233e087d2bd104d8f3d31f56b01c33 GIT binary patch literal 6154 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 literal 0 HcmV?d00001 diff --git a/exampleSite/content/third-parent/images/fake_logo/jakartaone_livestream_test_white_logo.svg b/exampleSite/content/third-parent/images/fake_logo/jakartaone_livestream_test_white_logo.svg new file mode 100644 index 00000000..3308e3ae --- /dev/null +++ b/exampleSite/content/third-parent/images/fake_logo/jakartaone_livestream_test_white_logo.svg @@ -0,0 +1 @@ +jakartaone_livestream_wht_full \ No newline at end of file diff --git a/exampleSite/data/subsites_custom_logo.yml b/exampleSite/data/subsites_custom_logo.yml new file mode 100644 index 00000000..168f0829 --- /dev/null +++ b/exampleSite/data/subsites_custom_logo.yml @@ -0,0 +1,11 @@ +items: + - + page_url: '/subsite-1' + logo: '/third-parent/images/fake_logo/jakarta_ee_logo_schooner_color_horizontal_default.png' + logo_url: '/subsite-1' + logo_title: 'subsite-1' + - + page_url: '/third-parent' + logo: '/third-parent/images/fake_logo/jakartaone_livestream_test_white_logo.svg' + logo_url: '/third-parent' + logo_title: 'Third Parent' \ No newline at end of file diff --git a/layouts/partials/nav_toggle.html b/layouts/partials/nav_toggle.html index 3ed2c79f..d5f4e0a8 100644 --- a/layouts/partials/nav_toggle.html +++ b/layouts/partials/nav_toggle.html @@ -22,8 +22,21 @@ {{ end }}
{{- with .Page.Params.logo | default .Site.Params.logo | default "https://www.eclipse.org/eclipse.org-common/themes/solstice/public/images/logo/eclipse-foundation-white-orange.svg" }} - - {{ $.Site.Title }} + {{ $currentPageLogo := . }} + {{ $currentPageLogoTitle := $.Site.Title }} + {{ $currentPageLogoLink := "" }} + + {{ range $.Site.Data.subsites_custom_logo.items }} + {{ $section := $.Site.GetPage (.page_url) }} + {{ if or (eq ($.Section) ($section)) ( $.Page.IsDescendant $section ) }} + {{ $currentPageLogo = .logo }} + {{ $currentPageLogoTitle = .logo_title }} + {{ $currentPageLogoLink = .logo_url }} + {{ end }} + {{ end }} + + + {{ $currentPageLogoTitle }} {{ end }}
diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index 7842b4fe..baa4d183 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -42,11 +42,27 @@