From c32a4e1345ac4d1b9cd97966e0899bc5d67758c4 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Tue, 5 Jan 2016 20:46:44 +0900 Subject: [PATCH] Add a new theme for the installer --- common/lang/lang.xml | 12 +- modules/install/conf/module.xml | 7 +- modules/install/install.controller.php | 56 +---- modules/install/install.view.php | 49 ++-- modules/install/lang/lang.xml | 246 +++++++++--------- modules/install/ruleset/cubrid.xml | 14 -- modules/install/ruleset/firebird.xml | 14 -- modules/install/ruleset/mssql.xml | 14 -- modules/install/ruleset/mysql.xml | 14 -- modules/install/ruleset/postgresql.xml | 14 -- modules/install/ruleset/sqlite.xml | 10 - modules/install/tpl/admin_form.html | 96 ++++---- modules/install/tpl/check_env.html | 86 ++++--- modules/install/tpl/config_form.html | 54 ++-- modules/install/tpl/css/install.css | 260 ++++++++++++++++---- modules/install/tpl/footer.html | 7 +- modules/install/tpl/form.cubrid.html | 54 ---- modules/install/tpl/form.mssql.html | 54 ---- modules/install/tpl/form.mysql.html | 54 ---- modules/install/tpl/form.mysql_innodb.html | 54 ---- modules/install/tpl/form.mysqli.html | 54 ---- modules/install/tpl/form.mysqli_innodb.html | 54 ---- modules/install/tpl/ftp.html | 115 +++++---- modules/install/tpl/header.html | 11 +- modules/install/tpl/introduce.html | 10 +- modules/install/tpl/js/install.js | 36 +-- modules/install/tpl/js/install_admin.js | 145 ----------- modules/install/tpl/license_agreement.html | 52 ++-- modules/install/tpl/license_text.en.html | 41 +++ modules/install/tpl/license_text.ko.html | 41 +++ modules/install/tpl/progress_menu.html | 6 +- modules/install/tpl/select_db.html | 86 +++++-- 32 files changed, 734 insertions(+), 1086 deletions(-) delete mode 100644 modules/install/ruleset/cubrid.xml delete mode 100644 modules/install/ruleset/firebird.xml delete mode 100644 modules/install/ruleset/mssql.xml delete mode 100644 modules/install/ruleset/mysql.xml delete mode 100644 modules/install/ruleset/postgresql.xml delete mode 100644 modules/install/ruleset/sqlite.xml delete mode 100644 modules/install/tpl/form.cubrid.html delete mode 100644 modules/install/tpl/form.mssql.html delete mode 100644 modules/install/tpl/form.mysql.html delete mode 100644 modules/install/tpl/form.mysql_innodb.html delete mode 100644 modules/install/tpl/form.mysqli.html delete mode 100644 modules/install/tpl/form.mysqli_innodb.html delete mode 100644 modules/install/tpl/js/install_admin.js create mode 100644 modules/install/tpl/license_text.en.html create mode 100644 modules/install/tpl/license_text.ko.html diff --git a/common/lang/lang.xml b/common/lang/lang.xml index 6e4ed7f8e..13c4fe49c 100644 --- a/common/lang/lang.xml +++ b/common/lang/lang.xml @@ -3963,18 +3963,18 @@ - + - Copyright (C) NAVER <http://www.navercorp.com>

"XpressEngine (XE)"은 자유 소프트웨어이며, 오픈 소스 프로젝트로 개발되고 있습니다. 자세한 내용은 아래 링크를 참조하시기 바랍니다.

"XpressEngine (XE)"은 자유 소프트웨어입니다. 소프트웨어의 피양도자는 자유 소프트웨어 재단이 공표한 GNU 약소 일반 공중 사용 허가서 2.1판 또는 그 이후 판을 임의로 선택해서, 그 규정에 따라 소프트웨어를 개작하거나 재배포할 수 있습니다.

이 소프트웨어는 유용하게 사용될 수 있으리라는 희망에서 배포되고 있지만, 특정한 목적에 맞는 적합성 여부나 판매용으로 사용할 수 있으리라는 묵시적인 보증을 포함한 어떠한 형태의 보증도 제공하지 않습니다. 보다 자세한 사항에 대해서는 GNU 약소 일반 공중 사용 허가서를 참고하시기 바랍니다.

GNU 약소 일반 공중 사용 허가서는 이 라이브러리와 함께 제공됩니다. 만약, 이 문서가 누락되어 있다면 자유 소프트웨어 재단으로 문의하시기 바랍니다. (자유 소프트웨어 재단: Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA)

]]> - Copyright (C) NAVER <http://www.navercorp.com>

"XpressEngine (XE)" is an opensource and being developed in the opensource project. For more information, please see the link below.

"XpressEngine (XE)" is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.

