Commit fe94b681457b1229eac20bdd93adeb352f6fa62c
1 parent
46449b0b
progress_bar added
Showing
1 changed file
with
52 additions
and
16 deletions
Show diff stats
calexium_lib/web/CXM_dojo.anubis
| @@ -429,13 +429,24 @@ public define HTML_Off_Form | @@ -429,13 +429,24 @@ public define HTML_Off_Form | ||
| 429 | dojo_button | 429 | dojo_button |
| 430 | ( | 430 | ( |
| 431 | HtmlId html_id, | 431 | HtmlId html_id, |
| 432 | + Maybe(String) class, | ||
| 432 | String name, | 433 | String name, |
| 433 | - String iconclass, | 434 | + Maybe(String) iconclass, |
| 434 | Maybe(String) tip_msg, | 435 | Maybe(String) tip_msg, |
| 435 | String execute, | 436 | String execute, |
| 436 | )= | 437 | )= |
| 437 | literal(" | 438 | literal(" |
| 438 | - <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >" | 439 | + <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\"" + |
| 440 | + if class is | ||
| 441 | + { | ||
| 442 | + failure then "", | ||
| 443 | + success(class_name) then " class=\"" + class_name + "\"" | ||
| 444 | + } + | ||
| 445 | + if iconclass is | ||
| 446 | + { | ||
| 447 | + failure then "", | ||
| 448 | + success(iconclass_name) then " iconClass=\"" + iconclass_name + "\"" | ||
| 449 | + } + ">" | ||
| 439 | + name | 450 | + name |
| 440 | + "<script type=\"dojo/method\" event=\"onClick\">" | 451 | + "<script type=\"dojo/method\" event=\"onClick\">" |
| 441 | + execute | 452 | + execute |
| @@ -452,24 +463,35 @@ public define HTML_In_Form | @@ -452,24 +463,35 @@ public define HTML_In_Form | ||
| 452 | dojo_button | 463 | dojo_button |
| 453 | ( | 464 | ( |
| 454 | HtmlId html_id, | 465 | HtmlId html_id, |
| 466 | + Maybe(String) class, | ||
| 455 | String name, | 467 | String name, |
| 456 | - String iconclass, | 468 | + Maybe(String) iconclass, |
| 457 | Maybe(String) tip_msg, | 469 | Maybe(String) tip_msg, |
| 458 | String execute, | 470 | String execute, |
| 459 | )= | 471 | )= |
| 460 | - literal(" | ||
| 461 | - <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\" iconClass=\"" + iconclass + "\" >" | ||
| 462 | - + name | ||
| 463 | - + "<script type=\"dojo/method\" event=\"onClick\">" | ||
| 464 | - + execute | ||
| 465 | - + "</script>" | ||
| 466 | - + "</button>" + | ||
| 467 | - if tip_msg is | ||
| 468 | - { | ||
| 469 | - failure then "", | ||
| 470 | - success(tip) then | ||
| 471 | - "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>" | ||
| 472 | - }). | 472 | + literal(" |
| 473 | + <button dojoType=\"dijit.form.Button\" id=\"" + html_id.id + "\"" + | ||
| 474 | + if class is | ||
| 475 | + { | ||
| 476 | + failure then "", | ||
| 477 | + success(class_name) then " class=\"" + class_name + "\"" | ||
| 478 | + } + | ||
| 479 | + if iconclass is | ||
| 480 | + { | ||
| 481 | + failure then "", | ||
| 482 | + success(iconclass_name) then " iconClass=\"" + iconclass_name + "\"" | ||
| 483 | + } + ">" | ||
| 484 | + + name | ||
| 485 | + + "<script type=\"dojo/method\" event=\"onClick\">" | ||
| 486 | + + execute | ||
| 487 | + + "</script>" | ||
| 488 | + + "</button>" + | ||
| 489 | + if tip_msg is | ||
| 490 | + { | ||
| 491 | + failure then "", | ||
| 492 | + success(tip) then | ||
| 493 | + "<span dojoType=\"dijit.Tooltip\" connectId=\"" + html_id.id + "\">" + tip + "</span>" | ||
| 494 | + }). | ||
| 473 | 495 | ||
| 474 | 496 | ||
| 475 | public define HTML_Off_Form | 497 | public define HTML_Off_Form |
| @@ -576,3 +598,17 @@ public define HTML_Off_Form | @@ -576,3 +598,17 @@ public define HTML_Off_Form | ||
| 576 | . attributes ]), | 598 | . attributes ]), |
| 577 | literal("")). | 599 | literal("")). |
| 578 | 600 | ||
| 601 | +public define HTML_Off_Form | ||
| 602 | + dojo_progressBar | ||
| 603 | + ( | ||
| 604 | + List(CoreAttrs) attributes, | ||
| 605 | + List(Text_Option) attributes_text, | ||
| 606 | + HtmlId html_id, | ||
| 607 | + String label | ||
| 608 | + )= | ||
| 609 | + sequence([ | ||
| 610 | + text([id("text_" + html_id.id), class("progress_bar") . attributes_text], label), | ||
| 611 | + div([id(html_id.id), class("progress_bar"), attr("indeterminate", "true"), attr("dojoType", "dijit.ProgressBar") . attributes], literal("")) | ||
| 612 | + ]). | ||
| 613 | + | ||
| 614 | + |