diff --git a/web/CXM_dojo.anubis b/web/CXM_dojo.anubis index 738a789..0d05e6c 100644 --- a/web/CXM_dojo.anubis +++ b/web/CXM_dojo.anubis @@ -671,14 +671,13 @@ public define HTML_Off_Form public define HTML_In_Form dojo_checkbox ( - List(CoreAttrs) attributes, - WebArgName name, - HTML_Id id, - String label_str, - WebArgValue val, - Bool checked, + List(CoreAttrs) attributes, + WebArgName name, + HTML_Id id, + String label_str, + Bool checked, )= - check_box_r([attr("dojoType", "dijit.form.CheckBox") . attributes] , label(label_str, no_help), id, name, val, checked). + check_box_r([attr("dojoType", "dijit.form.CheckBox") . attributes] , label(label_str, no_help), id, name, checked). public define HTML_In_Form dojo_combobox diff --git a/web/CXM_form.anubis b/web/CXM_form.anubis index 02b0858..ce08a55 100644 --- a/web/CXM_form.anubis +++ b/web/CXM_form.anubis @@ -157,7 +157,6 @@ public type CXM_Form_Field: HTML_Label label, HTML_Id id, WebArgName web_arg_name, - WebArgValue web_arg_value, Bool checked, Mandatory mandatory), @@ -167,7 +166,6 @@ public type CXM_Form_Field: HTML_Label label, HTML_Id id, WebArgName web_arg_name, - WebArgValue web_arg_value, Bool checked, Mandatory mandatory ), @@ -177,7 +175,6 @@ public type CXM_Form_Field: List(CoreAttrs) options, HTML_Label label, WebArgName web_arg_name, - WebArgValue web_arg_value, Bool checked, List(CXM_Form_Field) fields ), @@ -321,12 +318,12 @@ public define CXM_Form_Field = password_input([], label, html_Id(n.name), n, init_value, width, mand). public define CXM_Form_Field - checkbox(HTML_Label label, WebArgName n, WebArgValue value, Bool checked, Mandatory mand) - = checkbox([], label, html_Id(n.name), n, value, checked, mand). + checkbox(HTML_Label label, WebArgName n, Bool checked, Mandatory mand) + = checkbox([], label, html_Id(n.name), n, checked, mand). public define CXM_Form_Field - checkboxr(HTML_Label label, WebArgName n, WebArgValue value, Bool checked, Mandatory mand) - = checkboxr([], label, html_Id(n.name), n, value, checked, mand). + checkboxr(HTML_Label label, WebArgName n, Bool checked, Mandatory mand) + = checkboxr([], label, html_Id(n.name), n, checked, mand). public define CXM_Form_Field radio_button(HTML_Label label, WebArgName n, WebArgValue value, Bool checked, Mandatory mand) @@ -552,18 +549,18 @@ public define HTML_In_Form partial(partial_content(partial_content_list)) ]), - checkbox(options, _label, id, wan, val, checked, mand) then - check_box([class("in") . options], star(_label, mand), id, wan, val, get_Bool(lwa, wan.name, checked)), + checkbox(options, _label, id, wan, checked, mand) then + check_box([class("in") . options], star(_label, mand), id, wan, get_Bool(lwa, wan.name, checked)), - checkboxr(options, _label, id, wan, val, checked, mand) then - check_box_r([class("in") . options], star(_label, mand), id, wan, val, get_Bool(lwa, wan.name, checked)), + checkboxr(options, _label, id, wan, checked, mand) then + check_box_r([class("in") . options], star(_label, mand), id, wan, get_Bool(lwa, wan.name, checked)), - checkbox_hide_show(options, _label, wan, val, checked, fields) then + checkbox_hide_show(options, _label, wan, checked, fields) then with div_id = generate_random_string(15), sequence([ - check_box([data("show_id", div_id), class("in"), class("cxm_checkbox_hide_show"), event(onclick, "checked_hide_show_element('"+div_id+"', this);")], _label, html_Id("checkbox_"+div_id), wan, val, get_Bool(lwa, wan.name, checked)), + check_box([data("show_id", div_id), class("in"), class("cxm_checkbox_hide_show"), event(onclick, "checked_hide_show_element('"+div_id+"', this);")], _label, html_Id("checkbox_"+div_id), wan, get_Bool(lwa, wan.name, checked)), div([id(div_id), style("display:"+if checked then "block" else "none")], format_div_CXM_Form_Field(fields, lwa, _class, b_with_label)) - ]), + ]), radio_button(options, _label, id, wan, val, checked, mand) then radio_button([class("in"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);") . options], star(_label, mand), id, wan, val, get_Bool(lwa, wan.name, checked)), diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index 8f6f1a7..1e15609 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -1428,8 +1428,8 @@ public type HTML_In_Form: selector_c (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices, InitialValue selected), radio_button (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, WebArgValue value, Bool checked), radio_button_r (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, WebArgValue value, Bool checked), - check_box (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, WebArgValue value, Bool checked), - check_box_r (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, WebArgValue value, Bool checked), + check_box (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, Bool checked), + check_box_r (List(CoreAttrs), HTML_Label label, HTML_Id id, WebArgName name, Bool checked), div (List(CoreAttrs), List(HTML_In_Form) content), div_empty (List(CoreAttrs)), hidden (HTML_Id id, WebArgName name, WebArgValue value), @@ -1663,12 +1663,12 @@ public define HTML_In_Form = radio_button_r (options, label, html_Id(n.name), n, value, checked). public define HTML_In_Form - check_box (List(CoreAttrs) options, HTML_Label label, WebArgName n, WebArgValue value, Bool checked) - = check_box (options, label, html_Id(n.name), n, value, checked). + check_box (List(CoreAttrs) options, HTML_Label label, WebArgName n, Bool checked) + = check_box (options, label, html_Id(n.name), n, checked). public define HTML_In_Form - check_box_r (List(CoreAttrs) options, HTML_Label label, WebArgName n, WebArgValue value, Bool checked) - = check_box_r (options, label, html_Id(n.name), n, value, checked). + check_box_r (List(CoreAttrs) options, HTML_Label label, WebArgName n, Bool checked) + = check_box_r (options, label, html_Id(n.name), n, checked). public define HTML_In_Form file_upload (WebArgName n, Int width) @@ -3257,6 +3257,7 @@ public define Web_Site List(Web_arg) lwa, Bool is_https) |-> //(Printable_tree) + println(dump_web_arg_values(lwa)); since separate_web_args(lwa, http_info) is swa(mb_previous_state, mb_action_name, operands), with new_state = if mb_previous_state is { @@ -5540,11 +5541,11 @@ define Printable_tree radio_button_r(options, label, id, n, v, c) then [ "", format_label(label, id)], - check_box(options, label, id, n, v, c) then + check_box(options, label, id, n, c) then [ format_label(label, id), - ""] - check_box_r(options, label, id, n, v, c) then - [ "", + ""] + check_box_r(options, label, id, n, c) then + [ "", format_label(label, id)] div(options, e) then format(cinfo,ic_v,any_div(options, e),format_element,is_https, action_count, head_tags), @@ -5650,8 +5651,8 @@ define Bool selector_c(o,l,i,n,s,c,p) then false, radio_button(o,_,_,n,v,c) then false, radio_button_r(o,_,_,n,v,c) then false, - check_box(o,_,_,n,v,c) then false, - check_box_r(o,_,_,n,v,c) then false, + check_box(o,_,_,n,c) then false, + check_box_r(o,_,_,n,c) then false, div(o,l) then mapor(contains_an_upload,l), //contains_an_upload(c), div_empty(o) then false, hidden(_,_,_) then false, -- libgit2 0.21.4