This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

]]> + + - + - - + + diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml index 15406e777..5aa36c6b3 100644 --- a/modules/install/conf/module.xml +++ b/modules/install/conf/module.xml @@ -10,12 +10,7 @@ - - - - - - + diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php index 63ac3abbf..19e16bf18 100644 --- a/modules/install/install.controller.php +++ b/modules/install/install.controller.php @@ -26,64 +26,10 @@ class installController extends install $this->etc_tmp_config_file = _XE_PATH_.'files/config/tmpEtc.config.php'; } - /** - * @brief cubrid db setting wrapper, becase Server Side Validator... - * Server Side Validatro can use only one proc, one ruleset - */ - function procCubridDBSetting() - { - return $this->_procDBSetting(); - } - - /** - * @brief firebird db setting wrapper, becase Server Side Validator... - * Server Side Validatro can use only one proc, one ruleset - */ - function procFirebirdDBSetting() - { - return $this->_procDBSetting(); - } - - /** - * @brief mssql db setting wrapper, becase Server Side Validator... - * Server Side Validatro can use only one proc, one ruleset - */ - function procMssqlDBSetting() - { - return $this->_procDBSetting(); - } - - /** - * @brief mysql db setting wrapper, becase Server Side Validator... - * Server Side Validatro can use only one proc, one ruleset - */ - function procMysqlDBSetting() - { - return $this->_procDBSetting(); - } - - /** - * @brief postgresql db setting wrapper, becase Server Side Validator... - * Server Side Validatro can use only one proc, one ruleset - */ - function procPostgresqlDBSetting() - { - return $this->_procDBSetting(); - } - - /** - * @brief sqlite db setting wrapper, becase Server Side Validator... - * Server Side Validatro can use only one proc, one ruleset - */ - function procSqliteDBSetting() - { - return $this->_procDBSetting(); - } - /** * @brief division install step... DB Config temp file create */ - function _procDBSetting() + function procDBSetting() { // Get DB-related variables $con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix'); diff --git a/modules/install/install.view.php b/modules/install/install.view.php index 131a473d4..ccdd4a75a 100644 --- a/modules/install/install.view.php +++ b/modules/install/install.view.php @@ -76,7 +76,8 @@ class installView extends install } Context::set('l', Context::getLangType()); - $this->setTemplateFile('introduce'); + return $this->dispInstallLicenseAgreement(); + //$this->setTemplateFile('introduce'); } /** @@ -118,6 +119,7 @@ class installView extends install { Context::set('progressMenu', '3'); Context::set('server_ip_address', $_SERVER['SERVER_ADDR']); + Context::set('server_ftp_user', get_current_user()); $this->setTemplateFile('ftp'); } else @@ -136,43 +138,24 @@ class installView extends install } } Context::set('defaultDatabase', $defaultDatabase); - Context::set('progressMenu', '4'); + + $error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type')); + if($_SERVER['HTTPS'] == 'on') + { + // Error occured when using https protocol at "ModuleHandler::init() ' + $parsedUrl = parse_url($error_return_url); + $error_return_url = ''; + if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path']; + if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query']; + if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment']; + } + Context::set('error_return_url', $error_return_url); + $this->setTemplateFile('select_db'); } } - /** - * @brief Display a screen to enter DB and administrator's information - */ - function dispInstallDBForm() - { - // Display check_env if not installable - if(!$this->install_enable) return $this->dispInstallCheckEnv(); - // Return to the start-up screen if db_type is not specified - if(!Context::get('db_type')) return $this->dispInstallSelectDB(); - - // Output the file, disp_db_info_form.html - $tpl_filename = sprintf('form.%s', Context::get('db_type')); - - $title = sprintf(Context::getLang('input_dbinfo_by_dbtype'), Context::get('db_type')); - Context::set('title', $title); - - $error_return_url = getNotEncodedUrl('', 'act', Context::get('act'), 'db_type', Context::get('db_type')); - if($_SERVER['HTTPS'] == 'on') - { - // Error occured when using https protocol at "ModuleHandler::init() ' - $parsedUrl = parse_url($error_return_url); - $error_return_url = ''; - if(isset($parsedUrl['path'])) $error_return_url .= $parsedUrl['path']; - if(isset($parsedUrl['query'])) $error_return_url .= '?' . $parsedUrl['query']; - if(isset($parsedUrl['fragment'])) $error_return_url .= '?' . $parsedUrl['fragment']; - } - Context::set('error_return_url', $error_return_url); - - $this->setTemplateFile($tpl_filename); - } - /** * @brief Display a screen to enter DB and administrator's information */ diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml index 78b4b64e4..c5269a3be 100644 --- a/modules/install/lang/lang.xml +++ b/modules/install/lang/lang.xml @@ -33,21 +33,21 @@ - + - - + + - + @@ -61,34 +61,34 @@ - + - + - - + + - - + + - - + + @@ -216,26 +216,26 @@ - + - + - - - - - - - - - - + + + + + + + + + + @@ -359,31 +359,31 @@ - - - - - - - - - - + + + + + + + + + + 최초 로그인시 로그인 계정은 이메일 주소 입니다.]]> - - - - - - - - - + + + + + + + + + @@ -408,36 +408,23 @@ + + + + + + + + + + + + - - DB 파일은 myisam으로 생성되기에 트랜잭션이 이루어지지 않습니다.]]> - Transactions will not be processed since DB file is created in myisam.]]> - DBは「myisam」タイプで作成されるため、トランザクション処理はできません。]]> - DB数据是以myisam生成，因此不能实现transaction。]]> - 利用『myisam』建立資料庫檔案，因此不能實現transaction。]]> - La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.]]> - Транзакция отключена из-за того, что файл базы данных создан посредством myisam.]]> - La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.]]> - İşlemler, veritabanı dosyası myisam 'da oluşturulduğu zaman işlenmeyecektir.]]> - mysql*() để sử dụng MySql Database.
Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.]]> - - - innodb는 트랜잭션을 사용할 수 있습니다.]]> - Transactions will be processed with innodb]]> - 「innodb」ではトランザクションの処理が行えます。]]> - innodb可以使用transaction。]]> - innodb可以使用 transaction。]]> - La transaction sera validé pour innodb]]> - Транзакция включена для innodb]]> - La transacción es hablilitado para innodb]]> - İşlemler, innodb ile işlenecektir]]> - innodb để sử dụng MySql Database.
Giao dịch được kích hoạt cho innodb]]> - - - DB 파일은 myisam으로 생성되기에 트랜잭션이 이루어지지 않습니다.]]> - Transactions will not be processed since DB file is created in myisam]]> - DBは「myisam」タイプで作成されるため、トランザクション処理はできせん。]]> + MyISAM 저장엔진을 사용하므로 트랜잭션이 이루어지지 않으며 데이터 손상의 위험이 있습니다.]]> + Use the MyISAM storage engine, which does not support transactions.]]> + MyISAMのエンジンを使用するので、トランザクションが行われず、データの損傷の危険があります。]]> DB数据是以myisam生成，因此不能实现transaction。]]> 利用『myisam』建立資料庫檔案，因此不能實現transaction。]]> La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.]]> @@ -446,10 +433,34 @@ İşlemler, veritabanı dosyası myisam 'da oluşturulduğu zaman işlenmeyecektir.]]> mysqli*() để sử dụng MySql Database.
Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.]]> + + InnoDB 저장엔진은 트랜잭션을 지원하여 데이터 손상의 위험이 낮으며, 동시 처리 능력이 뛰어납니다.]]> + Use the InnoDB storage engine, which supports transactions and higher concurrency.]]> + InnoDBのエンジンは、トランザクションを支援してデータの損傷の危険が低く、同時処理能力が優れています。]]> + innodb可以使用transaction。]]> + innodb可以使用 transaction。]]> + La transaction sera validé pour innodb]]> + Транзакция включена для innodb]]> + La transacción es hablilitado para innodb]]> + İşlemler, innodb ile işlenecektir]]> + innodb để sử dụng MySql Database.
Giao dịch được kích hoạt cho innodb]]> + + + MyISAM 저장엔진을 사용하므로 트랜잭션이 이루어지지 않으며 데이터 손상의 위험이 있습니다.]]> + Use the MyISAM storage engine, which does not support transactions.]]> + MyISAMのエンジンを使用するので、トランザクションが行われず、データの損傷の危険があります。]]> + DB数据是以myisam生成，因此不能实现transaction。]]> + 利用『myisam』建立資料庫檔案，因此不能實現transaction。]]> + La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.]]> + Транзакция отключена из-за того, что файл базы данных создан посредством myisam.]]> + La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.]]> + İşlemler, veritabanı dosyası myisam 'da oluşturulduğu zaman işlenmeyecektir.]]> + mysql_*() để sử dụng MySql Database.
Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.]]> + - innodb는 트랜잭션을 사용할 수 있습니다.]]> - Transactions will be processed with innodb]]> - 「innodb」ではトランザクションの処理が行えます。]]> + InnoDB 저장엔진은 트랜잭션을 지원하여 데이터 손상의 위험이 낮으며, 동시 처리 능력이 뛰어납니다.]]> + Use the InnoDB storage engine, which supports transactions and higher concurrency.]]> + InnoDBのエンジンは、トランザクションを支援してデータの損傷の危険が低く、同時処理能力が優れています。]]> innodb可以使用transaction。]]> innodb可以使用 transaction。]]> La transaction sera validé pour innodb]]> @@ -471,19 +482,19 @@ CUBRID Database. Hướng dẫn]]> - - - - - - - - - + + + + + + + + + - + @@ -539,7 +550,7 @@ - + @@ -551,7 +562,7 @@ - + @@ -621,14 +632,12 @@ - DB 아이디, DB 비밀번호, DB 이름 정보는 서버 호스팅 관리자로부터 정보를 확인 하세요.

]]> - Please check database information to server master.

]]> - DB ID, DB パスワード, DB 名稱 情報は、サーバーホスティング管理者に情報を確認してください。

]]> + + - DB 호스트 네임, DB Port 정보는 서버 호스팅 관리자로부터 정보를 확인 하세요.

