diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css index 03bdeeb79..9d32426c3 100644 --- a/modules/editor/skins/xpresseditor/css/default.css +++ b/modules/editor/skins/xpresseditor/css/default.css @@ -64,7 +64,7 @@ .xpress-editor .tool ul.extra2{ width:auto; z-index:2;} .xpress-editor .tool ul.extra3{ float:right; width:auto; z-index:1; margin-right:1px;} .xpress-editor .tool ul.extra3 li{ margin-right:4px;} -.xpress-editor .tool li{ position:relative; float:left;} +.xpress-editor .tool li{ position:relative; float:left; margin:0 !important} .xpress-editor .tool li button{ width:21px; height:21px; background:url(../img/btn_set.gif) no-repeat 0 0; vertical-align:top;} .xpress-editor.black .tool li button{ width:21px; height:21px; background:url(../img/btn_set.black.gif) no-repeat 0 0; vertical-align:top;} .xpress-editor .tool li button span{ position:absolute; top:0; left:0; width:0; height:0; overflow:hidden; visibility:hidden;} diff --git a/modules/install/script/ko.install.php b/modules/install/script/ko.install.php index 4be125343..ffdc8f534 100644 --- a/modules/install/script/ko.install.php +++ b/modules/install/script/ko.install.php @@ -85,7 +85,7 @@ $obj->module_srl = $module_srl; Context::set('version', __ZBXE_VERSION__); - $obj->title = 'welcome_document'; + $obj->title = 'Welcome XE'; $obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang); diff --git a/modules/install/script/welcome_content/welcome_content_en.html b/modules/install/script/welcome_content/welcome_content_en.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_en.html +++ b/modules/install/script/welcome_content/welcome_content_en.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_es.html b/modules/install/script/welcome_content/welcome_content_es.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_es.html +++ b/modules/install/script/welcome_content/welcome_content_es.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_fr.html b/modules/install/script/welcome_content/welcome_content_fr.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_fr.html +++ b/modules/install/script/welcome_content/welcome_content_fr.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_jp.html b/modules/install/script/welcome_content/welcome_content_jp.html index 26056c39c..c4ae50fe4 100644 --- a/modules/install/script/welcome_content/welcome_content_jp.html +++ b/modules/install/script/welcome_content/welcome_content_jp.html @@ -1,28 +1,22 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

ウェブサイトを始める前にこのページを削除してください。
以下のリストの格項目をチェックして設置状態を確認することができます。
管理ページから全てのコンポネントを確認することができます。

-
    -
  1. - 画面の構成から header, body, footerが見えたら、レイアウトは正常に設置されたことです。 -
    2. -
  2. - 画面上端と左に位置する二つのメニューが見えたら、メニューモジュールは正常に設置されたことです -
    3. -
  3. - 画面右上端に検索ボックスが見えたら、統合検索モジュールは正常に設置されたことです -
    4. -
  4. - 画面左端にログインボックスが見えたら、ログインウィジェットは正常に設置されたことです -
    5. -
  5. - このページが読めたら、ページモジュールは正常に設置されたことです -
    6. -
-

- 設定ページで他のページを初期起動モジュールにセッティングすることができます。 -

-
-
-
+

XE core '{$version}' has been successfully installed!

+

ウェブサイトを始める前にこのページを削除してください。
以下のリストの格項目をチェックして設置状態を確認することができます。
管理ページから全てのコンポネントを確認することができます。

+
    +
  1. + 画面の構成から header, body, footerが見えたら、レイアウトは正常に設置されたことです。 +
    2. +
  2. + 画面上端と左に位置する二つのメニューが見えたら、メニューモジュールは正常に設置されたことです +
    3. +
  3. + 画面右上端に検索ボックスが見えたら、統合検索モジュールは正常に設置されたことです +
    4. +
  4. + 画面左端にログインボックスが見えたら、ログインウィジェットは正常に設置されたことです +
    5. +
  5. + このページが読めたら、ページモジュールは正常に設置されたことです +
    6. +
+

+ 設定ページで他のページを初期起動モジュールにセッティングすることができます。 +

diff --git a/modules/install/script/welcome_content/welcome_content_ko.html b/modules/install/script/welcome_content/welcome_content_ko.html index 59935e56a..8f85c2201 100644 --- a/modules/install/script/welcome_content/welcome_content_ko.html +++ b/modules/install/script/welcome_content/welcome_content_ko.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' 설치를 환영합니다!

-

XE core설치가 성공적으로 완료되었습니다.
이 페이지는 데모 페이지 이므로 추후 사이트 운영시 삭제 가능합니다.
모든 설치요소는 관리자로 로그인하셔야 확인할 수 있습니다.

-
    -
  1. - 헤더, 본문, 풋터로 구성된 화면이 보인다면 레이아웃이 정상적으로 설치된 것입니다. -
    2. -
  2. - 글로벌 네비게이션과 로컬 네비게이션이 보인다면 메뉴 모듈이 설치된 것입니다. -
    3. -
  3. - 통합 검색 인풋이 보인다면 통합검색 모듈이 설치된 것입니다. -
    4. -
  4. - 로그인 인풋이 보인다면 로그인 정보 출력 위젯이 설치된 것입니다. -
    5. -
  5. - 이 메시지가 보인다면 페이지 모듈이 설치된 것입니다. -
    6. -
-

페이지 모듈이 시작 모듈로 지정되어 있습니다. 관리자 설정화면에서 변경 가능합니다.

-
-
-
+

XE core '{$version}' 설치를 환영합니다!

