diff --git a/web/CXM_form.anubis b/web/CXM_form.anubis index a0896a9..4420aef 100644 --- a/web/CXM_form.anubis +++ b/web/CXM_form.anubis @@ -242,7 +242,8 @@ public type CXM_Form_Field: label_for ( String label, HTML_Id id, HTML_In_Form input), - div (List(CoreAttrs), HTML_In_Form content), + div (List(CoreAttrs), List(HTML_In_Form) contents), + div (List(CoreAttrs), List(CXM_Form_Field) fields), partial (HTML_Partial_Content p_content), br, hr (List(CoreAttrs) options), @@ -410,6 +411,22 @@ public define CXM_Form_Field hr([]) . +public define CXM_Form_Field + div + ( + List(CoreAttrs) attrs, + HTML_In_Form content + )= + div(attrs, [content]) +. + +public define CXM_Form_Field + div + ( + HTML_In_Form content + )= + div([], [content]) +. //--- explanation field --------------------- // ////////////////////////////////////////////////////////// @@ -492,7 +509,7 @@ public define HTML_In_Form empty, title(t) then - literal("

" + t + "

"), + literal("

"+t+"

"), message(t) then literal(t), @@ -615,7 +632,7 @@ public define HTML_In_Form ]), div(options, e) then div(options, e), - + div(options, fields)then div(options, format_div_CXM_Form_Field(fields, lwa, _class, b_with_label)), partial(p_content) then partial(p_content), br then br, hr(opts) then hr(opts), @@ -878,6 +895,16 @@ public define HTML_Off_Form public define HTML_Off_Form cxm_form ( + String form_id, + List(CoreAttrs) options, + List(HTML_In_Form) fields + ) = + cxm_form(html_Id(form_id), options, action_name(""), [], [], map((HTML_In_Form field) |-> raw_in_form(field), fields), "form_field aligned", true ) +. + +public define HTML_Off_Form + cxm_form + ( String form_id, List(CoreAttrs) options, List(Web_arg) lwa, -- libgit2 0.21.4