DB 테이블 머리말 정보는 사용자 정의 할 수 있습니다. 영문 소문자를 권장 합니다. 숫자를 포함할 수 있습니다. 특수 문자를 사용할 수 없습니다.

]]> - Please check database information to server master.

You can modify database table prefix, and can use small letters(small letter is recommended), and numbers, but you can not use special letters.

]]> - DBホスト名, DB Port 情報は、サーバーホスティング管理者に情報を確認してください。

DBテーブルプレフィックス 情報は、ユーザーが定義できます。英文小文字の使用を推奨します。数字を含めることができます。特殊文字は、使用できません。

]]> + + @@ -702,7 +711,7 @@ SSO]]> - http://yourdomain/?document_srl=123 과 같이 복잡한 주소를 http://yourdomain/123 과 같이 간단하게 줄일 수 있습니다. 웹 서버에서 mod_rewrite를 지원해야 합니다. 지원 여부는 서버 관리자에게 문의하세요.]]> + http://yourdomain/?document_srl=123 과 같이 복잡한 주소를 http://yourdomain/123 과 같이 간단하게 줄일 수 있습니다. 웹 서버에서 mod_rewrite를 지원해야 합니다. 지원 여부는 서버 관리자에게 문의하세요.]]> http://blah/?document_srl=123 can be shortened like http://blah/123]]> 例如，http://域名/?document_srl=123简化为http://域名/123。]]> @@ -714,14 +723,19 @@ http://blah/?document_srl=123 sẽ được rút ngắn thành http://blah/123]]> - mod_rewrite 지원 여부를 확인 바랍니다.]]> - mod_rewrite module support.]]> - mod_rewriteサポート可否を確認してください。]]> + + + + + + + + - 여기를 참고하세요.]]> - here.]]> - 여기を参考ください。]]> + 여기를 참고하세요.]]> + here.]]> + このページを参考ください。]]> @@ -736,8 +750,8 @@ - - + + @@ -770,16 +784,16 @@ - 데이터 파일은 707퍼미션 설정된 곳으로 지정해주세요.]]> - Data file should be inside the permission of 707.]]> - データファイルのパーミッションは「707」に設定してください。]]> - 数据文件应放在具有707属性的位置。]]> - 資料檔案應放在具有 707 權限的位置。]]> - Le fichier des Donées doit être en dedans la permission 707.]]> - Файл базы данных должен иметь права доступа 707.]]> - El archivo de dato debe estar ubicado en un lugar con la atribución 707.]]> - Veri dosyası 707 yetki kapsamı içinde olmalıdır.]]> - Hãy CHMOD thành 707.]]> + 데이터 파일은 777퍼미션 설정된 곳으로 지정해주세요.]]> + Data file should be inside the permission of 777.]]> + データファイルのパーミッションは「777」に設定してください。]]> + 数据文件应放在具有777属性的位置。]]> + 資料檔案應放在具有 777 權限的位置。]]> + Le fichier des Donées doit être en dedans la permission 777.]]> + Файл базы данных должен иметь права доступа 777.]]> + El archivo de dato debe estar ubicado en un lugar con la atribución 777.]]> + Veri dosyası 777 yetki kapsamı içinde olmalıdır.]]> + Hãy CHMOD thành 777.]]> @@ -927,9 +941,9 @@ - - - + + + @@ -1071,8 +1085,8 @@ - - + + diff --git a/modules/install/ruleset/cubrid.xml b/modules/install/ruleset/cubrid.xml deleted file mode 100644 index 75eaa7b13..000000000 --- a/modules/install/ruleset/cubrid.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/modules/install/ruleset/firebird.xml b/modules/install/ruleset/firebird.xml deleted file mode 100644 index 7d06396b7..000000000 --- a/modules/install/ruleset/firebird.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/modules/install/ruleset/mssql.xml b/modules/install/ruleset/mssql.xml deleted file mode 100644 index 75eaa7b13..000000000 --- a/modules/install/ruleset/mssql.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/modules/install/ruleset/mysql.xml b/modules/install/ruleset/mysql.xml deleted file mode 100644 index 23ff80d81..000000000 --- a/modules/install/ruleset/mysql.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/modules/install/ruleset/postgresql.xml b/modules/install/ruleset/postgresql.xml deleted file mode 100644 index 7d06396b7..000000000 --- a/modules/install/ruleset/postgresql.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/modules/install/ruleset/sqlite.xml b/modules/install/ruleset/sqlite.xml deleted file mode 100644 index 7aa3a18fc..000000000 --- a/modules/install/ruleset/sqlite.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/modules/install/tpl/admin_form.html b/modules/install/tpl/admin_form.html index 39e8bd520..548abdcfe 100644 --- a/modules/install/tpl/admin_form.html +++ b/modules/install/tpl/admin_form.html @@ -1,55 +1,51 @@ - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

