drame update

2024-12-27 18:50:01 +01:00 · 2024-12-27 18:50:01 +01:00 · 1083ce3f2e
commit 1083ce3f2e
parent b5c70ed7dd
6 changed files with 22 additions and 17 deletions
--- a/src/about.ml
+++ b/src/about.ml
@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang

 let get request =
--- a/src/contact.ml
+++ b/src/contact.ml
@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang

 let contact_img = { name = "contact.png"; alt = { fr = ""; en = "" } }
--- a/src/home.ml
+++ b/src/home.ml
@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang

 let get request =
--- a/src/projects.ml
+++ b/src/projects.ml
@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang

 (* projects data is in data/projects.scfg
--- a/src/services.ml
+++ b/src/services.ml
@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang

 let services request =
--- a/src/template.ml
+++ b/src/template.ml
@ -1,5 +1,5 @@
 open Drame
-open Html
+open Tyxml.Html
 open Lang

 (* wrap all elements of l wi a <li> to make a <ul> *)
@ -146,14 +146,19 @@ let render request ?title:title_txt ?(scripts = []) ?(styles = []) ~h1 content =

  let lang = Format.asprintf "%a" Lang.pp (Lang.of_request request) in

-  html
-    ~a:[ a_lang lang ]
-    head
-    (body
-       [ topbar
-       ; main
-           [ Tyxml.Html.h1 ~a:[ a_class [ "hidden" ] ] [ txt_choice request h1 ]
-           ; div [ content ]
-           ]
-       ; footer [ lang_choice ]
-       ] )
+  let doc =
+    html
+      ~a:[ a_lang lang ]
+      head
+      (body
+         [ topbar
+         ; main
+             [ Tyxml.Html.h1
+                 ~a:[ a_class [ "hidden" ] ]
+                 [ txt_choice request h1 ]
+             ; div [ content ]
+             ]
+         ; footer [ lang_choice ]
+         ] )
+  in
+  Html_doc.of_tyxml doc