From 50179ffab966f4e7baf262365f7e4059c46d0b06 Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Sun, 29 May 2022 12:12:57 -0400 Subject: [PATCH] WIP on RSS settings page - Move tag mappings to /settings URLs - Remove container wrap for table pages - Add notes for empty tables --- src/MyWebLog.Domain/SupportTypes.fs | 4 + src/MyWebLog/Handlers/Feed.fs | 10 +- src/MyWebLog/Handlers/Routes.fs | 24 ++-- src/MyWebLog/Program.fs | 8 +- .../themes/admin/category-list.liquid | 65 ++++++----- src/MyWebLog/themes/admin/layout.liquid | 2 +- src/MyWebLog/themes/admin/page-list.liquid | 53 +++++---- src/MyWebLog/themes/admin/post-list.liquid | 61 +++++----- src/MyWebLog/themes/admin/rss-settings.liquid | 105 +++++++++++------- src/MyWebLog/themes/admin/settings.liquid | 4 + .../themes/admin/tag-mapping-edit.liquid | 4 +- .../themes/admin/tag-mapping-list.liquid | 6 +- 12 files changed, 199 insertions(+), 147 deletions(-) diff --git a/src/MyWebLog.Domain/SupportTypes.fs b/src/MyWebLog.Domain/SupportTypes.fs index f0e226b..3922b8e 100644 --- a/src/MyWebLog.Domain/SupportTypes.fs +++ b/src/MyWebLog.Domain/SupportTypes.fs @@ -302,6 +302,9 @@ type RssOptions = /// Whether feeds are enabled for all tags tagEnabled : bool + /// A copyright string to be placed in all feeds + copyright : string option + /// Custom feeds for this web log customFeeds: CustomFeed list } @@ -316,6 +319,7 @@ module RssOptions = itemsInFeed = None categoryEnabled = true tagEnabled = true + copyright = None customFeeds = [] } diff --git a/src/MyWebLog/Handlers/Feed.fs b/src/MyWebLog/Handlers/Feed.fs index f5ee7a9..c9f6d3b 100644 --- a/src/MyWebLog/Handlers/Feed.fs +++ b/src/MyWebLog/Handlers/Feed.fs @@ -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 } diff --git a/src/MyWebLog/Handlers/Routes.fs b/src/MyWebLog/Handlers/Routes.fs index e629997..38aafcd 100644 --- a/src/MyWebLog/Handlers/Routes.fs +++ b/src/MyWebLog/Handlers/Routes.fs @@ -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 ] diff --git a/src/MyWebLog/Program.fs b/src/MyWebLog/Program.fs index e58ff1c..2ae829a 100644 --- a/src/MyWebLog/Program.fs +++ b/src/MyWebLog/Program.fs @@ -202,7 +202,7 @@ let main args = opts.TableName <- "Session" opts.Connection <- conn) let _ = builder.Services.AddSession(fun opts -> - opts.IdleTimeout <- TimeSpan.FromMinutes 30 + opts.IdleTimeout <- TimeSpan.FromMinutes 60 opts.Cookie.HttpOnly <- true opts.Cookie.IsEssential <- true) @@ -218,15 +218,15 @@ let main args = Template.RegisterTag "user_links" [ // Domain types - typeof; typeof; typeof; typeof + typeof; typeof; typeof; typeof; typeof; typeof // View models typeof; typeof; typeof; typeof typeof; typeof; typeof; typeof typeof; typeof; typeof; typeof typeof; typeof // Framework types - typeof; typeof; typeof; typeof - typeof; typeof + typeof; typeof; typeof; typeof + typeof; typeof; typeof ] |> List.iter (fun it -> Template.RegisterSafeType (it, [| "*" |])) diff --git a/src/MyWebLog/themes/admin/category-list.liquid b/src/MyWebLog/themes/admin/category-list.liquid index e98e9f0..71d2c9f 100644 --- a/src/MyWebLog/themes/admin/category-list.liquid +++ b/src/MyWebLog/themes/admin/category-list.liquid @@ -1,5 +1,5 @@ 

{{ page_title }}