+
+ +
+

{$lang->install_progress_menu['adminInfo']}

+
+

{$XE_VALIDATOR_MESSAGE}

+
+ +
+ +
+
- - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-

{$lang->install_notandum}

-
-
- - {$lang->cmd_back} - - - - -
- +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+

{$lang->install_notandum}

+
+
+
+ « {$lang->cmd_back} +
+
+
+ diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html index 10a87b594..9973f2311 100644 --- a/modules/install/tpl/check_env.html +++ b/modules/install/tpl/check_env.html @@ -2,45 +2,55 @@
-

- - XE {__XE_VERSION__} {$lang->install_condition_enable} -

-

- - XE {__XE_VERSION__} {$lang->install_condition_disable} -

-
    -
  • - {$lang->install_checklist_title[$key]} - : - {$lang->enable} ({$phpversion}) - {$lang->disable} ({$phpversion}) -

    - {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}] -

    -

    - {$lang->install_checklist_desc[$key]} -

    -
    • -
- -
-

- - {$lang->disable_rewrite} - {$lang->about_nginx_rewrite} -

+

{$lang->install_condition_enable}

+

{$lang->install_condition_disable}

+ + + + + + + + + + + + + + + + + + + + +
+ {$lang->install_checklist_title[$key]} + ({$phpversion}) + + OK + ERROR +
+ {sprintf($lang->install_checklist_desc['php_version_warning'], __XE_RECOMMEND_PHP_VERSION__)} [{$lang->more}] +
+ {$lang->install_checklist_desc[$key]} +
mod_rewrite + OK + — +
+ {$lang->disable_rewrite} +
{$lang->about_nginx_rewrite} +
{$lang->disable_rewrite_can_proceed} +
+
+ diff --git a/modules/install/tpl/config_form.html b/modules/install/tpl/config_form.html index 5d6dc39ec..d5ab8683d 100644 --- a/modules/install/tpl/config_form.html +++ b/modules/install/tpl/config_form.html @@ -1,34 +1,30 @@ - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

+
+ +
+

{$lang->install_progress_menu['configInfo']}

+
+

{$XE_VALIDATOR_MESSAGE}

+
+ + +
+ +
+
- - - -
- -

{$lang->about_time_zone}

-
-
- - - - - - -
- -
- - - -
+
+

{$lang->about_time_zone}

