Eliminate final admin theme Liquid resources

- Update admin.js with new field IDs

src/MyWebLog/Handlers/Admin.fs

@@ -384,7 +384,7 @@ module Theme =
         if ctx.Request.HasFormContentType && ctx.Request.Form.Files.Count > 0 then
             let themeFile = Seq.head ctx.Request.Form.Files
             match deriveIdFromFileName themeFile.FileName with
-            | Ok themeId when themeId <> adminTheme ->
+            | Ok themeId when themeId <> ThemeId "admin" ->
                 let  data   = ctx.Data
                 let! exists = data.Theme.Exists themeId
                 let  isNew  = not exists

src/MyWebLog/Handlers/Helpers.fs

@@ -355,13 +355,6 @@ let themedView template next ctx hash = task {
     return! viewForTheme (hash[ViewContext.WebLog] :?> WebLog).ThemeId template next ctx hash
 }
 
-/// The ID for the admin theme
-let adminTheme = ThemeId "admin"
-
-/// Display a bare view for the admin theme
-let adminBareView template =
-    bareForTheme adminTheme template
-
 /// Display a page for an admin endpoint
 let adminPage pageTitle includeCsrf next ctx (content: AppViewContext -> XmlNode list) = task {
     let! messages = getCurrentMessages ctx
@@ -416,7 +409,7 @@ let someTask<'T> (it: 'T) = Task.FromResult(Some it)
 
 /// Create an absolute URL from a string that may already be an absolute URL
 let absoluteUrl (url: string) (ctx: HttpContext) =
-    if url.StartsWith "http" then url else ctx.WebLog.AbsoluteUrl (Permalink url)
+    if url.StartsWith "http" then url else ctx.WebLog.AbsoluteUrl(Permalink url)
 
 
 open MyWebLog.Data

src/MyWebLog/Handlers/Page.fs

@@ -115,18 +115,9 @@ let private findPageRevision pgId revDate (ctx: HttpContext) = task {
 let previewRevision (pgId, revDate) : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     match! findPageRevision pgId revDate ctx with
     | Some pg, Some rev when canEdit pg.AuthorId ctx ->
-        return! {|
-            content =
-                [   """<div class="mwl-revision-preview mb-3">"""
-                    rev.Text.AsHtml() |> addBaseToRelativeUrls ctx.WebLog.ExtraPath
-                    "</div>"
-                ]
-                |> String.concat ""
-        |}
-        |> makeHash |> adminBareView "" next ctx
+        return! adminBarePage "" false next ctx (Views.Helpers.commonPreview rev)
     | Some _, Some _ -> return! Error.notAuthorized next ctx
-    | None, _
-    | _, None -> return! Error.notFound next ctx
+    | None, _ | _, None -> return! Error.notFound next ctx
 }
 
 // POST /admin/page/{id}/revision/{revision-date}/restore
@@ -150,7 +141,7 @@ let deleteRevision (pgId, revDate) : HttpHandler = requireAccess Author >=> fun
     | Some pg, Some rev when canEdit pg.AuthorId ctx ->
         do! ctx.Data.Page.Update { pg with Revisions = pg.Revisions |> List.filter (fun r -> r.AsOf <> rev.AsOf) }
         do! addMessage ctx { UserMessage.Success with Message = "Revision deleted successfully" }
-        return! adminBareView "" next ctx (makeHash {| content = "" |})
+        return! adminBarePage "" false next ctx (fun _ -> [])
     | Some _, Some _ -> return! Error.notAuthorized next ctx
     | None, _
     | _, None -> return! Error.notFound next ctx

src/MyWebLog/Handlers/Post.fs

@@ -358,18 +358,9 @@ let private findPostRevision postId revDate (ctx: HttpContext) = task {
 let previewRevision (postId, revDate) : HttpHandler = requireAccess Author >=> fun next ctx -> task {
     match! findPostRevision postId revDate ctx with
     | Some post, Some rev when canEdit post.AuthorId ctx ->
-        return! {|
-            content =
-                [   """<div class="mwl-revision-preview mb-3">"""
-                    rev.Text.AsHtml() |> addBaseToRelativeUrls ctx.WebLog.ExtraPath
-                    "</div>"
-                ]
-                |> String.concat ""
-        |}
-        |> makeHash |> adminBareView "" next ctx
+        return! adminBarePage "" false next ctx (Views.Helpers.commonPreview rev)
     | Some _, Some _ -> return! Error.notAuthorized next ctx
-    | None, _
-    | _, None -> return! Error.notFound next ctx
+    | None, _ | _, None -> return! Error.notFound next ctx
 }
 
 // POST /admin/post/{id}/revision/{revision-date}/restore
@@ -393,7 +384,7 @@ let deleteRevision (postId, revDate) : HttpHandler = requireAccess Author >=> fu
     | Some post, Some rev when canEdit post.AuthorId ctx ->
         do! ctx.Data.Post.Update { post with Revisions = post.Revisions |> List.filter (fun r -> r.AsOf <> rev.AsOf) }
         do! addMessage ctx { UserMessage.Success with Message = "Revision deleted successfully" }
-        return! adminBareView "" next ctx (makeHash {| content = "" |})
+        return! adminBarePage "" false next ctx (fun _ -> [])
     | Some _, Some _ -> return! Error.notAuthorized next ctx
     | None, _
     | _, None -> return! Error.notFound next ctx

src/MyWebLog/Views/Helpers.fs

@@ -393,6 +393,14 @@ let commonMetaItems (model: EditCommonModel) =
     ]
 
 
+/// Revision preview template
+let commonPreview (rev: Revision) app =
+    div [ _class "mwl-revision-preview mb-3" ] [
+        rev.Text.AsHtml() |> addBaseToRelativeUrls app.WebLog.ExtraPath |> raw
+    ]
+    |> List.singleton
+
+
 /// Form to manage permalinks for pages or posts
 let managePermalinks (model: ManagePermalinksModel) app = [
     let baseUrl = relUrl app $"admin/{model.Entity}/"