diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 6568e9e..449f612 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -1695,10 +1695,49 @@ public define HTML_In_Form hidden (WebArgName name, WebArgValue value) = hidden(html_Id(""), name, value). - + +public type Input_Type: +button, +checkbox, +color, +date, +datetime_local, +email, +file, +hidden, +image, +month, +number, +password, +radio, +range, +reset, +search, +submit, +tel, +text, +time, +url, +week +. + +public type A_href: + href(String href), + href(WEB_Action_Name action, List((String,String)) extra_ops) +. + +public type A_target: + _blank, + _self, + _parent, + _top, + framename(String name) +. + public type HTML_Body:... public type HTML_Off_Form: + a (List(CoreAttrs), A_href, A_target, List(HTML_Off_Form) content), empty, literal_pt (Printable_tree), literal (String), @@ -1762,6 +1801,14 @@ public type HTML_Off_Form: 'HTML_Off_Form' defines all the elements you may put outside any form. +public define HTML_Off_Form a(A_href _href) = a([], _href, _self, []). +public define HTML_Off_Form a(List(CoreAttrs) attrs, A_href _href) = a(attrs, _href, _self, []). +public define HTML_Off_Form a(List(CoreAttrs) attrs, A_href _href, HTML_Off_Form content) = a(attrs, _href, _self, [content]). +public define HTML_Off_Form a(List(CoreAttrs) attrs, A_href _href, List(HTML_Off_Form) content) = a(attrs, _href, _self, content). +public define HTML_Off_Form a(A_href _href, HTML_Off_Form content) = a([], _href, _self, [content]). +public define HTML_Off_Form a(A_href _href, List(HTML_Off_Form) content) = a([], _href, _self, content). + + public define HTML_Off_Form strong(HTML_Off_Form content) = strong([], [content]). public define HTML_Off_Form strong(List(HTML_Off_Form) content) = strong([], content). public define HTML_Off_Form strong(List(CoreAttrs) attrs, HTML_Off_Form content) = strong(attrs, [content]). @@ -2334,6 +2381,13 @@ public define HTML_Partial_Content public define HTML_Partial_Content partial_content ( + List(HTML_Off_Form) content + )= + partial_content([], sequence(content)). + +public define HTML_Partial_Content + partial_content + ( List(HTML_Head_Tag) tags, HTML_Partial_Content p_content )= @@ -5716,7 +5770,34 @@ define String "" . - +define Printable_tree + format_href + ( + A_href _href + )= + if _href is + { + href(str) then if str = "" then [] else [" href=\"", str, "\""], + href(action, extra) then [" href=\"",format_web_action_name(action, extra), "\""] + } +. + +define Printable_tree + format_target + ( + A_target _target + )= + [" target=\"", + if _target is + { + _blank then "_blank", + _self then "_self", + _parent then "_parent", + _top then "_top", + framename(name) then name + }, + "\""] +. define Printable_tree format @@ -5730,9 +5811,10 @@ define Printable_tree ) = if cinfo is info(common_name,http_port,https_port,site_directory,secret) then with format_element = (HTML_Off_Form e) |-> format(cinfo, ic_v, e, is_https, action_count, head_tags), - if element is - { - empty then [], + if element is + { + a(opts, _href, _target, l) then ["",flat(map(format_element,l)),"\n"], + empty then [], literal_pt(t) then t, literal(t) then [t], sequence(l) then flat(map(format_element,l)), diff --git a/web/jQuery/CXM_jquery_dialog.anubis b/web/jQuery/CXM_jquery_dialog.anubis index e6c59d0..c2f584c 100644 --- a/web/jQuery/CXM_jquery_dialog.anubis +++ b/web/jQuery/CXM_jquery_dialog.anubis @@ -78,6 +78,25 @@ $( \"#"+dlg_id+"\" ).dialog({ public define HTML_Partial_Content jq_dialog_create ( + JQuery_dialog_id dial_id, + JQuery_dialog content, + JQuery_dialog_size size, + String extra_param + )= + jq_dialog_create(dial_id, content, false, size, extra_param). + +public define HTML_Partial_Content + jq_dialog_create + ( + JQuery_dialog_id dial_id, + JQuery_dialog content, + JQuery_dialog_size size + )= + jq_dialog_create(dial_id, content, false, size, ""). + +public define HTML_Partial_Content + jq_dialog_create + ( JQuery_dialog_id dial_id, JQuery_dialog content, String extra_param diff --git a/web/jQuery/CXM_jquery_tabs.anubis b/web/jQuery/CXM_jquery_tabs.anubis index a47c802..76853bb 100644 --- a/web/jQuery/CXM_jquery_tabs.anubis +++ b/web/jQuery/CXM_jquery_tabs.anubis @@ -44,7 +44,7 @@ define HTML_Partial_Content partial_content( tabs_heads, sequence([ - literal("