+

XE core설치가 성공적으로 완료되었습니다.
이 페이지는 데모 페이지 이므로 추후 사이트 운영시 삭제 가능합니다.
모든 설치요소는 관리자로 로그인하셔야 확인할 수 있습니다.

+
    +
  1. + 헤더, 본문, 풋터로 구성된 화면이 보인다면 레이아웃이 정상적으로 설치된 것입니다. +
    2. +
  2. + 글로벌 네비게이션과 로컬 네비게이션이 보인다면 메뉴 모듈이 설치된 것입니다. +
    3. +
  3. + 통합 검색 인풋이 보인다면 통합검색 모듈이 설치된 것입니다. +
    4. +
  4. + 로그인 인풋이 보인다면 로그인 정보 출력 위젯이 설치된 것입니다. +
    5. +
  5. + 이 메시지가 보인다면 페이지 모듈이 설치된 것입니다. +
    6. +
+

페이지 모듈이 시작 모듈로 지정되어 있습니다. 관리자 설정화면에서 변경 가능합니다.

diff --git a/modules/install/script/welcome_content/welcome_content_mn.html b/modules/install/script/welcome_content/welcome_content_mn.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_mn.html +++ b/modules/install/script/welcome_content/welcome_content_mn.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_ru.html b/modules/install/script/welcome_content/welcome_content_ru.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_ru.html +++ b/modules/install/script/welcome_content/welcome_content_ru.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_tr.html b/modules/install/script/welcome_content/welcome_content_tr.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_tr.html +++ b/modules/install/script/welcome_content/welcome_content_tr.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_vi.html b/modules/install/script/welcome_content/welcome_content_vi.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_vi.html +++ b/modules/install/script/welcome_content/welcome_content_vi.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_zh-CN.html b/modules/install/script/welcome_content/welcome_content_zh-CN.html index b88945202..1c0398c4c 100644 --- a/modules/install/script/welcome_content/welcome_content_zh-CN.html +++ b/modules/install/script/welcome_content/welcome_content_zh-CN.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}' has been successfully installed!

-

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

-
    -
  1. - When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. -
    2. -
  2. - When Menu module has been successfully installed, you can see both global and local navigations. -
    3. -
  3. - When Integrated Search module has been successfully installed, you can see the search form. -
    4. -
  4. - When Login widget has been successfully installed, you can see the login form. -
    5. -
  5. - When Page module has been successfully installed, you see this page. -
    6. -
-

You can replace it with some other module on the Settings page.

-
-
-
+

XE core '{$version}' has been successfully installed!

+

We recommend you to delete this demo page before launching the site.
Please check the following list to verify whether the installation has been properly completed.
You can see all the components on the administration page.

+
    +
  1. + When the layout has been successfully installed, you can see the screen containing a header, a content body, and a footer. +
    2. +
  2. + When Menu module has been successfully installed, you can see both global and local navigations. +
    3. +
  3. + When Integrated Search module has been successfully installed, you can see the search form. +
    4. +
  4. + When Login widget has been successfully installed, you can see the login form. +
    5. +
  5. + When Page module has been successfully installed, you see this page. +
    6. +
+

You can replace it with some other module on the Settings page.

diff --git a/modules/install/script/welcome_content/welcome_content_zh-TW.html b/modules/install/script/welcome_content/welcome_content_zh-TW.html index e00809f42..24ecb9e46 100644 --- a/modules/install/script/welcome_content/welcome_content_zh-TW.html +++ b/modules/install/script/welcome_content/welcome_content_zh-TW.html @@ -1,26 +1,20 @@ -
-
-
-

XE core '{$version}'

-

ءߢ
?
ʦη̸졣

-
    -
  1. - ͪ ʦ̸ Ү ڭ -
    2. -
  2. - Ӥټ ʦ̸ ӤӤ -
    3. -
  3. - ټ ʦ̸ ? -
    4. -
  4. - Login widget ʦ̸ ? -
    5. -
  5. - ټ ʦ̸ -
    6. -
-

?ʦ ټڡ

-
-
-
+

XE core '{$version}'

+

ءߢ
?
ʦη̸졣

+
    +
  1. + ͪ ʦ̸ Ү ڭ +
    2. +
  2. + Ӥټ ʦ̸ ӤӤ +
    3. +
  3. + ټ ʦ̸ ? +
    4. +
  4. + Login widget ʦ̸ ? +
    5. +
  5. + ټ ʦ̸ +
    6. +
+

?ʦ ټڡ

diff --git a/modules/page/skins/default/content.html b/modules/page/skins/default/content.html index 92940b223..995dd3ed3 100644 --- a/modules/page/skins/default/content.html +++ b/modules/page/skins/default/content.html @@ -1,12 +1,9 @@ -
제목 : {$oDocument->getTitle()}
-
내용 : {$oDocument->getContent()}
-
태그 : {implode(',', $oDocument->get('tag_list'))}
- - -
- - {$lang->cmd_setup} - - {$lang->cmd_page_modify} -
- +

{$oDocument->getTitle()}

+{$oDocument->getContent()} + + +
+ {$lang->cmd_setup} + {$lang->cmd_page_modify} +
+ diff --git a/modules/page/tpl/article_content_modify.html b/modules/page/tpl/article_content_modify.html index d42354047..6b91e765f 100644 --- a/modules/page/tpl/article_content_modify.html +++ b/modules/page/tpl/article_content_modify.html @@ -1,10 +1,10 @@ -
+ -
- +
+
{$oDocument->getEditor()}