diff --git a/web/CXM_form.anubis b/web/CXM_form.anubis
index 7fa8c82..baf1acf 100644
--- a/web/CXM_form.anubis
+++ b/web/CXM_form.anubis
@@ -82,8 +82,8 @@ public type CXM_Form_Field:
//--- hidden field ------------------------------------------------------------
hidden (HtmlId id,
- WebArgName web_arg_name,
- InitialValue init_value),
+ WebArgName web_arg_name,
+ WebArgValue init_value),
//--- explanation field ---------------------------------------------------------------
explain (String text),
@@ -343,11 +343,10 @@ public define CXM_Form_Field
public define CXM_Form_Field
hidden
(
- WebArgName web_arg_name,
- InitialValue init_value
+ WebArgName web_arg_name,
+ WebArgValue value
)=
- if web_arg_name is wan(name) then
- hidden(htmlId(name), web_arg_name, init_value).
+ hidden(htmlId(""), web_arg_name, value).
//--- explanation field ---------------------
diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis
index 8f96e9c..71c534c 100644
--- a/web/CXM_making_a_web_site.anubis
+++ b/web/CXM_making_a_web_site.anubis
@@ -1146,55 +1146,55 @@ public define List(HTML_Head_Tag)
map((JS_File js_f) |-> js(js_f), js_file_list).
public type HTML_In_Form:
- empty,
- literal_pt (Printable_tree),
- literal (String),
- sequence (List(HTML_In_Form) items),
- text (List(Text_Option), String the_text),
- preformated (List(Text_Option), String),
- paragraph (List(Text_Option), HTML_In_Form content),
- image (List(CoreAttrs), String url, String alternate),
- image (List(CoreAttrs), String url, String alternate, Int width, Int height),
- table (List(Table_Option), HTML_Header_Row(HTML_In_Form), List(HTML_Row(HTML_In_Form)), HTML_Footer_Row(HTML_In_Form)),
- center (HTML_In_Form),
- mail_to (String email, HTML_In_Form element),
- scroller (Int width, Int height,
+ empty,
+ literal_pt (Printable_tree),
+ literal (String),
+ sequence (List(HTML_In_Form) items),
+ text (List(Text_Option), String the_text),
+ preformated (List(Text_Option), String),
+ paragraph (List(Text_Option), HTML_In_Form content),
+ image (List(CoreAttrs), String url, String alternate),
+ image (List(CoreAttrs), String url, String alternate, Int width, Int height),
+ table (List(Table_Option), HTML_Header_Row(HTML_In_Form), List(HTML_Row(HTML_In_Form)), HTML_Footer_Row(HTML_In_Form)),
+ center (HTML_In_Form),
+ mail_to (String email, HTML_In_Form element),
+ scroller (Int width, Int height,
Int content_width, Int content_height,
HTML_In_Form content),
- actioner (Actioner_Connection, Actioner_Target, Actioner_Aspect,
+ actioner (Actioner_Connection, Actioner_Target, Actioner_Aspect,
String action_name, List((String,String)) extra_ops,
List(Actioner_Local_Action)),
- foreign_link_new (Actioner_Target, Actioner_Aspect, String url),
- foreign_link (List(Text_Option), String url),
- foreign_link (List(Text_Option), String url, String name),
- private_download (String abs_path, String name, String extra_ext,
+ foreign_link_new (Actioner_Target, Actioner_Aspect, String url),
+ foreign_link (List(Text_Option), String url),
+ foreign_link (List(Text_Option), String url, String name),
+ private_download (String abs_path, String name, String extra_ext,
Maybe((String,List((String,String)))) action),
- text_input (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width),
- text_input_ro (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width),
- password_input (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width),
- text_area (List(TextAreaOption), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width, Int height),
- file_upload (List(InputAttrs), String label, HtmlId id, WebArgName name, Int width),
- selector (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List(String) choices),
- selector (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List(String) choices, InitialValue selected),
+ text_input (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width),
+ text_input_ro (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width),
+ password_input (List(InputAttrs), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width),
+ text_area (List(TextAreaOption), String label_text, HtmlId id, WebArgName name, InitialValue init, Int width, Int height),
+ file_upload (List(InputAttrs), String label, HtmlId id, WebArgName name, Int width),
+ selector (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List(String) choices),
+ selector (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List(String) choices, InitialValue selected),
// List((String,String)) = List((code,name)) where :
// code is the web-arg value
// name appears in selector
- selector_c (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices),
- selector_c (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices, InitialValue selected),
- 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),
+ selector_c (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices),
+ selector_c (List(InputAttrs), String label_text, HtmlId id, WebArgName name, Int size, List((List(CoreAttrs),WebArgValue,String)) choices, InitialValue selected),
+ 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, WebArgValue value),
+ partial (HTML_Partial_Content),
br,
- progress (List(CoreAttrs), Int value, Int max),
- ol (List(CoreAttrs), HTML_In_Form content),
- ul (List(CoreAttrs), HTML_In_Form content),
- li (List(CoreAttrs), HTML_In_Form content),
- button (List(CoreAttrs), HTML_In_Form content).
+ progress (List(CoreAttrs), Int value, Int max),
+ ol (List(CoreAttrs), HTML_In_Form content),
+ ul (List(CoreAttrs), HTML_In_Form content),
+ li (List(CoreAttrs), HTML_In_Form content),
+ button (List(CoreAttrs), HTML_In_Form content).
'HTML_In_Form' defines all the elements you may put within a form. We define a
@@ -1337,9 +1337,9 @@ public define HTML_In_Form
= file_upload([], "", htmlId(""), name, width).
public define HTML_In_Form
- hidden (WebArgName name, InitialValue init)
- = if name is wan(web_name) then
- hidden(htmlId(web_name), name, init).
+ hidden (WebArgName name, WebArgValue value)
+ =
+ hidden(htmlId(""), name, value).
public type HTML_Body:...
@@ -4260,8 +4260,9 @@ define Printable_tree
format(cinfo,sn,ic_v,any_div(options, e),format_element,is_https, action_count, head_tags),
div_empty(options) then
format(cinfo,sn,ic_v,any_div_empty(options),format_element,is_https, action_count, head_tags),
- hidden(id, name, value) then
- [""],
+ hidden(_id, name, value) then
+ since _id is htmlId(id),
+ [""],
partial(p_content) then
if p_content is partial_content(tags, html_elements) then
head_tags <- *head_tags + tags;
--
libgit2 0.21.4