diff --git a/modules/install/lang/en.php b/modules/install/lang/en.php index e14213872..a90b02f5c 100644 --- a/modules/install/lang/en.php +++ b/modules/install/lang/en.php @@ -82,6 +82,7 @@ $lang->ssl_options['optional'] = 'Optional'; $lang->ssl_options['always'] = 'Always'; $lang->about_database_file = 'Sqlite saves data in a file. Location of the database file should be unreachable by web
Data file should be inside the permission of 777.'; $lang->success_installed = 'Installation has been completed.'; +$lang->msg_db_checking = 'Checking...'; $lang->msg_installing = 'Installing...'; $lang->msg_cannot_proc = 'Installation environment is not proper to proceed.'; $lang->msg_already_installed = 'Rhymix is already installed.'; diff --git a/modules/install/lang/ko.php b/modules/install/lang/ko.php index b403afeda..c61d02dfd 100644 --- a/modules/install/lang/ko.php +++ b/modules/install/lang/ko.php @@ -83,6 +83,7 @@ $lang->ssl_options['always'] = '항상 사용'; $lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 해야 합니다.
데이터 파일은 777퍼미션 설정된 곳으로 지정해주세요.'; $lang->success_installed = '설치가 되었습니다.'; $lang->msg_cannot_proc = '설치 환경이 갖춰지지 않아 요청을 실행할 수가 없습니다.'; +$lang->msg_db_checking = '확인 중입니다...'; $lang->msg_installing = '설치 중입니다...'; $lang->msg_already_installed = '이미 설치가 되어 있습니다.'; $lang->msg_dbconnect_failed = 'DB접속 오류가 발생하였습니다. DB정보를 다시 확인해주세요.'; diff --git a/modules/install/tpl/db_config.html b/modules/install/tpl/db_config.html index 259230de2..901e0e332 100644 --- a/modules/install/tpl/db_config.html +++ b/modules/install/tpl/db_config.html @@ -59,7 +59,7 @@ « {$lang->cmd_back}
- +
diff --git a/modules/install/tpl/js/install.js b/modules/install/tpl/js/install.js index 7146adcb8..76943a8a7 100644 --- a/modules/install/tpl/js/install.js +++ b/modules/install/tpl/js/install.js @@ -37,11 +37,20 @@ jQuery(function($){ } }); } + if($("#task-db-select").size()) { + $("#task-db-select").parents("form").on("submit", function() { + setTimeout(function() { + $("#task-db-select").text($("#task-db-select").data("checking")); + $("#task-db-select").prop("disabled", true); + }, 100); + }); + } if($("#task-complete-install").size()) { - $("#task-complete-install").click(function() { - $("#task-complete-install").text($("#task-complete-install").data("installing")); - $("#task-complete-install").prop("disabled", true); - $(window).on("beforeunload", function() { return ""; }); + $("#task-complete-install").parents("form").on("submit", function() { + setTimeout(function() { + $("#task-complete-install").text($("#task-complete-install").data("installing")); + $("#task-complete-install").prop("disabled", true); + }, 100); }); } });