add some helpers for fieldset

totoro
1 parent 9d0e15c5
Showing 2 changed files with 35 additions and 9 deletions Show diff stats
web/CXM_form.anubis
web/CXM_xml_rpc_parser.anubis
@@ -202,6 +202,7 @@ public type CXM_Form_Field:
                     HTML_In_Form   input),
    div              (List(CoreAttrs), HTML_In_Form content),
    partial          (HTML_Partial_Content p_content),
+   br,
    input_with_help  (CXM_Form_Field   field,
                     Maybe(String)  help_title,
                     String         help_text,
@@ -540,7 +541,7 @@ public define HTML_In_Form
     div(options, e)     then  div(options, e),
     partial(p_content)  then partial(p_content),
-    
+    br                  then br,    
     input_with_help(input, help_title, help_text, width) then 
       sequence([
         format_CXM_Form_Field(input, lwa), 
@@ -583,6 +584,31 @@ public define HTML_In_Form
   )=
   sequence( map((CXM_Form_Field ff) |-> div([class("form_field aligned")], format_CXM_Form_Field(ff, lwa)), fields) ).
+public define HTML_In_Form
+  fieldset
+  (
+    List(Web_arg)         lwa,
+    List(CXM_Form_Field)  fields,
+  )=
+  sequence( map((CXM_Form_Field ff) |-> div([class("form_field aligned")], format_CXM_Form_Field(ff, lwa)), fields) ).
+
+public define HTML_In_Form
+  fieldset
+  (
+    List(Web_arg)   lwa,
+    CXM_Form_Field  field,
+  )=
+  div([class("form_field aligned")], format_CXM_Form_Field(field, lwa)).
+
+
+public define HTML_In_Form
+  fieldset
+  (
+    List(CXM_Form_Field)  fields
+  )=
+  sequence( map((CXM_Form_Field ff) |-> div([class("form_field aligned")], format_CXM_Form_Field(ff, [])), fields) ).
+
+
 public define HTML_Off_Form
   cxm_form
   (
@@ -81,9 +81,9 @@ define Maybe(String)
         if b = '<' then //just found the begin bracket,
           if read_byte(stream) is
           {
-            failure     then failure,   //can't read on stream !!
-            success(b)  then 
-              if b = '/' then       //can't find / => syntax error
+            failure       then failure,   //can't read on stream !!
+            success(_b)   then 
+              if _b = '/' then       //can't find / => syntax error
                 _xml_tag_content(stream, tag, [], content, false, false, true)
               else
                 failure
@@ -93,9 +93,9 @@ define Maybe(String)
       else if in_last_token then
         if b = '>' then //just found the end of bracket, so we return the token in LOWER case
           if to_lower(implode(reverse(so_far))) = tag then
-            with content = implode(reverse(content)),
-            println("Tag ["+tag+"] content found ["+content+"]");
-            success(content)
+            with _content = implode(reverse(content)),
+            println("Tag ["+tag+"] content found ["+_content+"]");
+            success(_content)
           else
             failure
         else
@@ -470,8 +470,8 @@ public define Maybe(XML_RPC_response)
         if next_xml_token(stream) is
         {
           none        then failure
-          token(tok)  then
-            if tok = "methodresponse" then
+          token(_tok)  then
+            if _tok = "methodresponse" then
               in_params(stream)
             else
               failure