From 050bbffb97ee36fcacf53220719b2f9181c3d2b9 Mon Sep 17 00:00:00 2001 From: totoro Date: Mon, 15 Feb 2021 14:33:32 +0900 Subject: [PATCH] print the version when the generator is loaded move css file in the new path (hayamiki/css/ or hayamiki/js/) --- hk_generator.anubis | 2 +- view/view_apps_renderer.anubis | 2 +- view/view_table_renderer.anubis | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hk_generator.anubis b/hk_generator.anubis index 9d52506..30fc37f 100644 --- a/hk_generator.anubis +++ b/hk_generator.anubis @@ -29,5 +29,5 @@ public define Maybe(HK_Generator_API) wrong_type(expected,found) then print("Secondary module '"+file_name+"' has type:\n"+ found+" while primary module expected:\n"+ expected+"\n\n");failure, - ok(hk_gen_api) then println("Hayamiki generator loaded ");success(hk_gen_api) + ok(hk_gen_api) then println("Hayamiki generator 1.19 loaded ");success(hk_gen_api) }. diff --git a/view/view_apps_renderer.anubis b/view/view_apps_renderer.anubis index 4e3f10d..f3fdcc3 100644 --- a/view/view_apps_renderer.anubis +++ b/view/view_apps_renderer.anubis @@ -72,7 +72,7 @@ public define Maybe(HTML_Partial_Content) String web_site_directory ) = with dialog_uid = "_"+generate_random_string(15)+"_cxm_dlg", - success(partial_content([css(css_file("hayamiki/hayamiki.css")),]+ + success(partial_content([css(css_file("hayamiki/css/hayamiki.css")),]+ jq_dialog_init + jq_datetimepicker_init(lang), sequence([ partial(jq_dialog_create(dialog_id(dialog_uid), ajax(controller_action("hk_c", "ajax_edit_table&dialog_id="+dialog_uid)))), /*&table_name="+rows.table_name*/ diff --git a/view/view_table_renderer.anubis b/view/view_table_renderer.anubis index 5116e50..8ed62b1 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -512,7 +512,7 @@ url:'?aws_controller=hk_c&aws_action=grid_view&table_name="+rows.table_name+"&vi return ret; }")), - partial_content(jqgrid_init(lang) + [js, css(css_file("hayamiki/hayamiki.css"))], + partial_content(jqgrid_init(lang) + [js, css(css_file("hayamiki/css/hayamiki.css"))], div([], sequence([ table([core_attrs([id(uid+"_grid")])],[]), @@ -734,7 +734,7 @@ public define List(CXM_Form_Field) //Get the priority of the web argument content for the value, this means the value already set by the user or called with programmaticaly with it with value = get_DB_id(lwa, c_name, _value), //create refresh function and call it first to construct the dropdown - with load_script = script("text/javascript","function "+refresh_func+"() { CalexiumToolBox.ajax_load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"&"+to_Web_arg(table_referer, "")+"');} "+refresh_func+"(); "), + with load_script = script("text/javascript","function "+refresh_func+"() { Xlib.load_content('"+uid+foreign_table_name+"_"+c_name+"_selector', '?aws_controller=hk_c&aws_action=selector&table_name="+foreign_table_name+"&fk_filter="+fk_clause+"&selected="+value+"&"+to_Web_arg(table_referer, "")+"');} "+refresh_func+"(); "), [ partial(jq_dialog_create(dialog_id(uid+foreign_table_name+"_dlg_ajax"), ajax(controller_action("hk_c", "ajax_edit_table&dialog_id="+uid+foreign_table_name+"_dlg_ajax&sub_dialog=true&table_name="+foreign_table_name+"&after_close_cb="+refresh_func)))), one_line_fields([ @@ -865,8 +865,8 @@ public define HTML_Partial_Content with form_id = dialog_id+"_form", //println("renderer_edit_list_form dialog_id ["+dialog_id+"]"); partial_content( - [ js(js_file("js/jscolor.min.js")), - js(js_file("js/dropzone.js")), + [ js(js_file("hayamiki/js/jscolor.min.js")), + js(js_file("xlib/js/dropzone.js")), js_inline(jquery_ready("Dropzone.options.myAwesomeDropzone = { maxFiles: 100, dictDefaultMessage : \""+_T("DROP_FILE_HERE")+"\", -- libgit2 0.21.4