diff --git a/src/MyWebLog/Handlers/Post.fs b/src/MyWebLog/Handlers/Post.fs index 7f6da60..faa7aff 100644 --- a/src/MyWebLog/Handlers/Post.fs +++ b/src/MyWebLog/Handlers/Post.fs @@ -111,6 +111,10 @@ let pageOfPosts pageNbr : HttpHandler = fun next ctx -> task { return! themedView "index" next ctx hash } +// GET /page/{pageNbr}/ +let redirectToPageOfPosts (pageNbr : int) : HttpHandler = fun next ctx -> + redirectTo true (WebLog.relativeUrl ctx.WebLog (Permalink $"page/{pageNbr}")) next ctx + // GET /category/{slug}/ // GET /category/{slug}/page/{pageNbr} let pageOfCategorizedPosts slugAndPage : HttpHandler = fun next ctx -> task { diff --git a/src/MyWebLog/Handlers/Routes.fs b/src/MyWebLog/Handlers/Routes.fs index 75ac4c3..f67d24b 100644 --- a/src/MyWebLog/Handlers/Routes.fs +++ b/src/MyWebLog/Handlers/Routes.fs @@ -160,6 +160,7 @@ let router : HttpHandler = choose [ ]) GET >=> routexp "/category/(.*)" Post.pageOfCategorizedPosts GET >=> routef "/page/%i" Post.pageOfPosts + GET >=> routef "/page/%i/" Post.redirectToPageOfPosts GET >=> routexp "/tag/(.*)" Post.pageOfTaggedPosts subRoute "/user" (choose [ GET >=> choose [ diff --git a/src/MyWebLog/appsettings.json b/src/MyWebLog/appsettings.json index 29f11b0..e2577c7 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-alpha26", + "Generator": "myWebLog 2.0-alpha27", "Logging": { "LogLevel": { "MyWebLog.Handlers": "Debug" diff --git a/src/MyWebLog/themes/admin/dashboard.liquid b/src/MyWebLog/themes/admin/dashboard.liquid index fb0ece6..c7046ea 100644 --- a/src/MyWebLog/themes/admin/dashboard.liquid +++ b/src/MyWebLog/themes/admin/dashboard.liquid @@ -9,8 +9,8 @@ Published {{ model.posts }}   Drafts {{ model.drafts }} - View All - Write a New Post + View All + Write a New Post diff --git a/src/MyWebLog/themes/admin/log-on.liquid b/src/MyWebLog/themes/admin/log-on.liquid index 5452859..ef5960a 100644 --- a/src/MyWebLog/themes/admin/log-on.liquid +++ b/src/MyWebLog/themes/admin/log-on.liquid @@ -1,6 +1,6 @@ 

Log On to {{ web_log.name }}

-
+ {% if model.return_to %}