From b660fef7591e9903b49ba475458f067cb5a49a2d Mon Sep 17 00:00:00 2001 From: Dean Attali Date: Mon, 24 Aug 2020 20:43:43 +0000 Subject: [PATCH] support multiple files in footer-extra and head-extra --- CHANGELOG.md | 2 +- README.md | 2 +- _includes/footer.html | 4 +++- _includes/head.html | 4 +++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70dd877..aa1515e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ One of the major changes in this version is that a lot of time was spent on reth - Added `share-title` YAML option to give control over the search engine/social media title - Added `head-extra` YAML option which is similar to `footer-extra` but is used to include custom HTML code in a page's `` tag - Added `full-width` YAML option to allow having full-width pages +- Improved the `footer-extra` YAML option to support multiple files instead of only a single file - Upgraded jQuery to version 3.5.1 to fix a couple security vulnerabilities with the previous version - Added automatic navbar color detection (#702) - Changed navbar and footer background colour to be slightly darker, for better contrast with the default white page background @@ -17,7 +18,6 @@ One of the major changes in this version is that a lot of time was spent on reth - Renamed internal css/js files from "main" to "beautifuljekyll" to make it easier for users to troubleshoot - Added alt text to all images for better accessibility - ## v4.1.0 (2020-08-08) - Added Open Graph `site_name` meta field to pages automatically diff --git a/README.md b/README.md index 397af65..0590a42 100644 --- a/README.md +++ b/README.md @@ -171,7 +171,7 @@ These are advanced parameters that are only useful for people who need very fine Parameter | Description ----------- | ----------- -footer-extra | If you want to include extra information in the footer (below the social media icons), create an HTML file in the `_includes/` folder (for example `_includes/myinfo.html`) and set `footer-extra` to the name of the file (for example `footer-extra: myinfo.html`) +footer-extra | If you want to include extra content below the social media icons in the footer, create an HTML file in the `_includes/` folder (for example `_includes/myinfo.html`) and set `footer-extra` to the name of the file (for example `footer-extra: myinfo.html`). Accepts a single file or a list of files. head-extra | Works in a similar way to `footer-extra`, but used if you have any HTML code that needs to be included in the `` tag of the page. language | HTML language code to be set on the page's <html> element. full-width | By default, page content is constrained to a standard width. Use `full-width: true` to allow the content to span the entire width of the window. diff --git a/_includes/footer.html b/_includes/footer.html index 4bf9237..8af6439 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -5,7 +5,9 @@ {% include social-networks-links.html %} {% if page.footer-extra %}
- {% include {{ page.footer-extra }} %} + {% for file in page.footer-extra %} + {% include {{ file }} %} + {% endfor %}
{% endif %}

diff --git a/_includes/head.html b/_includes/head.html index 97eb0bd..9d43c46 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -141,7 +141,9 @@ {% endif %} {% if page.head-extra %} - {% include {{ page.head-extra }} %} + {% for file in page.head-extra %} + {% include {{ file }} %} + {% endfor %} {% endif %}