diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 8db0a3e..cc52b91 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -1116,11 +1116,13 @@ public type HTML_In_Form: radio_button (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), radio_button_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), check_box (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), - check_box_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), - div (List(CoreAttrs), HTML_In_Form content), - div_empty (List(CoreAttrs)), - hidden (HtmlId id, WebArgName name, InitialValue init), - partial (HTML_Partial_Content). + check_box_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), + div (List(CoreAttrs), HTML_In_Form content), + div_empty (List(CoreAttrs)), + hidden (HtmlId id, WebArgName name, InitialValue init), + partial (HTML_Partial_Content), + br, + progress (List(CoreAttrs), Int value, Int max). 'HTML_In_Form' defines all the elements you may put within a form. We define a @@ -1303,16 +1305,18 @@ public type HTML_Off_Form: form (HtmlId form_id, List(CoreAttrs), String action_name, List((String,String)) extra_ops, HTML_In_Form content), - in_form (HtmlId form_id, HTML_In_Form content), - div (List(CoreAttrs), HTML_Off_Form content), - div (List(CoreAttrs), HTML_Partial_Content p_content), - div_empty (List(CoreAttrs)), - iframe (List(CoreAttrs), + in_form (HtmlId form_id, HTML_In_Form content), + div (List(CoreAttrs), HTML_Off_Form content), + div (List(CoreAttrs), HTML_Partial_Content p_content), + div_empty (List(CoreAttrs)), + iframe (List(CoreAttrs), List(CSS_Style) /*styles*/, List(CSS_File) /*css_files*/, List(JS_File) /*js_files*/, HTML_Body /*body*/), - partial (HTML_Partial_Content). + partial (HTML_Partial_Content), + br, + progress (List(CoreAttrs), Int value, Int max). 'HTML_Off_Form' defines all the elements you may put outside any form. @@ -4327,7 +4331,9 @@ define Printable_tree if p_content is partial_content(tags, html_elements) then head_tags <- *head_tags + tags; - format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags) + format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags), + br then ["
"], + progress(options, value, max) then [""] }. @@ -4409,7 +4415,9 @@ define Bool div(o,c) then contains_an_upload(c), div_empty(o) then false, hidden(_,_,_) then false, - partial(_) then false + partial(_) then false, + br then false, + progress(_,_,_) then false }. define String @@ -4539,7 +4547,9 @@ define Printable_tree partial(p_content) then if p_content is partial_content(tags, html_elements) then head_tags <- *head_tags + tags; - format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags) + format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags), + br then ["
"], + progress(options, value, max) then [""] }. diff --git a/web/jQuery/CXM_jquery_button.anubis b/web/jQuery/CXM_jquery_button.anubis index bf7f23f..c31afd5 100644 --- a/web/jQuery/CXM_jquery_button.anubis +++ b/web/jQuery/CXM_jquery_button.anubis @@ -293,8 +293,8 @@ public define HTML_Partial_Content String dlg_title, String dlg_text, String dlg_ok, - String dlg_cancel, - JQuery_Actioner actioner + String dlg_cancel + //JQuery_Actioner actioner //String url, //List((String, String)) extra_ops )= -- libgit2 0.21.4