diff --git a/web/CXM_html_tooltip.anubis b/web/CXM_html_tooltip.anubis index 0b46044..3877354 100644 --- a/web/CXM_html_tooltip.anubis +++ b/web/CXM_html_tooltip.anubis @@ -84,7 +84,7 @@ public define HTML_Off_Form ) = actioner(same,same, link([id("help_" + keyword), class("jTipu jTip_"+class_suffix), attr("target", "_blank")], " ", success(title)), "ajax_show_tooltip", [("tooltip_ext", keyword)], []). -public define HTML_In_Form + public define HTML_In_Form html_tooltip_ext ( String title, @@ -95,6 +95,17 @@ public define HTML_In_Form with extra_args = format_extra_operands(ext_args), literal(""). +public define HTML_In_Form + html_tooltip_ext + ( + String title, + String extend_type, + String class_suffix, + List((String, String)) ext_args + ) = + with extra_args = format_extra_operands(ext_args), + literal(""). + href=\"/?a=ajax_show_tooltip&tooltip_id="+keyword+"\" id=\"help_"+keyword+HELP_HMS_MODE" class="jTip jTip_help" target="_blank" name="Aide sur la fonctionnalité 'No Limit'"> "). diff --git a/web/CXM_jquery.anubis b/web/CXM_jquery.anubis index 3d87660..8c4c9d8 100644 --- a/web/CXM_jquery.anubis +++ b/web/CXM_jquery.anubis @@ -57,8 +57,8 @@ define List(HTML_Head_Tag) jquery_defaults = [ - js(js_file("/jquery/jquery-1.11.3.js")), - js(js_file("/jquery/jquery-ui-1.11.4/jquery-ui.min.js")), + js(js_file("/js/jquery/jquery-1.11.3.js")), + js(js_file("/js/jquery/jquery-ui-1.11.4/jquery-ui.min.js")), ]. /* Initialize jQuery in compatiblity mode with jQueryUI */ @@ -69,11 +69,12 @@ public define List(HTML_Head_Tag) String theme_name ) = - if file_exists(web_dir+"/public/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.min.css") then - [ css(css_file("/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.min.css")), - css(css_file("/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.structure.min.css")), - css(css_file("/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.theme.min.css")) . jquery_defaults ] + if file_exists(web_dir+"/public/js/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.min.css") then + [ css(css_file("/js/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.min.css")), + css(css_file("/js/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.structure.min.css")), + css(css_file("/js/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.theme.min.css")) . jquery_defaults ] else - println("Jquery Theme not found "+web_dir+"/css/jquery/"+theme_name+"/jquery-ui-1.10.4.custom.min.css"); - [ css(css_file("/css/jquery/jquery-ui-1.11.4.custom.min.css")) . jquery_defaults ] + println("Jquery Theme not found "+web_dir+"/public/js/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.min.css"); + //TODO change to real default jquery ui css + [ css(css_file("/js/jquery/jquery-ui-1.11.4/theme/"+theme_name+"/jquery-ui.min.css")) . jquery_defaults ] . diff --git a/web/CXM_multihost_http_server.anubis b/web/CXM_multihost_http_server.anubis index e5e3c3a..fbb035a 100644 --- a/web/CXM_multihost_http_server.anubis +++ b/web/CXM_multihost_http_server.anubis @@ -186,8 +186,8 @@ public type HTTP_Info: String hostname, // hostname requested by the client String uri, // URI requested by the client List(HTTP_header) http_headers, // HTTP headers sent by the client - Bool is_https, - One -> String generate_trust_ticket // may be used against denial of + Bool is_https + //One -> String generate_trust_ticket // may be used against denial of // service attacks ). @@ -2397,7 +2397,7 @@ define One read_www_url_encoded_web_args(to_string(body),0), uri = uri(request_line), ext = get_uri_extension(uri), - http_inf = http_info(ip_addr, host_name, uri, headers, is_SSL(connection), generate_tt), + http_inf = http_info(ip_addr, host_name, uri, headers, is_SSL(connection)), (if member(journal_extensions(desc),ext) then log_journal_msg(desc, format_request(desc,connection,request_line,headers,all_web_args)) @@ -2862,7 +2862,7 @@ define One else if (ext = ".awp" | ext = "") then (with answer_headers_body = awp_handler(desc)(host_name, - http_info(ip_addr, host_name, uri, headers, is_SSL(connection), generate_tt), + http_info(ip_addr, host_name, uri, headers, is_SSL(connection)), all_web_args, is_SSL(connection)), forget(reliable_write(connection, answer_headers_body))) diff --git a/web/jQuery/CXM_jquery_datatable.anubis b/web/jQuery/CXM_jquery_datatable.anubis index b8427ea..e288f38 100644 --- a/web/jQuery/CXM_jquery_datatable.anubis +++ b/web/jQuery/CXM_jquery_datatable.anubis @@ -14,6 +14,8 @@ read calexium_lib/web/jQuery/CXM_jquery_datatable_translation.anubis read tools/basis.anubis read system/string.anubis read system/convert.anubis +transmit calexium_lib/web/jQuery/CXM_jquery_datatable_plugins.anubis + /* Initialize jQuery datatables */ public define List(HTML_Head_Tag) @@ -44,11 +46,11 @@ public define List(HTML_Head_Tag) [ //css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/jquery.dataTables.min.css")), //css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/jquery.dataTables_themeroller.css")), - js(js_file("jquery/plug-in/DataTables-1.10.7/media/js/jquery.dataTables.js")), - js(js_file("jquery/plug-in/DataTables-1.10.7/media/js/dataTables.jqueryui.js")) , //only for datatable 1.10 - css(css_file("jquery/plug-in/DataTables-1.10.7/media/css/dataTables.jqueryui.css")), //only for datatable 1.10 - css(css_file("jquery/plug-in/DataTables-1.10.7/extensions/Scroller/css/dataTables.scroller.min.css")), - js(js_file("jquery/plug-in/DataTables-1.10.7/extensions/Scroller/js/dataTables.scroller.js")), + js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/jquery.dataTables.js")), + js(js_file("js/jquery/plug-in/DataTables-1.10.7/media/js/dataTables.jqueryui.js")) , //only for datatable 1.10 + css(css_file("js/jquery/plug-in/DataTables-1.10.7/media/css/dataTables.jqueryui.css")), //only for datatable 1.10 + css(css_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/css/dataTables.scroller.min.css")), + js(js_file("js/jquery/plug-in/DataTables-1.10.7/extensions/Scroller/js/dataTables.scroller.js")), // css(css_file("jquery/plug-in/DataTables-1.10.7/extensions/Responsive/css/dataTables.responsive.css")), // js(js_file("jquery/plug-in/DataTables-1.10.7/extensions/responsive/js/dataTables.responsive.js")), ] diff --git a/web/jQuery/CXM_jquery_datatable_plugins.anubis b/web/jQuery/CXM_jquery_datatable_plugins.anubis new file mode 100644 index 0000000..18e7619 --- /dev/null +++ b/web/jQuery/CXM_jquery_datatable_plugins.anubis @@ -0,0 +1,19 @@ +/* + * Created by PyramIDE. + * User: フランスのトトロ + * Date: 25/05/2015 + * Time: 22:38 + * © Calexium + */ +read calexium_lib/web/CXM_jquery.anubis +read calexium_lib/web/CXM_making_a_web_site.anubis + +public define List(HTML_Head_Tag) jq_datatable_sorting + = + [ + js(js_file("js/jquery/plug-in/DataTables-1.10.7/plugins/sorting/moment.min.js")), + js(js_file("js/jquery/plug-in/DataTables-1.10.7/plugins/sorting/datetime-moment.js")), + js_inline(jquery_ready("$.fn.dataTable.moment( 'DD/MM/YYYY HH:mm:ss' );")), + + ]. + diff --git a/web/jQuery/CXM_jquery_datatable_translation.anubis b/web/jQuery/CXM_jquery_datatable_translation.anubis index c14fbfd..2a4ed82 100644 --- a/web/jQuery/CXM_jquery_datatable_translation.anubis +++ b/web/jQuery/CXM_jquery_datatable_translation.anubis @@ -14,15 +14,15 @@ public define String String language, String web_dir )= - - with file = if file_exists(web_dir+"/public/jquery/plug-in/DataTables-1.10.7/translation/"+language+".txt") then + with lang_file = web_dir+"/public/js/jquery/plug-in/DataTables-1.10.7/translation/"+language+".txt", + with file = if file_exists(lang_file) then language else - println("NOT FOUND : "+web_dir+"/public/jquery/plug-in/DataTables-1.10.7/translation/"+language+".txt"); + println("NOT FOUND : "+lang_file); "en", "\"oLanguage\": { - \"sUrl\": \"/jquery/plug-in/DataTables-1.10.7/translation/"+file+".txt\" + \"sUrl\": \"/js/jquery/plug-in/DataTables-1.10.7/translation/"+file+".txt\" }". -- libgit2 0.21.4