From e7921b1c144d92e56e878ed564c665e091907b3e Mon Sep 17 00:00:00 2001 From: totoro Date: Thu, 11 Feb 2021 16:58:20 +0900 Subject: [PATCH] update to xlib with renamed files and references --- controller/hk_controller.anubis | 2 +- controller/hk_delete.anubis | 4 ++-- controller/hk_rows_import.anubis | 6 +++--- controller/hk_utils.anubis | 2 +- model/app.anubis | 2 +- model/columns.anubis | 2 +- model/database.anubis | 4 ++-- model/display.anubis | 4 ++-- model/fields.anubis | 4 ++-- model/help.anubis | 4 ++-- model/icons.anubis | 4 ++-- model/model.anubis | 2 +- model/tables.anubis | 2 +- types/hayamiki.anubis | 2 +- view/jqgrid.anubis | 2 +- view/types/hk_form_entry.anubis | 2 +- view/types/hk_view.anubis | 2 +- view/view_apps_renderer.anubis | 6 +++--- view/view_editor_renderer.anubis | 4 ++-- view/view_rows_import.anubis | 18 +++++++++--------- view/view_table_manager_types.anubis | 4 ++-- view/view_table_renderer.anubis | 24 ++++++++++++------------ view/web_action.anubis | 2 +- 23 files changed, 54 insertions(+), 54 deletions(-) diff --git a/controller/hk_controller.anubis b/controller/hk_controller.anubis index c6dfeaa..cd7c81d 100644 --- a/controller/hk_controller.anubis +++ b/controller/hk_controller.anubis @@ -13,7 +13,7 @@ transmit hayamiki_lib/controller/hk_trigger.anubis transmit kayamiki_lib/controller/hk_rows_import.anubis -transmit xlib/web/CXM_common.anubis +transmit xlib/web/common.anubis transmit xlib/web/types/making_a_web_site.anubis transmit xlib/web/types/web_session.anubis transmit xlib/database/db_types.anubis diff --git a/controller/hk_delete.anubis b/controller/hk_delete.anubis index 3ad4433..198b02e 100644 --- a/controller/hk_delete.anubis +++ b/controller/hk_delete.anubis @@ -6,8 +6,8 @@ * © David RENÉ */ -read xlib/web/CXM_common.anubis -read xlib/web/CXM_web_arg_utils.anubis +read xlib/web/common.anubis +read xlib/web/web_arg_utils.anubis //TODO move to hayamiki lib as view part of MVC //read hayamiki_lib/view/view_table_manager.anubis read hayamiki_lib/controller/hk_sql_utils.anubis diff --git a/controller/hk_rows_import.anubis b/controller/hk_rows_import.anubis index 6b744ca..c0e88a7 100644 --- a/controller/hk_rows_import.anubis +++ b/controller/hk_rows_import.anubis @@ -11,10 +11,10 @@ read data_base/read_csv.anubis read tools/function.anubis read hayamiki_lib/model/types/hk_database.anubis -read xlib/web/CXM_web_arg_utils.anubis -read xlib/web/CXM_web_session.anubis +read xlib/web/web_arg_utils.anubis +read xlib/web/web_session.anubis read xlib/database/csv_import_status.anubis -read lexical_analysis/fast_lexer_4.anubis +//read lexical_analysis/fast_lexer_4.anubis define Maybe(SQLite3Bind) diff --git a/controller/hk_utils.anubis b/controller/hk_utils.anubis index a054290..8ede420 100644 --- a/controller/hk_utils.anubis +++ b/controller/hk_utils.anubis @@ -6,7 +6,7 @@ * © David RENÉ */ -read xlib/web/CXM_web_arg_utils.anubis +read xlib/web/web_arg_utils.anubis read hayamiki_lib/view/view_table_manager_types.anubis read hayamiki_lib/types/hayamiki.anubis diff --git a/model/app.anubis b/model/app.anubis index 8e0d04e..c012e47 100644 --- a/model/app.anubis +++ b/model/app.anubis @@ -12,7 +12,7 @@ transmit icons.anubis read tools/basis.anubis transmit system/muscle.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_app.anubis /* Default constructor for HK_App*/ diff --git a/model/columns.anubis b/model/columns.anubis index 7d9827a..831e4c9 100644 --- a/model/columns.anubis +++ b/model/columns.anubis @@ -10,7 +10,7 @@ read tools/basis.anubis transmit help.anubis transmit fields.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_model_column.anubis transmit hayamiki_lib/model/types/hk_model_attr.anubis transmit hayamiki_lib/model/types/hk_help_text.anubis diff --git a/model/database.anubis b/model/database.anubis index 49fb36b..dc6696f 100644 --- a/model/database.anubis +++ b/model/database.anubis @@ -10,8 +10,8 @@ transmit app.anubis transmit tools/basis.anubis transmit system/muscle.anubis -transmit xlib/CXM_message_constants.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/message_constants.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_database.anubis diff --git a/model/display.anubis b/model/display.anubis index 24b216f..8e24776 100644 --- a/model/display.anubis +++ b/model/display.anubis @@ -8,8 +8,8 @@ transmit system/muscle.anubis transmit tools/basis.anubis -transmit xlib/CXM_message_constants.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/message_constants.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/view/types/hk_display.anubis transmit hayamiki_lib/view/types/hk_viewer.anubis diff --git a/model/fields.anubis b/model/fields.anubis index e593d74..2e9f508 100644 --- a/model/fields.anubis +++ b/model/fields.anubis @@ -9,8 +9,8 @@ transmit tools/basis.anubis transmit system/convert.anubis transmit system/muscle.anubis -transmit xlib/CXM_message_constants.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/message_constants.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_model_field.anubis transmit hayamiki_lib/model/types/hk_app_name.anubis transmit hayamiki_lib/model/types/hk_text_field_attr.anubis diff --git a/model/help.anubis b/model/help.anubis index 3b87bdb..f599a8d 100644 --- a/model/help.anubis +++ b/model/help.anubis @@ -8,8 +8,8 @@ transmit tools/basis.anubis transmit system/muscle.anubis -transmit xlib/CXM_message_constants.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/message_constants.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_help_text.anubis diff --git a/model/icons.anubis b/model/icons.anubis index 9bce02a..84ed282 100644 --- a/model/icons.anubis +++ b/model/icons.anubis @@ -8,8 +8,8 @@ transmit tools/basis.anubis transmit system/muscle.anubis -transmit xlib/CXM_message_constants.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/message_constants.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_icon.anubis diff --git a/model/model.anubis b/model/model.anubis index 0bb6b53..f2a1b47 100644 --- a/model/model.anubis +++ b/model/model.anubis @@ -8,7 +8,7 @@ transmit tools/basis.anubis transmit columns.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_model.anubis public define HK_Model diff --git a/model/tables.anubis b/model/tables.anubis index 534ef2f..95dbd27 100644 --- a/model/tables.anubis +++ b/model/tables.anubis @@ -9,7 +9,7 @@ read tools/basis.anubis transmit display.anubis transmit model.anubis -transmit xlib/web/CXM_json.anubis +transmit xlib/web/json.anubis transmit hayamiki_lib/model/types/hk_table.anubis transmit hayamiki_lib/model/types/hk_constraint.anubis diff --git a/types/hayamiki.anubis b/types/hayamiki.anubis index 2fb1333..c786c98 100644 --- a/types/hayamiki.anubis +++ b/types/hayamiki.anubis @@ -6,7 +6,7 @@ * © David RENÉ */ -read xlib/web/CXM_web_arg_utils.anubis +read xlib/web/web_arg_utils.anubis transmit hayamiki_lib/model/fields.anubis transmit hayamiki_lib/model/database.anubis transmit hayamiki_lib/model/columns.anubis diff --git a/view/jqgrid.anubis b/view/jqgrid.anubis index dad15e9..4876225 100644 --- a/view/jqgrid.anubis +++ b/view/jqgrid.anubis @@ -6,7 +6,7 @@ * © David RENÉ */ -read xlib/web/CXM_making_a_web_site.anubis +read xlib/web/making_a_web_site.anubis read hayamiki_lib/types/hayamiki.anubis read hayamiki_lib/view/types/hk_form.anubis read hayamiki_lib/view/types/hk_view.anubis diff --git a/view/types/hk_form_entry.anubis b/view/types/hk_form_entry.anubis index 4060770..1254809 100644 --- a/view/types/hk_form_entry.anubis +++ b/view/types/hk_form_entry.anubis @@ -8,7 +8,7 @@ read xlib/web/types/making_a_web_site.anubis -transmit xlib/web/CXM_common.anubis +transmit xlib/web/common.anubis transmit xlib/database/types/db_id.anubis read hayamiki_lib/types/hayamiki.anubis diff --git a/view/types/hk_view.anubis b/view/types/hk_view.anubis index 308344a..cd06886 100644 --- a/view/types/hk_view.anubis +++ b/view/types/hk_view.anubis @@ -7,7 +7,7 @@ */ read xlib/web/types/making_a_web_site.anubis -transmit xlib/web/CXM_common.anubis +transmit xlib/web/common.anubis read hayamiki_lib/types/hayamiki.anubis read hayamiki_lib/view/types/hk_form_table.anubis read hayamiki_lib/view/types/hk_form_tab.anubis diff --git a/view/view_apps_renderer.anubis b/view/view_apps_renderer.anubis index 7ede307..4e3f10d 100644 --- a/view/view_apps_renderer.anubis +++ b/view/view_apps_renderer.anubis @@ -9,10 +9,10 @@ read hayamiki_lib/types/hayamiki.anubis read hayamiki_lib/view/web_action.anubis read hayamiki_lib/controller/hk_sql_utils.anubis -read xlib/web/CXM_making_a_web_site.anubis +read xlib/web/making_a_web_site.anubis -read xlib/web/jQuery/CXM_jquery_dialog.anubis -read xlib/web/jQuery/CXM_jquery_button.anubis +read xlib/web/jQuery/jq_dialog.anubis +read xlib/web/jQuery/jq_button.anubis read xlib/web/jQuery/ui-addon/datetimepicker.anubis read xlib/web/widgets/button.anubis diff --git a/view/view_editor_renderer.anubis b/view/view_editor_renderer.anubis index 4224c1f..b64e88a 100644 --- a/view/view_editor_renderer.anubis +++ b/view/view_editor_renderer.anubis @@ -6,8 +6,8 @@ * © David RENÉ */ -read xlib/web/CXM_making_a_web_site.anubis -read xlib/web/CXM_form.anubis +read xlib/web/making_a_web_site.anubis +read xlib/web/form.anubis read hayamiki_lib/view/view_table_manager_types.anubis read hayamiki_lib/view/view_table_manager.anubis read hayamiki_lib/types/hayamiki.anubis diff --git a/view/view_rows_import.anubis b/view/view_rows_import.anubis index 5672100..42fc834 100644 --- a/view/view_rows_import.anubis +++ b/view/view_rows_import.anubis @@ -13,10 +13,10 @@ read tools/line_reader.anubis read tools/basis.anubis read xlib/database/csv_tools.anubis -read xlib/web/CXM_making_a_web_site.anubis -read xlib/web/CXM_jquery.anubis -read xlib/web/CXM_form.anubis -read xlib/web/jQuery/CXM_jquery_button.anubis +read xlib/web/making_a_web_site.anubis +read xlib/web/jquery.anubis +read xlib/web/form.anubis +read xlib/web/jQuery/jq_button.anubis read xlib/web/widgets/css_helper.anubis read xlib/web/widgets/icons_set.anubis @@ -59,7 +59,7 @@ public define HTML_Partial_Content )= html_wave_box(_T("CONTROL_PANEL"), partial_content( - [ js(js_file("js/dropzone.js")), + [ js(js_file("xlib/js/dropzone.js")), js_inline(jquery_ready("Dropzone.options.myAwesomeDropzone = { maxFiles: 1, dictDefaultMessage : \""+_T("DROP_FILE_HERE")+"\", @@ -187,10 +187,10 @@ public define HTML_Partial_Content WEB_Action_Name cancel_action, // (String) -> String _T // translator from dictionary )= - partial_content([css(css_file("css/cxm/cxm_dnd.css")), - css(css_file("css/changelists.css")), - js(js_file("js/cxm/cxm_dnd.js")), - js(js_file("js/data_import.js")) + partial_content([css(css_file("xlib/css/dnd.css")), + css(css_file("xlib/css/changelists.css")), + js(js_file("xlib/js/dnd.js")), + js(js_file("hayamiki/js/data_import.js")) ], sequence([ form("import_csv_form",[], hkc_import_execute, [("table_name", target_table_name), ("file",uploaded_file)], sequence([ diff --git a/view/view_table_manager_types.anubis b/view/view_table_manager_types.anubis index 8abb0da..a8267b3 100644 --- a/view/view_table_manager_types.anubis +++ b/view/view_table_manager_types.anubis @@ -9,14 +9,14 @@ transmit hayamiki_lib/view/types/hk_form.anubis transmit hayamiki_lib/view/types/hk_view.anubis transmit hayamiki_lib/view/types/hk_filter.anubis -transmit xlib/web/CXM_common.anubis +transmit xlib/web/common.anubis transmit xlib/database/db_version.anubis transmit hayamiki_lib/controller/hk_controller.anubis //read hayamiki_lib/types/hayamiki.anubis -//read xlib/web/CXM_common.anubis +//read xlib/web/common.anubis //read xlib/database/db_types.anubis public type VTM_edit: diff --git a/view/view_table_renderer.anubis b/view/view_table_renderer.anubis index 70d3bd0..5116e50 100644 --- a/view/view_table_renderer.anubis +++ b/view/view_table_renderer.anubis @@ -26,22 +26,22 @@ read system/convert.anubis //read utils.anubis read locale/L3LanguageInfo.anubis -read xlib/web/CXM_common.anubis -read xlib/web/CXM_web_arg_utils.anubis -read xlib/web/CXM_making_a_web_site.anubis -read xlib/web/CXM_multihost_http_server.anubis -read xlib/web/jQuery/CXM_jquery_datatable.anubis -read xlib/web/jQuery/CXM_jquery_datatable_types.anubis -read xlib/web/jQuery/CXM_jquery_dialog.anubis -read xlib/web/jQuery/CXM_jquery_button.anubis -read xlib/web/jQuery/CXM_jq_form.anubis +read xlib/web/common.anubis +read xlib/web/web_arg_utils.anubis +read xlib/web/making_a_web_site.anubis +read xlib/web/multihost_http_server.anubis +read xlib/web/jQuery/jq_datatable.anubis +read xlib/web/jQuery/jq_datatable_types.anubis +read xlib/web/jQuery/jq_dialog.anubis +read xlib/web/jQuery/jq_button.anubis +read xlib/web/jQuery/jq_form.anubis read xlib/web/jQuery/ui-addon/datetimepicker.anubis -read xlib/web/jQuery/jqgrid.anubis -read xlib/web/CXM_form.anubis +read xlib/web/jQuery/jq_grid.anubis +read xlib/web/form.anubis read xlib/web/widgets/css_helper.anubis read xlib/web/widgets/button.anubis read xlib/web/widgets/specialized_elements.anubis -read xlib/web/CXM_urllib.anubis +read xlib/web/urllib.anubis public define List(CXM_Form_Field) get_hidden diff --git a/view/web_action.anubis b/view/web_action.anubis index befad6e..6e7c5d9 100644 --- a/view/web_action.anubis +++ b/view/web_action.anubis @@ -6,7 +6,7 @@ * © David RENÉ */ -read xlib/web/CXM_making_a_web_site.anubis +read xlib/web/making_a_web_site.anubis here are defined all action managed by Hayamiki Controller -- libgit2 0.21.4