diff --git a/web/CXM_jquery.anubis b/web/CXM_jquery.anubis index a4fa82f..7932fe0 100644 --- a/web/CXM_jquery.anubis +++ b/web/CXM_jquery.anubis @@ -28,8 +28,8 @@ define List(HTML_Head_Tag) jquery_defaults = [ - js(js_file("/js/jquery/jquery-1.8.0.min.js")), - js(js_file("/js/jquery/jquery-ui-1.8.23.custom.min.js")), + js(js_file("/js/jquery/jquery-1.11.0.min.js")), + js(js_file("/js/jquery/jquery-ui-1.10.4.custom.min.js")), ]. /* Initialize jQuery in compatiblity mode with jQueryUI */ @@ -40,9 +40,9 @@ public define List(HTML_Head_Tag) String theme_name ) = - if file_exists(web_dir+"/public/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css") then - [ css(css_file("/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css")) . jquery_defaults ] + if file_exists(web_dir+"/public/css/jquery/"+theme_name+"/jquery-ui-1.10.4.custom.min.css") then + [ css(css_file("/css/jquery/"+theme_name+"/jquery-ui-1.10.4.custom.min.css")) . jquery_defaults ] else - println("Jquery Theme not found "+web_dir+"/css/jquery/"+theme_name+"/jquery-ui-1.8.23.custom.css"); - [ css(css_file("/css/jquery/redmond/jquery-ui-1.8.23.custom.css")) . jquery_defaults ] + println("Jquery Theme not found "+web_dir+"/css/jquery/"+theme_name+"/jquery-ui-1.10.4.custom.min.css"); + [ css(css_file("/css/jquery/redmond/jquery-ui-1.10.4.custom.min.css")) . jquery_defaults ] . diff --git a/web/jQuery/CXM_jquery_button.anubis b/web/jQuery/CXM_jquery_button.anubis index 9411044..ad3bb22 100644 --- a/web/jQuery/CXM_jquery_button.anubis +++ b/web/jQuery/CXM_jquery_button.anubis @@ -263,3 +263,25 @@ public define HTML_Partial_Content literal("") ) . + +public define HTML_Partial_Content + jquery_button + ( + 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, []))) + ] + ) + )) + + . + diff --git a/web/jQuery/CXM_jquery_datatable.anubis b/web/jQuery/CXM_jquery_datatable.anubis index aadd7cd..c69ce74 100644 --- a/web/jQuery/CXM_jquery_datatable.anubis +++ b/web/jQuery/CXM_jquery_datatable.anubis @@ -69,6 +69,7 @@ public define HTML_Partial_Content Bool enable_jqueryui, Bool enable_pagination, JQuery_datatable_pagination_type pagination_type, + JQuery_datatable_scrollY_type scrollY, Bool enable_change_page_length, // if true, "enable_pagination" must be true too. Bool enable_search_field, Bool enable_columns_sorting, @@ -88,7 +89,13 @@ public define HTML_Partial_Content \"bJQueryUI\":"+to_String(enable_jqueryui)+", \"sPaginationType\":'"+jquery_datatable_pagination_type_to_string(pagination_type)+"', \"bFilter\":"+to_String(enable_search_field)+", - \"bPaginate\":"+to_String(enable_pagination)+", + \"bPaginate\":"+to_String(enable_pagination)+","+ + if scrollY is + { + no_scroll then "", + scrollY(size) then "\"sScrollY\": \""+size+"px\"," + }+ + "\"bStateSave\": true, \"bLengthChange\":"+to_String(enable_change_page_length)+", \"bSort\":"+to_String(enable_columns_sorting)+","+ get_datatable_translation(lang)+" @@ -110,8 +117,9 @@ public define HTML_Partial_Content Bool enable_jqueryui, Bool enable_pagination, JQuery_datatable_pagination_type pagination_type, + JQuery_datatable_scrollY_type scrollY, Bool enable_change_page_length, // if true, "enable_pagination" must be true too. Bool enable_search_field, Bool enable_columns_sorting ) = - jquery_datatable(table_id, table, enable_jqueryui, enable_pagination, pagination_type, enable_change_page_length, enable_search_field, enable_columns_sorting, "en"). + jquery_datatable(table_id, table, enable_jqueryui, enable_pagination, pagination_type, scrollY, enable_change_page_length, enable_search_field, enable_columns_sorting, "en"). diff --git a/web/jQuery/CXM_jquery_datatable_types.anubis b/web/jQuery/CXM_jquery_datatable_types.anubis index 5960d5a..9bc813d 100644 --- a/web/jQuery/CXM_jquery_datatable_types.anubis +++ b/web/jQuery/CXM_jquery_datatable_types.anubis @@ -15,7 +15,10 @@ public type JQuery_datatable_pagination_type: jq_dt_pt_two_button, //default option jq_dt_pt_full_numbers . - +public type JQuery_datatable_scrollY_type: + no_scroll, + scrollY(Int size). + public define String jquery_datatable_pagination_type_to_string ( -- libgit2 0.21.4