+
+
+
+ « {$lang->cmd_back} +
+
+
+ diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css index 33726d8c3..716e43a2a 100644 --- a/modules/install/tpl/css/install.css +++ b/modules/install/tpl/css/install.css @@ -1,59 +1,213 @@ @charset "utf-8"; /* NAVER (developers@xpressengine.com) */ -/* Element Reset */ -html, body{margin:0;min-height:100%} -body, .x input, .x textarea, .x select, .x table, .x button, .x label{font-family:Tahoma, Geneva, sans-serif;font-size:12px} -body{background:-webkit-linear-gradient(top,#ccc,#fff);background:-moz-linear-gradient(top,#ccc,#fff);background:-o-linear-gradient(top,#ccc,#fff);background:-ms-linear-gradient(top,#ccc,#fff);background:linear-gradient(top,#ccc,#fff)} -img, fieldset{border:0} -form, fieldset{margin:0;padding:0} -.x em{color:#ffc;font-weight:normal;font-style:normal} -.x em.ok{color:#0f0;font-weight:normal;font-style:normal} -.x em.error{color:#f44;font-weight:normal;font-style:normal} -.x strong{color:#f60} -.x button{margin:0;padding:0;overflow:visible;cursor:pointer} -.x a{text-decoration:none} -.x a:hover, -.x a:active, -.x a:focus{text-decoration:underline} -/* Bootstrap Override */ -.x label[for], -.x .x_form-horizontal .x_control-label{font-weight:bold} -.x ol, -.x ul{margin-top:15px;margin-bottom:15px} -.x input[type="radio"], -.x input[type="checkbox"]{margin:0} -.x hr{border-bottom:0} -.x .x_btn{text-decoration:none} -.x .x_control-group{padding-top:8px;margin-bottom:10px;border-top:1px dotted #888;clear:both} -.x .x_control-group:first-child, -.x .x_control-group:first-of-type{border-top:0;padding-top:0} + +html, body { margin: 0; min-height: 100%; background-color: #f0f0f0; } +img, form, fieldset { border: 0; margin:0; padding: 0; } +.x a { color: #1976d2; text-decoration: none; } +.x a:hover, .x a:active, .x a:focus { text-decoration: underline; } + +/* Font */ +.x, .x input, .x textarea, .x select, .x table, .x button, .x label { + font: normal 13px/100% NanumGothic, "Malgun Gothic", Gulim, sans-serif; +} +.enfont, .enfont input, .enfont textarea, .enfont select, .enfont table, .enfont button, .enfont label { + font: normal 13px/100% Arial, NanumGothic, "Malgun Gothic", sans-serif; +} +.x input[type=password] { + font-family: Arial, sans-serif; +} + /* Layout */ -.x{width:800px;margin:120px auto 0 auto;background-color:transparent} -.x #header{position:relative;background:#444;margin:0 0 1px 0;padding:10px 20px;color:#fff;border-radius:5px 5px 0 0} -.x #header h1{margin:0} -.x #header em{position:absolute;bottom:10px;right:20px;font-weight:bold;font-size:14px;color:#eee} -.x #header em strong{font-size:20px;color:#F60} -.x #body{width:580px;padding:0 0 0 220px;position:relative;*zoom:1} -.x #body:after{content:"";display:block;clear:both} -.x #progress{position:absolute;left:0;top:0;width:219px} -.x #progress ul{list-style:none;margin:0;padding:0} -.x #progress li{position:relative;margin:0 0 1px 0;vertical-align:top;line-height:40px;color:#999;text-indent:30px;background-color:#555;background-image:url(../img/icoStatus.gif);background-repeat:no-repeat;background-position:10px 0;*zoom:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} -.x #progress li:last-child{border-radius:0 0 0 5px} -.x #progress li.done{background-position:10px -40px} -.x #progress li.active{background-color:#666;background-position:10px -80px;font-weight:bold;color:#fff;margin-right:-1px} -.x #content{position:relative;width:500px;min-height:145px;padding:40px;background:#666;color:#fff} -.x #content a{color:#FFC} +.x { + width: 90%; max-width: 800px; + margin: 80px auto 0 auto; + background-color: transparent; +} +.x #header { + clear: both; + margin: 0; +} +.x #header h1 { + font: bold 48px/100% Arial, sans-serif; + color: #444; + text-align: center; + margin: 0 0 16px 0; +} +.x #header h1 span.green { + color: #55a72f; +} +.x #header h1 span.brown { + color: #905a29; +} +.x #header h1 span.colon { + color: #888888; + position: relative; + top: -4px; +} +.x #header h2 { + font: normal 16px/100% Arial, sans-serif; + color: #666; + text-align: center; + margin: 0 0 32px 0; +} +.x #header h2 strong { + font-weight: bold; + color: #444; +} + +.x #body { + clear: both; + position: relative; + background-color: #fff; + border-radius: 2px; + margin-bottom: 32px; + box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.16), 0px 2px 8px 0px rgba(0, 0, 0, 0.10); +} + +.x #progress { + clear: both; padding: 16px 16px 4px 16px; border-bottom: 1px solid #ddd; + background-color: #fbfbfb; +} +.x #progress ul { clear: both; margin: 0; padding: 0; } +.x #progress li { list-style:none; display: inline-block; color: #888; margin: 0 4px 12px 0; padding: 0; } +.x #progress li.done { color: #444; } +.x #progress li.active { color: #444; font-weight: bold; } +.x #progress li:after { content: ">"; color: #aaa; font-weight: normal; margin-left: 8px; } +.x #progress li:last-child { margin-right: 0; } +.x #progress li:last-child:after { content: ""; margin-left: 0; } + +.x #footer { + text-align: center; + margin-bottom: 32px; + font: 11px/160% Arial, sans-serif; + color: #aaa; +} + +/* Table */ +table { + clear: both; + width: 100%; + box-sizing: border-box; + border-collapse: collapse; + margin: 0 0 16px 0; +} +table tr td { + padding: 4px 8px; border: 1px solid #ddd; + border-spacing: 0; + line-height: 160%; +} +table tr td.check_env_status { text-align: center; } +table tr td.check_env_status span.ok { color: #4caf50; font-weight: bold; } +table tr td.check_env_status span.error { color: #f44336; font-weight: bold; } +table tr td.check_env_status span.warn { color: #fb8c00; font-weight: bold; } +table tr td.error_description { text-align: center; color: #666; } + /* Button Area */ -.x .ibtnArea{position:absolute;bottom:-61px;right:0;width:540px;height:30px;margin:1px 0 0 0;padding:15px 20px;text-align:center;*zoom:1;color:#fff;background:#555;border-radius:0 0 5px 5px} -.x .ibtnArea:after{content:"";display:block;clear:both} -.x .ibtnArea .x_btn-inverse{color:#fff !important} -.x .ibtnArea .x_btn>i{opacity:.75;filter:alpha(opacity=75)} +.x #buttons { + clear: both; padding: 16px; + border-top: 1px solid #ddd; + height: 34px; + background-color: #fbfbfb; +} +.x #buttons .align-left { + float: left; +} +.x #buttons .align-right { + float: right; +} +button, a.button { + display: inline-block; + margin: 0px 4px; + padding: 9px 18px 9px 18px; + font-weight: bold !important; + line-height: 15px; + text-align: center; + text-decoration: none; + border: 0; + cursor: pointer; + color: #fff; + background-color: #1976d2; + border-radius: 2px; + box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.16), 0px 2px 8px 0px rgba(0, 0, 0, 0.10); +} +button.grey, a.button.grey { + background-color: #aaa; +} +button:hover, a.button:hover { + text-decoration: none; + background-color: #303f9f; +} +button.grey:hover, a.button.grey:hover { + background-color: #888; +} + /* Content */ -.x h2{font-size:22px;margin:0 0 15px 0;color:#ff9;line-height:1} -.x .desc{padding:10px 20px;margin:15px 0;background:#555;color:#fff;line-height:1.5;border-radius:5px} -.x .desc strong{color:#F60} -.x .language{list-style:none;margin:0;padding:0 0 0 20px} -.x .language li{position:relative;margin:0 0 7px 0} -.x .language li>i{position:absolute;top:2px;left:-20px} +.x #content { clear: both; padding: 16px 16px 4px 16px; } +.x #content a { } +.x #content h2 { + font-size: 20px; + line-height: 140%; + margin: 0 0 16px 0; +} +.x #content p { + line-height: 160%; + margin: 0 0 12px 0; +} +.x #content p.install_help { + margin: -6px 0 16px 16px; + color: #888; +} +.x #content ul { + margin: 0 0 12px 0; +} +.x #content ul li { + line-height: 160%; +} +.x #content label input[type=checkbox] { + position: relative; + top: 2px; +} +.x .language { + clear: both; + margin: 0 0 16px 0; + padding: 0; +} +.x .language li { + list-style: none; + display: inline-block; + margin-right: 12px; +} +.x .language li:last-child { + margin-right: 0; +} + +.x .x_control-group { clear: both; margin-bottom: 16px; } +.x .x_control-group .x_control-label { display: inline-block; line-height: 17px; width: 130px; } +.x .x_control-group .x_controls { display: inline-block; } +.x .x_control-group .x_controls input { + line-height: 17px; padding: 3px 5px; + width: 260px; box-sizing: border-box; +} +.x .x_control-group .x_controls select { + line-height: 17px; padding: 3px 7px 3px 3px; + width: 260px; box-sizing: border-box; +} +@media screen and (max-width: 480px) { + .x .x_control-group .x_control-label { display: block; clear: both; margin-bottom: 6px; } + .x .x_control-group .x_controls { display: block; clear: both; } +} + /* Waiting for server response */ -.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;right:0;bottom:0;z-index:100;color:#fff;background:#333 url(../../common/img/msg.loading.gif) no-repeat center 90px;text-align:center;margin:0;padding:120px 0 0 0;opacity:.8;filter:alpha(opacity=80);font:bold 16px "Helvetica Neue", Helvetica, Arial, 돋움, Dotum, sans-serif} +.wfsr { + display: none; + position: absolute; + position: fixed; + left: 0; top: 0; right: 0; bottom: 0; z-index: 100; + color: #fff; + background: #333 url(../../common/img/msg.loading.gif) no-repeat center 90px; + text-align: center; + margin: 0; + padding: 120px 0 0 0; + opacity: 0.8; filter:alpha(opacity=80); + font-size: 16px; font-weight: bold; +} diff --git a/modules/install/tpl/footer.html b/modules/install/tpl/footer.html index 4947d9fd4..705305bfd 100644 --- a/modules/install/tpl/footer.html +++ b/modules/install/tpl/footer.html @@ -1,2 +1,7 @@ + +
- diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html deleted file mode 100644 index f3495114f..000000000 --- a/modules/install/tpl/form.cubrid.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - -

{$title}

-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_info_desc}
-

{$lang->advanced_setup}

-
-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_prefix_desc}
-
-
- - {$lang->cmd_back} - -
- -
-
-
-
-
- diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html deleted file mode 100644 index 97d2288cd..000000000 --- a/modules/install/tpl/form.mssql.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - -

