diff --git a/web/CXM_jquery.anubis b/web/CXM_jquery.anubis index 7932fe0..b058ba0 100644 --- a/web/CXM_jquery.anubis +++ b/web/CXM_jquery.anubis @@ -28,7 +28,7 @@ define List(HTML_Head_Tag) jquery_defaults = [ - js(js_file("/js/jquery/jquery-1.11.0.min.js")), + js(js_file("/js/jquery/jquery-1.11.1.min.js")), js(js_file("/js/jquery/jquery-ui-1.10.4.custom.min.js")), ]. diff --git a/web/CXM_making_a_web_site.anubis b/web/CXM_making_a_web_site.anubis index eba11b7..b0100bb 100644 --- a/web/CXM_making_a_web_site.anubis +++ b/web/CXM_making_a_web_site.anubis @@ -2969,7 +2969,7 @@ define RGBA &oname=value -define String +public define String format_extra_operands ( List((String,String)) l diff --git a/web/jQuery/CXM_jquery_datatable.anubis b/web/jQuery/CXM_jquery_datatable.anubis index ebd17d0..dc11d7b 100644 --- a/web/jQuery/CXM_jquery_datatable.anubis +++ b/web/jQuery/CXM_jquery_datatable.anubis @@ -23,16 +23,18 @@ public define List(HTML_Head_Tag) ) = [ - css(css_file("/css/jquery/jquery.dataTables.min.css")), - css(css_file("/css/jquery/jquery.dataTables_themeroller.min.css")), + css(css_file("/css/jquery/jquery.dataTables.css")), + css(css_file("/css/jquery/jquery.dataTables_themeroller.css")), js(js_file("/js/jquery/jquery.dataTables.min.js")), - css(css_file("js/jquery/dataTables/extensions/Scroller/css/dataTables.scroller.min.css")), + js(js_file("js/jquery/dataTables/dataTables.jqueryui.js")) , + css(css_file("js/jquery/dataTables/extensions/Scroller/css/shCore.css")), + css(css_file("js/jquery/dataTables/extensions/Scroller/css/shThemeDataTables.css")), + css(css_file("js/jquery/dataTables/extensions/Scroller/css/doc.css")), + css(css_file("js/jquery/dataTables/extensions/Scroller/css/dataTables.scroller.css")), js(js_file("js/jquery/dataTables/extensions/Scroller/js/dataTables.scroller.min.js")), - ] . - public define HTML_Partial_Content jquery_datatable ( diff --git a/web/jQuery/CXM_jquery_datatable_types.anubis b/web/jQuery/CXM_jquery_datatable_types.anubis index fa33825..390c755 100644 --- a/web/jQuery/CXM_jquery_datatable_types.anubis +++ b/web/jQuery/CXM_jquery_datatable_types.anubis @@ -11,14 +11,10 @@ read calexium_lib/web/CXM_making_a_web_site.anubis read tools/basis.anubis read system/string.anubis - pagingType Since: 1.10 - Pagination button display options - + public type JQuery_datatable_pagination_type: - jq_dt_pt_simple, //'Previous' and 'Next' buttons only - jq_dt_pt_simple_numbers, //'Previous' and 'Next' buttons, plus page numbers (default option) - jq_dt_pt_full, //'First', 'Previous', 'Next' and 'Last' buttons - jq_dt_pt_full_numbers //'First', 'Previous', 'Next' and 'Last' buttons, plus page numbers + jq_dt_pt_two_button, //default option + jq_dt_pt_full_numbers . public type JQuery_datatable_scrollY_type: no_scroll, @@ -45,13 +41,12 @@ public define String JQuery_datatable_pagination_type pt ) = - if pt is - { - jq_dt_pt_simple then "simple", - jq_dt_pt_simple_numbers then "simple_numbers", - jq_dt_pt_full then "full", - jq_dt_pt_full_numbers then "full_numbers", - }. + if pt is + { + jq_dt_pt_two_button then "two_button", + jq_dt_pt_full_numbers then "full_numbers" + } + . public define JQuery_datatable_pagination_type string_to_jquery_datatable_pagination_type @@ -60,11 +55,9 @@ public define JQuery_datatable_pagination_type ) = with st=to_lower(str), - if st="simple" then jq_dt_pt_simple else - if st="simple_numbers" then jq_dt_pt_simple_numbers else - if st="full" then jq_dt_pt_full else + if st="two_button" then jq_dt_pt_two_button else if st="full_numbers" then jq_dt_pt_full_numbers else - jq_dt_pt_simple_numbers + jq_dt_pt_two_button . public type JQuery_datatable_server_side_type: diff --git a/web/jQuery/CXM_jquery_jqplot.anubis b/web/jQuery/CXM_jquery_jqplot.anubis new file mode 100644 index 0000000..fe70ac9 --- /dev/null +++ b/web/jQuery/CXM_jquery_jqplot.anubis @@ -0,0 +1,55 @@ +/* + * Created by PyramIDE. + * User: Totoro + * Date: 17/05/2014 + * Time: 12:19 + * + */ + +read calexium_lib/web/CXM_making_a_web_site.anubis +read tools/basis.anubis + + public define HTML_Partial_Content + jqplot + ( + String img_url, + String label_text, + String action + )= + partial_content( + [ + js_inline(script("","$(document).ready(function(){$('#jq_img_btn').button();});")) + ], + div([id("jq_img_btn")], + table([ + row( cell( actioner(same,same, img_link(img_url, label_text), action, []))), + row( cell( actioner(same,same, link(label_text), action, []))) + ] + ) + )) + + . + +public define HTML_Head_Tag + jqplot_plugin + ( + String plugin + )= + js(js_file("/js/jquery/jqplot/plugins/jqplot."+plugin+".min.js")) + . + +/* jQuery default js files */ +define List(HTML_Head_Tag) + jqplot_defaults + = + [ + js(js_file("/js/jquery/jqplot/jquery.jqplot.min.js")), + css(css_file("/js/jquery/jqplot/jquery.jqplot.min.css")), + ]. + + +/* Initialize jQuery in compatiblity mode with jQueryUI */ +public define List(HTML_Head_Tag) + jqplot_init + = + jqplot_defaults. -- libgit2 0.21.4