From a34dedddf129158f9d1024636581c64cc403944c Mon Sep 17 00:00:00 2001 From: Julien Verneuil Date: Tue, 3 May 2016 17:37:05 +0200 Subject: [PATCH] change translation folder for DataTables from "DataTables-1.10.7" to "DataTables" move "datetimepicker" plugin initialization js into another function so it can be used elsewhere replace "lang" option for datetimepicker to "setLocale" (this option was removed in the latest version of the plug-in, breaking translations) optimize further a "img_button_confirm" function replace the usage of "image" in a "img_button_confirm" function by literal, because there was no "cursor: pointer" being applied --- web/jQuery/CXM_jquery_datatable_translation.anubis | 4 ++-- web/jQuery/ui-addon/datetimepicker.anubis | 57 ++++++++++++++++++++++++++++++++------------------------- web/widgets/button.anubis | 20 ++++++++++---------- 3 files changed, 44 insertions(+), 37 deletions(-) diff --git a/web/jQuery/CXM_jquery_datatable_translation.anubis b/web/jQuery/CXM_jquery_datatable_translation.anubis index 2a4ed82..69d74b8 100644 --- a/web/jQuery/CXM_jquery_datatable_translation.anubis +++ b/web/jQuery/CXM_jquery_datatable_translation.anubis @@ -14,7 +14,7 @@ public define String String language, String web_dir )= - with lang_file = web_dir+"/public/js/jquery/plug-in/DataTables-1.10.7/translation/"+language+".txt", + with lang_file = web_dir+"/public/js/jquery/plug-in/DataTables/translation/"+language+".txt", with file = if file_exists(lang_file) then language else @@ -22,7 +22,7 @@ public define String "en", "\"oLanguage\": { - \"sUrl\": \"/js/jquery/plug-in/DataTables-1.10.7/translation/"+file+".txt\" + \"sUrl\": \"/js/jquery/plug-in/DataTables/translation/"+file+".txt\" }". diff --git a/web/jQuery/ui-addon/datetimepicker.anubis b/web/jQuery/ui-addon/datetimepicker.anubis index d3d8070..427833e 100644 --- a/web/jQuery/ui-addon/datetimepicker.anubis +++ b/web/jQuery/ui-addon/datetimepicker.anubis @@ -23,42 +23,49 @@ read calexium_lib/web/CXM_jquery.anubis ] . +public define String + datetimepicker_init_js + ( + String lang, + Bool add_icon + ) = "// Datetimepicker\n + $.datetimepicker.setLocale('"+lang+"'); + $('.datepicker').datetimepicker({timepicker:false,format:'d/m/Y'}); + $('.datetimepicker').datetimepicker({format:'Y-m-d H:i'}); + $('.timepicker').datetimepicker({datepicker:false,format:'H:i',step:5}); + " + if add_icon then " + var items_add_func = function (index) { + var icon_file = 'icon_calendar.gif'; + var dt_picker = $(this); + + if (dt_picker.hasClass('timepicker')) { + icon_file = 'icon_clock.gif'; + } + + var icon = $(''); + + icon.click(function () { dt_picker.datetimepicker('show'); }); + icon.hover(function() { $(this).css('cursor','pointer'); }); + dt_picker.after(icon); + }; + + $('.datepicker').each(items_add_func); + $('.datetimepicker').each(items_add_func); + $('.timepicker').each(items_add_func); + " else "". /* Initialize jQuery datetimepicker */ public define List(HTML_Head_Tag) jq_datetimepicker_init ( - String lang, + String lang, Bool add_icon ) = [ css(css_file("js/jquery/plug-in/datetimepicker/datetimepicker.css")), js(js_file("js/jquery/plug-in/datetimepicker/datetimepicker.min.js")), - js_inline(jquery_ready("// Datetimepicker\n - $('.datepicker').datetimepicker({lang:'"+lang+"',timepicker:false,format:'d/m/Y'}); - $('.datetimepicker').datetimepicker({lang:'"+lang+"',format:'Y-m-d H:i'}); - $('.timepicker').datetimepicker({lang:'"+lang+"',datepicker:false,format:'H:i',step:5}); - " + if add_icon then " - var items_add_func = function (index) { - var icon_file = 'icon_calendar.gif'; - var dt_picker = $(this); - - if (dt_picker.hasClass('timepicker')) { - icon_file = 'icon_clock.gif'; - } - - var icon = $(''); - - icon.click(function () { dt_picker.datetimepicker('show'); }); - icon.hover(function() { $(this).css('cursor','pointer'); }); - dt_picker.after(icon); - }; - - $('.datepicker').each(items_add_func); - $('.datetimepicker').each(items_add_func); - $('.timepicker').each(items_add_func); - " else "")) + js_inline(jquery_ready(datetimepicker_init_js(lang, add_icon))) ] . diff --git a/web/widgets/button.anubis b/web/widgets/button.anubis index 4d80261..1486024 100644 --- a/web/widgets/button.anubis +++ b/web/widgets/button.anubis @@ -120,7 +120,7 @@ public define HTML_Partial_Content with uid = generate_random_string(20), partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))], - image(img_button_confirm_image_attrs(core_attrs, uid, actioner), img_path, "")). + literal("")). public define HTML_Partial_Content img_button_confirm @@ -149,21 +149,21 @@ public define String "" + "". - + public define String img_button_confirm ( - String img_path, - List(CoreAttrs) core_attrs, - String dlg_title_js_escaped, - String dlg_text_js_escaped, - String dlg_ok_js_escaped, - String dlg_cancel_js_escaped, - String dlg_ok_js_script + String img_path, + String inline_img_attrb, + String dlg_title_js_escaped, + String dlg_text_js_escaped, + String dlg_ok_js_escaped, + String dlg_cancel_js_escaped, + String dlg_ok_js_script ) = with uid = generate_random_string(10), "". + "};});". public define String img_button_confirm -- libgit2 0.21.4