{$title}

-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_info_desc}
-

{$lang->advanced_setup}

-
-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_prefix_desc}
-
-
- - {$lang->cmd_back} - -
- -
-
-
-
-
- diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html deleted file mode 100644 index 7946b98c9..000000000 --- a/modules/install/tpl/form.mysql.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - -

{$title}

-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_info_desc}
-

{$lang->advanced_setup}

-
-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_prefix_desc}
-
-
- - {$lang->cmd_back} - -
- -
-
-
-
-
- diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html deleted file mode 100644 index 7946b98c9..000000000 --- a/modules/install/tpl/form.mysql_innodb.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - -

{$title}

-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_info_desc}
-

{$lang->advanced_setup}

-
-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_prefix_desc}
-
-
- - {$lang->cmd_back} - -
- -
-
-
-
-
- diff --git a/modules/install/tpl/form.mysqli.html b/modules/install/tpl/form.mysqli.html deleted file mode 100644 index 2a008984d..000000000 --- a/modules/install/tpl/form.mysqli.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - -

{$title}

-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_info_desc}
-

{$lang->advanced_setup}

-
-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_prefix_desc}
-
-
- - {$lang->cmd_back} - -
- -
-
-
-
-
- diff --git a/modules/install/tpl/form.mysqli_innodb.html b/modules/install/tpl/form.mysqli_innodb.html deleted file mode 100644 index 2a008984d..000000000 --- a/modules/install/tpl/form.mysqli_innodb.html +++ /dev/null @@ -1,54 +0,0 @@ - - -
- -
-
-

{$XE_VALIDATOR_MESSAGE}

-
-
- - - -

{$title}

-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_info_desc}
-

{$lang->advanced_setup}

-
-
- -
-
-
- -
-
-
- -
-
-
{$lang->db_prefix_desc}
-
-
- - {$lang->cmd_back} - -
- -
-
-
-
-
- diff --git a/modules/install/tpl/ftp.html b/modules/install/tpl/ftp.html index dca69b133..116fdbce7 100644 --- a/modules/install/tpl/ftp.html +++ b/modules/install/tpl/ftp.html @@ -1,62 +1,61 @@ - -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -

{$lang->msg_ftp_installed_realpath}:
{_XE_PATH_}

- -
    -
- -
-
-
-

{$lang->install_ftp_reason}

