diff --git a/database/db_types.anubis b/database/db_types.anubis index 0bb1f9f..eb3aac5 100644 --- a/database/db_types.anubis +++ b/database/db_types.anubis @@ -183,17 +183,17 @@ public define DB_datetime db_datetime(""). public define DB_datetime - now + db_now = db_datetime(_Int_to_ISO_8601_datetime(now)). public define DB_date - now + db_now = db_date(_Int_to_ISO_8601_date(now)). public define DB_time - now + db_now = db_time(_Int_to_ISO_8601_time(now)). diff --git a/web/CXM_dojo.anubis b/web/CXM_dojo.anubis index c4e62eb..738a789 100644 --- a/web/CXM_dojo.anubis +++ b/web/CXM_dojo.anubis @@ -557,13 +557,13 @@ public define HTML_Off_Form dojo_tooltip ( List(CoreAttrs) attributes, - List(Text_Option) txt_attr, +// List(Text_Option) txt_attr, HTML_Id html_id, String label, HTML_Off_Form tooltip_content, )= sequence([ - text([id(html_id.id) . txt_attr], label), + text([id(html_id.id)], label), div([id(html_id.id + "_tt"), attr("connectId", html_id.id), attr("dojoType", "dijit.Tooltip") . attributes], tooltip_content) ]). @@ -719,12 +719,12 @@ public define HTML_Off_Form dojo_progressBar ( List(CoreAttrs) attributes, - List(Text_Option) attributes_text, +// List(Text_Option) attributes_text, HTML_Id html_id, String label )= sequence([ - text([id("text_" + html_id.id), class("progress_bar") . attributes_text], label), + text([id("text_" + html_id.id), class("progress_bar")], label), div([id(html_id.id), class("progress_bar"), attr("indeterminate", "true"), attr("dojoType", "dijit.ProgressBar") . attributes], literal("")) ]). @@ -732,19 +732,19 @@ public define HTML_Off_Form dojo_progressBar ( List(CoreAttrs) attributes, - List(Text_Option) attributes_text, +// List(Text_Option) attributes_text, HTML_Id html_id, String label, Int progress, Int maximum )= sequence([ - text([id("text_" + html_id.id), class("progress_bar") . attributes_text], label), - div([id(html_id.id), + text([id("text_" + html_id.id), class("progress_bar")], label), + div_empty([id(html_id.id), class("progress_bar"), - attr("maximum", abs_to_decimal(maximum)), - attr("progress", abs_to_decimal(progress)), - attr("dojoType", "dijit.ProgressBar") . attributes], literal("")) + attr("maximum", abs_to_decimal(maximum)), + attr("progress", abs_to_decimal(progress)), + attr("dojoType", "dijit.ProgressBar") . attributes]) ]). define Maybe(Int) diff --git a/web/CXM_form.anubis b/web/CXM_form.anubis index 03ffb1e..57fce35 100644 --- a/web/CXM_form.anubis +++ b/web/CXM_form.anubis @@ -741,7 +741,14 @@ public define HTML_In_Form )= to_HTML_In_Form(fields, [], _class, b_with_label). - +public define HTML_In_Form + to_HTML_In_Form + ( + List(CXM_Form_Field) fields, + List(Web_arg) lwa + )= + to_HTML_In_Form(fields, lwa, "", true) +. public define HTML_Off_Form cxm_form diff --git a/web/jQuery/CXM_jquery_tiptip.anubis b/web/jQuery/CXM_jquery_tiptip.anubis index 6c4ee77..9427d9e 100644 --- a/web/jQuery/CXM_jquery_tiptip.anubis +++ b/web/jQuery/CXM_jquery_tiptip.anubis @@ -72,18 +72,19 @@ public define HTML_Partial_Content JQ_tiptip_position position ) = + with uid = tooltip_id+"-"+(Int)now, if tooltip_partial_content is partial_content(head, body) then partial_content( [ js_inline(jquery_ready(" - var tooltip_"+now+"=$('#"+tooltip_id+"-"+now+"').html(); + var tooltip_"+uid+"=$('#"+uid+"').html(); $('#"+rollovered_id+"').tipTip({maxWidth: 'auto', edgeOffset: 10, defaultPosition: \""+jq_tiptip_position_to_string(position)+"\", content: tooltip_"+now+"}); ")) . head ], sequence([ - literal("
"), + literal("
"), body, literal("
") ]) -- libgit2 0.21.4