-
+
Add a New Category @@ -9,36 +9,43 @@ - {% for cat in categories -%} - - + - + {{ cat.name }}
+ + {%- if cat.post_count > 0 %} + + View {{ cat.post_count }} Post{% unless cat.post_count == 1 %}s{% endunless -%} + + • + {%- endif %} + {%- capture cat_edit %}admin/category/{{ cat.id }}/edit{% endcapture -%} + Edit + • + {%- capture cat_del %}admin/category/{{ cat.id }}/delete{% endcapture -%} + {%- capture cat_del_link %}{{ cat_del | relative_link }}{% endcapture -%} + + Delete + + + + + + {%- endfor %} + {%- else -%} + + - {%- endfor %} + {%- endif %}
- {%- if cat.parent_names %} - {% for name in cat.parent_names %}{{ name }} ⟩ {% endfor %} - {%- endif %} - {{ cat.name }}
- - {%- if cat.post_count > 0 %} - - View {{ cat.post_count }} Post{% unless cat.post_count == 1 %}s{% endunless -%} - - • + {%- assign cat_count = categories | size -%} + {% if cat_count > 0 %} + {% for cat in categories -%} +
+ {%- if cat.parent_names %} + {% for name in cat.parent_names %}{{ name }} ⟩ {% endfor %} {%- endif %} - {%- capture cat_edit %}admin/category/{{ cat.id }}/edit{% endcapture -%} - Edit - • - {%- capture cat_del %}admin/category/{{ cat.id }}/delete{% endcapture -%} - {%- capture cat_del_link %}{{ cat_del | relative_link }}{% endcapture -%} - - Delete - - - - {%- if cat.description %}{{ cat.description.value }}{% else %}none{% endif %} - + {%- if cat.description %}{{ cat.description.value }}{% else %}none{% endif %} +
This web log has no categores defined
diff --git a/src/MyWebLog/themes/admin/layout.liquid b/src/MyWebLog/themes/admin/layout.liquid index f03e8f0..55efeba 100644 --- a/src/MyWebLog/themes/admin/layout.liquid +++ b/src/MyWebLog/themes/admin/layout.liquid @@ -24,7 +24,7 @@ {{ "admin/pages" | nav_link: "Pages" }} {{ "admin/posts" | nav_link: "Posts" }} {{ "admin/categories" | nav_link: "Categories" }} - {{ "admin/tag-mappings" | nav_link: "Tag Mappings" }} + {{ "admin/settings" | nav_link: "Settings" }} {%- endif %}
    diff --git a/src/MyWebLog/themes/admin/page-list.liquid b/src/MyWebLog/themes/admin/page-list.liquid index 42b1fc0..aea551c 100644 --- a/src/MyWebLog/themes/admin/page-list.liquid +++ b/src/MyWebLog/themes/admin/page-list.liquid @@ -1,5 +1,5 @@

    {{ page_title }}

    -
    +
    Create a New Page @@ -10,30 +10,37 @@ - {% for pg in pages -%} + {%- assign page_count = pages | size -%} + {% if page_count > 0 %} + {% for pg in pages -%} + + + + + + {%- endfor %} + {% else %} - - - + - {%- endfor %} + {% endif %}
    + {{ pg.title }} + {%- if pg.is_default %}   HOME PAGE{% endif -%} + {%- if pg.show_in_page_list %}   IN PAGE LIST {% endif -%}
    + + {%- capture pg_link %}{% unless pg.is_default %}{{ pg.permalink }}{% endunless %}{% endcapture -%} + View Page + • + Edit + • + {%- capture pg_del %}admin/page/{{ pg.id }}/delete{% endcapture -%} + {%- capture pg_del_link %}{{ pg_del | relative_link }}{% endcapture -%} + + Delete + + +     		/{% unless pg.is_default %}{{ pg.permalink }}{% endunless %}{{ pg.updated_on | date: "MMMM d, yyyy" }}
    - {{ pg.title }} - {%- if pg.is_default %}   HOME PAGE{% endif -%} - {%- if pg.show_in_page_list %}   IN PAGE LIST {% endif -%}
    - - {%- capture pg_link %}{% unless pg.is_default %}{{ pg.permalink }}{% endunless %}{% endcapture -%} - View Page - • - Edit - • - {%- capture pg_del %}admin/page/{{ pg.id }}/delete{% endcapture -%} - {%- capture pg_del_link %}{{ pg_del | relative_link }}{% endcapture -%} - - Delete - - -     		/{% unless pg.is_default %}{{ pg.permalink }}{% endunless %}{{ pg.updated_on | date: "MMMM d, yyyy" }}This web log has no pages
    diff --git a/src/MyWebLog/themes/admin/post-list.liquid b/src/MyWebLog/themes/admin/post-list.liquid index 41c5296..7ec742d 100644 --- a/src/MyWebLog/themes/admin/post-list.liquid +++ b/src/MyWebLog/themes/admin/post-list.liquid @@ -1,5 +1,5 @@

    {{ page_title }}

    -
    +
    Write a New Post @@ -12,34 +12,41 @@ - {% for post in model.posts -%} + {%- assign post_count = model.posts | size -%} + {%- if post_count > 0 %} + {% for post in model.posts -%} + + + + + + + + {%- endfor %} + {% else %} - - - - - + - {%- endfor %} + {% endif %}
    + {% if post.published_on %}{{ post.published_on | date: "MMMM d, yyyy" }}{% else %}Not Published{% endif %} + {%- if post.published_on != post.updated_on %}
    + {{ post.updated_on | date: "MMMM d, yyyy" }} + {%- endif %} +     		+ {{ post.title }}
    + + View Post + • + Edit + • + {%- capture post_del %}admin/post/{{ post.id }}/delete{% endcapture -%} + {%- capture post_del_link %}{{ post_del | relative_link }}{% endcapture -%} + + Delete + + +     		{{ model.authors | value: post.author_id }}{{ post.status }}{{ post.tags | join: ", " }}
    - {% if post.published_on %}{{ post.published_on | date: "MMMM d, yyyy" }}{% else %}Not Published{% endif %} - {%- if post.published_on != post.updated_on %}
    - {{ post.updated_on | date: "MMMM d, yyyy" }} - {%- endif %} -     		- {{ post.title }}
    - - View Post - • - Edit - • - {%- capture post_del %}admin/post/{{ post.id }}/delete{% endcapture -%} - {%- capture post_del_link %}{{ post_del | relative_link }}{% endcapture -%} - - Delete - - -     		{{ model.authors | value: post.author_id }}{{ post.status }}{{ post.tags | join: ", " }}This web log has no posts
    {% if model.newer_link or model.older_link %} diff --git a/src/MyWebLog/themes/admin/rss-settings.liquid b/src/MyWebLog/themes/admin/rss-settings.liquid index cdc6bb8..89ebee2 100644 --- a/src/MyWebLog/themes/admin/rss-settings.liquid +++ b/src/MyWebLog/themes/admin/rss-settings.liquid @@ -1,41 +1,58 @@ -

    {{ web_log.name }} RSS Options

    +

    {{ page_title }}

    - +
    -
    -
    -
    - - -
    +
    +
    +
    + Feeds Enabled +
    + + +
    +
    + + +
    +
    + + +
    +
    -
    +
    +
    +
    - + Default is feed.xml
    -
    +
    - + - Set to “0” to use “Posts per Page” setting + Set to “0” to use “Posts per Page” setting ({{ web_log.posts_per_page }})
    -
    -
    - - -
    -
    - - +
    +
    + + + + Can be a + + Creative Commons license string + +
    @@ -47,31 +64,33 @@

    Custom Feeds

    - Add a New Custom Feed - {%- assign feed_count = model.custom_feeds | size -%} - {% if feed_count > 0 %} - - - - - - - - - + Add a New Custom Feed +
    SourcePathPodcast?
    + + + + + + + + + {%- assign feed_count = model.custom_feeds | size -%} + {% if feed_count > 0 %} {% for feed in model.custom_feeds %} {% endfor %} - -
    SourcePathPodcast?
    {{ feed.source }} - + {{ feed.path }} {% if feed.is_podcast %}Yes{% else %}No{% endif %}
    - {% else %} -

    No custom feeds defined

    - {% endif %} + {% else %} + + No custom feeds defined + + {% endif %} + +
    diff --git a/src/MyWebLog/themes/admin/settings.liquid b/src/MyWebLog/themes/admin/settings.liquid index df2e309..c3234b9 100644 --- a/src/MyWebLog/themes/admin/settings.liquid +++ b/src/MyWebLog/themes/admin/settings.liquid @@ -1,4 +1,8 @@ 

    {{ web_log.name }} Settings

    +

    + Other Settings: Tag Mappings • + RSS Settings +

    diff --git a/src/MyWebLog/themes/admin/tag-mapping-edit.liquid b/src/MyWebLog/themes/admin/tag-mapping-edit.liquid index 93724e8..9b72eb3 100644 --- a/src/MyWebLog/themes/admin/tag-mapping-edit.liquid +++ b/src/MyWebLog/themes/admin/tag-mapping-edit.liquid @@ -1,12 +1,12 @@ 

    {{ page_title }}

    - +
    - « Back to Tag Mappings + « Back to Tag Mappings
    diff --git a/src/MyWebLog/themes/admin/tag-mapping-list.liquid b/src/MyWebLog/themes/admin/tag-mapping-list.liquid index 856e864..48863dc 100644 --- a/src/MyWebLog/themes/admin/tag-mapping-list.liquid +++ b/src/MyWebLog/themes/admin/tag-mapping-list.liquid @@ -1,6 +1,6 @@ 

    {{ page_title }}

    - + Add a New Tag Mapping @@ -17,10 +17,10 @@
    {{ map.tag }}
    - {%- capture map_edit %}admin/tag-mapping/{{ map_id }}/edit{% endcapture -%} + {%- capture map_edit %}admin/settings/tag-mapping/{{ map_id }}/edit{% endcapture -%} Edit • - {%- capture map_del %}admin/tag-mapping/{{ map_id }}/delete{% endcapture -%} + {%- capture map_del %}admin/settings/tag-mapping/{{ map_id }}/delete{% endcapture -%} {%- capture map_del_link %}{{ map_del | relative_link }}{% endcapture -%}