Anubis / Xlib

Commit e318729d35430be58b6fb6307a892a6aa62bcadf

Authored by totoro
1 parent 2ca4d41a

rename now from db_types to db_now to avoid confusion with primitive now 

improve the library to compatible with last HTML_Off_Form definition
Showing 4 changed files with 24 additions and 16 deletions   Show diff stats
Inline Side-by-side
database/db_types.anubis
  Show/Hide comments   View file @e318729
@@ -183,17 +183,17 @@ public define DB_datetime @@ -183,17 +183,17 @@ public define DB_datetime
183 db_datetime(""). 183 db_datetime("").
184 184
185 public define DB_datetime 185 public define DB_datetime
186 - now 186 + db_now
187 = 187 =
188 db_datetime(_Int_to_ISO_8601_datetime(now)). 188 db_datetime(_Int_to_ISO_8601_datetime(now)).
189 189
190 public define DB_date 190 public define DB_date
191 - now 191 + db_now
192 = 192 =
193 db_date(_Int_to_ISO_8601_date(now)). 193 db_date(_Int_to_ISO_8601_date(now)).
194 194
195 public define DB_time 195 public define DB_time
196 - now 196 + db_now
197 = 197 =
198 db_time(_Int_to_ISO_8601_time(now)). 198 db_time(_Int_to_ISO_8601_time(now)).
199 199
web/CXM_dojo.anubis
  Show/Hide comments   View file @e318729
@@ -557,13 +557,13 @@ public define HTML_Off_Form @@ -557,13 +557,13 @@ public define HTML_Off_Form
557 dojo_tooltip 557 dojo_tooltip
558 ( 558 (
559 List(CoreAttrs) attributes, 559 List(CoreAttrs) attributes,
560 - List(Text_Option) txt_attr, 560 +// List(Text_Option) txt_attr,
561 HTML_Id html_id, 561 HTML_Id html_id,
562 String label, 562 String label,
563 HTML_Off_Form tooltip_content, 563 HTML_Off_Form tooltip_content,
564 )= 564 )=
565 sequence([ 565 sequence([
566 - text([id(html_id.id) . txt_attr], label), 566 + text([id(html_id.id)], label),
567 div([id(html_id.id + "_tt"), attr("connectId", html_id.id), attr("dojoType", "dijit.Tooltip") . attributes], tooltip_content) 567 div([id(html_id.id + "_tt"), attr("connectId", html_id.id), attr("dojoType", "dijit.Tooltip") . attributes], tooltip_content)
568 ]). 568 ]).
569 569
@@ -719,12 +719,12 @@ public define HTML_Off_Form @@ -719,12 +719,12 @@ public define HTML_Off_Form
719 dojo_progressBar 719 dojo_progressBar
720 ( 720 (
721 List(CoreAttrs) attributes, 721 List(CoreAttrs) attributes,
722 - List(Text_Option) attributes_text, 722 +// List(Text_Option) attributes_text,
723 HTML_Id html_id, 723 HTML_Id html_id,
724 String label 724 String label
725 )= 725 )=
726 sequence([ 726 sequence([
727 - text([id("text_" + html_id.id), class("progress_bar") . attributes_text], label), 727 + text([id("text_" + html_id.id), class("progress_bar")], label),
728 div([id(html_id.id), class("progress_bar"), attr("indeterminate", "true"), attr("dojoType", "dijit.ProgressBar") . attributes], literal("")) 728 div([id(html_id.id), class("progress_bar"), attr("indeterminate", "true"), attr("dojoType", "dijit.ProgressBar") . attributes], literal(""))
729 ]). 729 ]).
730 730
@@ -732,19 +732,19 @@ public define HTML_Off_Form @@ -732,19 +732,19 @@ public define HTML_Off_Form
732 dojo_progressBar 732 dojo_progressBar
733 ( 733 (
734 List(CoreAttrs) attributes, 734 List(CoreAttrs) attributes,
735 - List(Text_Option) attributes_text, 735 +// List(Text_Option) attributes_text,
736 HTML_Id html_id, 736 HTML_Id html_id,
737 String label, 737 String label,
738 Int progress, 738 Int progress,
739 Int maximum 739 Int maximum
740 )= 740 )=
741 sequence([ 741 sequence([
742 - text([id("text_" + html_id.id), class("progress_bar") . attributes_text], label),  
743 - div([id(html_id.id), 742 + text([id("text_" + html_id.id), class("progress_bar")], label),
  743 + div_empty([id(html_id.id),
744 class("progress_bar"), 744 class("progress_bar"),
745 - attr("maximum", abs_to_decimal(maximum)),  
746 - attr("progress", abs_to_decimal(progress)),  
747 - attr("dojoType", "dijit.ProgressBar") . attributes], literal("")) 745 + attr("maximum", abs_to_decimal(maximum)),
  746 + attr("progress", abs_to_decimal(progress)),
  747 + attr("dojoType", "dijit.ProgressBar") . attributes])
748 ]). 748 ]).
749 749
750 define Maybe(Int) 750 define Maybe(Int)
web/CXM_form.anubis
  Show/Hide comments   View file @e318729
@@ -741,7 +741,14 @@ public define HTML_In_Form @@ -741,7 +741,14 @@ public define HTML_In_Form
741 )= 741 )=
742 to_HTML_In_Form(fields, [], _class, b_with_label). 742 to_HTML_In_Form(fields, [], _class, b_with_label).
743 743
744 - 744 +public define HTML_In_Form
  745 + to_HTML_In_Form
  746 + (
  747 + List(CXM_Form_Field) fields,
  748 + List(Web_arg) lwa
  749 + )=
  750 + to_HTML_In_Form(fields, lwa, "", true)
  751 +.
745 752
746 public define HTML_Off_Form 753 public define HTML_Off_Form
747 cxm_form 754 cxm_form
web/jQuery/CXM_jquery_tiptip.anubis
  Show/Hide comments   View file @e318729
@@ -72,18 +72,19 @@ public define HTML_Partial_Content @@ -72,18 +72,19 @@ public define HTML_Partial_Content
72 JQ_tiptip_position position 72 JQ_tiptip_position position
73 ) 73 )
74 = 74 =
  75 + with uid = tooltip_id+"-"+(Int)now,
75 if tooltip_partial_content is partial_content(head, body) then 76 if tooltip_partial_content is partial_content(head, body) then
76 partial_content( 77 partial_content(
77 [ 78 [
78 js_inline(jquery_ready(" 79 js_inline(jquery_ready("
79 - var tooltip_"+now+"=$('#"+tooltip_id+"-"+now+"').html(); 80 + var tooltip_"+uid+"=$('#"+uid+"').html();
80 $('#"+rollovered_id+"').tipTip({maxWidth: 'auto', edgeOffset: 10, defaultPosition: \""+jq_tiptip_position_to_string(position)+"\", content: tooltip_"+now+"}); 81 $('#"+rollovered_id+"').tipTip({maxWidth: 'auto', edgeOffset: 10, defaultPosition: \""+jq_tiptip_position_to_string(position)+"\", content: tooltip_"+now+"});
81 ")) 82 "))
82 . 83 .
83 head 84 head
84 ], 85 ],
85 sequence([ 86 sequence([
86 - literal("<div id=\""+tooltip_id+"-"+now+"\" style=\"display:none\">"), 87 + literal("<div id=\""+uid+"\" style=\"display:none\">"),
87 body, 88 body,
88 literal("</div>") 89 literal("</div>")
89 ]) 90 ])