-
    -
  • {$lang->msg_safe_mode_ftp_needed}
    • -
  • {$lang->msg_safe_mode_ftp_needed2}
    • -
-

{$lang->msg_safe_mode_ftp_config}

-
-
- - {$lang->cmd_back} - - - - - -
-
+
+ +
+

{$lang->install_progress_menu['ftp']}

+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +

{$lang->msg_ftp_installed_realpath}: {_XE_PATH_}

+

+ + +

+
    + +

    {$lang->install_ftp_reason}

    +
      +
    • {$lang->msg_safe_mode_ftp_needed}
      • +
    • {$lang->msg_safe_mode_ftp_needed2}
      • +
    +

    {$lang->msg_safe_mode_ftp_config}

    +
    +
    +
    + « {$lang->cmd_back} +
    +
    + +
    + diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html index 5d883d5fc..16ce84041 100644 --- a/modules/install/tpl/header.html +++ b/modules/install/tpl/header.html @@ -1,7 +1,8 @@ - - -
    + + + +
    diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html index 6d0f4957f..6401ba61b 100644 --- a/modules/install/tpl/introduce.html +++ b/modules/install/tpl/introduce.html @@ -1,8 +1,8 @@ -
    +

    {$lang->install_progress_menu['language']}

    • @@ -10,10 +10,10 @@ {$val}
    -
    - - {$lang->cmd_next} - +
    +
    diff --git a/modules/install/tpl/js/install.js b/modules/install/tpl/js/install.js index 9df8bdaa7..beebe2cf2 100644 --- a/modules/install/tpl/js/install.js +++ b/modules/install/tpl/js/install.js @@ -1,31 +1,9 @@ jQuery(function($){ -// TARGET toggle - $(document.body).on('click', '.x [data-toggle]', function(){ - var $this = $(this); - if($this.is('a') && $this.attr('href') != $this.attr('data-toggle')){ - var target = $this.attr('href'); - $this.attr('data-toggle', target); - } - var $target = $($this.attr('data-toggle')); - var focusable = 'a,input,button,textarea,select'; - $target.toggle(); - if($target.is(':visible') && !$target.find(focusable).length){ - $target.not(':disabled').attr('tabindex','0').focus(); - } else if($target.is(':visible') && $target.find(focusable).length) { - $target.not(':disabled').find(focusable).eq(0).focus(); - } else { - $this.focus(); - } - return false; - }); -// SUBMIT disabled - $('input[required]').change(function(){ - var invalid = $('input[required]').is('[value=""], [value=" "], [value=" "], [value=" "]'); - var $submit = $('[type="submit"]'); - if(!invalid){ - $submit.removeClass('x_disabled'); - } else { - $submit.addClass('x_disabled'); - } - }); + $('.focus').focus(); + if($("#db_type").size()) { + $("#db_type").click(function() { + $("p.db_type").hide(); + $("p.db_type_" + $(this).val()).show(); + }).triggerHandler("click"); + } }); diff --git a/modules/install/tpl/js/install_admin.js b/modules/install/tpl/js/install_admin.js deleted file mode 100644 index e1a7a85c1..000000000 --- a/modules/install/tpl/js/install_admin.js +++ /dev/null @@ -1,145 +0,0 @@ -/** - * @brief DB정보 Setting후 실행될 함수 - */ -function completeAgreement(ret_obj) -{ - if(ret_obj['error'] != 0) { - alert(ret_obj['message']); - return; - } else { - var url = current_url.setQuery('act', 'dispInstallCheckEnv'); - location.href = url; - } -} - -function completeDBSetting(ret_obj) { - if(ret_obj['error'] != 0) { - alert(ret_obj['message']); - return; - } else { - location.href = "./index.php?act=dispInstallConfigForm"; - } -} - -/** - * @brief Rewrite module, Time-zone Setting 후 실행될 함수 - */ -function completeConfigSetting(ret_obj) { - if(ret_obj['error'] != 0) { - alert(ret_obj['message']); - return; - } else { - location.href = "./index.php?act=dispInstallManagerForm"; - } -} - -/** - * @brief 설치 완료후 실행될 함수 - */ -function completeInstalled(ret_obj) { - alert(ret_obj["message"]); - location.href = "./index.php"; -} - -/** - * @brief FTP 정보 입력 - **/ -function doInstallFTPInfo(form) { - var params={}, data=jQuery(form).serializeArray(); - jQuery.each(data, function(i, field){ params[field.name] = field.value }); - exec_xml('install', 'procInstallFTP', params, completeInstallFTPInfo, ['error', 'message'], params, form); - return false; -} - -function completeInstallFTPInfo(ret_obj) { - location.href = current_url; -} - -function doCheckFTPInfo() { - var form = jQuery("#ftp_form").get(0); - var params={}, data=jQuery(form).serializeArray(); - jQuery.each(data, function(i, field){ params[field.name] = field.value }); - - exec_xml('install', 'procInstallCheckFTP', params, completeInstallCheckFtpInfo, ['error', 'message'], params, form); - return false; -} - -function completeInstallCheckFtpInfo(ret_obj) { - alert(ret_obj['message']); -} - -function completeFtpPath(ret_obj){ - location.reload(); -} - -function getFTPList(pwd) -{ - var form = jQuery("#ftp_form").get(0); - if(typeof(pwd) != 'undefined') - { - form.ftp_root_path.value = pwd; - } - else - { - if(!form.ftp_root_path.value) - { - if(typeof(form.sftp) != 'undefined' && form.sftp.checked) { - form.ftp_root_path.value = xe_root; - } - else - { - form.ftp_root_path.value = "/"; - } - } - } - var params={}, data=jQuery("#ftp_form").serializeArray(); - jQuery.each(data, function(i, field){ params[field.name] = field.value }); - exec_xml('install', 'getInstallFTPList', params, completeGetFtpInfo, ['list', 'error', 'message'], params, form); -} - -function completeGetFtpInfo(ret_obj) -{ - if(ret_obj['error'] != 0) - { - alert(ret_obj['error']); - alert(ret_obj['message']); - return; - } - var e = jQuery("#ftplist").empty(); - var list = ""; - if(!jQuery.isArray(ret_obj['list']['item'])) - { - ret_obj['list']['item'] = [ret_obj['list']['item']]; - } - - pwd = jQuery("#ftp_form").get(0).ftp_root_path.value; - if(pwd != "/") - { - arr = pwd.split("/"); - arr.pop(); - arr.pop(); - arr.push(""); - target = arr.join("/"); - list = list + "
  • ../
    • "; - } - - for(var i=0;i"+v+""; - } - } - - //list = "
      "+list+"
    "; - e.append(jQuery(list)); -} diff --git a/modules/install/tpl/license_agreement.html b/modules/install/tpl/license_agreement.html index 752bd1ab6..e844fad7c 100644 --- a/modules/install/tpl/license_agreement.html +++ b/modules/install/tpl/license_agreement.html @@ -1,35 +1,37 @@ - -
    +
    +

    {$lang->license_agreement}

    +

    {$XE_VALIDATOR_MESSAGE}

    -

    {$lang->license_agreement}

    - - - - -
    -
    {$lang->license}
    -
    - -
    - -
    - -
    - - {$lang->cmd_back} - - - - -
    - + + +
    + + +
    +

    + +

    -
    +
    +
    + +
    +
    + +
    +
    + diff --git a/modules/install/tpl/license_text.en.html b/modules/install/tpl/license_text.en.html new file mode 100644 index 000000000..db117413f --- /dev/null +++ b/modules/install/tpl/license_text.en.html @@ -0,0 +1,41 @@ +

    Copyright © NAVER and Contributors

    + +

    + XpressEngine (XE) is an opensource and being developed in the open-source project. + For more information, please see the links below. +

    + + + +

    + XpressEngine XETown Remix is a fork of the XpressEngine CMS + with additional patches by members of the XETOWN community. + For more information, please see the links below. +

    + + + +

    + XpressEngine XETown Remix is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License (LGPL) as published by the Free Software Foundation; + either version 2.1 of the License, or (at your option) any later version. +

    + +

    + This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the GNU Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public License along with this library; + if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +

    + + diff --git a/modules/install/tpl/license_text.ko.html b/modules/install/tpl/license_text.ko.html new file mode 100644 index 000000000..af74e8f2d --- /dev/null +++ b/modules/install/tpl/license_text.ko.html @@ -0,0 +1,41 @@ +

    Copyright © NAVER and Contributors

    + +

    + XpressEngine(XE)은 자유 소프트웨어이며, 오픈 소스 프로젝트로 개발되고 있습니다. + 자세한 내용은 아래 링크를 참조하시기 바랍니다. +

    + + + +

    + XpressEngine XETOWN Remix는 XE를 가지치기(fork)하여 XETOWN 커뮤니티 회원들이 개발한 다양한 기능을 추가한 것입니다. + 자세한 내용은 아래 링크를 참조하시기 바랍니다. +

    + + + +

    + XpressEngine XETOWN Remix는 자유 소프트웨어입니다. + 소프트웨어의 피양도자는 자유 소프트웨어 재단이 공표한 GNU 약소 일반 공중 사용 허가서 (LGPL) 2.1판 + 또는 그 이후 판을 임의로 선택해서, 그 규정에 따라 소프트웨어를 개작하거나 재배포할 수 있습니다. +

    + +

    + 이 소프트웨어는 유용하게 사용될 수 있으리라는 희망에서 배포되고 있지만, + 특정한 목적에 맞는 적합성 여부나 판매용으로 사용할 수 있으리라는 묵시적인 보증을 포함한 + 어떠한 형태의 보증도 제공하지 않습니다. + 보다 자세한 사항에 대해서는 GNU 약소 일반 공중 사용 허가서를 참고하시기 바랍니다. + GNU 약소 일반 공중 사용 허가서는 이 라이브러리와 함께 제공됩니다. + 만약, 이 문서가 누락되어 있다면 자유 소프트웨어 재단으로 문의하시기 바랍니다. +

    + + diff --git a/modules/install/tpl/progress_menu.html b/modules/install/tpl/progress_menu.html index 244182b10..1602c3a3c 100644 --- a/modules/install/tpl/progress_menu.html +++ b/modules/install/tpl/progress_menu.html @@ -1,11 +1,9 @@
      -
    • {$lang->install_progress_menu['language']}
      • -
    • {$lang->install_progress_menu['license_agreement']}
      • +
    • {$lang->install_progress_menu['license_agreement']}
    • {$lang->install_progress_menu['condition']}
    • {$lang->install_progress_menu['ftp']}
      • -
    • {$lang->install_progress_menu['dbSelect']}
      • -
    • {$lang->install_progress_menu['dbInfo']}
      • +
    • {$lang->install_progress_menu['dbInfo']}
    • {$lang->install_progress_menu['configInfo']}
    • {$lang->install_progress_menu['adminInfo']}
    diff --git a/modules/install/tpl/select_db.html b/modules/install/tpl/select_db.html index ab7ed78c7..439dc328b 100644 --- a/modules/install/tpl/select_db.html +++ b/modules/install/tpl/select_db.html @@ -1,28 +1,66 @@ - -
    - -
    -
    - - -
    - -

    {$lang->db_desc[$val->db_type]}

    -
    -
    - -

    {$lang->db_desc[$val->db_type]}

    -
    -
    - - {$lang->cmd_back} - - - - -
    -
    +
    + +
    +

    {$lang->install_progress_menu['dbInfo']}

    +
    +

    {$XE_VALIDATOR_MESSAGE}

    +
    + + + +
    + +
    + +
    +
    +

    {$lang->db_desc[$val->db_type]}

    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    +

    + {$lang->db_info_desc}
    {$lang->db_prefix_desc} +

    +
    +
    +
    + « {$lang->cmd_back} +
    +
    +
    +