")
]).
@@ -139,25 +140,20 @@ public define HTML_Off_Form
dojo_TabContainer
(
String id,
- String region,
HTML_Off_Form content
) =
sequence([
- literal("
"),
+ literal("
"),
content,
literal("
")
]).
+
+
public define HTML_Off_Form
- dojo_BorderContainer
+ dojo_tree
(
String id,
- HTML_Off_Form content
- ) =
- sequence([
- literal("
"),
- content,
- literal("
")
- ]).
->
+ )=
+ literal("
").
diff --git a/calexium_lib/web/CXM_making_a_web_site.anubis b/calexium_lib/web/CXM_making_a_web_site.anubis
index 7cf0e5f..3f80216 100644
--- a/calexium_lib/web/CXM_making_a_web_site.anubis
+++ b/calexium_lib/web/CXM_making_a_web_site.anubis
@@ -1484,7 +1484,8 @@ public type HTTP_Answer:
ByteArray content),
custom_tree(String mime_type,
Printable_tree content),
- http_raw(Printable_tree).
+ http_raw(Printable_tree),
+ html_content(HTML_Off_Form content).
public define HTTP_Answer
html_page
@@ -2165,7 +2166,7 @@ public type Web_Site:
We gather common (constant) informations in the following type:
-type CommonInfo:
+public type CommonInfo:
info(String common_name,
Word32 http_port,
Word32 https_port,
@@ -3994,7 +3995,7 @@ define Printable_tree
(
CommonInfo cinfo,
String sn, // state_name
- Var(Int) ic_v, // 'idnum' counter variable
+ Var(Int) ic_v, // 'idnum' counter variable
HTML_Off_Form element,
Bool is_https,
) =
@@ -4316,6 +4317,16 @@ define Printable_tree
content
],
- http_raw(Printable_tree content) then content
+ http_raw(Printable_tree content) then content,
+
+ html_content(HTML_Off_Form content_HTML) then
+ with content = format(cinfo, state_name, ic_v, content_HTML, is_https),
+ [ "HTTP/1.1 200 OK", crlf,
+ format_headers(standard_headers),
+ format_headers(standard_headers_for("text/html", length(content), success(charset))),
+ format_headers(additional_headers),
+ crlf .
+ content
+ ],
}.
--
libgit2 0.21.4