Merge pull request #96 from 2m/fix/inner-html-2m

Add inner_html tag attribute (rebase)
This commit is contained in:
Leonardo Cavaletti 2022-04-03 17:54:28 +01:00 committed by GitHub
commit ab3ec1a491
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 11 deletions

View File

@ -120,10 +120,10 @@ theme = "dark"
## Custom Fonts ## ## Custom Fonts ##
# you can specify the name of a google font to use on the site - use the font embed name # you can specify the name of a google font to use on the site - use the font embed name
# if in doubt select a style on fonts.google.com and navigate to the "embed" tag to # if in doubt select a style on fonts.google.com and navigate to the "embed" tag to
# check the name under CSS rules # check the name under CSS rules
# the following table keys controls the font of specific elements: # the following table keys controls the font of specific elements:
# site: changes the font for the whole page (apart from code blocks) # site: changes the font for the whole page (apart from code blocks)
# but the settings below override it # but the settings below override it
# navbar: site breadcrumbs on the top-left of the page # navbar: site breadcrumbs on the top-left of the page
# title: page title (under the icon) # title: page title (under the icon)
@ -143,31 +143,38 @@ theme = "dark"
code = '' code = ''
## Custom Element Injection ## ## Custom Element Injection ##
# defined as an array of tables [[site.inject]], followed by 'head' or 'body' to set # defined as an array of tables [[site.inject]], followed by 'head' or 'body' to set
# the injection point, followed by name of the tag to inject # the injection point, followed by name of the tag to inject
# each key in the table maps to an atttribute in the tag # each key in the table maps to an atttribute in the tag
# e.g. the following injects this tag in the <head>: # e.g. the following injects this tag in the <head>:
# <link href="favicon-16x16.png" rel="icon" sizes="16x16" type="image/png"/> # <link href="favicon-16x16.png" rel="icon" sizes="16x16" type="image/png"/>
[[site.inject.head.link]] [[site.inject.head.link]]
rel="icon" rel="icon"
sizes="16x16" sizes="16x16"
type="image/png" type="image/png"
href="/example/favicon-16x16.png" href="/example/favicon-16x16.png"
# the following injects this tag in the in the <body>: # the following injects this tag in the in the <body>:
# <script src="custom-script.js" type="text/javascript"></script> # <script src="custom-script.js" type="text/javascript"></script>
# note that all href / src files are copied to the root of the site folder # note that all href / src files are copied to the root of the site folder
# regardless of their original path # regardless of their original path
[[site.inject.body.script]] [[site.inject.body.script]]
type="text/javascript" type="text/javascript"
src="/example/custom-script.js" src="/example/custom-script.js"
# the following injects this script in the <head>:
# <script>console.log("Hello, world!")</script>
[[site.inject.body.script]]
inner_html="""
console.log("Hello, world!")
"""
## Individual Page Settings ## ## Individual Page Settings ##
# the [pages] table defines override settings for individual pages, by defining # the [pages] table defines override settings for individual pages, by defining
# a sub-table named after the page url (or part of the url, but careful about # a sub-table named after the page url (or part of the url, but careful about
# not using a string that appears in multiple page urls) # not using a string that appears in multiple page urls)
[pages] [pages]
# the following settings will only apply to this page: # the following settings will only apply to this page:
# https://www.notion.so/d2fa06f244e64f66880bb0491f58223d # https://www.notion.so/d2fa06f244e64f66880bb0491f58223d
[pages.d2fa06f244e64f66880bb0491f58223d] [pages.d2fa06f244e64f66880bb0491f58223d]
## custom slugs ## ## custom slugs ##
@ -176,13 +183,13 @@ theme = "dark"
slug = "games-list" slug = "games-list"
# change the description meta tag for this page only # change the description meta tag for this page only
[[pages.d2fa06f244e64f66880bb0491f58223d.meta]] [[pages.d2fa06f244e64f66880bb0491f58223d.meta]]
name = "description" name = "description"
content = "A fullscreen list database page, now with a pretty slug" content = "A fullscreen list database page, now with a pretty slug"
# change the title font for this page only # change the title font for this page only
[pages.d2fa06f244e64f66880bb0491f58223d.fonts] [pages.d2fa06f244e64f66880bb0491f58223d.fonts]
title = 'DM Mono' title = 'DM Mono'
# set up pretty slugs and options for the other database pages # set up pretty slugs and options for the other database pages
[pages.54dab6011e604430a21dc477cb8e4e3a] [pages.54dab6011e604430a21dc477cb8e4e3a]

View File

@ -625,6 +625,12 @@ class Parser:
for element in elements: for element in elements:
injected_tag = soup.new_tag(tag) injected_tag = soup.new_tag(tag)
for attr, value in element.items(): for attr, value in element.items():
# `inner_html` refers to the tag's inner content
# and will be added later
if attr == "inner_html":
continue
injected_tag[attr] = value injected_tag[attr] = value
# if the value refers to a file, copy it to the dist folder # if the value refers to a file, copy it to the dist folder
if attr.lower() in ["href", "src"]: if attr.lower() in ["href", "src"]:
@ -636,6 +642,11 @@ class Parser:
# shutil.copyfile(source, destination) # shutil.copyfile(source, destination)
injected_tag[attr] = str(cached_custom_file) # source.name injected_tag[attr] = str(cached_custom_file) # source.name
log.debug(f"Injecting <{section}> tag: {injected_tag}") log.debug(f"Injecting <{section}> tag: {injected_tag}")
# adding `inner_html` as the tag's content
if "inner_html" in element:
injected_tag.string = element["inner_html"]
soup.find(section).append(injected_tag) soup.find(section).append(injected_tag)
def inject_loconotion_script_and_css(self, soup): def inject_loconotion_script_and_css(self, soup):