From 7bd9b8d35c162aa77a497cb4dc1a92dd4dd4f631 Mon Sep 17 00:00:00 2001
From: "Daniel J. Summers"
Date: Tue, 31 May 2022 19:17:23 -0400
Subject: [PATCH] Add htmx support to bit-badger and personal
- Tweak transitions on tech-blog
- Fix URL forwarding on settings save
- Add newer/older posts to tech-blog single post template
---
src/MyWebLog/Handlers/Admin.fs | 2 +-
src/MyWebLog/appsettings.json | 2 +-
.../themes/bit-badger/layout-partial.liquid | 10 +++
src/MyWebLog/themes/bit-badger/layout.liquid | 8 +-
.../daniel-j-summers/layout-partial.liquid | 16 ++++
.../themes/daniel-j-summers/layout.liquid | 8 +-
.../daniel-j-summers/single-post.liquid | 10 ++-
src/MyWebLog/themes/tech-blog/layout.liquid | 2 +-
.../themes/tech-blog/single-post.liquid | 48 ++++++++----
.../wwwroot/themes/bit-badger/style.css | 54 ++++++++++++-
.../wwwroot/themes/daniel-j-summers/style.css | 75 +++++++++++++++++--
.../wwwroot/themes/tech-blog/style.css | 20 +++--
12 files changed, 213 insertions(+), 42 deletions(-)
create mode 100644 src/MyWebLog/themes/bit-badger/layout-partial.liquid
create mode 100644 src/MyWebLog/themes/daniel-j-summers/layout-partial.liquid
diff --git a/src/MyWebLog/Handlers/Admin.fs b/src/MyWebLog/Handlers/Admin.fs
index 14498c3..7f6e6ad 100644
--- a/src/MyWebLog/Handlers/Admin.fs
+++ b/src/MyWebLog/Handlers/Admin.fs
@@ -298,7 +298,7 @@ let saveSettings : HttpHandler = fun next ctx -> task {
WebLogCache.set webLog
do! addMessage ctx { UserMessage.success with message = "Web log settings saved successfully" }
- return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin")) next ctx
+ return! redirectToGet (WebLog.relativeUrl webLog (Permalink "admin/settings")) next ctx
| None -> return! Error.notFound next ctx
}
diff --git a/src/MyWebLog/appsettings.json b/src/MyWebLog/appsettings.json
index e6eb741..c6c2488 100644
--- a/src/MyWebLog/appsettings.json
+++ b/src/MyWebLog/appsettings.json
@@ -3,7 +3,7 @@
"hostname": "data02.bitbadger.solutions",
"database": "myWebLog_dev"
},
- "Generator": "myWebLog 2.0-alpha20",
+ "Generator": "myWebLog 2.0-alpha21",
"Logging": {
"LogLevel": {
"MyWebLog.Handlers": "Debug"
diff --git a/src/MyWebLog/themes/bit-badger/layout-partial.liquid b/src/MyWebLog/themes/bit-badger/layout-partial.liquid
new file mode 100644
index 0000000..5451130
--- /dev/null
+++ b/src/MyWebLog/themes/bit-badger/layout-partial.liquid
@@ -0,0 +1,10 @@
+
+
+
+
+ {{ page_title }} » Bit Badger Solutions
+
+
+ {{ content }}
+
+
diff --git a/src/MyWebLog/themes/bit-badger/layout.liquid b/src/MyWebLog/themes/bit-badger/layout.liquid
index b5344a7..08c9ae5 100644
--- a/src/MyWebLog/themes/bit-badger/layout.liquid
+++ b/src/MyWebLog/themes/bit-badger/layout.liquid
@@ -7,7 +7,7 @@
{% page_head -%}
-
+
- {{ content }}
-
+ {{ content }}
+
+ {% page_foot %}
\ No newline at end of file
diff --git a/src/MyWebLog/themes/daniel-j-summers/layout-partial.liquid b/src/MyWebLog/themes/daniel-j-summers/layout-partial.liquid
new file mode 100644
index 0000000..0128a05
--- /dev/null
+++ b/src/MyWebLog/themes/daniel-j-summers/layout-partial.liquid
@@ -0,0 +1,16 @@
+
+
+
+
+
+ {%- if is_home -%}
+ {{ web_log.name }}{% if web_log.subtitle %} | {{ web_log.subtitle.value }}{% endif %}
+ {%- else -%}
+ {{ page_title | strip_html }}{% if page_title and page_title != "" %} » {% endif %}{{ web_log.name }}
+ {%- endif -%}
+
+
+
+ {{ content }}
+
+
diff --git a/src/MyWebLog/themes/daniel-j-summers/layout.liquid b/src/MyWebLog/themes/daniel-j-summers/layout.liquid
index cf47a19..9b5091c 100644
--- a/src/MyWebLog/themes/daniel-j-summers/layout.liquid
+++ b/src/MyWebLog/themes/daniel-j-summers/layout.liquid
@@ -18,7 +18,7 @@
{% page_head -%}
-
+
Site Links
- {{ content }}
+ Loading...
+ {{ content }}