Commit 050bbffb97ee36fcacf53220719b2f9181c3d2b9
1 parent
e7921b1c
print the version when the generator is loaded
move css file in the new path (hayamiki/css/ or hayamiki/js/)
Showing
3 changed files
with
6 additions
and
6 deletions
Show diff stats
hk_generator.anubis
| ... | ... | @@ -29,5 +29,5 @@ public define Maybe(HK_Generator_API) |
| 29 | 29 | wrong_type(expected,found) then print("Secondary module '"+file_name+"' has type:\n"+ |
| 30 | 30 | found+" while primary module expected:\n"+ |
| 31 | 31 | expected+"\n\n");failure, |
| 32 | - ok(hk_gen_api) then println("Hayamiki generator loaded ");success(hk_gen_api) | |
| 32 | + ok(hk_gen_api) then println("Hayamiki generator 1.19 loaded ");success(hk_gen_api) | |
| 33 | 33 | }. | ... | ... |
view/view_apps_renderer.anubis
| ... | ... | @@ -72,7 +72,7 @@ public define Maybe(HTML_Partial_Content) |
| 72 | 72 | String web_site_directory |
| 73 | 73 | ) = |
| 74 | 74 | with dialog_uid = "_"+generate_random_string(15)+"_cxm_dlg", |
| 75 | - success(partial_content([css(css_file("hayamiki/hayamiki.css")),]+ | |
| 75 | + success(partial_content([css(css_file("hayamiki/css/hayamiki.css")),]+ | |
| 76 | 76 | jq_dialog_init + jq_datetimepicker_init(lang), |
| 77 | 77 | sequence([ |
| 78 | 78 | 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*/ | ... | ... |
view/view_table_renderer.anubis
| ... | ... | @@ -512,7 +512,7 @@ url:'?aws_controller=hk_c&aws_action=grid_view&table_name="+rows.table_name+"&vi |
| 512 | 512 | return ret; |
| 513 | 513 | }")), |
| 514 | 514 | |
| 515 | - partial_content(jqgrid_init(lang) + [js, css(css_file("hayamiki/hayamiki.css"))], | |
| 515 | + partial_content(jqgrid_init(lang) + [js, css(css_file("hayamiki/css/hayamiki.css"))], | |
| 516 | 516 | div([], |
| 517 | 517 | sequence([ |
| 518 | 518 | table([core_attrs([id(uid+"_grid")])],[]), |
| ... | ... | @@ -734,7 +734,7 @@ public define List(CXM_Form_Field) |
| 734 | 734 | //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 |
| 735 | 735 | with value = get_DB_id(lwa, c_name, _value), |
| 736 | 736 | //create refresh function and call it first to construct the dropdown |
| 737 | - 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+"(); "), | |
| 737 | + 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+"(); "), | |
| 738 | 738 | [ |
| 739 | 739 | 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)))), |
| 740 | 740 | one_line_fields([ |
| ... | ... | @@ -865,8 +865,8 @@ public define HTML_Partial_Content |
| 865 | 865 | with form_id = dialog_id+"_form", |
| 866 | 866 | //println("renderer_edit_list_form dialog_id ["+dialog_id+"]"); |
| 867 | 867 | partial_content( |
| 868 | - [ js(js_file("js/jscolor.min.js")), | |
| 869 | - js(js_file("js/dropzone.js")), | |
| 868 | + [ js(js_file("hayamiki/js/jscolor.min.js")), | |
| 869 | + js(js_file("xlib/js/dropzone.js")), | |
| 870 | 870 | js_inline(jquery_ready("Dropzone.options.myAwesomeDropzone = { |
| 871 | 871 | maxFiles: 100, |
| 872 | 872 | dictDefaultMessage : \""+_T("DROP_FILE_HERE")+"\", | ... | ... |