diff --git a/README.md b/README.md index 1cca060..0e6c925 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Needed for Gemtext output support: ## Features roadmap -- [ ] HTML feeds (pages with list of N most recent posts) +- [x] HTML feeds (pages with list of N most recent posts) - [x] Lists of all pages in a site directory - [x] Page redirects / Alt URLs (+ ActivityPub URL overrides) - [x] Progress bars for the build process! diff --git a/Source/Build.py b/Source/Build.py index 85d291b..23ef59b 100755 --- a/Source/Build.py +++ b/Source/Build.py @@ -248,6 +248,7 @@ def Main(Args, FeedEntries): WriteFile( DestFile, RedirectPageTemplate.format( + SiteDomain=SiteDomain, DestURL=DestURL, TitlePrefix=f"{SiteName} - " if SiteName else '', StrClick=Locale['ClickHere'], diff --git a/Source/Modules/Elements.py b/Source/Modules/Elements.py index 3e06afa..25ab7aa 100644 --- a/Source/Modules/Elements.py +++ b/Source/Modules/Elements.py @@ -25,11 +25,12 @@ RedirectPageTemplate = """\ -{TitlePrefix}Redirect - + {TitlePrefix}Redirect + + -

{StrClick} {StrRedirect}.

+

{StrClick} {StrRedirect}.

""" diff --git a/Source/Modules/Site.py b/Source/Modules/Site.py index bb92c99..dde920f 100644 --- a/Source/Modules/Site.py +++ b/Source/Modules/Site.py @@ -347,6 +347,7 @@ def PatchHTML(File, HTML, StaticPartsText, DynamicParts, DynamicPartsText, HTMLP for e in Meta['Macros']: HTML = ReplWithEsc(HTML, f"[:{e}:]", Meta['Macros'][e]) for e in FolderRoots: + HTML = ReplWithEsc(HTML, f"", FolderRoots[e]) HTML = ReplWithEsc(HTML, f"[staticoso:Folder:{e}:AbsoluteRoot]", FolderRoots[e]) HTML = ReplWithEsc(HTML, f"", FolderRoots[e]) for e in Categories: @@ -362,6 +363,7 @@ def PatchHTML(File, HTML, StaticPartsText, DynamicParts, DynamicPartsText, HTMLP '': Title, '[staticoso:Page:Description]': Description, '': Description, + '': SiteDomain, '[staticoso:Site:Name]': SiteName, '': SiteName, '[staticoso:Site:AbsoluteRoot]': SiteRoot, @@ -372,6 +374,7 @@ def PatchHTML(File, HTML, StaticPartsText, DynamicParts, DynamicPartsText, HTMLP for e in Meta['Macros']: ContentHTML = ReplWithEsc(ContentHTML, f"[:{e}:]", Meta['Macros'][e]) for e in FolderRoots: + ContentHTML = ReplWithEsc(ContentHTML, f"", FolderRoots[e]) ContentHTML = ReplWithEsc(ContentHTML, f"[staticoso:Folder:{e}:AbsoluteRoot]", FolderRoots[e]) ContentHTML = ReplWithEsc(ContentHTML, f"", FolderRoots[e]) for e in Categories: diff --git a/TODO b/TODO index ba945c0..ad19cdd 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,9 @@ +- Release on pip +- Alert for deprecated features +- WriteFreely/Wordpress/Blogger integration for reposting+comments +- Fix comment box not appearing in pages with changed URL - Set categories for all files in a folder and subfolder -- Pages with lists of all posts and all pages (? the folder categories thing might make it redundant?) +- Pages with lists of all posts and all pages (? the folder lists thing might make it redundant?) - Fix title detection: - Don't consider titles in code/comment blocks - Consider titles in lists (title marker preceded by chars)