From ba6403dfefb5baceb7702dbed3cbfc3d4b0e78ba Mon Sep 17 00:00:00 2001 From: "Daniel J. Summers" Date: Tue, 31 May 2022 08:45:45 -0400 Subject: [PATCH] Add pagination to page admin - Update blog link in bit-badger theme --- src/MyWebLog/Handlers/Admin.fs | 3 +++ src/MyWebLog/appsettings.json | 2 +- src/MyWebLog/themes/admin/page-list.liquid | 18 +++++++++++++++++- .../themes/bit-badger/home-page.liquid | 5 ++++- 4 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/MyWebLog/Handlers/Admin.fs b/src/MyWebLog/Handlers/Admin.fs index ea2a22a..9fa2bd3 100644 --- a/src/MyWebLog/Handlers/Admin.fs +++ b/src/MyWebLog/Handlers/Admin.fs @@ -132,6 +132,9 @@ let listPages pageNbr : HttpHandler = fun next ctx -> task { {| csrf = csrfToken ctx pages = pages |> List.map (DisplayPage.fromPageMinimal webLog) page_title = "Pages" + page_nbr = pageNbr + prev_page = if pageNbr = 2 then "" else $"/page/{pageNbr - 1}" + next_page = $"/page/{pageNbr + 1}" |} |> viewForTheme "admin" "page-list" next ctx } diff --git a/src/MyWebLog/appsettings.json b/src/MyWebLog/appsettings.json index b7c6de0..0be4f82 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-alpha16", + "Generator": "myWebLog 2.0-alpha17", "Logging": { "LogLevel": { "MyWebLog.Handlers": "Debug" diff --git a/src/MyWebLog/themes/admin/page-list.liquid b/src/MyWebLog/themes/admin/page-list.liquid index aea551c..bdcc956 100644 --- a/src/MyWebLog/themes/admin/page-list.liquid +++ b/src/MyWebLog/themes/admin/page-list.liquid @@ -1,6 +1,7 @@

{{ page_title }}

Create a New Page + {%- assign page_count = pages | size -%} @@ -10,7 +11,6 @@ - {%- assign page_count = pages | size -%} {% if page_count > 0 %} {% for pg in pages -%} @@ -43,6 +43,22 @@ {% endif %}
+ {% if page_nbr > 1 or page_count == 25 %} +
+
+ {% if page_nbr > 1 %} + {%- capture prev_link %}admin/pages{{ prev_page }}{% endcapture -%} +

« Previous

+ {% endif %} +
+
+ {% if page_count == 25 %} + {%- capture next_link %}admin/pages{{ next_page }}{% endcapture -%} +

Next »

+ {% endif %} +
+
+ {% endif %}
diff --git a/src/MyWebLog/themes/bit-badger/home-page.liquid b/src/MyWebLog/themes/bit-badger/home-page.liquid index 7712f8c..04a7b22 100644 --- a/src/MyWebLog/themes/bit-badger/home-page.liquid +++ b/src/MyWebLog/themes/bit-badger/home-page.liquid @@ -91,14 +91,17 @@

Biloxi, Mississippi

+ +
+
myWebLog

The Bit Badger Blog
About • - + Visit