Anubis / Xlib

Commit dd5292a301e00fb64ff08176923f94b308a43a73

Authored by totoro
1 parent 6f5e1243

[-] remove extra jquery_actioner in jq_button_confirm 

[+] add br and progress html element in making_a_web_site
Showing 2 changed files with 26 additions and 16 deletions   Show diff stats
Inline Side-by-side
web/CXM_making_a_web_site.anubis
  Show/Hide comments   View file @dd5292a
@@ -1116,11 +1116,13 @@ public type HTML_In_Form: @@ -1116,11 +1116,13 @@ public type HTML_In_Form:
1116 radio_button (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), 1116 radio_button (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),
1117 radio_button_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), 1117 radio_button_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),
1118 check_box (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked), 1118 check_box (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),
1119 - check_box_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),  
1120 - div (List(CoreAttrs), HTML_In_Form content),  
1121 - div_empty (List(CoreAttrs)),  
1122 - hidden (HtmlId id, WebArgName name, InitialValue init),  
1123 - partial (HTML_Partial_Content). 1119 + check_box_r (List(InputAttrs), String label_text, HtmlId id, WebArgName name, WebArgValue value, Bool checked),
  1120 + div (List(CoreAttrs), HTML_In_Form content),
  1121 + div_empty (List(CoreAttrs)),
  1122 + hidden (HtmlId id, WebArgName name, InitialValue init),
  1123 + partial (HTML_Partial_Content),
  1124 + br,
  1125 + progress (List(CoreAttrs), Int value, Int max).
1124 1126
1125 1127
1126 'HTML_In_Form' defines all the elements you may put within a form. We define a 1128 '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: @@ -1303,16 +1305,18 @@ public type HTML_Off_Form:
1303 form (HtmlId form_id, List(CoreAttrs), 1305 form (HtmlId form_id, List(CoreAttrs),
1304 String action_name, List((String,String)) extra_ops, 1306 String action_name, List((String,String)) extra_ops,
1305 HTML_In_Form content), 1307 HTML_In_Form content),
1306 - in_form (HtmlId form_id, HTML_In_Form content),  
1307 - div (List(CoreAttrs), HTML_Off_Form content),  
1308 - div (List(CoreAttrs), HTML_Partial_Content p_content),  
1309 - div_empty (List(CoreAttrs)),  
1310 - iframe (List(CoreAttrs), 1308 + in_form (HtmlId form_id, HTML_In_Form content),
  1309 + div (List(CoreAttrs), HTML_Off_Form content),
  1310 + div (List(CoreAttrs), HTML_Partial_Content p_content),
  1311 + div_empty (List(CoreAttrs)),
  1312 + iframe (List(CoreAttrs),
1311 List(CSS_Style) /*styles*/, 1313 List(CSS_Style) /*styles*/,
1312 List(CSS_File) /*css_files*/, 1314 List(CSS_File) /*css_files*/,
1313 List(JS_File) /*js_files*/, 1315 List(JS_File) /*js_files*/,
1314 HTML_Body /*body*/), 1316 HTML_Body /*body*/),
1315 - partial (HTML_Partial_Content). 1317 + partial (HTML_Partial_Content),
  1318 + br,
  1319 + progress (List(CoreAttrs), Int value, Int max).
1316 1320
1317 'HTML_Off_Form' defines all the elements you may put outside any form. 1321 'HTML_Off_Form' defines all the elements you may put outside any form.
1318 1322
@@ -4327,7 +4331,9 @@ define Printable_tree @@ -4327,7 +4331,9 @@ define Printable_tree
4327 if p_content is partial_content(tags, html_elements) then 4331 if p_content is partial_content(tags, html_elements) then
4328 head_tags <- *head_tags + tags; 4332 head_tags <- *head_tags + tags;
4329 4333
4330 - format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags) 4334 + format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags),
  4335 + br then ["<br>"],
  4336 + progress(options, value, max) then ["<progress max=\"",value,"\" value=\"",max,"\"",format_attrs(options),"></progress>"]
4331 }. 4337 }.
4332 4338
4333 4339
@@ -4409,7 +4415,9 @@ define Bool @@ -4409,7 +4415,9 @@ define Bool
4409 div(o,c) then contains_an_upload(c), 4415 div(o,c) then contains_an_upload(c),
4410 div_empty(o) then false, 4416 div_empty(o) then false,
4411 hidden(_,_,_) then false, 4417 hidden(_,_,_) then false,
4412 - partial(_) then false 4418 + partial(_) then false,
  4419 + br then false,
  4420 + progress(_,_,_) then false
4413 }. 4421 }.
4414 4422
4415 define String 4423 define String
@@ -4539,7 +4547,9 @@ define Printable_tree @@ -4539,7 +4547,9 @@ define Printable_tree
4539 partial(p_content) then 4547 partial(p_content) then
4540 if p_content is partial_content(tags, html_elements) then 4548 if p_content is partial_content(tags, html_elements) then
4541 head_tags <- *head_tags + tags; 4549 head_tags <- *head_tags + tags;
4542 - format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags) 4550 + format(cinfo, sn, ic_v, html_elements, is_https, action_count, head_tags),
  4551 + br then ["<br>"],
  4552 + progress(options, value, max) then ["<progress max=\"",value,"\" value=\"",max,"\"",format_attrs(options),"></progress>"]
4543 }. 4553 }.
4544 4554
4545 4555
web/jQuery/CXM_jquery_button.anubis
  Show/Hide comments   View file @dd5292a
@@ -293,8 +293,8 @@ public define HTML_Partial_Content @@ -293,8 +293,8 @@ public define HTML_Partial_Content
293 String dlg_title, 293 String dlg_title,
294 String dlg_text, 294 String dlg_text,
295 String dlg_ok, 295 String dlg_ok,
296 - String dlg_cancel,  
297 - JQuery_Actioner actioner 296 + String dlg_cancel
  297 + //JQuery_Actioner actioner
298 //String url, 298 //String url,
299 //List((String, String)) extra_ops 299 //List((String, String)) extra_ops
300 )= 300 )=