bit-badger/myWebLog
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 11 Activity

WIP on RSS settings page

Browse Source 
- Move tag mappings to /settings URLs
- Remove container wrap for table pages
- Add notes for empty tables
This commit is contained in:
Daniel J. Summers
2022-05-29 12:12:57 -04:00
parent 92cc50254c
commit 50179ffab9
12 changed files with 199 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MyWebLog/Handlers/Feed.fs
View File

@@ -199,7 +199,6 @@ let private addPodcast webLog (rssFeed : SyndicationFeed) (feed : CustomFeed) =
"link", feedUrl
]
|> List.fold (fun doc (name, value) -> addChild doc name "" value) (XmlDocument ()))
// TODO: is copyright required?
rssFeed.ElementExtensions.Add ("summary", "itunes", podcast.summary)
rssFeed.ElementExtensions.Add ("author", "itunes", podcast.displayedAuthor)
podcast.subtitle |> Option.iter (fun sub -> rssFeed.ElementExtensions.Add ("subtitle", "itunes", sub))
@@ -238,10 +237,11 @@ let createFeed (feedType : FeedType) posts : HttpHandler = fun next ctx -> backg
feed.Items <- posts |> Seq.ofList |> Seq.map toItem
feed.Language <- "en"
feed.Id <- webLog.urlBase
webLog.rss.copyright |> Option.iter (fun copy -> feed.Copyright <- TextSyndicationContent copy)
// TODO: adjust this link for non-root feeds
feed.Links.Add (SyndicationLink (Uri $"{webLog.urlBase}/feed.xml", "self", "", "application/rss+xml", 0L))
feed.AttributeExtensions.Add
(XmlQualifiedName ("content", "http://www.w3.org/2000/xmlns/"), "http://purl.org/rss/1.0/modules/content/")
addNamespace feed "content" "http://purl.org/rss/1.0/modules/content/"
feed.ElementExtensions.Add ("link", "", webLog.urlBase)
podcast |> Option.iter (addPodcast webLog feed)
@@ -273,7 +273,9 @@ let editSettings : HttpHandler = fun next ctx -> task {
// TODO: stopped here
return!
Hash.FromAnonymousObject
{| csrf = csrfToken ctx
{| csrf = csrfToken ctx
model = ctx.WebLog.rss
page_title = "RSS Settings"
|}
|> viewForTheme "admin" "rss-settings" next ctx
}

24
src/MyWebLog/Handlers/Routes.fs
View File

@@ -93,13 +93,13 @@ let router : HttpHandler = choose [
routef "/%s/edit" Post.edit
routef "/%s/permalinks" Post.editPermalinks
])
subRoute "/rss" (choose [
route "/settings" >=> Feed.editSettings
])
route "/settings" >=> Admin.settings
subRoute "/tag-mapping" (choose [
route "s" >=> Admin.tagMappings
routef "/%s/edit" Admin.editMapping
subRoute "/settings" (choose [
route "" >=> Admin.settings
route "/rss" >=> Feed.editSettings
subRoute "/tag-mapping" (choose [
route "s" >=> Admin.tagMappings
routef "/%s/edit" Admin.editMapping
])
])
route "/user/edit" >=> User.edit
]
@@ -118,10 +118,12 @@ let router : HttpHandler = choose [
route "/permalinks" >=> Post.savePermalinks
routef "/%s/delete" Post.delete
])
route "/settings" >=> Admin.saveSettings
subRoute "/tag-mapping" (choose [
route "/save" >=> Admin.saveMapping
routef "/%s/delete" Admin.deleteMapping
subRoute "/settings" (choose [
route "" >=> Admin.saveSettings
subRoute "/tag-mapping" (choose [
route "/save" >=> Admin.saveMapping
routef "/%s/delete" Admin.deleteMapping
])
])
route "/user/save" >=> User.save
]