\n\n");
+ // 카드제목
+ printf("\n\n\n",htmlspecialchars($this->title),htmlspecialchars($titlePageStr));
}
/**
@@ -27,7 +29,7 @@
**/
function printTitle() {
if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
- printf('<%s%s>
- 모바일XE 애드온
- モバイルXEアドオン
- 手机XE插件
- Mobile XE
- XE行動上網
-
- 모바일에서 접속시 헤더 정보를 분석하여 메뉴 - 모듈의 관계를 이용하여 WAP 태그로 출력하는 애드온입니다.
- wml, hdml, mhtml를 지원하고 그 이외의 경우에는 동작하지 않습니다.
-
-
- モバイル端末機からアクセス時、ヘッダー（header）情報を分析してメニュー - モジュールの関係を利用してWAPタグに変換表示するアドオンです。
- wml, hdml, mhtmlをサポートし、その以外は対応していません。
-
-
- 通过手机访问网站时将网页输出为WAP标签的插件。
- 支持语言：wml, hdml, mhtml
-
-
- This addon displays WAP tag by analyzing header information on mobile connection.
- Only wml, hdml, mhtml formats are provided.
-
-
- 透過行動工具上網時，會將網頁轉換為WAP標籤顯示。
- 只限於 wml, hdml, mhtml格式。
-
- 0.1
- 2008-06-20
-
-
- zero
- zero
- zero
- zero
- zero
-
-
-
-
- 문자셋
- 文字コード
- 编码
- Charset
- 編碼
-
- 모바일 기기의 경우 utf-8 문자셋을 인식하지 못할 수 있습니다.
- 문자셋에 원하시는 문자셋을 입력하면 자동으로 변환하여 출력하여 모바일에서 이상없이 출력하도록 합니다.
- 기본값은 euc-kr입니다.
-
-
- ある特定のモバイル機器ではutf-8文字コードの認識が出来ない場合があります。
- 文字コードを設定すると、該当文字コードに自動変換して正常に表示出来るようになります。
- 本アドオンのデフォルト値はeuc-krです。
-
-
- 手机有时无法识别utf-8编码，这时输入相应的编码值即可自动转换。
- 默认编码为euc-kr。
-
-
- utf-8 cannot be read for mobile tools.
- Mobile tools will display correct charset when you input charset you want.
- Default charset is euc-kr.
-
-
- 行動工具無法讀取utf-8編碼。
- 當您輸入所想要的編碼時，行動工具將會正確的顯示。
- 預設編碼是euc-kr.
-
-
-
-
+
+
+ 모바일XE 애드온
+ モバイルXEアドオン
+ 手机XE插件
+ Mobile XE
+ XE行動上網
+
+ 모바일에서 접속시 헤더 정보를 분석하여 메뉴 - 모듈의 관계를 이용하여 WAP 태그로 출력하는 애드온입니다.
+ wml, hdml, mhtml를 지원하고 그 이외의 경우에는 동작하지 않습니다.
+
+
+ モバイル端末機からアクセス時、ヘッダー（header）情報を分析して「メニュー」と「モジュール」の関係を利用してWAPタグに変換表示するアドオンです。
+ wml, hdml, mhtmlをサポートし、その以外は対応していません。
+
+
+ 通过手机访问网站时将网页输出为WAP标签的插件。
+ 支持语言：wml, hdml, mhtml
+
+
+ This addon displays WAP tag by analyzing header information on mobile connection.
+ Only wml, hdml, mhtml formats are provided.
+
+
+ 透過行動工具上網時，會將網頁轉換為WAP標籤顯示。
+ 只限於 wml, hdml, mhtml格式。
+
+ 0.1.1
+ 2009-05-23
+
+
+ zero
+ zero
+ zero
+ zero
+ zero
+
+
+
+
+ misol
+ misol
+ misol
+ misol
+ misol
+
+ 언어선택 추가(WML, mHTML)
+ 인코딩 설정 개선
+ 그 외 소소한 개선들
+
+
+
+
+ 문자셋
+ 文字コード
+ 编码
+ Charset
+ 編碼
+
+ 모바일 기기의 경우 UTF-8 문자셋을 인식하지 못할 수 있습니다.
+ 문자셋에 원하시는 문자셋을 입력하면 자동으로 변환하여 출력하여 모바일에서 이상없이 출력하도록 합니다.
+ 기본값은 UTF-8입니다.
+ (*SK Telecom 휴대전화의 경우 euc-kr인코딩만 지원하므로, 강제로 euc-kr인코딩만 지원합니다.)
+
+
+ ある特定のモバイル機器ではutf-8文字コードの認識が出来ない場合があります。
+ 文字コードを設定すると、（日本語だけの場合）該当文字コードに自動変換して正常に表示出来るようになります。
+ 本アドオンのデフォルト値はUTF-8で、日本の携帯はshift-jisが一般的です。
+
+
+ 手机有时无法识别utf-8编码，这时输入相应的编码值即可自动转换。
+ 默认编码为UTF-8。
+
+
+ utf-8 cannot be read for mobile tools.
+ Mobile tools will display correct charset when you input charset you want.
+ Default charset is UTF-8.
+
+
+ 行動工具無法讀取utf-8編碼。
+ 當您輸入所想要的編碼時，行動工具將會正確的顯示。
+ 預設編碼是UTF-8.
+
+
+
+
diff --git a/addons/mobile/lang/en.lang.php b/addons/mobile/lang/en.lang.php
index 977217ca8..a0c93fd16 100644
--- a/addons/mobile/lang/en.lang.php
+++ b/addons/mobile/lang/en.lang.php
@@ -4,6 +4,10 @@
* @author zero (zero@nzeo.com)
* @brief English Language Pack (Basic Contents only)
**/
+ // lang select by misol
+ $lang->president_lang = 'selected Language';
+ $lang->select_lang = 'select Language';
+ $lang->lang_return = 'Go Back';
$lang->cmd_go_upper = 'Upper';
$lang->cmd_go_home = 'Go Home';
diff --git a/addons/mobile/lang/jp.lang.php b/addons/mobile/lang/jp.lang.php
index eb2715145..697c560e6 100644
--- a/addons/mobile/lang/jp.lang.php
+++ b/addons/mobile/lang/jp.lang.php
@@ -5,7 +5,7 @@
* @brief 日本語言語パッケージ
**/
- $lang->cmd_go_upper = '上位';
+ $lang->cmd_go_upper = '上位メニュー';
$lang->cmd_go_home = 'トップへ';
$lang->cmd_view_sitemap = 'サイトマップ';
?>
diff --git a/addons/mobile/lang/ko.lang.php b/addons/mobile/lang/ko.lang.php
index 6b20e1f0f..f0b28dc0f 100644
--- a/addons/mobile/lang/ko.lang.php
+++ b/addons/mobile/lang/ko.lang.php
@@ -5,7 +5,13 @@
* @brief 한국어 언어팩 (기본적인 내용만 수록)
**/
+ // 언어 선택부분 by misol
+ $lang->president_lang = '현재 언어';
+ $lang->select_lang = '언어 선택';
+ $lang->lang_return = '돌아가기';
+
$lang->cmd_go_upper = '상위';
$lang->cmd_go_home = '홈으로';
$lang->cmd_view_sitemap = '사이트맵 보기';
+
?>
diff --git a/addons/mobile/mobile.addon.php b/addons/mobile/mobile.addon.php
index 02169f752..3c1f2b50b 100644
--- a/addons/mobile/mobile.addon.php
+++ b/addons/mobile/mobile.addon.php
@@ -42,6 +42,11 @@
// 네비게이트 모드이거나 WAP class가 있을 경우 미리 컨텐츠를 추출하여 출력/ 종료
if($called_position == 'before_module_proc') {
+ if($oMobile->isLangChange()) {
+ $oMobile->setLangType();
+ $oMobile->displayLangSelect();
+ }
+
// 네비게이트 모드이면 네비게이션 컨텐츠 출력
if($oMobile->isNavigationMode()) $oMobile->displayNavigationContent();
diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml
index f51af83c7..68d8dafe2 100644
--- a/addons/point_level_icon/conf/info.xml
+++ b/addons/point_level_icon/conf/info.xml
@@ -17,8 +17,8 @@
级别图标可以在模块 > 积分系统中进行选择。
- ポイントシステムを使用する場合、ユーザ名の前にレベルアイコンの表示が出来ます。
- レベルアイコンは、「モジュール > ポイントシステム」で選択出来ます。
+ ポイントシステムを使用する場合、ユーザ名の前にレベルアイコンの表示します。
+ レベルアイコンは、「モジュール > ポイントシステム」で選択します。
This addon displays level icon in front of the user name when you are using the point system.
diff --git a/addons/resize_image/conf/info.xml b/addons/resize_image/conf/info.xml
index 0f341bd1d..77d3c646e 100644
--- a/addons/resize_image/conf/info.xml
+++ b/addons/resize_image/conf/info.xml
@@ -12,7 +12,7 @@
본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
- 本文内に挿入されたイメージのサイズを本文の幅サイズに合わせてリーサイズし、クリックした時、オリジナルサイズのイメージを表示するアドオンです。
+ 本文内に挿入されたイメージのサイズを本文の幅サイズに合わせてリーサイズし、クリックした時、オリジナルサイズのイメージを表示します。
自动调整主题内容区内的图片大小，点击将显示原始大小的插件。
diff --git a/addons/resize_image/js/resize_image.js b/addons/resize_image/js/resize_image.js
index dd3ecd111..9f8b5982e 100644
--- a/addons/resize_image/js/resize_image.js
+++ b/addons/resize_image/js/resize_image.js
@@ -157,48 +157,50 @@ function slideshow(event) {
xScreen.xeShow();
}
-$(window).load(function(){
+$(document).ready(function(){
var regx_skip = /(?:modules|addons|classes|common|layouts|libs|widgets)/i;
var regx_parent = /(?:document|comment)_[0-9]+_[0-9]+/i;
- var xe_content = $(".xe_content");
- var overflow = xe_content.css("overflow");
- var width = xe_content.css("width");
- xe_content.css("overflow","hidden");
- xe_content.css("width","100%");
- var offsetWidth = xe_content.attr("offsetWidth");
- xe_content.css("overflow",overflow);
- xe_content.css("width",width);
+ $(".xe_content").each(function() {
+ $(this).find("img").each(function(){
+ var img = $(this);
+ var width = img.attr("width");
+ if(!width) width = img.width();
+ img.attr("orig_width",width);
+ img.attr("width",1);
+ });
+ var offsetWidth = $(this).width();
- // 이미지 목록을 가져와서 리사이즈
- $(".xe_content img").each(function(){
- var img = $(this);
- var src = img.attr("src");
- var width = img.attr("width");
- var height = img.attr("height");
-
- // XE 내부 프로그램 또는 스킨의 이미지라면 이미지 리사이즈를 하지 않음
- if ( regx_skip.test(src) ) return;
-
- // 커스텀 속성 추가
- img.attr("rel", "xe_gallery");
-
- // 크기를 계산한다
- if(width>offsetWidth) {
- img.attr("width",offsetWidth-1);
- img.attr("height",parseInt(offsetWidth/width*height,10));
- }
-
- // 링크가 설정되어 있거나 onclick 이벤트가 부여되어 있으면 원본 보기를 하지 않음
- if ( !img.parent("a").size() && !img.attr("onclick") ) {
- // 스타일 설정
- img.css("cursor", "pointer");
+ $(this).find("img").each(function(){
+ var img = $(this);
+ var src = img.attr("src");
+ img.attr("width",img.attr("orig_width"));
+ img.removeAttr("orig_width",'');
+ var width = img.attr("width");
+ var height = img.attr("height");
- // 클릭하면 슬라이드쇼 시작
- img.click(slideshow);
- }
+ // XE 내부 프로그램 또는 스킨의 이미지라면 이미지 리사이즈를 하지 않음
+ if ( !regx_skip.test(src) ) {
+ // 커스텀 속성 추가
+ img.attr("rel", "xe_gallery");
- });
+ // 크기를 계산한다
+ if(width>offsetWidth) {
+ img.attr("width",offsetWidth-10);
+ img.attr("height",parseInt(offsetWidth/width*height,10));
+ }
+
+ // 링크가 설정되어 있거나 onclick 이벤트가 부여되어 있으면 원본 보기를 하지 않음
+ if ( !img.parent("a").size() && !img.attr("onclick") ) {
+ // 스타일 설정
+ img.css("cursor", "pointer");
+
+ // 클릭하면 슬라이드쇼 시작
+ img.click(slideshow);
+ }
+ }
+ });
+ });
});
})(jQuery);
diff --git a/addons/smartphone/classes/smartphone.class.php b/addons/smartphone/classes/smartphone.class.php
index 9ba8f7f0f..652a33898 100644
--- a/addons/smartphone/classes/smartphone.class.php
+++ b/addons/smartphone/classes/smartphone.class.php
@@ -1,106 +1,134 @@
oModule = $oModule;
+ $this->module_info = $module_info;
+
+ if(!$this->module_info->menu_srl) {
+ $oMenuModel = &getAdminModel('menu');
+ $menus = $oMenuModel->getMenus($this->module_info->site_srl);
+ if($menus[0]) $this->module_info->menu_srl = $menus[0]->menu_srl;
+ }
+
+ if($this->module_info->menu_srl) {
+ $menu_cache_file = sprintf(_XE_PATH_.'files/cache/menu/%d.php', $this->module_info->menu_srl);
+ if(!file_exists($menu_cache_file)) return;
+ @include $menu_cache_file;
+ Context::addHtmlHeader(sprintf('', $this->_getAllItems($menu->list)));
+ $this->_setParentUrl($menu->list);
}
}
- function setModuleInstance(&$oModule) {
- if($this->oModule) return;
- $this->oModule = $oModule;
+ function _setParentUrl($menu_list) {
+ if(!count($menu_list)) return;
+ foreach($menu_list as $key => $val) {
+ if(!$val['text']) continue;
+ if($val['list'] && $this->_setParentUrl($val['list'])) {
+ $href = $val['href'];
+ if(preg_match('/^[a-z0-9_]+$/i',$val['url'])) $href = getUrl('','mid',$val['url'],'smartphone','true');
+ else $href = $val['href'];
+ $this->setParentUrl($href);
+ return false;
+ }
+ if($val['url']==Context::get('mid')) return true;
+ }
+ return false;
+ }
+
+ function _getAllItems($menu_list, $depth=0) {
+ if(!count($menu_list)) return;
+ $output = '';
+
+ foreach($menu_list as $menu_item)
+ {
+ if($output) $output .= ",";
+ $key = $menu_item['text'];
+ $val = $menu_item['url'];
+ if($menu_item['list']) {
+ $childs = '{'.$this->_getAllItems($menu_item['list'], $depth+1).'}';
+ } else {
+ $childs = 'null';
+ }
+
+ $output .= sprintf('"%s" : { "url" : "%s", "childs" : %s } ',str_replace('"','\"',$key), str_replace('"','\"',$val), $childs);
+ }
+ return $output;
+ }
+
+ function procSmartPhone($msg = null) {
+ if(preg_match('/(iPopd|iPhone)/',$_SERVER['HTTP_USER_AGENT'])) {
+ Context::addHtmlHeader('
SmartphonePhone XE 애드온
+ SmartphonePhone XE
+ SmartphonePhone XE アドオン
IPhone (touch) 등, smartphone 에서 접속시 최적화된 화면을 보여줍니다.
+
+ 以 IPhone (touch) 和 smartphone 瀏覽時會以最適當的畫面顯示。
+
+
+ IPhone(touch)など、スマートフォンからアクセスした時、最適化されたインターフェースで表示させます。
+
0.1
2009-04-20
haneul
+ haneul
+ haneul
diff --git a/addons/smartphone/iui/LICENSE.txt b/addons/smartphone/iui/LICENSE.txt
deleted file mode 100644
index c43b26eec..000000000
--- a/addons/smartphone/iui/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2007, iUI Project Members
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * Neither the name of the iUI Project nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/addons/smartphone/iui/backButton.png b/addons/smartphone/iui/backButton.png
deleted file mode 100644
index e27ea8cdf..000000000
Binary files a/addons/smartphone/iui/backButton.png and /dev/null differ
diff --git a/addons/smartphone/iui/blueButton.png b/addons/smartphone/iui/blueButton.png
deleted file mode 100644
index 0f92dfd94..000000000
Binary files a/addons/smartphone/iui/blueButton.png and /dev/null differ
diff --git a/addons/smartphone/iui/cancel.png b/addons/smartphone/iui/cancel.png
deleted file mode 100644
index 5f6dcc87d..000000000
Binary files a/addons/smartphone/iui/cancel.png and /dev/null differ
diff --git a/addons/smartphone/iui/grayButton.png b/addons/smartphone/iui/grayButton.png
deleted file mode 100644
index 0ce6a30d4..000000000
Binary files a/addons/smartphone/iui/grayButton.png and /dev/null differ
diff --git a/addons/smartphone/iui/image/next.png b/addons/smartphone/iui/image/next.png
deleted file mode 100644
index 1b2c6e4ef..000000000
Binary files a/addons/smartphone/iui/image/next.png and /dev/null differ
diff --git a/addons/smartphone/iui/image/next_New.png b/addons/smartphone/iui/image/next_New.png
deleted file mode 100644
index eefc826dd..000000000
Binary files a/addons/smartphone/iui/image/next_New.png and /dev/null differ
diff --git a/addons/smartphone/iui/image/previous.png b/addons/smartphone/iui/image/previous.png
deleted file mode 100644
index 8095e0928..000000000
Binary files a/addons/smartphone/iui/image/previous.png and /dev/null differ
diff --git a/addons/smartphone/iui/image/previous_New.png b/addons/smartphone/iui/image/previous_New.png
deleted file mode 100644
index 36b1752c0..000000000
Binary files a/addons/smartphone/iui/image/previous_New.png and /dev/null differ
diff --git a/addons/smartphone/iui/iui.css b/addons/smartphone/iui/iui.css
deleted file mode 100644
index 6470d9b59..000000000
--- a/addons/smartphone/iui/iui.css
+++ /dev/null
@@ -1,486 +0,0 @@
-/* iui.css (c) 2007 by iUI Project Members, see LICENSE.txt for license */
-body {
- margin: 0;
- font-family: Helvetica;
- background: #FFFFFF;
- color: #000000;
- overflow-x: hidden;
- -webkit-user-select: none;
- -webkit-text-size-adjust: none;
-}
-
-body > *:not(.toolbar) {
- display: none;
- position: absolute;
- margin: 0;
- padding: 0;
- left: 0;
- top: 45px;
- width: 100%;
- min-height: 372px;
-}
-
-body[orient="landscape"] > *:not(.toolbar) {
- min-height: 268px;
-}
-
-body > *[selected="true"] {
- display: block;
-}
-
-a[selected].link, a:active, link {
- background-color: #194fdb !important;
- background-image: url(listArrowSel.png), url(selection.png) !important;
- background-repeat: no-repeat, repeat-x;
- background-position: right center, left top;
- color: #FFFFFF !important;
-}
-
-a[selected="progress"].link {
- background-image: url(loading.gif), url(selection.png) !important;
-}
-
-/************************************************************************************************/
-
-body > .toolbar {
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- border-bottom: 1px solid #2d3642;
- border-top: 1px solid #6d84a2;
- padding: 10px;
- height: 45px;
- background: url(toolbar.png) #6d84a2 repeat-x;
-}
-
-.toolbar > h1 {
- position: absolute;
- overflow: hidden;
- left: 50%;
- margin: 1px 0 0 -75px;
- height: 45px;
- font-size: 20px;
- width: 150px;
- font-weight: bold;
- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
- text-align: center;
- text-overflow: ellipsis;
- white-space: nowrap;
- color: #FFFFFF;
-}
-
-body[orient="landscape"] > .toolbar > h1 {
- margin-left: -125px;
- width: 250px;
-}
-
-.button {
- position: absolute;
- overflow: hidden;
- top: 8px;
- right: 6px;
- margin: 0;
- border-width: 0 5px;
- padding: 0 3px;
- width: auto;
- height: 30px;
- line-height: 30px;
- font-family: inherit;
- font-size: 12px;
- font-weight: bold;
- color: #FFFFFF;
- text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0;
- text-overflow: ellipsis;
- text-decoration: none;
- white-space: nowrap;
- background: none;
- -webkit-border-image: url(toolButton.png) 0 5 0 5;
-}
-
-.blueButton {
- -webkit-border-image: url(blueButton.png) 0 5 0 5;
- border-width: 0 5px;
-}
-
-.leftButton {
- left: 6px;
- right: auto;
-}
-
-#backButton {
- display: none;
- left: 6px;
- right: auto;
- padding: 0;
- max-width: 55px;
- border-width: 0 8px 0 14px;
- -webkit-border-image: url(backButton.png) 0 8 0 14;
-}
-
-.whiteButton,
-.grayButton {
- display: block;
- border-width: 0 12px;
- padding: 10px;
- text-align: center;
- font-size: 20px;
- font-weight: bold;
- text-decoration: inherit;
- color: inherit;
-}
-
-.whiteButton {
- -webkit-border-image: url(whiteButton.png) 0 12 0 12;
- text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0;
-}
-
-.grayButton {
- -webkit-border-image: url(grayButton.png) 0 12 0 12;
- color: #FFFFFF;
-}
-
-/************************************************************************************************/
-
-body > ul > li {
- position: relative;
- margin: 0;
- border-bottom: 1px solid #E0E0E0;
- padding: 8px 0 8px 10px;
- font-size: 18px;
- font-weight: bold;
- list-style: none;
-}
-
-body > ul > li.group {
- position: relative;
- top: -1px;
- margin-bottom: -2px;
- border-top: 1px solid #7d7d7d;
- border-bottom: 1px solid #999999;
- padding: 1px 10px;
- background: url(listGroup.png) repeat-x;
- font-size: 17px;
- font-weight: bold;
- text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
- color: #FFFFFF;
-}
-
-body > ul > li.group:first-child {
- top: 0;
- border-top: none;
-}
-
-body > ul > li > a {
- display: block;
- margin: -8px 0 -8px -10px;
- padding: 8px 32px 8px 10px;
- text-decoration: none;
- color: inherit;
- background: url(listArrow.png) no-repeat right center;
-}
-
-a[target="_replace"] {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- padding-top: 25px;
- padding-bottom: 25px;
- font-size: 18px;
- color: cornflowerblue;
- background-color: #FFFFFF;
- background-image: none;
-}
-
-/************************************************************************************************/
-
-body > .dialog {
- top: 0;
- width: 100%;
- min-height: 417px;
- z-index: 2;
- background: rgba(0, 0, 0, 0.8);
- padding: 0;
- text-align: right;
-}
-
-.dialog > fieldset {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- width: 100%;
- margin: 0;
- border: none;
- border-top: 1px solid #6d84a2;
- padding: 10px 6px;
- background: url(toolbar.png) #7388a5 repeat-x;
-}
-
-.dialog > fieldset > h1 {
- margin: 0 10px 0 10px;
- padding: 0;
- font-size: 20px;
- font-weight: bold;
- color: #FFFFFF;
- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
- text-align: center;
-}
-
-.dialog > fieldset > label {
- position: absolute;
- margin: 16px 0 0 6px;
- font-size: 14px;
- color: #999999;
-}
-
-input {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- width: 100%;
- margin: 8px 0 0 0;
- padding: 6px 6px 6px 44px;
- font-size: 16px;
- font-weight: normal;
-}
-
-/************************************************************************************************/
-
-body > .panel {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- padding: 10px;
- background: #c8c8c8 url(pinstripes.png);
-}
-
-.panel > fieldset {
- position: relative;
- margin: 0 0 20px 0;
- padding: 0;
- background: #FFFFFF;
- -webkit-border-radius: 8px;
- border: 1px solid #999999;
- text-align: right;
- font-size: 16px;
-}
-
-.row {
- position: relative;
- min-height: 42px;
- border-bottom: 1px solid #999999;
- -webkit-border-radius: 0;
- text-align: right;
-}
-
-fieldset > .row:last-child {
- border-bottom: none !important;
-}
-
-.row > input {
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- margin: 0;
- border: none;
- padding: 12px 10px 0 110px;
- height: 42px;
- background: none;
-}
-
-.row > label {
- position: absolute;
- margin: 0 0 0 14px;
- line-height: 42px;
- font-weight: bold;
-}
-
-.row > .toggle {
- position: absolute;
- top: 6px;
- right: 6px;
- width: 100px;
- height: 28px;
-}
-
-.toggle {
- border: 1px solid #888888;
- -webkit-border-radius: 6px;
- background: #FFFFFF url(toggle.png) repeat-x;
- font-size: 19px;
- font-weight: bold;
- line-height: 30px;
-}
-
-.toggle[toggled="true"] {
- border: 1px solid #143fae;
- background: #194fdb url(toggleOn.png) repeat-x;
-}
-
-.toggleOn {
- display: none;
- position: absolute;
- width: 60px;
- text-align: center;
- left: 0;
- top: 0;
- color: #FFFFFF;
- text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
-}
-
-.toggleOff {
- position: absolute;
- width: 60px;
- text-align: center;
- right: 0;
- top: 0;
- color: #666666;
-}
-
-.toggle[toggled="true"] > .toggleOn {
- display: block;
-}
-
-.toggle[toggled="true"] > .toggleOff {
- display: none;
-}
-
-.thumb {
- position: absolute;
- top: -1px;
- left: -1px;
- width: 40px;
- height: 28px;
- border: 1px solid #888888;
- -webkit-border-radius: 6px;
- background: #ffffff url(thumb.png) repeat-x;
-}
-
-.toggle[toggled="true"] > .thumb {
- left: auto;
- right: -1px;
-}
-
-.panel > h2 {
- margin: 0 0 8px 14px;
- font-size: inherit;
- font-weight: bold;
- color: #4d4d70;
- text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0;
-}
-
-.panel > .content {
- background: #FFFFFF;
- -webkit-border-radius: 8px;
- border: 1px solid #999999;
- padding: 10px;
-}
-
-/************************************************************************************************/
-
-#preloader {
- display: none;
- background-image: url(loading.gif), url(selection.png),
- url(blueButton.png), url(listArrowSel.png), url(listGroup.png);
-}
-
-body > ul > li.post_item > a > .post > span.title {
- font-size:13px;
- font-weight:normal;
- display:block;
-}
-body > ul > li.post_item > a > .post > span.description {
- font-size:10px;
- font-weight:normal;
- color:#bbb;
- display:block;
- margin-top:2px;
- letter-spacing:0px;
-}
-
-.next, .previous {
- display: block;
- text-decoration: none;
- font-size: 16px;
- padding: 7px 0;
- background: url(image/previous_New.png) no-repeat;
- color: #fff;
- margin: 8px 12px;
- width: 110px;
- height: 21px;
- text-align: center;
- margin-bottom: 30px;
- font-weight:normal;
-}
-
-.next {
- float: right;
- background: url(image/next_New.png) no-repeat;
-}
-
-.previous {
- float: left;
- opacity: 0.7;
- margin: 8px 0px;
-}
-
-.pagination {
- background: none;
- border: none;
- text-align: center;
-}
-
-.pagination strong {
- font-size: 32px;
- color: #ccc;
- position: relative;
- top: 5px;
-}
-
-.siteinfo .description
-{
- display: block;
- font-size: 16px;
- color: #6699FF;
- text-align: right;
-}
-
-.siteinfo .xe
-{
- display: block;
- text-align: right;
- font-size:11px;
- color: #999;
-}
-
-ul.navigation {
- margin:0;
- padding:0;
- list-style: none;
-}
-
-ul.navigation > li {
- position: relative;
- font-size: 14px;
- border-bottom: 1px solid #E0E0E0;
- text-align: left;
-}
-
-ul.navigation > li > a {
- display: block;
- background-image: url(listArrow.png);
- background-repeat: no-repeat;
- background-position: right center;
- color: inherit;
- text-decoration: none;
- padding: 8px 32px 8px 10px;
-}
-
-.comment_item > .author {
- color: #3074A5;
-}
-
-.comment_item > .regdate {
- float:right;
- font-size: 12px;
- color: #CCC;
-}
-
-.comment_item > .re {
- font-size: 12px;
- color: #DCC;
-}
diff --git a/addons/smartphone/iui/iui.js b/addons/smartphone/iui/iui.js
deleted file mode 100644
index e479fefa6..000000000
--- a/addons/smartphone/iui/iui.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- Copyright (c) 2007, iUI Project Members
- See LICENSE.txt for licensing terms
- */
-
-
-(function() {
-
-var slideSpeed = 40;
-var slideInterval = 0;
-
-var currentPage = null;
-var currentDialog = null;
-var currentWidth = 0;
-var currentHash = location.hash;
-var hashPrefix = "#_";
-var pageHistory = [];
-var newPageCount = 0;
-var checkTimer;
-
-// *************************************************************************************************
-
-window.iui =
-{
- showPage: function(page, backwards)
- {
- if (page)
- {
- if (currentDialog)
- {
- currentDialog.removeAttribute("selected");
- currentDialog = null;
- }
-
- if (hasClass(page, "dialog"))
- showDialog(page);
- else
- {
- var fromPage = currentPage;
- currentPage = page;
-
- if (fromPage)
- setTimeout(slidePages, 0, fromPage, page, backwards);
- else
- updatePage(page, fromPage);
- }
- }
- },
-
- showPageById: function(pageId)
- {
- var page = $(pageId);
- if (page)
- {
- var index = pageHistory.indexOf(pageId);
- var backwards = index != -1;
- if (backwards)
- pageHistory.splice(index, pageHistory.length);
-
- iui.showPage(page, backwards);
- }
- },
-
- showPageByHref: function(href, args, method, replace, cb)
- {
- var req = new XMLHttpRequest();
- req.onerror = function()
- {
- if (cb)
- cb(false);
- };
-
- req.onreadystatechange = function()
- {
- if (req.readyState == 4)
- {
- if (replace)
- replaceElementWithSource(replace, req.responseText);
- else
- {
- var frag = document.createElement("div");
- frag.innerHTML = req.responseText;
- iui.insertPages(frag.childNodes);
- }
- if (cb)
- setTimeout(cb, 1000, true);
- }
- };
-
- if (args)
- {
- req.open(method || "GET", href, true);
- req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- req.setRequestHeader("Content-Length", args.length);
- req.send(args.join("&"));
- }
- else
- {
- req.open(method || "GET", href, true);
- req.send(null);
- }
- },
-
- insertPages: function(nodes)
- {
- var targetPage;
- for (var i = 0; i < nodes.length; ++i)
- {
- var child = nodes[i];
- if (child.nodeType == 1)
- {
- if (!child.id)
- child.id = "__" + (++newPageCount) + "__";
-
- var clone = $(child.id);
- if (clone)
- clone.parentNode.replaceChild(child, clone);
- else
- document.body.appendChild(child);
-
- if (child.getAttribute("selected") == "true" || !targetPage)
- targetPage = child;
-
- --i;
- }
- }
-
- if (targetPage)
- iui.showPage(targetPage);
- },
-
- getSelectedPage: function()
- {
- for (var child = document.body.firstChild; child; child = child.nextSibling)
- {
- if (child.nodeType == 1 && child.getAttribute("selected") == "true")
- return child;
- }
- }
-};
-
-// *************************************************************************************************
-
-addEventListener("load", function(event)
-{
- var page = iui.getSelectedPage();
- if (page)
- iui.showPage(page);
-
- setTimeout(preloadImages, 0);
- setTimeout(checkOrientAndLocation, 0);
- checkTimer = setInterval(checkOrientAndLocation, 300);
-}, false);
-
-addEventListener("click", function(event)
-{
- var link = findParent(event.target, "a");
- if (link)
- {
- function unselect() { link.removeAttribute("selected"); }
-
- if (link.href && link.hash && link.hash != "#")
- {
- link.setAttribute("selected", "true");
- iui.showPage($(link.hash.substr(1)));
- setTimeout(unselect, 500);
- }
- else if (link == $("backButton"))
- history.back();
- else if (link.getAttribute("type") == "submit")
- submitForm(findParent(link, "form"));
- else if (link.getAttribute("type") == "cancel")
- cancelDialog(findParent(link, "form"));
- else if (link.target == "_replace")
- {
- link.setAttribute("selected", "progress");
- iui.showPageByHref(link.href, null, null, link, unselect);
- }
- else if (!link.target)
- {
- link.setAttribute("selected", "progress");
- iui.showPageByHref(link.href, null, null, null, unselect);
- }
- else
- return;
-
- event.preventDefault();
- }
-}, true);
-
-addEventListener("click", function(event)
-{
- var div = findParent(event.target, "div");
- if (div && hasClass(div, "toggle"))
- {
- div.setAttribute("toggled", div.getAttribute("toggled") != "true");
- event.preventDefault();
- }
-}, true);
-
-function checkOrientAndLocation()
-{
- if (window.innerWidth != currentWidth)
- {
- currentWidth = window.innerWidth;
- var orient = currentWidth == 320 ? "profile" : "landscape";
- document.body.setAttribute("orient", orient);
- setTimeout(scrollTo, 100, 0, 1);
- }
-
- if (location.hash != currentHash)
- {
- var pageId = location.hash.substr(hashPrefix.length)
- iui.showPageById(pageId);
- }
-}
-
-function showDialog(page)
-{
- currentDialog = page;
- page.setAttribute("selected", "true");
-
- if (hasClass(page, "dialog") && !page.target)
- showForm(page);
-}
-
-function showForm(form)
-{
- form.onsubmit = function(event)
- {
- event.preventDefault();
- submitForm(form);
- };
-
- form.onclick = function(event)
- {
- if (event.target == form && hasClass(form, "dialog"))
- cancelDialog(form);
- };
-}
-
-function cancelDialog(form)
-{
- form.removeAttribute("selected");
-}
-
-function updatePage(page, fromPage)
-{
- if (!page.id)
- page.id = "__" + (++newPageCount) + "__";
-
- location.href = currentHash = hashPrefix + page.id;
- pageHistory.push(page.id);
-
- var pageTitle = $("pageTitle");
- if (page.title)
- pageTitle.innerHTML = page.title;
-
- if (page.localName.toLowerCase() == "form" && !page.target)
- showForm(page);
-
- var backButton = $("backButton");
- if (backButton)
- {
- var prevPage = $(pageHistory[pageHistory.length-2]);
- if (prevPage && !page.getAttribute("hideBackButton"))
- {
- backButton.style.display = "inline";
- backButton.innerHTML = prevPage.title ? prevPage.title : "Back";
- }
- else
- backButton.style.display = "none";
- }
-}
-
-function slidePages(fromPage, toPage, backwards)
-{
- var axis = (backwards ? fromPage : toPage).getAttribute("axis");
- if (axis == "y")
- (backwards ? fromPage : toPage).style.top = "100%";
- else
- toPage.style.left = "100%";
-
- toPage.setAttribute("selected", "true");
- scrollTo(0, 1);
- clearInterval(checkTimer);
-
- var percent = 100;
- slide();
- var timer = setInterval(slide, slideInterval);
-
- function slide()
- {
- percent -= slideSpeed;
- if (percent <= 0)
- {
- percent = 0;
- if (!hasClass(toPage, "dialog"))
- fromPage.removeAttribute("selected");
- clearInterval(timer);
- checkTimer = setInterval(checkOrientAndLocation, 300);
- setTimeout(updatePage, 0, toPage, fromPage);
- }
-
- if (axis == "y")
- {
- backwards
- ? fromPage.style.top = (100-percent) + "%"
- : toPage.style.top = percent + "%";
- }
- else
- {
- fromPage.style.left = (backwards ? (100-percent) : (percent-100)) + "%";
- toPage.style.left = (backwards ? -percent : percent) + "%";
- }
- }
-}
-
-function preloadImages()
-{
- var preloader = document.createElement("div");
- preloader.id = "preloader";
- document.body.appendChild(preloader);
-}
-
-function submitForm(form)
-{
- iui.showPageByHref(form.action || "POST", encodeForm(form), form.method);
-}
-
-function encodeForm(form)
-{
- function encode(inputs)
- {
- for (var i = 0; i < inputs.length; ++i)
- {
- if (inputs[i].name)
- args.push(inputs[i].name + "=" + escape(inputs[i].value));
- }
- }
-
- var args = [];
- encode(form.getElementsByTagName("input"));
- encode(form.getElementsByTagName("select"));
- return args;
-}
-
-function findParent(node, localName)
-{
- while (node && (node.nodeType != 1 || node.localName.toLowerCase() != localName))
- node = node.parentNode;
- return node;
-}
-
-function hasClass(self, name)
-{
- var re = new RegExp("(^|\\s)"+name+"($|\\s)");
- return re.exec(self.getAttribute("class")) != null;
-}
-
-function replaceElementWithSource(replace, source)
-{
- var page = replace.parentNode;
- var parent = replace;
- while (page.parentNode != document.body)
- {
- page = page.parentNode;
- parent = parent.parentNode;
- }
-
- var frag = document.createElement(parent.localName);
- frag.innerHTML = source;
-
- page.removeChild(parent);
-
- while (frag.firstChild)
- page.appendChild(frag.firstChild);
-}
-
-function $(id) { return document.getElementById(id); }
-function ddd() { console.log.apply(console, arguments); }
-
-})();
diff --git a/addons/smartphone/iui/iuix.css b/addons/smartphone/iui/iuix.css
deleted file mode 100644
index 1a1969058..000000000
--- a/addons/smartphone/iui/iuix.css
+++ /dev/null
@@ -1 +0,0 @@
-body{margin:0;font-family:Helvetica;background:#FFF;color:#000;overflow-x:hidden;-webkit-user-select:none;-webkit-text-size-adjust:none;}body>*:not(.toolbar){display:none;position:absolute;margin:0;padding:0;left:0;top:45px;width:100%;min-height:372px;}body[orient="landscape"]>*:not(.toolbar){min-height:268px;}body>*[selected="true"]{display:block;}a[selected],a:active{background-color:#194fdb!important;background-image:url(listArrowSel.png),url(selection.png)!important;background-repeat:no-repeat,repeat-x;background-position:right center,left top;color:#FFF!important;}a[selected="progress"]{background-image:url(loading.gif),url(selection.png)!important;}body>.toolbar{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border-bottom:1px solid #2d3642;border-top:1px solid #6d84a2;padding:10px;height:45px;background:url(toolbar.png) #6d84a2 repeat-x;}.toolbar>h1{position:absolute;overflow:hidden;left:50%;margin:1px 0 0 -75px;height:45px;font-size:20px;width:150px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;text-overflow:ellipsis;white-space:nowrap;color:#FFF;}body[orient="landscape"]>.toolbar>h1{margin-left:-125px;width:250px;}.button{position:absolute;overflow:hidden;top:8px;right:6px;margin:0;border-width:0 5px;padding:0 3px;width:auto;height:30px;line-height:30px;font-family:inherit;font-size:12px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.6) 0 -1px 0;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;background:none;-webkit-border-image:url(toolButton.png) 0 5 0 5;}.blueButton{-webkit-border-image:url(blueButton.png) 0 5 0 5;border-width:0 5px;}.leftButton{left:6px;right:auto;}#backButton{display:none;left:6px;right:auto;padding:0;max-width:55px;border-width:0 8px 0 14px;-webkit-border-image:url(backButton.png) 0 8 0 14;}.whiteButton,.grayButton{display:block;border-width:0 12px;padding:10px;text-align:center;font-size:20px;font-weight:bold;text-decoration:inherit;color:inherit;}.whiteButton{-webkit-border-image:url(whiteButton.png) 0 12 0 12;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}.grayButton{-webkit-border-image:url(grayButton.png) 0 12 0 12;color:#FFF;}body>ul>li{position:relative;margin:0;border-bottom:1px solid #E0E0E0;padding:8px 0 8px 10px;font-size:20px;font-weight:bold;list-style:none;}body>ul>li.group{position:relative;top:-1px;margin-bottom:-2px;border-top:1px solid #7d7d7d;border-bottom:1px solid #999;padding:1px 10px;background:url(listGroup.png) repeat-x;font-size:17px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 1px 0;color:#FFF;}body>ul>li.group:first-child{top:0;border-top:none;}body>ul>li>a{display:block;margin:-8px 0 -8px -10px;padding:8px 32px 8px 10px;text-decoration:none;color:inherit;background:url(listArrow.png) no-repeat right center;}a[target="_replace"]{box-sizing:border-box;-webkit-box-sizing:border-box;padding-top:25px;padding-bottom:25px;font-size:18px;color:cornflowerblue;background-color:#FFF;background-image:none;}body>.dialog{top:0;width:100%;min-height:417px;z-index:2;background:rgba(0,0,0,0.8);padding:0;text-align:right;}.dialog>fieldset{box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:0;border:none;border-top:1px solid #6d84a2;padding:10px 6px;background:url(toolbar.png) #7388a5 repeat-x;}.dialog>fieldset>h1{margin:0 10px 0 10px;padding:0;font-size:20px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;}.dialog>fieldset>label{position:absolute;margin:16px 0 0 6px;font-size:14px;color:#999;}input{box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:8px 0 0 0;padding:6px 6px 6px 44px;font-size:16px;font-weight:normal;}body>.panel{box-sizing:border-box;-webkit-box-sizing:border-box;padding:10px;background:#c8c8c8 url(pinstripes.png);}.panel>fieldset{position:relative;margin:0 0 20px 0;padding:0;background:#FFF;-webkit-border-radius:10px;border:1px solid #999;text-align:right;font-size:16px;}.row{position:relative;min-height:42px;border-bottom:1px solid #999;-webkit-border-radius:0;text-align:right;}fieldset>.row:last-child{border-bottom:none!important;}.row>input{box-sizing:border-box;-webkit-box-sizing:border-box;margin:0;border:none;padding:12px 10px 0 110px;height:42px;background:none;}.row>label{position:absolute;margin:0 0 0 14px;line-height:42px;font-weight:bold;}.row>.toggle{position:absolute;top:6px;right:6px;width:100px;height:28px;}.toggle{border:1px solid #888;-webkit-border-radius:6px;background:#FFF url(toggle.png) repeat-x;font-size:19px;font-weight:bold;line-height:30px;}.toggle[toggled="true"]{border:1px solid #143fae;background:#194fdb url(toggleOn.png) repeat-x;}.toggleOn{display:none;position:absolute;width:60px;text-align:center;left:0;top:0;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;}.toggleOff{position:absolute;width:60px;text-align:center;right:0;top:0;color:#666;}.toggle[toggled="true"]>.toggleOn{display:block;}.toggle[toggled="true"]>.toggleOff{display:none;}.thumb{position:absolute;top:-1px;left:-1px;width:40px;height:28px;border:1px solid #888;-webkit-border-radius:6px;background:#fff url(thumb.png) repeat-x;}.toggle[toggled="true"]>.thumb{left:auto;right:-1px;}.panel>h2{margin:0 0 8px 14px;font-size:inherit;font-weight:bold;color:#4d4d70;text-shadow:rgba(255,255,255,0.75) 2px 2px 0;}#preloader{display:none;background-image:url(loading.gif),url(selection.png),url(blueButton.png),url(listArrowSel.png),url(listGroup.png);}
\ No newline at end of file
diff --git a/addons/smartphone/iui/iuix.js b/addons/smartphone/iui/iuix.js
deleted file mode 100644
index 3b2b37f9d..000000000
--- a/addons/smartphone/iui/iuix.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(){var _1=20;var _2=0;var _3=null;var _4=null;var _5=0;var _6=location.hash;var _7="#_";var _8=[];var _9=0;var _a;window.iui={showPage:function(_b,_c){if(_b){if(_4){_4.removeAttribute("selected");_4=null;}if(hasClass(_b,"dialog")){showDialog(_b);}else{var _d=_3;_3=_b;if(_d){setTimeout(slidePages,0,_d,_b,_c);}else{updatePage(_b,_d);}}}},showPageById:function(_e){var _f=$(_e);if(_f){var _10=_8.indexOf(_e);var _11=_10!=-1;if(_11){_8.splice(_10,_8.length);}iui.showPage(_f,_11);}},showPageByHref:function(_12,_13,_14,_15,cb){var req=new XMLHttpRequest();req.onerror=function(){if(cb){cb(false);}};req.onreadystatechange=function(){if(req.readyState==4){if(_15){replaceElementWithSource(_15,req.responseText);}else{var _18=document.createElement("div");_18.innerHTML=req.responseText;iui.insertPages(_18.childNodes);}if(cb){setTimeout(cb,1000,true);}}};if(_13){req.open(_14||"GET",_12,true);req.setRequestHeader("Content-Type","application/x-www-form-urlencoded");req.setRequestHeader("Content-Length",_13.length);req.send(_13.join("&"));}else{req.open(_14||"GET",_12,true);req.send(null);}},insertPages:function(_19){var _1a;for(var i=0;i<_19.length;++i){var _1c=_19[i];if(_1c.nodeType==1){if(!_1c.id){_1c.id="__"+(++_9)+"__";}var _1d=$(_1c.id);if(_1d){_1d.parentNode.replaceChild(_1c,_1d);}else{document.body.appendChild(_1c);}if(_1c.getAttribute("selected")=="true"||!_1a){_1a=_1c;}--i;}}if(_1a){iui.showPage(_1a);}},getSelectedPage:function(){for(var _1e=document.body.firstChild;_1e;_1e=_1e.nextSibling){if(_1e.nodeType==1&&_1e.getAttribute("selected")=="true"){return _1e;}}}};addEventListener("load",function(_1f){var _20=iui.getSelectedPage();if(_20){iui.showPage(_20);}setTimeout(preloadImages,0);setTimeout(checkOrientAndLocation,0);_a=setInterval(checkOrientAndLocation,300);},false);addEventListener("click",function(_21){var _22=findParent(_21.target,"a");if(_22){function unselect(){_22.removeAttribute("selected");}if(_22.href&&_22.hash&&_22.hash!="#"){_22.setAttribute("selected","true");iui.showPage($(_22.hash.substr(1)));setTimeout(unselect,500);}else{if(_22==$("backButton")){history.back();}else{if(_22.getAttribute("type")=="submit"){submitForm(findParent(_22,"form"));}else{if(_22.getAttribute("type")=="cancel"){cancelDialog(findParent(_22,"form"));}else{if(_22.target=="_replace"){_22.setAttribute("selected","progress");iui.showPageByHref(_22.href,null,null,_22,unselect);}else{if(!_22.target){_22.setAttribute("selected","progress");iui.showPageByHref(_22.href,null,null,null,unselect);}else{return;}}}}}}_21.preventDefault();}},true);addEventListener("click",function(_23){var div=findParent(_23.target,"div");if(div&&hasClass(div,"toggle")){div.setAttribute("toggled",div.getAttribute("toggled")!="true");_23.preventDefault();}},true);function checkOrientAndLocation(){if(window.innerWidth!=_5){_5=window.innerWidth;var _25=_5==320?"profile":"landscape";document.body.setAttribute("orient",_25);setTimeout(scrollTo,100,0,1);}if(location.hash!=_6){var _26=location.hash.substr(_7.length);iui.showPageById(_26);}}function showDialog(_27){_4=_27;_27.setAttribute("selected","true");if(hasClass(_27,"dialog")&&!_27.target){showForm(_27);}}function showForm(_28){_28.onsubmit=function(_29){_29.preventDefault();submitForm(_28);};_28.onclick=function(_2a){if(_2a.target==_28&&hasClass(_28,"dialog")){cancelDialog(_28);}};}function cancelDialog(_2b){_2b.removeAttribute("selected");}function updatePage(_2c,_2d){if(!_2c.id){_2c.id="__"+(++_9)+"__";}location.href=_6=_7+_2c.id;_8.push(_2c.id);var _2e=$("pageTitle");if(_2c.title){_2e.innerHTML=_2c.title;}if(_2c.localName.toLowerCase()=="form"&&!_2c.target){showForm(_2c);}var _2f=$("backButton");if(_2f){var _30=$(_8[_8.length-2]);if(_30&&!_2c.getAttribute("hideBackButton")){_2f.style.display="inline";_2f.innerHTML=_30.title?_30.title:"Back";}else{_2f.style.display="none";}}}function slidePages(_31,_32,_33){var _34=(_33?_31:_32).getAttribute("axis");if(_34=="y"){(_33?_31:_32).style.top="100%";}else{_32.style.left="100%";}_32.setAttribute("selected","true");scrollTo(0,1);clearInterval(_a);var _35=100;slide();var _36=setInterval(slide,_2);function slide(){_35-=_1;if(_35<=0){_35=0;if(!hasClass(_32,"dialog")){_31.removeAttribute("selected");}clearInterval(_36);_a=setInterval(checkOrientAndLocation,300);setTimeout(updatePage,0,_32,_31);}if(_34=="y"){_33?_31.style.top=(100-_35)+"%":_32.style.top=_35+"%";}else{_31.style.left=(_33?(100-_35):(_35-100))+"%";_32.style.left=(_33?-_35:_35)+"%";}}}function preloadImages(){var _37=document.createElement("div");_37.id="preloader";document.body.appendChild(_37);}function submitForm(_38){iui.showPageByHref(_38.action||"POST",encodeForm(_38),_38.method);}function encodeForm(_39){function encode(_3a){for(var i=0;i<_3a.length;++i){if(_3a[i].name){args.push(_3a[i].name+"="+escape(_3a[i].value));}}}var _3c=[];encode(_39.getElementsByTagName("input"));encode(_39.getElementsByTagName("select"));return _3c;}function findParent(_3d,_3e){while(_3d&&(_3d.nodeType!=1||_3d.localName.toLowerCase()!=_3e)){_3d=_3d.parentNode;}return _3d;}function hasClass(_3f,_40){var re=new RegExp("(^|\\s)"+_40+"($|\\s)");return re.exec(_3f.getAttribute("class"))!=null;}function replaceElementWithSource(_42,_43){var _44=_42.parentNode;var _45=_42;while(_44.parentNode!=document.body){_44=_44.parentNode;_45=_45.parentNode;}var _46=document.createElement(_45.localName);_46.innerHTML=_43;_44.removeChild(_45);while(_46.firstChild){_44.appendChild(_46.firstChild);}}function $(id){return document.getElementById(id);}function ddd(){console.log.apply(console,arguments);}})();
\ No newline at end of file
diff --git a/addons/smartphone/iui/listArrowSel.png b/addons/smartphone/iui/listArrowSel.png
deleted file mode 100644
index 86832ebc7..000000000
Binary files a/addons/smartphone/iui/listArrowSel.png and /dev/null differ
diff --git a/addons/smartphone/iui/loading.gif b/addons/smartphone/iui/loading.gif
deleted file mode 100644
index 8522ddf1a..000000000
Binary files a/addons/smartphone/iui/loading.gif and /dev/null differ
diff --git a/addons/smartphone/iui/selection.png b/addons/smartphone/iui/selection.png
deleted file mode 100644
index 537e3f0b1..000000000
Binary files a/addons/smartphone/iui/selection.png and /dev/null differ
diff --git a/addons/smartphone/iui/thumb.png b/addons/smartphone/iui/thumb.png
deleted file mode 100644
index cefa8fc5e..000000000
Binary files a/addons/smartphone/iui/thumb.png and /dev/null differ
diff --git a/addons/smartphone/iui/toggle.png b/addons/smartphone/iui/toggle.png
deleted file mode 100644
index 3b62ebf26..000000000
Binary files a/addons/smartphone/iui/toggle.png and /dev/null differ
diff --git a/addons/smartphone/iui/toggleOn.png b/addons/smartphone/iui/toggleOn.png
deleted file mode 100644
index b016814de..000000000
Binary files a/addons/smartphone/iui/toggleOn.png and /dev/null differ
diff --git a/addons/smartphone/iui/toolButton.png b/addons/smartphone/iui/toolButton.png
deleted file mode 100644
index afe4d7a3e..000000000
Binary files a/addons/smartphone/iui/toolButton.png and /dev/null differ
diff --git a/addons/smartphone/iui/toolbar.png b/addons/smartphone/iui/toolbar.png
deleted file mode 100644
index 3dde94c07..000000000
Binary files a/addons/smartphone/iui/toolbar.png and /dev/null differ
diff --git a/addons/smartphone/iui/whiteButton.png b/addons/smartphone/iui/whiteButton.png
deleted file mode 100644
index 5514b2700..000000000
Binary files a/addons/smartphone/iui/whiteButton.png and /dev/null differ
diff --git a/addons/smartphone/smartphone.addon.php b/addons/smartphone/smartphone.addon.php
index 4974d9460..f4d9a3190 100644
--- a/addons/smartphone/smartphone.addon.php
+++ b/addons/smartphone/smartphone.addon.php
@@ -3,20 +3,29 @@
if(Context::get('module')=='admin') return;
- if($called_position != 'before_module_proc' && $called_position != 'after_module_proc' ) return;
-
require_once(_XE_PATH_.'addons/smartphone/classes/smartphone.class.php');
- debugPrint("here");
- if(!smartphoneXE::isFromSmartPhone())
- {
- debugPrint("here");
- return;
+ if(!smartphoneXE::isFromSmartPhone()) return;
+
+ if($called_position == 'after_module_proc' ) {
+ $oSmartphoneXE = new smartphoneXE($this, $this->module_info, $output);
+ $oSmartphoneXE->procSmartPhone();
+ Context::set('layout', 'none');
+ Context::set('smart_content', $oSmartphoneXE->content);
+ Context::set('parent_url', $oSmartphoneXE->parent_url);
+ Context::set('prev_url', $oSmartphoneXE->prev_url);
+ Context::set('next_url', $oSmartphoneXE->next_url);
+ $this->setTemplatePath('addons/smartphone/tpl');
+ $this->setTemplateFile('layout');
+
+ } elseif($called_position == 'before_module_proc' && !$this->grant->access) {
+ $oSmartphoneXE = new smartphoneXE($this, $this->module_info, $output);
+ $oSmartphoneXE->procSmartPhone('msg_not_permitted_act');
+ Context::set('layout', 'none');
+ Context::set('smart_content', $oSmartphoneXE->content);
+ Context::set('parent_url', $oSmartphoneXE->parent_url);
+ Context::set('prev_url', $oSmartphoneXE->prev_url);
+ Context::set('next_url', $oSmartphoneXE->next_url);
+ $this->setTemplatePath('addons/smartphone/tpl');
+ $this->setTemplateFile('layout');
}
- debugPrint("here");
-
-
- $oSmartphoneXE = &smartphoneXE::getInstance();
- $oSmartphoneXE->setModuleInfo($this->module_info);
- $oSmartphoneXE->setModuleInstance($this);
- $oSmartphoneXE->display();
?>
diff --git a/addons/smartphone/tpl/images/btnMenu.png b/addons/smartphone/tpl/images/btnMenu.png
new file mode 100755
index 000000000..3c43a027c
Binary files /dev/null and b/addons/smartphone/tpl/images/btnMenu.png differ
diff --git a/addons/smartphone/tpl/images/btnNext.png b/addons/smartphone/tpl/images/btnNext.png
new file mode 100755
index 000000000..15b8215ba
Binary files /dev/null and b/addons/smartphone/tpl/images/btnNext.png differ
diff --git a/addons/smartphone/tpl/images/btnPrev.png b/addons/smartphone/tpl/images/btnPrev.png
new file mode 100755
index 000000000..085d42942
Binary files /dev/null and b/addons/smartphone/tpl/images/btnPrev.png differ
diff --git a/addons/smartphone/tpl/images/btnTop.png b/addons/smartphone/tpl/images/btnTop.png
new file mode 100755
index 000000000..aa106e8cc
Binary files /dev/null and b/addons/smartphone/tpl/images/btnTop.png differ
diff --git a/addons/smartphone/iui/listArrow.png b/addons/smartphone/tpl/images/listArrow.png
similarity index 100%
rename from addons/smartphone/iui/listArrow.png
rename to addons/smartphone/tpl/images/listArrow.png
diff --git a/addons/smartphone/iui/listGroup.png b/addons/smartphone/tpl/images/listGroup.png
similarity index 100%
rename from addons/smartphone/iui/listGroup.png
rename to addons/smartphone/tpl/images/listGroup.png
diff --git a/addons/smartphone/iui/pinstripes.png b/addons/smartphone/tpl/images/pinstripes.png
similarity index 100%
rename from addons/smartphone/iui/pinstripes.png
rename to addons/smartphone/tpl/images/pinstripes.png
diff --git a/addons/smartphone/tpl/images/titlebar.png b/addons/smartphone/tpl/images/titlebar.png
new file mode 100755
index 000000000..ddc3cd9b8
Binary files /dev/null and b/addons/smartphone/tpl/images/titlebar.png differ
diff --git a/addons/smartphone/tpl/layout.html b/addons/smartphone/tpl/layout.html
index 41193bc91..bf8cec8c0 100644
--- a/addons/smartphone/tpl/layout.html
+++ b/addons/smartphone/tpl/layout.html
@@ -1,55 +1,21 @@
-
-
-
- {Context::getBrowserTitle()}
-
-
- {$module_info->description}
- Powered by Xpress Engine
-
-
- View
-
- 이 모듈은 smartphoneView를 지원하지 않습니다.
-
- Menu
-
-
-
-
-
+
+ {$smart_content}
+
+
diff --git a/addons/smartphone/tpl/smartphone.css b/addons/smartphone/tpl/smartphone.css
new file mode 100644
index 000000000..3a356caf8
--- /dev/null
+++ b/addons/smartphone/tpl/smartphone.css
@@ -0,0 +1,189 @@
+body {
+ margin: 0;
+ padding:0;
+ font-family: Helvetica;
+ background: #E6E6E6 url(./images/pinstripes.png);
+ color: #000000;
+ overflow-x: hidden;
+ -webkit-user-select: none;
+ -webkit-text-size-adjust: none;
+ width:100%;
+}
+
+.smartPhoneTitleBar {
+ border-bottom: 1px solid #2d3642;
+ border-top: 1px solid #6d84a2;
+ height: 43px;
+ overflow:hidden;
+ background:#485567 url(./images/titlebar.png) repeat-x left top;
+
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+}
+
+.smartPhoneTitleBar h1 {
+ white-space:nowrap;
+ overflow: hidden;
+ color: #FFFFFF;
+ font-size: 20px;
+ font-weight: bold;
+ padding:8px 10px;
+ margin:0;
+ text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
+ text-overflow: ellipsis;
+}
+
+.smartPhoneTitleBar h1 a {
+ text-decoration:none;
+ color:#fff;
+}
+
+.smartPhoneContent {
+ z-index:450;
+ border: 1px solid #999999;
+ padding:10px;
+ background-color:#fff;
+ margin:10px;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -webkit-border-radius: 8px;
+}
+
+.smartPhoneToolBar {
+ z-index:9999;
+ width:100%;
+ border-bottom: 1px solid #2d3642;
+ border-top: 1px solid #6d84a2;
+ height: 43px;
+ overflow:hidden;
+ background:#485567 url(./images/titlebar.png) repeat-x left top;
+ white-space:nowrap;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+}
+
+.smartPhoneBtn {
+ width:43px;
+ height:43px;
+ margin-left:8px;
+ border:0;
+}
+
+.smartPhoneContent div.info {
+ font-size:13px;
+ padding-bottom:10px;
+ border-bottom:1px solid #444;
+ overflow:hidden;
+ *zoom:1;
+}
+
+.smartPhoneContent div.info .author {
+ font-weight:bold;
+ float:left;
+}
+
+.smartPhoneContent div.info .date {
+ font-size:11px;
+ float:right;
+}
+
+.smartPhoneContent div.link {
+ margin-top:10px;
+ border-top:1px solid #444;
+}
+
+.smartPhoneContent div.link a {
+ display:block;
+ padding:10px 0;
+ font-size:15px;
+ text-decoration:underline;
+ font-weight:bold;
+ color:#000;
+}
+
+.smartPhoneList {
+ background-color:#fff;
+ z-index:500;
+ padding:0;
+ margin:0;
+}
+
+.smartPhoneList ul {
+ padding:0;
+ margin:0;
+ left:0;
+ right:0;
+ top:43px;
+}
+
+.smartPhoneList li {
+ list-style:none;
+ font-size:18px;
+ font-weight:bold;
+ padding:10px 20px 10px 10px;
+ border-bottom:1px solid #ccc;
+}
+
+.smartPhoneList li a {
+ text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0;
+ text-overflow: ellipsis;
+ color:#000;
+ text-decoration:none;
+ display:block;
+ width:100%;
+}
+
+.smartPhoneList li.title {
+ position: relative;
+ top: -1px;
+ margin-bottom: -2px;
+ border-top: 1px solid #7d7d7d;
+ border-bottom: 1px solid #999999;
+ padding: 5px 10px;
+ background: url(./images/listGroup.png) repeat-x;
+ font-size: 12px;
+ font-weight: bold;
+ text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
+ color: #FFFFFF;
+}
+
+.smartPhoneList li.selected {
+ background-color:#ddd;
+}
+
+.smartPhoneList li.selected * {
+ color:#fff;
+}
+
+
+.smartPhoneList li a {
+ background:transparent url(./images/listArrow.png) no-repeat scroll right center;
+ padding-right:30px;
+}
+
+.smartPhoneList li.noArrow a {
+ background:none !important;
+}
+
+.smartPhoneList li.item img.thumbnail {
+ margin:0 10px 0 0;
+ padding:0;
+}
+
+.smartPhoneList li.item span.title, .smartPhoneList li.item span.title div {
+ font-size:15px;
+ font-weight:normal;
+ display:block;
+}
+
+.smartPhoneList li.item span.info {
+ font-size:10px;
+ font-weight:normal;
+ color:#bbb;
+ display:block;
+ margin-top:2px;
+ letter-spacing:0px;
+}
+
diff --git a/addons/smartphone/tpl/smartphone.js b/addons/smartphone/tpl/smartphone.js
new file mode 100644
index 000000000..d0b4a13ca
--- /dev/null
+++ b/addons/smartphone/tpl/smartphone.js
@@ -0,0 +1,101 @@
+var xeSmartMenu = null;
+var xeSmartUpperMenu = null;
+function showXEMenu() {
+ if(!xeSmartMenu) {
+
+ xeSmartMenu = jQuery('')
+ .attr("className","smartPhoneList")
+ .css('display','none')
+ .css('backgroundColor','#fff');
+
+ jQuery(document.body).append(xeSmartMenu);
+
+ xeSmartMenu.slideIn = function(step) {
+ var w = this.width() + Math.pow(step,2)*30;
+
+ if(w>jQuery(document).width()) {
+ this.css({left:0,right:0,display:'block'});
+ this.width('');
+ jQuery('.smartPhoneContentArea').css("display","none");
+ } else {
+ this.width(w);
+ var o = parseInt(jQuery(document).width/w,10)/5;
+ if(o>1) o = 1;
+ setTimeout(function() { xeSmartMenu.slideIn(step+1); }, 50);
+ }
+ }
+
+ xeSmartMenu.slideOut = function(step) {
+ var l = parseInt(this.css('left'),10) + Math.pow(step,2)*30;
+
+ if(l>jQuery('.smartPhoneContent').width()) {
+ this.css({display:'none','left':''});
+ jQuery('.smartPhoneContentArea').css("display","block");
+ } else {
+ var o = parseInt(jQuery(document).width/l,10)/5;
+ if(o<0) o = 0;
+ this.css('left',l+'px');
+ setTimeout(function() { xeSmartMenu.slideOut(step+1); }, 50);
+ }
+ }
+ }
+
+ if(xeSmartMenu.css('display')=='none' && typeof(xeMenus)!='undefined') {
+ xeSmartUpperMenu = null;
+ var menu = findSmartNode(xeMenus);
+ if(!menu) menu = xeMenus;
+ var html = '
';
+ if(location.href.getQuery('mid')) html += '< go Home > < go Upper > '+text+' ';
+
+ jQuery(xeSmartMenu).html(html);
+ jQuery(xeSmartMenu).css({
+ width:'1px',
+ right:'0',
+ top:'43px',
+ display:'block',
+ position:'absolute',
+ padding:0
+ });
+ xeSmartMenu.slideIn(0);
+ } else if(location.href.getQuery('mid')||location.href.getQuery('document_srl')) {
+ xeSmartMenu.slideOut(0);
+ }
+}
+
+function findSmartNode(nodes) {
+ var mid = current_url.getQuery('mid');
+ if(typeof(mid)=='undefined'||!mid) return nodes;
+ for(var text in nodes) {
+ if(!text) continue;
+ if(nodes[text].childs) {
+ var n = findSmartNode(nodes[text].childs);
+ if(n) {
+ xeSmartUpperMenu = nodes[text];
+ return n;
+ }
+ }
+ if(nodes[text].url == mid) {
+ if(nodes[text].childs) return nodes[text].childs;
+ return nodes;
+ }
+ }
+ return null;
+}
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 170641063..ba2609b27 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -860,6 +860,10 @@
return sprintf('%s%s/%s',$rpath,$get_vars['mid'],$get_vars['document_srl']);
case 'entry.mid' :
return sprintf('%s%s/entry/%s',$rpath,$get_vars['mid'],$get_vars['entry']);
+ case 'act.document_srl.key' :
+ if($get_vars['act']=='trackback') return sprintf('%s%s/%s/%s', $rpath,$get_vars['document_srl'],$get_vars['key'],$get_vars['act']);
+ break;
+
}
}
@@ -918,10 +922,18 @@
if(Context::get("_https_port") && Context::get("_https_port") != 443) {
$url_info['port'] = Context::get("_https_port");
}
+ else
+ {
+ unset($url_info['port']);
+ }
} else {
if(Context::get("_http_port") && Context::get("_http_port") != 80) {
$url_info['port'] = Context::get("_http_port");
}
+ else
+ {
+ unset($url_info['port']);
+ }
}
$url[$ssl_mode][$domain_key] = sprintf("%s://%s%s%s",$use_ssl?'https':$url_info['scheme'], $url_info['host'], $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$url_info['path']);
@@ -1088,6 +1100,18 @@
}
}
+ /**
+ * @brief 모든 JS File을 제거
+ **/
+ function unloadAllJsFiles() {
+ $oContext = &Context::getInstance();
+ return $oContext->_unloadAllJsFiles();
+ }
+
+ function _unloadAllJsFiles() {
+ $this->js_files = array();
+ }
+
/**
* @brief javascript filter 추가
**/
@@ -1172,6 +1196,18 @@
}
}
+ /**
+ * @brief 모든 CSS File을 제거
+ **/
+ function unloadAllCSSFiles() {
+ $oContext = &Context::getInstance();
+ return $oContext->_unloadAllCSSFiles();
+ }
+
+ function _unloadAllCSSFiles() {
+ $this->css_files = array();
+ }
+
/**
* @brief CSS file 목록 return
**/
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 621ae4d30..fcbbae601 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -183,7 +183,7 @@
function getNextSequence() {
$query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
$this->_query($query);
- $sequence = mysql_insert_id();
+ $sequence = mysql_insert_id($this->fd);
if($sequence % 10000 == 0) {
$query = sprintf("delete from `%ssequence` where seq < %d", $this->prefix, $sequence);
$this->_query($query);
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index d0c53fe60..71ad1a90e 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -193,7 +193,7 @@
function getNextSequence() {
$query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
$this->_query($query);
- $sequence = mysql_insert_id();
+ $sequence = mysql_insert_id($this->fd);
if($sequence % 10000 == 0) {
$query = sprintf("delete from `%ssequence` where seq < %d", $this->prefix, $sequence);
$this->_query($query);
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 277865b25..8b386f4eb 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -101,7 +101,7 @@
$output = preg_replace_callback('!
!is', array($this,'moveStyleToHeader'), $output);
// 메타 파일 변경 (캐싱기능등으로 인해 위젯등에서 태그를 content에 넣는 경우가 있음
- $output = preg_replace_callback('//is', array($this,'transMeta'), $output);
+ $output = preg_replace_callback('//is', array($this,'transMeta'), $output);
// rewrite module 사용시 생기는 상대경로에 대한 처리를 함
if(Context::isAllowRewrite()) {
@@ -117,6 +117,9 @@
if(__DEBUG__==3) $GLOBALS['__trans_content_elapsed__'] = getMicroTime()-$start;
+ // 불필요한 정보 제거
+ $output = preg_replace('/member\_\-([0-9]+)/s','member_0',$output);
+
// 최종 레이아웃 변환
Context::set('content', $output);
$output = $oTemplate->compile('./common/tpl', 'common_layout');
@@ -166,9 +169,7 @@
$variables = $oModule->getVariables();
$variables['error'] = $oModule->getError();
$variables['message'] = $oModule->getMessage();
- //if(function_exists('json_encode')) return json_encode($variables);
- //else return json_encode2($variables);
- $json = str_replace("\r\n",'\n',json_encode2($variables));
+ $json = preg_replace("(\r\n|\n)",'\n',json_encode2($variables));
return $json;
}
diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index 9c201559c..761e7bc1f 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -45,9 +45,14 @@
}
function setContent($content) {
+ $content = preg_replace_callback('/]+)>/i',array($this,'replaceResourceRealPath'), $content);
$this->content = $content;
}
+ function replaceResourceRealPath($matches) {
+ return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
+ }
+
function getPlainContent() {
return chunk_split(base64_encode(str_replace(array("<",">","&"), array("<",">","&"), $this->content)));
}
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 0d659e73e..1c96a7952 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -112,7 +112,7 @@
// 모듈을 여전히(;;) 못 찾고 모듈번호(module_srl)가 있으면 해당 모듈을 구함
// module_srl로 대상 모듈을 찾는 것을 주석 처리함.
- if(!$this->module && !$module_info && $this->module_srl) {
+ if((!$this->module || $this->module != 'admin') && !$module_info && $this->module_srl) {
$module_info = $oModuleModel->getModuleInfoByModuleSrl($this->module_srl);
//if($this->module && $module_info->module != $this->module) unset($module_info);
}
@@ -155,17 +155,17 @@
// mid값이 있을 경우 mid값을 세팅
if($this->mid) Context::set('mid', $this->mid, true);
-
- // 현재 모듈의 정보를 세팅
- Context::set('current_module_info', $module_info);
// 실제 동작을 하기 전에 trigger 호출
- $output = ModuleHandler::triggerCall('display', 'before', $content);
+ $output = ModuleHandler::triggerCall('moduleHandler.init', 'after', $this->module_info);
if(!$output->toBool()) {
$this->error = $output->getMessage();
return false;
}
+ // 현재 모듈의 정보를 세팅
+ Context::set('current_module_info', $this->module_info);
+
return true;
}
@@ -241,6 +241,10 @@
$this->error = 'msg_dbconnect_failed';
}
+ // 모듈 동작을 마친 후 trigger call
+ $output = ModuleHandler::triggerCall('moduleHandler.proc', 'after', $oModule);
+ if(!$output->toBool()) $this->error = $output->getMessage();
+
// HTML call 이면 message view 객체 이용하도록
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
// 에러가 발생하였을시 처리
@@ -296,8 +300,6 @@
// 레이아웃이 수정되었을 경우 수정본을 지정
$edited_layout = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-// $edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
-// Context::addCSSFile($edited_layout_css);
if(file_exists($edited_layout)) $oModule->setEditedLayoutFile($edited_layout);
}
}
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index aef05c31e..f0014af7d 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -239,8 +239,7 @@
$addon_file = $oAddonController->getCacheFilePath();
if(file_exists($addon_file)) @include($addon_file);
- // action 실행
- if(method_exists($this, $this->act)) {
+ if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act)) {
// 권한 체크
if(!$this->grant->access) return $this->stop("msg_not_permitted_act");
@@ -275,7 +274,7 @@
if(!$forward) $forward = $oModuleModel->getActionForward($this->act);
// 찾아진 forward 모듈이 있으면 실행
- if($forward->module && $forward->type && $forward->act) {
+ if($forward->module && $forward->type && $forward->act && $forward->act == $this->act) {
$kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
@@ -288,7 +287,7 @@
$oModule->setModuleInfo($this->module_info, $xml_info);
- if(method_exists($oModule, $forward->act)) {
+ if(isset($xml_info->action->{$forward->act}) && method_exists($oModule, $forward->act)) {
$output = $oModule->{$forward->act}();
} else {
return $this->stop("msg_module_is_not_exists");
@@ -299,11 +298,13 @@
$this->setTemplatePath($oModule->getTemplatePath());
$this->setTemplateFile($oModule->getTemplateFile());
+ if($oModule->getLayoutFile()) $this->setLayoutFile($oModule->getLayoutFile());
$this->adds($oModule->getVariables());
// forward 모듈을 찾지 못했다면 원 모듈의 default index action을 실행
} else if($this->xml_info->default_index_act && method_exists($this, $this->xml_info->default_index_act)) {
+ Context::set('act',$this->act = $this->xml_info->default_index_act);
$output = $this->{$this->xml_info->default_index_act}();
} else {
return false;
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index ed75fc545..ea6368ece 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -138,11 +138,33 @@
**/
function _compileVarToContext($matches) {
$str = trim(substr($matches[0],1,strlen($matches[0])-2));
- return ']+)/i','$__Context->\\1', $str).');?>';
+ if(!$str) return $matches[0];
+ if(!in_array(substr($str,0,1),array('(','$','\'','"'))) {
+ if(preg_match('/^([^\( \.]+)(\(| \.)/i',$str,$m)) {
+ $func = trim($m[1]);
+ if(strpos($func,'::')===false) {
+ if(!function_exists($func)) {
+ return $matches[0];
+ }
+ } else {
+ list($class, $method) = explode('::',$func);
+ if(!class_exists($class) || !in_array($method, get_class_methods($class))) {
+ // 서버 환경에 따라서 class, method가 대소문자 구별을 할때와 하지 않을때가 있음
+ list($class, $method) = explode('::',strtolower($func));
+ if(!class_exists($class) || !in_array($method, get_class_methods($class))) {
+ return $matches[0];
+ }
+ }
+ }
+ } else {
+ if(!defined($str)) return $matches[0];
+ }
+ }
+ return ']+)/i','$__Context->\\1', $str).');?>';
}
/**
- * @brief {$와 } 안의 $... 변수를 Context::get(...) 으로 변경
+ * @brief 이미지의 경로를 변경
**/
function _compileImgPath($matches) {
static $real_path = null;
@@ -290,18 +312,14 @@
**/
function _compileImportCode($matches) {
// 현재 tpl 파일의 위치를 구해서 $base_path에 저장하여 적용하려는 xml file을 찾음
- //$base_path = dirname($this->tpl_file).'/';
$base_path = $this->tpl_path;
$given_file = trim($matches[1]);
if(!$given_file) return;
- if(isset($matches[3]))
- $optimized = strtolower(trim($matches[3]));
+ if(isset($matches[3])) $optimized = strtolower(trim($matches[3]));
if(!$optimized) $optimized = 'true';
- if(isset($matches[5]))
- $media = trim($matches[5]);
+ if(isset($matches[5])) $media = trim($matches[5]);
if(!$media) $media = 'all';
- if(isset($matches[7]))
- $targetie = trim($matches[7]);
+ if(isset($matches[7])) $targetie = trim($matches[7]);
if(!$targetie) $targetie = '';
else $optimized = 'false';
@@ -313,10 +331,11 @@
// load lang이 아니라면 xml, css, js파일을 읽도록 시도
} else {
- $filename = sprintf("%s%s",$base_path, $given_file);
+ if(substr($given_file,0,1)!='/') $source_filename = sprintf("%s%s",$base_path, $given_file);
+ else $source_filename = $given_file;
// path와 파일이름을 구함
- $tmp_arr = explode("/",$filename);
+ $tmp_arr = explode("/",$source_filename);
$filename = array_pop($tmp_arr);
$base_path = implode("/",$tmp_arr)."/";
@@ -347,18 +366,26 @@
break;
// css file
case 'css' :
- $meta_file = sprintf('%s%s', $base_path, $filename);
- $output = sprintf('', $base_path, $filename, $optimized, $media, $targetie);
+ if(preg_match('/^(http|\/)/i',$source_filename)) {
+ $output = sprintf('', $source_filename, 'false', $media, $targetie);
+ } else {
+ $meta_file = sprintf('%s%s', $base_path, $filename);
+ $output = sprintf('', $base_path, $filename, $optimized, $media, $targetie);
+ }
break;
// js file
case 'js' :
- $meta_file = sprintf('%s%s', $base_path, $filename);
- $output = sprintf('', $base_path, $filename, $optimized, $targetie);
+ if(preg_match('/^(http|\/)/i',$source_filename)) {
+ $output = sprintf('', $source_filename, 'false', $targetie);
+ } else {
+ $meta_file = sprintf('%s%s', $base_path, $filename);
+ $output = sprintf('', $base_path, $filename, $optimized, $targetie);
+ }
break;
}
}
- $output = ''.$output;
+ if($meta_file) $output = ''.$output;
return $output;
}
@@ -377,25 +404,22 @@
**/
function _compileUnloadCode($matches) {
// 현재 tpl 파일의 위치를 구해서 $base_path에 저장하여 적용하려는 xml file을 찾음
- //$base_path = dirname($this->tpl_file).'/';
$base_path = $this->tpl_path;
$given_file = trim($matches[1]);
if(!$given_file) return;
- if(isset($matches[3]))
- $optimized = strtolower(trim($matches[3]));
+ if(isset($matches[3])) $optimized = strtolower(trim($matches[3]));
if(!$optimized) $optimized = 'true';
- if(isset($matches[5]))
- $media = trim($matches[5]);
+ if(isset($matches[5])) $media = trim($matches[5]);
if(!$media) $media = 'all';
- if(isset($matches[7]))
- $targetie = trim($matches[7]);
+ if(isset($matches[7])) $targetie = trim($matches[7]);
if(!$targetie) $targetie = '';
else $optimized = 'false';
- $filename = sprintf("%s%s",$base_path, $given_file);
+ if(substr($given_file,0,1)!='/') $source_filename = sprintf("%s%s",$base_path, $given_file);
+ else $source_filename = $given_file;
// path와 파일이름을 구함
- $tmp_arr = explode("/",$filename);
+ $tmp_arr = explode("/",$source_filename);
$filename = array_pop($tmp_arr);
$base_path = implode("/",$tmp_arr)."/";
@@ -408,13 +432,21 @@
switch($ext) {
// css file
case 'css' :
- $meta_file = sprintf('%s%s', $base_path, $filename);
- $output = sprintf('', $base_path, $filename, $optimized, $media, $targetie);
+ if(preg_match('/^(http|\/)/i',$source_filename)) {
+ $output = sprintf('', $source_filename, 'false', $media, $targetie);
+ } else {
+ $meta_file = sprintf('%s%s', $base_path, $filename);
+ $output = sprintf('', $base_path, $filename, $optimized, $media, $targetie);
+ }
break;
// js file
case 'js' :
- $meta_file = sprintf('%s%s', $base_path, $filename);
- $output = sprintf('', $base_path, $filename, $optimized, $targetie);
+ if(preg_match('/^(http|\/)/i',$source_filename)) {
+ $output = sprintf('', $source_filename, 'false', $targetie);
+ } else {
+ $meta_file = sprintf('%s%s', $base_path, $filename);
+ $output = sprintf('', $base_path, $filename, $optimized, $targetie);
+ }
break;
}
diff --git a/common/css/button.css b/common/css/button.css
index 25336fc1c..322a8ff77 100644
--- a/common/css/button.css
+++ b/common/css/button.css
@@ -6,55 +6,35 @@ a.button,
a.button span { position:relative; display:inline-block; text-decoration:none !important; background:url(../tpl/images/buttonWhite.gif) no-repeat; cursor:pointer; white-space:nowrap; vertical-align:middle; *vertical-align:top;}
a.button { padding:0; background-position:left top; overflow:visible;}
a.button span { left:2px; padding:6px 10px 5px 8px; color:#000; font:12px/12px Sans-serif; background-position:right top;}
-a.button, x:-moz-any-link { font:0/23px Sans-serif; padding:12px 0; top:1px;} /* Firefox 2 Fix */
-a.button, x:-moz-any-link, x:default { padding:0; top:0;} /* Firefox 2 Fix */
/* Large Size */
a.button.large { background-position:left -30px; }
a.button.large span { padding:7px 10px 6px 8px; font:16px/16px Sans-serif; background-position:right -30px;}
-a.button.large, x:-moz-any-link { font:0/29px Sans-serif; padding:15px 0;} /* Firefox 2 Fix */
-a.button.large, x:-moz-any-link, x:default { padding:0;} /* Firefox 2 Fix */
/* xLarge Size */
a.button.xLarge { background-position:left -65px; }
a.button.xLarge span { padding:8px 10px 7px 8px; font:20px/20px Sans-serif; background-position:right -65px;}
-a.button.xLarge, x:-moz-any-link { font:0/35px Sans-serif; padding:18px 0;} /* Firefox 2 Fix */
-a.button.xLarge, x:-moz-any-link, x:default { padding:0;} /* Firefox 2 Fix */
/* Small Size */
a.button.small { background-position:left -107px; }
a.button.small span { padding:4px 6px 3px 4px; font:11px/11px Sans-serif; background-position:right -107px;}
-a.button.small, x:-moz-any-link { font:0/18px Sans-serif; padding:9px 0;} /* Firefox 2 Fix */
-a.button.small, x:-moz-any-link, x:default { padding:0;} /* Firefox 2 Fix */
/* Control Button + Submit Button */
span.button,
span.button button,
span.button input { position:relative; margin:0; display:inline-block; border:0; font:12px Sans-serif; white-space:nowrap; background:url(../tpl/images/buttonWhite.gif) no-repeat; vertical-align:middle;}
span.button { padding:0; background-position:left top;}
-span.button, x:-moz-any-link{ font:0/23px Sans-serif; padding:11px 0;} /* Firefox 2 Fix */
-span.button, x:-moz-any-link, x:default{ padding:0;} /* Firefox 2 Fix */
span.button button,
-span.button input { height:23px; left:2px; *top:-1px; _top:0; padding:0 10px 0 8px; *padding:0 5px 0 3px; line-height:24px; background-position:right top; cursor:pointer;}
+span.button input { height:23px; left:2px; *top:-1px; _top:0; padding:0 10px 0 8px; line-height:24px; background-position:right top; cursor:pointer; *overflow:visible;}
/* Large Size */
span.button.large { background-position:left -30px;}
-span.button.large, x:-moz-any-link{ font:0/29px Sans-serif; padding:14px 0;} /* Firefox 2 Fix */
-span.button.large, x:-moz-any-link, x:default{ padding:0;} /* Firefox 2 Fix */
span.button.large button,
-span.button.large input { height:30px; *top:0; _top:-1px; padding:0 10px 0 8px; *padding:0 5px 0 3px; font:16px/30px Sans-serif; background-position:right -30px;}
+span.button.large input { height:30px; *top:0; _top:-1px; padding:0 10px 0 8px; font:16px/30px Sans-serif; background-position:right -30px;}
/* xLarge Size */
span.button.xLarge { background-position:left -65px;}
-span.button.xLarge, x:-moz-any-link{ font:0/35px Sans-serif; padding:17px 0;} /* Firefox 2 Fix */
-span.button.xLarge, x:-moz-any-link, x:default{ padding:0;} /* Firefox 2 Fix */
span.button.xLarge button,
-span.button.xLarge input { height:35px; padding:0 10px 0 8px; *padding:0 5px 0 3px; font:20px/36px Sans-serif; background-position:right -65px;}
+span.button.xLarge input { height:35px; padding:0 10px 0 8px; font:20px/36px Sans-serif; background-position:right -65px;}
/* Small Size */
span.button.small { background-position:left -107px;}
-span.button.small, x:-moz-any-link{ font:0/18px Sans-serif; padding:9px 0;} /* Firefox 2 Fix */
-span.button.small, x:-moz-any-link, x:default{ padding:0;} /* Firefox 2 Fix */
span.button.small button,
-span.button.small input { height:18px; *top:0; _top:-1px; padding:0 6px 0 4px; *padding:0 3px 0 2px; font:11px/18px Sans-serif; background-position:right -107px;}
-span.button.small button, x:-moz-any-link,
-span.button.small input, x:-moz-any-link{ top:-1px;} /* Firefox 2 Fix */
-span.button.small button, x:-moz-any-link, x:default,
-span.button.small input, x:-moz-any-link, x:default{ top:0;} /* Firefox 2 Fix */
+span.button.small input { height:18px; *top:0; _top:-1px; padding:0 6px 0 4px; font:11px/18px Sans-serif; background-position:right -107px;}
/* Strong Button */
a.button.strong *,
diff --git a/common/css/default.css b/common/css/default.css
index e4344407b..d4f85fc4b 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -73,7 +73,7 @@ a.bold { font-weight:bold; }
.folder_closer { display: none; }
.folder_area { display: none; }
-.xe_content { line-height:1.6; }
+.xe_content { line-height:1.6; overflow:hidden; }
.zbxe_widget_output { background:url(../tpl/images/widget_text.gif) no-repeat center bottom; display:block;}
diff --git a/common/js/common.js b/common/js/common.js
index 2fc9a0100..c09725b0b 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -517,7 +517,7 @@ function setFixedPopupSize() {
bodyObj.css({paddingRight:30});
var w = jQuery("#popup_content").width();
- w = w< 400 ? 400 : w;
+ w = w< 600 ? 600 : w;
var h = jQuery("#popup_content").height();
if(h != _popupHeight) {
diff --git a/common/js/plugins/ui.calendar/img/buttonCloseLayerX.gif b/common/js/plugins/ui.calendar/img/buttonCloseLayerX.gif
new file mode 100644
index 000000000..535cfafad
Binary files /dev/null and b/common/js/plugins/ui.calendar/img/buttonCloseLayerX.gif differ
diff --git a/common/js/plugins/ui.calendar/img/buttonPaginate.gif b/common/js/plugins/ui.calendar/img/buttonPaginate.gif
new file mode 100644
index 000000000..ab1c524c1
Binary files /dev/null and b/common/js/plugins/ui.calendar/img/buttonPaginate.gif differ
diff --git a/common/js/plugins/ui.calendar/plugin.load b/common/js/plugins/ui.calendar/plugin.load
new file mode 100644
index 000000000..800d8a64a
--- /dev/null
+++ b/common/js/plugins/ui.calendar/plugin.load
@@ -0,0 +1,2 @@
+ui.calendar.js
+ui.calendar.css
\ No newline at end of file
diff --git a/common/js/plugins/ui.calendar/ui.calendar.css b/common/js/plugins/ui.calendar/ui.calendar.css
new file mode 100644
index 000000000..ff3205e47
--- /dev/null
+++ b/common/js/plugins/ui.calendar/ui.calendar.css
@@ -0,0 +1,30 @@
+/* Calendar */
+.ui-calendar {display:none; padding:25px 15px 15px 15px; position:absolute; border:2px solid #737373; background:#fff; color:#333;}
+.ui-calendar .close{ position:absolute; top:10px; right:15px; width:17px; height:17px; border:0; padding:0; background:url(./img/buttonCloseLayerX.gif) no-repeat center center; cursor:pointer;}
+.ui-calendar .close span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
+.ui-calendar table{ border:0; border-spacing:0; _width:200px;}
+.ui-calendar caption{ font-weight:bold; text-align:center; position:relative;}
+.ui-calendar caption span{ display:block; position:relative; padding:10px 0 15px 0; *zoom:1;}
+.ui-calendar caption .today{ font-size:11px; border:0; padding:0; border-bottom:1px solid; background:none; cursor:pointer;}
+.ui-calendar caption .today span{text-decoration:underline;}
+.ui-calendar caption .navi{ position:absolute; top:10px; border:0; padding:0; width:17px; height:18px; background-color:transparent; background-image:url(./img/buttonPaginate.gif); background-repeat:no-repeat; cursor:pointer;}
+.ui-calendar caption .navi span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+.ui-calendar caption .navi.prev{ left:0; background-position:left top;}
+.ui-calendar caption .navi.next{ right:0; background-position:right top;}
+.ui-calendar th,
+.ui-calendar td{ border:0; text-align:center;}
+.ui-calendar th{ color:#666; background:#f2f2f2; padding:3px 8px;}
+.ui-calendar td{ font-size:11px; padding:3px 8px;}
+.ui-calendar td button{ padding:0; border:0; background:none; cursor:pointer; width:20px; font-size:11px; font-family:Tahoma, Sans-serif;}
+.ui-calendar td button.today{ font-weight:bold;}
+.ui-calendar td button.book,
+.ui-calendar td button.active,
+.ui-calendar tr.active button{ background:#ff4747; color:#fff;}
+.ui-calendar .sun,
+.ui-calendar .sun button{ color:#ff1a1a;}
+
+.ui-calendar table.month{ border-top:1px solid #f2f2f2; border-left:1px solid #f2f2f2;}
+.ui-calendar table.month td{ border-right:1px solid #f2f2f2; border-bottom:1px solid #f2f2f2;}
+.ui-calendar table.month td button{ width:50px; color:#bababa;}
+.ui-calendar table.month td button.past{ color:#333;}
+.ui-calendar table.month td button.active{ color:#fff;}
diff --git a/common/js/plugins/ui.calendar/ui.calendar.js b/common/js/plugins/ui.calendar/ui.calendar.js
new file mode 100644
index 000000000..c25f95f70
--- /dev/null
+++ b/common/js/plugins/ui.calendar/ui.calendar.js
@@ -0,0 +1,358 @@
+/**
+ * @brief XE Calendar
+ * @author gony (http://mygony.com)
+ *
+ * 사용법
+ *
+ **/
+(function($){
+
+if (!$.ui) $.ui = {};
+$.extend($.ui, { calendar: { version:'0.3' } });
+
+var PROP_NAME = 'calendar';
+var index = 0;
+var calendars = {};
+var template = {calendar:'',month:''};
+
+function Calendar() {
+}
+
+$.extend(Calendar.prototype, {
+ _activeCalendar : null,
+ _getuid : function(obj) {
+ var uid = obj.attr('class').match(/ui-calendar-(\d+-\d+)/);
+
+ if (!uid) return -1;
+ return uid[1];
+ },
+ _show : function(obj) {
+ if (this._activeCalendar) this._hide(this._activeCalendar);
+
+ // disabled?
+ if (obj.hasClass('ui-calendar-disabled')) return;
+
+ // Active Calendar
+ this._activeCalendar = obj.show(300);
+ },
+ _hide : function(obj) {
+ if (this._activeCalendar && this._activeCalendar.get(0) == obj.get(0)) this._activeCalendar = null;
+ obj.hide(300);
+ },
+ _toggle : function(obj) {
+ (obj.css('display' ) == 'none')?this._show(obj):this._hide(obj);
+ },
+ _attachCalendar : function(obj, options) {
+ if ((obj=$(obj)).hasClass('ui-calendar')) return;
+
+ var uid = $.calendar.uuid+'-'+(index++);
+ var c = calendars[uid] = {};
+
+ // uid 추가
+ obj.addClass('ui-calendar-'+uid).mousedown(function(){return false});
+
+ // default options
+ c.options = $.extend({
+ type : 'day',
+ activeDate : ''
+ }, options||{});
+ c.lang = $.extend({
+ weekdays : 'Sun,Mon,Tue,Wed,Thu,Fri,Sat',
+ today : 'Today',
+ prevmonth : 'Prev Month',
+ nextmonth : 'Next Month',
+ close : 'Close'
+ }, options.lang||{});
+
+ c.lang.weekdays = c.lang.weekdays.split(',');
+
+ // 날짜 설정
+ var d;
+ if (typeof c.options.activeDate == 'string' && c.options.activeDate) {
+ var s = c.options.activeDate.split('/');
+ d = new Date(s[0], s[1]-1, s[2]-0);
+ } else {
+ d = new Date();
+ }
+ this._setDate(obj, d);
+
+ // 토글 버튼
+ if (c.options.button) {
+ (c.button=$(c.options.button)).click(function(){ obj.calendar('toggle') });
+ }
+
+ // 클래스 추가
+ obj.addClass('ui-calendar');
+
+ // position 설정한 후, 좌표를 (0,0)으로 변경
+ var pos = obj.css({position:'absolute',top:0,left:0}).show().offset();
+
+ // 버튼의 위치 구해서 좌표 조정
+ var bpos = c.button.offset();
+ var dx = bpos.left - pos.left;
+ var dy = bpos.top - pos.top;
+
+ // 좌표 조정 후 레이어 숨김
+ obj.css({top:(dy+c.button.height())+'px',left:dx+'px'}).hide();
+ },
+ _checkExternalClick : function(e) {
+ if ($.calendar._activeCalendar) $.calendar._hide($.calendar._activeCalendar);
+ },
+ _processTemplate : function(tpl, vars) {
+ tpl = (' '+tpl+' ').split(/[\{\}]/g);
+
+ for(var i=0; i < tpl.length; i++) {
+ if (i%2) {
+ if (/^[\w\.\[\]]+$/.test(tpl[i])) tpl[i] = 'try{v=vv.'+tpl[i]+'}catch(e){v=""};ret.push(v);';
+ else if (/^@(\w+)\s+in\s+(\w+)$/.test(tpl[i])) tpl[i] = 'for(i=0,l=vv.'+RegExp.$2+'.length;i 9?v['m']:'0'+v['m'];
+
+ // 연간 달력이 아니라면 이 달의 날짜를 구한다.
+ if (cal.options.type != 'month') {
+ // 날짜에 사용할 달력
+ v['weeks'] = [];
+
+ var d = new Date(cal.date.getTime()), w = [];
+ var last = (v.m!=2)? (v.m%2?31:30) : ((new Date(v.yyyy,v.m-1,29)).getMonth()==v.m?29:28); // 마지막 날
+
+ d.setDate(1); // 1일로 설정 후 1일의 요일을 가져온다.
+ var start = d.getDay(), end = last+start;
+
+ for(var i=0,len=end+(7-(end%7||7));i= end) w.push(' ');
+ else w.push(''+(i+1-start)+' ');
+ }
+ }
+
+ // 템플릿 처리
+ tpl = this._processTemplate(tpl, v);
+ obj.html(tpl);
+
+ // 선택한 날짜
+ if (cal.options.type == 'month') {
+
+ } else {
+ var t = new Date();
+ obj.find('td>button.day'+t.getFullYear()+'-'+(t.getMonth()+1)+'-'+t.getDate()).addClass('today');
+
+ t = cal.activeDate;
+ obj.find('td>button.day'+t.getFullYear()+'-'+(t.getMonth()+1)+'-'+t.getDate()).addClass('active');
+ }
+
+ // 이벤트 핸들러
+ obj.find('button.close').click(function(){ $.calendar._hide(obj); });
+ obj.find('button.today').click(function(){ $.calendar._moveToday(obj); });
+ if (cal.options.type == 'month') {
+ obj.find('button.prev').click(function(){ $.calendar._prevYear(obj) });
+ obj.find('button.next').click(function(){ $.calendar._nextYear(obj) });
+ } else {
+ obj.find('button.prev').click(function(){ $.calendar._prevMonth(obj) });
+ obj.find('button.next').click(function(){ $.calendar._nextMonth(obj) });
+ }
+ obj.find('td>button').click(function(){ $.calendar._selectDate(obj, $(this)) });
+ },
+ _selectDate : function(obj, btn) {
+ var cal = calendars[ this._getuid(obj) ];
+ var date = btn.attr('class').match(/day([\d\-]+)/);
+ if (!date) return;
+
+ date = date[1].split('-');
+
+ var ad = cal.activeDate;
+ ad.setFullYear(date[0]-0);
+ ad.setMonth(date[1]-1);
+ ad.setDate(date[2]-0);
+
+ this._setDate(obj, ad);
+ },
+ _setDate : function(obj, newDate) {
+ var uid = this._getuid(obj);
+ if (uid < 0) return null;
+ if (!newDate || !(newDate instanceof Date)) newDate = new Date();
+
+ var cal = calendars[uid];
+ cal.activeDate = new Date(newDate.getTime());
+ cal.date = new Date(newDate.getTime());
+ this._draw(obj);
+
+ if ($.isFunction(cal.options.select) && obj.hasClass('ui-calendar')) {
+ cal.options.select(newDate.getFullYear(), newDate.getMonth()+1, newDate.getDate());
+ }
+ },
+ _getDate : function(obj, format) {
+ var uid = this._getuid(obj);
+ if (uid < 0) return null;
+ if (typeof format != 'string') return calendars[uid].activeDate;
+
+ // format string
+ },
+ _moveToday : function(obj) {
+ calendars[this._getuid(obj)].date = new Date();
+ this._draw(obj);
+ },
+ _prevMonth : function(obj) {
+ var cal = calendars[this._getuid(obj)];
+ var m = cal.date.getMonth();
+
+ cal.date.setDate(1);
+ if (m == 0) {
+ cal.date.setFullYear(cal.date.getFullYear()-1);
+ cal.date.setMonth(11);
+ } else {
+ cal.date.setMonth(m-1);
+ }
+
+ this._draw(obj);
+ },
+ _nextMonth : function(obj) {
+ var cal = calendars[this._getuid(obj)];
+ var m = cal.date.getMonth();
+
+ cal.date.setDate(1);
+ if (m == 11) {
+ cal.date.setFullYear(cal.date.getFullYear()+1);
+ cal.date.setMonth(0);
+ } else {
+ cal.date.setMonth(m+1);
+ }
+
+ this._draw(obj);
+ },
+ _prevYear : function(obj) {
+ this._draw(obj);
+ cal.date.setFullYear(cal.date.getFullYear()-1);
+ },
+ _nextYear : function(obj) {
+ cal.date.setFullYear(cal.date.getFullYear()+1);
+ this._draw(obj);
+ }
+});
+
+/**
+ * Invoke the calednar functionallity
+ * @return jQuery object
+ */
+$.fn.calendar = function(options) {
+ var args = $.makeArray(arguments);
+
+ if (!$.calendar.initialized) {
+ $(document).mousedown($.calendar._checkExternalClick);
+ $.calendar.initialized = true;
+ }
+
+ if (typeof options == 'string' && $.inArray(options, ['getDate'])) {
+ args.shift();
+ return $.calendar['_'+options].apply($.calendar, [$(this[0])].concat(args) );
+ }
+
+ return this.each(function(){
+ if (typeof options == 'string') {
+ args.shift();
+ $.calendar['_'+ options].apply($.calendar, [$(this)].concat(args));
+ } else {
+ $.calendar._attachCalendar($(this), options);
+ }
+ });
+}
+
+$.calendar = new Calendar(); // singleton instance
+$.calendar.initialized = false;
+$.calendar.uuid = new Date().getTime();
+$.calendar.version = $.ui.calendar.version;
+
+// template
+template.calendar = '{lang.close_layer} \
+\
+ \
+ {yyyy}.{mm}.\
+ {lang.today} \
+ {lang.prevmonth} {lang.nextmonth} \
+ \
+\
+ \
+ {lang.weekdays[0]} \
+ {lang.weekdays[1]} \
+ {lang.weekdays[2]} \
+ {lang.weekdays[3]} \
+ {lang.weekdays[4]} \
+ {lang.weekdays[5]} \
+ {lang.weekdays[6]} \
+ \
+ \
+\
+ {@week in weeks}\
+ \
+ {week[0]} \
+ {week[1]} \
+ {week[2]} \
+ {week[3]} \
+ {week[4]} \
+ {week[5]} \
+ {week[6]} \
+ \
+ {/}\
+ \
+
\
+{lang.close_layer} {lang.close_layer} \
+\
+ \
+ {yyyy}.{mm} {lang.today} \
+ {lang.prevyear} {lang.nextyear} \
+ \
+\
+ \
+ 1 2 3 4 \
+ \
+ 5 6 7 8 \
+ \
+ 9 10 11 12 \
+ \
+
\
+{lang.close_layer} Homepage's URL
站点地址
主頁網址
- ホームページのURL
+ cafeXEのURL
로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.
Input a destination URL when users click the logo.
点击LOGO时要移动的页面地址。
請輸入當用戶按了網站Logo後，要前往的頁面網址。
- ロゴをクリックする際、移動するホームページURLを入力して下さい。
+ ロゴをクリックする際、移動するcafeXEのURLを入力して下さい。
로고 글자
@@ -136,7 +136,7 @@
Content position
内容区位置
選擇位置
- 本文位置
+ 本文配置
본문의 위치를 좌/우중 선택할 수 있습니다.
You can choose the position of content between left and right.
可以设置内容区的位置(左侧/右侧)。
diff --git a/layouts/cafeXE/lang/jp.lang.php b/layouts/cafeXE/lang/jp.lang.php
index ff71c4e87..e90649314 100644
--- a/layouts/cafeXE/lang/jp.lang.php
+++ b/layouts/cafeXE/lang/jp.lang.php
@@ -5,7 +5,7 @@
* @brief 日本語言語パッケージ（基本的な内容のみ）
**/
- $lang->new_members = '新規会員のお知らせ';
+ $lang->new_members = '新規会員';
$lang->document_ranking = '書き込みランキング';
$lang->comment_ranking = 'コメント数ランキング';
?>
diff --git a/layouts/xe_blog/conf/info.xml b/layouts/xe_blog/conf/info.xml
index 620ae2658..5dc11e715 100644
--- a/layouts/xe_blog/conf/info.xml
+++ b/layouts/xe_blog/conf/info.xml
@@ -208,7 +208,7 @@
상단 메뉴
- 上段メニュー
+ 上段用メニュー
菜单
Top Menu
Top-Menü
diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml
index 1d2c53729..bb1789a1c 100644
--- a/layouts/xe_official/conf/info.xml
+++ b/layouts/xe_official/conf/info.xml
@@ -130,7 +130,7 @@
Изображения логотипа
Imagen del logotipo
레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)
- レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージが最も合います。)
+ レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージをお勧めします。。)
请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。
請輸入要顯示在版面上端的Logo圖片。(適當高度為23px的透明圖片。)
Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)
@@ -179,7 +179,7 @@
상단 메뉴
- 上段メニュー
+ 上段用メニュー
主菜单
主選單
Top menu
@@ -189,7 +189,7 @@
하단 메뉴
- 下段メニュー
+ 下段用メニュー
底部菜单
底部選單
Bottom menu
diff --git a/modules/addon/lang/jp.lang.php b/modules/addon/lang/jp.lang.php
index 85cb120c6..74e1fbfed 100644
--- a/modules/addon/lang/jp.lang.php
+++ b/modules/addon/lang/jp.lang.php
@@ -1,6 +1,6 @@
addon_info = 'アドオン情報';
$lang->addon_maker = 'アドオン制作者';
$lang->addon_license = 'ライセンス';
- $lang->addon_history = '変更内容';
+ $lang->addon_history = '変更履歴';
- $lang->about_addon_mid = "アドオンが使われる対象を指定します。This module shows a list of features of each module, and enables you to use a quite few of managers by applying layout for administrator.
Este módulo muestra una lista de características de cada módulo, en donde puede activar la función de la administracion aplicando el diseño del administrador.
列出各模块的功能并使用管理员布局，可以让其使用管理功能的模块。
- 各モジュールの機能を羅列し、管理者用のレイアウトを適用させ、管理機能が使用出来るようにするモジュールです。
+ 各モジュールを機能別に並べ、かつ管理者用のレイアウトを適用させて、管理機能が使用出来るようにします。
Этот модуль показывает список возможностей каждого модуля, и позволяет Вам использовать несколько менеджеров, применяя лейаут для администратора.
列出各模組的功能並使用管理員版面，可讓其使用管理功能的模組。
0.1
diff --git a/modules/admin/lang/jp.lang.php b/modules/admin/lang/jp.lang.php
index d15c45d89..50fe3e8da 100644
--- a/modules/admin/lang/jp.lang.php
+++ b/modules/admin/lang/jp.lang.php
@@ -1,6 +1,6 @@
admin_info = '管理者情報';
$lang->admin_index = '管理者トップページ';
$lang->control_panel = 'コントロールパネル';
- $lang->start_module = 'モジュールを起動します';
+ $lang->start_module = '初期起動モジュール';
$lang->about_start_module = 'デフォルトで起動するモジュールを指定することができます。';
$lang->module_category_title = array(
@@ -45,19 +45,19 @@
$lang->module_name = "モジュール名";
$lang->addon_name = "アドオン名";
$lang->version = "バージョン";
- $lang->author = "作者";
+ $lang->author = "制作者";
$lang->table_count = "テーブル数";
$lang->installed_path = "インストールパス";
- $lang->cmd_shortcut_management = "メニュー編集";
+ $lang->cmd_shortcut_management = "メニューの編集";
- $lang->msg_is_not_administrator = '管理者のみアクセス出来ます';
+ $lang->msg_is_not_administrator = '管理者だけアクセス出来ます';
$lang->msg_manage_module_cannot_delete = 'モジュール、アドオン、ウィジェットのショットカットは削除出来ません。';
$lang->msg_default_act_is_null = 'デフォルトの管理者のアクションが指定されていないため、ショットカットを登録することが出来ません。';
$lang->welcome_to_xe = 'XEの管理者ページです。';
$lang->about_admin_page = "管理者ページはまだ未完成です。\nクローズベータバージョンの期間に、多くの方々からご意見をいただきながら、必ず必要なコンテンツを埋めていきたいと思います。";
- $lang->about_lang_env = "上で設定された言語を、初めてサイトに訪問したユーザに同じく適用させるためには、希望する言語に変更してから「保存」ボタンをクリックして下さい。";
+ $lang->about_lang_env = "初めてサイトに訪問したユーザーに対し、上記の選択した言語でサイトを表示させるためには、必ず下記の「保存」ボタンをクリックして適用して下さい。";
$lang->xe_license = 'XEのライセンスはGPLです。';
$lang->about_shortcut = 'よく使用するモジュールに登録されたショートカットは削除出来ます。';
@@ -66,8 +66,8 @@
$lang->today = "今日";
$lang->cmd_lang_select = "言語選択";
- $lang->about_cmd_lang_select = "選択された言語のみでサービスを行います。";
- $lang->about_recompile_cache = "要らないｄか誤ったキャッシューファイルを整理します。";
+ $lang->about_cmd_lang_select = "選択された言語だけでサービスを行います。";
+ $lang->about_recompile_cache = "要らないかごみのキャッシューファイルを整理します。";
$lang->use_ssl = "SSL環境設定";
$lang->ssl_options = array(
'none' => "使わない",
@@ -77,6 +77,6 @@
$lang->about_use_ssl = "「部分的に使う場合」は「会員登録/会員情報変更」など特定のactionでSSLを利用する場合、「常に使う」は全てのサービスがSSLを使う場合に選択します。";
$lang->server_ports = "サーバーポート指定";
$lang->about_server_ports = "一般的に使われているHTTPの80、HTTPSの443以外の他のポートを使うために、ポートを指定して下さい。";
- $lang->use_db_session = '인증 세션 DB 사용';
- $lang->about_db_session = '인증시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.".$oComment->getNickName()." (".$oComment->getRegdate("Y-m-d").")','');
// 내용 상단에 정보 출력 (댓글 보기 링크 포함)
$content = Context::getLang('replies').' : '.$oDocument->getCommentCount().' '.$oDocument->getNickName()." (".$oDocument->getRegdate("Y-m-d").")'.$oDocument->getNickName().' ('.$oDocument->getRegdate("Y-m-d").")
게시판 제목 형식
- 게시판 제목 형식
+ 掲示板タイトルフォーマット
게시판 제목 형식
게시판 제목 형식
게시판 제목 형식
@@ -353,7 +353,7 @@
글 제목 형식
- 글 제목 형식
+ 書き込みタイトルフォーマット
글 제목 형식
글 제목 형식
글 제목 형식
diff --git a/modules/board/skins/xe_board/write_form.html b/modules/board/skins/xe_board/write_form.html
index c4f0d3968..959f02e36 100644
--- a/modules/board/skins/xe_board/write_form.html
+++ b/modules/board/skins/xe_board/write_form.html
@@ -1,5 +1,6 @@
+
Communication
交流
회원들간의 쪽지, 친구기능을 담당하는 모듈입니다.
- 会員間にメッセージや友達管理などコミュニティ機能を提供するモジュールです。
+ 会員間にメッセージや友達管理などコミュニティ機能を提供します。
管理在线会员间短信息及好友功能的模块。
This module is for managing message, friend functions.
管理線上會員間短訊及好友功能的模組。
diff --git a/modules/communication/lang/jp.lang.php b/modules/communication/lang/jp.lang.php
index b140e6bee..1845587f1 100644
--- a/modules/communication/lang/jp.lang.php
+++ b/modules/communication/lang/jp.lang.php
@@ -16,9 +16,9 @@
);
$lang->message_box = array(
- 'R' => 'メッセージ受信ボックス',
- 'S' => 'メッセージ送信ボックス',
- 'T' => '保存ボックス',
+ 'R' => 'メッセージ受信箱',
+ 'S' => 'メッセージ送信箱',
+ 'T' => '保存箱',
);
$lang->readed_date = "開封時間";
@@ -30,9 +30,9 @@
$lang->cmd_send_message = 'メッセージ送信';
$lang->cmd_reply_message = 'メッセージ返信';
- $lang->cmd_view_friend = '友達表示';
+ $lang->cmd_view_friend = '友達リスト';
$lang->cmd_add_friend = '友達登録';
- $lang->cmd_view_message_box = 'メッセージ表示';
+ $lang->cmd_view_message_box = 'メッセージ';
$lang->cmd_store = "保存";
$lang->cmd_add_friend_group = '友達グループ追加';
$lang->cmd_rename_friend_group = '友達グループ名変更';
diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php
index 733178605..5c1e41096 100644
--- a/modules/counter/counter.model.php
+++ b/modules/counter/counter.model.php
@@ -105,6 +105,34 @@
$sum += $count;
}
break;
+ case 'week' :
+ $time = strtotime($selected_date);
+ $w = date("D");
+ while(date("D",$time) != "Sun") {
+ $time += 60*60*24;
+ }
+ $time -= 60*60*24;
+ while(date("D",$time)!="Sun") {
+ $thisWeek[] = date("Ymd",$time);
+ $time -= 60*60*24;
+ }
+ $thisWeek[] = date("Ymd",$time);
+ asort($thisWeek);
+ foreach($thisWeek as $day) {
+ unset($args);
+ $args->start_date = $day;
+ $args->end_date = $day;
+ if($site_srl) {
+ $args->site_srl = $site_srl;
+ $output = executeQuery('counter.getSiteCounterStatus', $args);
+ } else {
+ $output = executeQuery('counter.getCounterStatus', $args);
+ }
+ $count = (int)$output->data->unique_visitor;
+ $status->list[$day] = (int)$count;
+ if($count>$max) $max = $count;
+ $sum += $count;
+ }
break;
case 'month' :
$year = substr($selected_date, 0, 4);
diff --git a/modules/document/conf/info.xml b/modules/document/conf/info.xml
index 5208488d3..43cf2490c 100644
--- a/modules/document/conf/info.xml
+++ b/modules/document/conf/info.xml
@@ -11,7 +11,7 @@
Module for managing documents used in board, blog, etc.
Módulo para manejar los documentos en blog y en los tableros.
管理版面，博客等处主题的模块。
- 掲示板、ブログなどのモジュールで使用されるドキュメント（書き込み）を管理するモジュールです。
+ 掲示板、ブログなどのモジュールで使用されるドキュメント（書き込み）を管理します。
Модуль для управления документами в форуме, блоге и прочее.
管理討論板，部落格等主題的模組。
0.1
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index e964ff1ac..681f97011 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -469,7 +469,10 @@
function procDocumentAdminRestoreTrash() {
$trash_srl = Context::get('trash_srl');
+ $this->restoreTrash($trash_srl);
+ }
+ function restoreTrash($trash_srl){
$oDB = &DB::getInstance();
$trash_args->trash_srl = $trash_srl;
@@ -499,7 +502,8 @@
// commit
$oDB->commit();
- }
+ return $output;
+ }
}
?>
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 440f6ad21..b84bbf438 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -248,7 +248,7 @@
$oDB->begin();
$oModuleModel = &getModel('module');
- $module_srl = $source_obj->get('module_srl');
+ $module_srl = $obj->module_srl;
$document_config = $oModuleModel->getModulePartConfig('document', $module_srl);
if(!isset($document_config->use_history)) $document_config->use_history = 'N';
$bUseHistory = $document_config->use_history == 'Y' || $document_config->use_history == 'Trace';
@@ -348,7 +348,7 @@
}
// 모든 확장 변수 삭제
- $this->deleteDocumentExtraVars($obj->module_srl, $obj->document_srl, null, Context::getLangType());
+ $this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
// 등록 성공시 확장 변수 등록
$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
@@ -510,7 +510,7 @@
/**
* @brief 해당 document의 조회수 증가
**/
- function updateReadedCount($oDocument) {
+ function updateReadedCount(&$oDocument) {
$document_srl = $oDocument->document_srl;
$member_srl = $oDocument->get('member_srl');
$logged_info = Context::get('logged_info');
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 828e7cf1e..d0aa3c783 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -37,10 +37,6 @@
$this->document_srl = null;
return;
}
- if ($attribute->member_srl < 0) {
- $attribute->member_srl = 0;
- $attribute->ipaddress = '0.0.0.0';
- }
$this->document_srl = $attribute->document_srl;
$this->lang_code = $attribute->lang_code;
$this->adds($attribute);
@@ -55,7 +51,11 @@
$oDocumentModel = &getModel('document');
$GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl] = $this;
- if($load_extra_vars) $oDocumentModel->setToAllDocumentExtraVars();
+ if($load_extra_vars) {
+ $oDocumentModel->setToAllDocumentExtraVars();
+ $this->add('title', $GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl]->get('title'));
+ $this->add('content', $GLOBALS['XE_DOCUMENT_LIST'][$this->document_srl]->get('content'));
+ }
}
function isExists() {
@@ -239,7 +239,7 @@
function getContentText($strlen = 0) {
if(!$this->document_srl) return;
- if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret');
+ if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
$_SESSION['accessible'][$this->document_srl] = true;
@@ -253,7 +253,7 @@
function getContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true) {
if(!$this->document_srl) return;
- if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret');
+ if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
$_SESSION['accessible'][$this->document_srl] = true;
@@ -309,8 +309,7 @@
}
function getSummary($str_size = 50, $tail = '...') {
- // 영문이나 숫자가 연결되어서 20개 이상으로 연결시에 강제 띄움 시도 - {20,}으로 길이를 정하면, 20개 이상 문자열 맨 마지막에 스페이스를 추가할 뿐 원하는 의도는 달성되지 못함
- $content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$this->getContent(false,false));
+ $content = $this->getContent(false,false);
// 줄바꿈이 있을 때, 공백문자 삽입
$content = preg_replace('!([\s]*)+!is', ' ', $content);
@@ -325,13 +324,18 @@
$content = str_replace(array('<','>','"',' '), array('<','>','"',' '), $content);
// 연속된 공백문자 삭제
- $content = preg_replace('/([\s]{2,})/is', ' ', $content);
+ $content = preg_replace('/ ( +)/is', ' ', $content);
// 문자열을 자름
$content = trim(cut_str($content, $str_size, $tail));
// >, <, "를 다시 복구
- return str_replace(array('<','>','"'),array('<','>','"'), $content);
+ $content = str_replace(array('<','>','"'),array('<','>','"'), $content);
+
+ // 영문이 연결될 경우 개행이 안 되는 문제를 해결
+ $content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$content);
+
+ return $content;
}
function getRegdate($format = 'Y.m.d H:i:s') {
@@ -387,8 +391,7 @@
$oDocumentController = &getController('document');
if($oDocumentController->updateReadedCount($this)) {
$readed_count = $this->get('readed_count');
- $readed_count++;
- $this->add('readed_count', $readed_count);
+ $this->add('readed_count', $readed_count+1);
}
}
@@ -553,7 +556,8 @@
preg_match_all("!src=(\"|')([^\"' ]*?)(\"|')!is", $content, $matches, PREG_SET_ORDER);
$cnt = count($matches);
for($i=0;$i<$cnt;$i++) {
- $target_src = $matches[$i][2];
+ $target_src = trim($matches[$i][2]);
+ if(!preg_match("/\.(jpg|png|jpeg|gif|bmp)$/i",$target_src)) continue;
if(preg_match('/\/(common|modules|widgets|addons|layouts)\//i', $target_src)) continue;
else {
if(!preg_match('/^(http|https):\/\//i',$target_src)) $target_src = Context::getRequestUri().$target_src;
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index ad5f43392..124cb7564 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -27,7 +27,7 @@
static $checked_documents = array();
// XE에서 모든 문서 객체는 XE_DOCUMENT_LIST라는 전역 변수에 세팅을 함
- if(!count($GLOBALS['XE_DOCUMENT_LIST'])) continue;
+ if(!count($GLOBALS['XE_DOCUMENT_LIST'])) return;
// 모든 호출된 문서 객체를 찾아서 확장변수가 설정되었는지를 확인
$document_srls = array();
@@ -51,45 +51,42 @@
}
}
+ $user_lang_code = Context::getLangType();
for($i=0,$c=count($document_srls);$i<$c;$i++) {
$document_srl = $document_srls[$i];
- $oDocument = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
- $this->_setExtraVars($oDocument, $extra_vars[$document_srl]);
- }
- }
+ unset($vars);
- function _setExtraVars($oDocument, $vars) {
- if(!$oDocument || !is_object($oDocument) || !$oDocument->isExists()) return;
- $module_srl = $oDocument->get('module_srl');
- $extra_keys = $this->getExtraKeys($module_srl);
- $document_srl = $oDocument->document_srl;
+ if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] || !is_object($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) || !$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->isExists()) continue;
- $user_lang_code = Context::getLangType();
- $document_lang_code = $oDocument->get('lang_code');
+ $module_srl = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('module_srl');
+ $extra_keys = $this->getExtraKeys($module_srl);
+ $vars = $extra_vars[$document_srl];
+ $document_lang_code = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('lang_code');
- // 확장변수 처리
- if(count($extra_keys)) {
- foreach($extra_keys as $idx => $key) {
- $val = $vars[$idx];
- if($val[$user_lang_code]) $v = $val[$user_lang_code];
- else if($val[$document_lang_code]) $v = $val[$document_lang_code];
- else if($val[0]) $v = $val[0];
- else $v = null;
- $extra_keys[$idx]->value = $v;
+ // 확장변수 처리
+ if(count($extra_keys)) {
+ foreach($extra_keys as $idx => $key) {
+ $val = $vars[$idx];
+ if($val[$user_lang_code]) $v = $val[$user_lang_code];
+ else if($val[$document_lang_code]) $v = $val[$document_lang_code];
+ else if($val[0]) $v = $val[0];
+ else $v = null;
+ $extra_keys[$idx]->value = $v;
+ }
}
+
+ unset($evars);
+ $evars = new ExtraVar($module_srl);
+ $evars->setExtraVarKeys($extra_keys);
+
+ // 제목 처리
+ if($vars[-1][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('title',$vars[-1][$user_lang_code]);
+
+ // 내용 처리
+ if($vars[-2][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('content',$vars[-2][$user_lang_code]);
+
+ $GLOBALS['XE_EXTRA_VARS'][$document_srl] = $evars->getExtraVars();
}
-
- $extra_vars = new ExtraVar($module_srl);
- $extra_vars->setExtraVarKeys($extra_keys);
-
- // 제목 처리
- if($vars[-1][$user_lang_code]) $oDocument->add('title',$vars[-1][$user_lang_code]);
-
- // 내용 처리
- if($vars[-2][$user_lang_code]) $oDocument->add('content',$vars[-2][$user_lang_code]);
-
- $GLOBALS['XE_EXTRA_VARS'][$document_srl] = $extra_vars->getExtraVars();
- $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
}
/**
@@ -159,7 +156,7 @@
**/
function getDocumentList($obj, $except_notice = false) {
// 정렬 대상과 순서 체크
- if(!in_array($obj->sort_index, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count','title'))) $obj->sort_index = 'list_order';
+ if(!in_array($obj->sort_index, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count','title','category_srl'))) $obj->sort_index = 'list_order';
if(!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
// module_srl 대신 mid가 넘어왔을 경우는 직접 module_srl을 구해줌
@@ -834,8 +831,8 @@
$category_xml_file = $this->getCategoryXmlFile($module_srl);
Context::set('category_xml_file', $category_xml_file);
- Context::addJsFile('./common/js/tree_menu.js');
+ Context::loadJavascriptPlugin('ui.tree');
// grant 정보를 추출
$oTemplate = &TemplateHandler::getInstance();
return $oTemplate->compile($this->module_path.'tpl', 'category_list');
@@ -913,6 +910,15 @@
else return $output->data->document_srl;
}
+ function getAlias($document_srl){
+ if(!$document_srl) return null;
+ $args->document_srl = $document_srl;
+ $output = executeQueryArray('document.getAliases', $args);
+
+ if(!$output->data) return null;
+ else return $output->data[0]->alias_title;
+ }
+
function getHistories($document_srl, $list_count, $page)
{
$args->list_count = $list_count;
@@ -928,5 +934,84 @@
$output = executeQuery('document.getHistory', $args);
return $output->data;
}
+
+ /**
+ * @brief module_srl값을 가지는 문서의 목록을 가져옴
+ **/
+ function getTrashList($obj) {
+
+ // 변수 체크
+ $args->category_srl = $obj->category_srl?$obj->category_srl:null;
+ $args->sort_index = $obj->sort_index;
+ $args->order_type = $obj->order_type?$obj->order_type:'desc';
+ $args->page = $obj->page?$obj->page:1;
+ $args->list_count = $obj->list_count?$obj->list_count:20;
+ $args->page_count = $obj->page_count?$obj->page_count:10;
+
+
+ // 검색 옵션 정리
+ $search_target = $obj->search_target;
+ $search_keyword = $obj->search_keyword;
+ if($search_target && $search_keyword) {
+ switch($search_target) {
+ case 'title' :
+ case 'content' :
+ if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+ $args->{"s_".$search_target} = $search_keyword;
+ $use_division = true;
+ break;
+ case 'title_content' :
+ if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+ $args->s_title = $search_keyword;
+ $args->s_content = $search_keyword;
+ break;
+ case 'user_id' :
+ if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+ $args->s_user_id = $search_keyword;
+ $args->sort_index = 'documents.'.$args->sort_index;
+ break;
+ case 'user_name' :
+ case 'nick_name' :
+ case 'email_address' :
+ case 'homepage' :
+ if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+ $args->{"s_".$search_target} = $search_keyword;
+ break;
+ case 'is_notice' :
+ case 'is_secret' :
+ if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
+ elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
+ else $args->{"s_".$search_target} = '';
+ break;
+ case 'member_srl' :
+ case 'readed_count' :
+ case 'voted_count' :
+ case 'comment_count' :
+ case 'trackback_count' :
+ case 'uploaded_count' :
+ $args->{"s_".$search_target} = (int)$search_keyword;
+ break;
+ case 'regdate' :
+ case 'last_update' :
+ case 'ipaddress' :
+ case 'tag' :
+ $args->{"s_".$search_target} = $search_keyword;
+ break;
+ }
+ }
+
+
+ $output = executeQueryArray('document.getTrashList', $args);
+ if($output->data){
+ foreach($output->data as $key => $attribute) {
+ $oDocument = null;
+ $oDocument = new documentItem();
+ $oDocument->setAttribute($attribute, false);
+ $attribute = $oDocument;
+ }
+ }
+ return $output;
+ }
+
}
?>
diff --git a/modules/document/queries/getDocumentTags.xml b/modules/document/queries/getDocumentTags.xml
new file mode 100644
index 000000000..de796080e
--- /dev/null
+++ b/modules/document/queries/getDocumentTags.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/document/queries/getTrashByDocumentSrl.xml b/modules/document/queries/getTrashByDocumentSrl.xml
new file mode 100644
index 000000000..cc5b463df
--- /dev/null
+++ b/modules/document/queries/getTrashByDocumentSrl.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/document/queries/getTrashList.xml b/modules/document/queries/getTrashList.xml
index 07bda9c42..61be9e5ad 100644
--- a/modules/document/queries/getTrashList.xml
+++ b/modules/document/queries/getTrashList.xml
@@ -19,6 +19,29 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/document/queries/updateDocumentsAllowCommentTrackback.xml b/modules/document/queries/updateDocumentsAllowCommentTrackback.xml
new file mode 100644
index 000000000..f425d8934
--- /dev/null
+++ b/modules/document/queries/updateDocumentsAllowCommentTrackback.xml
@@ -0,0 +1,13 @@
+
diff --git a/modules/document/queries/updateDocumentsSecret.xml b/modules/document/queries/updateDocumentsSecret.xml
new file mode 100644
index 000000000..3a036f39d
--- /dev/null
+++ b/modules/document/queries/updateDocumentsSecret.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/editor/components/cc_license/lang/jp.lang.php b/modules/editor/components/cc_license/lang/jp.lang.php
index 5f30c8052..7d7e55bc0 100644
--- a/modules/editor/components/cc_license/lang/jp.lang.php
+++ b/modules/editor/components/cc_license/lang/jp.lang.php
@@ -1,6 +1,6 @@
翻訳：RisaPapa
* @brief ウィジウィグエディターモジュール > CCL 表示エディターコンポーネント
**/
diff --git a/modules/editor/components/cc_license/lang/ko.lang.php b/modules/editor/components/cc_license/lang/ko.lang.php
index 53c9a078a..eba3c3876 100644
--- a/modules/editor/components/cc_license/lang/ko.lang.php
+++ b/modules/editor/components/cc_license/lang/ko.lang.php
@@ -1,6 +1,6 @@
* @brief 위지윅에디터(editor) 모듈 > CCL 출력 에디터 컴포넌트
**/
diff --git a/modules/editor/components/code_highlighter/lang/jp.lang.php b/modules/editor/components/code_highlighter/lang/jp.lang.php
index 2d4951475..324694df5 100644
--- a/modules/editor/components/code_highlighter/lang/jp.lang.php
+++ b/modules/editor/components/code_highlighter/lang/jp.lang.php
@@ -1,6 +1,7 @@
翻訳：ミニミ
**/
$lang->code_type = '言語種類';
diff --git a/modules/editor/components/code_highlighter/lang/ko.lang.php b/modules/editor/components/code_highlighter/lang/ko.lang.php
index 37894834e..fef6af2c8 100644
--- a/modules/editor/components/code_highlighter/lang/ko.lang.php
+++ b/modules/editor/components/code_highlighter/lang/ko.lang.php
@@ -1,5 +1,6 @@
**/
$lang->code_type = '언어 종류';
diff --git a/modules/editor/components/emoticon/tpl/popup.css b/modules/editor/components/emoticon/tpl/popup.css
index 2227a0deb..d091d39fe 100644
--- a/modules/editor/components/emoticon/tpl/popup.css
+++ b/modules/editor/components/emoticon/tpl/popup.css
@@ -1,9 +1,6 @@
@charset "utf-8";
@import url(../../../../../modules/admin/tpl/css/admin.css);
-
-img.emoticon { margin:10px; cursor:pointer; }
-
-.emoticonList { position:absolute; top:9px; right:30px; }
-*:first-child+html .emoticonList { top:9px; }
+img.emoticon { margin:10px 10px 0 0; cursor:pointer; }
+.emoticonList { position:absolute; right:40px; top:4px;}
diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index 31758f7fe..2f991727b 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -10,14 +10,10 @@
- {$val}
+ selected="select" value="{$val}">{$val}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
» {$lang->edit->jumptoedit}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{$lang->edit->edit_height_control}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {$lang->edit->upload_file} {$lang->edit->delete_selected} {$lang->edit->link_file}
-
{$upload_status}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
» {$lang->edit->jumptoedit}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{$lang->edit->edit_height_control}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {$lang->edit->upload_file} {$lang->edit->delete_selected} {$lang->edit->link_file}
+
{$upload_status}
+
+
+
" + sURL + " ";
- this.oSelection.pasteHTML(str);
- }else{
- var nSession = Math.ceil(Math.random()*10000);
- var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, this.sATagMarker+nSession+sURL] );
- this.oApp.exec("EXECCOMMAND", arg);
+ if(this.oSelection.collapsed){
+ var str = "" + sURL + " ";
+ this.oSelection.pasteHTML(str);
+ }else{
+ var nSession = Math.ceil(Math.random()*10000);
+ var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, this.sATagMarker+nSession+sURL] );
+ this.oApp.exec("EXECCOMMAND", arg);
- this.oSelection.setFromSelection();
+ this.oSelection.setFromSelection();
- var oDoc = this.oApp.getWYSIWYGDocument();
- var aATags = oDoc.body.getElementsByTagName("A");
- var nLen = aATags.length;
- var rxMarker = new RegExp(this.sRXATagMarker+nSession, "i");
- var elATag;
- for(var i=0; i]+))(.*?)>/ig,
regex_class2 = /xe_selected_cell/g;
regex_handler = /<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig,
- regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
- regex_script = //ig,
+ //regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
+ //regex_script = //ig,
regex_font_color = /color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
regex_font_face = /face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
regex_font_size = /size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i,
@@ -5432,11 +5432,11 @@ var
regex_font_weight = /font-weight\s*:\s*([a-z]+);?/i,
regex_font_style = /font-style\s*:\s*italic;?/i,
regex_font_decoration = /text-decoration\s*:\s*([a-z -]+);?/i,
- regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/g,
+ regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/ig,
regex_quote_attr = /([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g; //"
var
- allow_tags = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param'.split(','),
+ allow_tags = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style'.split(','),
lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
var
@@ -5459,6 +5459,10 @@ xe.XE_XHTMLFormatter = $.Class({
TO_IR : function(sContent) {
var stack = [];
+
+ // remove xeHandled attrs
+ sContent = sContent.replace(/xeHandled="YES"/ig,'');
+
// remove all useless styles
sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
@@ -5478,10 +5482,10 @@ xe.XE_XHTMLFormatter = $.Class({
sContent = sContent.replace(regex_handler, '<$1$2>');
// remove all id
- sContent = sContent.replace(regex_id, '<$1$2>');
+ //sContent = sContent.replace(regex_id, '<$1$2>');
// remove all scripts
- sContent = sContent.replace(regex_script, '');
+ //sContent = sContent.replace(regex_script, '');
if (jQuery.browser.msie) {
// remove jQuery attributes
@@ -5492,6 +5496,7 @@ xe.XE_XHTMLFormatter = $.Class({
return '<'+m1+' '+
m2.replace(regex_quote_attr, function(s0,s1,s2,s3){
if (s1) return s1;
+ if(/^"/.test(s3)||/"$/.test(s3)) return s2+'='+s3;
return s2+'="'+s3+'"';
}) + '>';
});
@@ -5656,8 +5661,6 @@ xe.XE_Extension = jQuery.Class({
},
_removeAttrs : function(sContent) {
- sContent = sContent.replace(/]*?) xe_handled\s*=\s*".+?"([^>]*?)>/i, '');
-
return sContent;
},
@@ -5669,25 +5672,24 @@ xe.XE_Extension = jQuery.Class({
var fn = function(){
var obj = jQuery(this);
var comp = obj.attr('editor_component');
-
if (comp && jQuery.isFunction(openComponent)) {
editorPrevNode = obj.get(0);
openComponent(comp, seq);
}
};
- jQuery('img[editor_component],div[editor_component]', doc).each(function(){
+ jQuery('img,div[editor_component]', doc).each(function(){
var obj = jQuery(this);
- if (!obj.attr('xe_handled')) {
- obj.attr('xe_handled', 'yes').dblclick(fn);
- }
+ if(this.nodeName == 'IMG' && !obj.attr('editor_component')) obj.attr('editor_component','image_link')
+ if(!obj.attr('xeHandled')) {
+ obj.attr('xeHandled','YES');
+ obj.dblclick(fn);
+ }
});
},
$ON_MSG_APP_READY : function() {
this.oApp.exec('REGISTER_UI_EVENT', ['extension', 'click', 'TOGGLE_EXTENSION_LAYER']);
-
- this.oApp.addConverter("WYSIWYG_TO_IR", this._removeAttrs);
},
$ON_TOGGLE_EXTENSION_LAYER : function() {
diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js
index f14cd1ec9..07948db08 100644
--- a/modules/editor/skins/xpresseditor/js/xe_interface.js
+++ b/modules/editor/skins/xpresseditor/js/xe_interface.js
@@ -54,10 +54,15 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height
oEditor.getFrame = function(){ return oWYSIWYGIFrame;}
var content = form[content_key].value;
- var srcPathRegx = /src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/g; //'
- var hrefPathRegx = /href=("|\'){1}(\.\/)?\?([^"\']+)("|\'){1}/g; //'
- content = content.replace(srcPathRegx, 'src="'+request_uri+'$3/$4.$5"');
- content = content.replace(hrefPathRegx, 'href="'+request_uri+'?$3"');
+
+ // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+ content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5) {
+ if(m1=="url(") { m2=''; m4=')'; } else { if(typeof(m2)=='undefined') m2 = '"'; if(typeof(m4)=='undefined') m4 = '"'; if(typeof(m5)=='undefined') m5 = ''; }
+ var val = jQuery.trim(m3).replace(/^\.\//,'');
+ if(/^(http|https|ftp|telnet|mms|\/|\.\.)/i.test(val)) return m0;
+ return m1+m2+request_uri+val+m4+m5;
+ });
+
form[content_key].value = content;
jQuery("#xpress-editor-"+editor_sequence).val(content);
@@ -124,11 +129,11 @@ function editorStart_xe(editor_sequence, primary_key, content_key, editor_height
oEditor.registerPlugin(new xe.XE_WYSIWYGEnterKey(oWYSIWYGIFrame));
}
- // 자동 저장 사용?
+ // 자동 저장 사용
if (s=form._saved_doc_title) {
oEditor.registerPlugin(new xe.XE_AutoSave(oIRTextarea, elAppContainer));
}
-
+
function load_proc() {
try {
var doc = oWYSIWYGIFrame.contentWindow.document, str;
@@ -170,17 +175,17 @@ function editorGetIframe(srl) {
return jQuery('iframe#editor_iframe_'+srl).get(0);
}
-function editorReplaceHTML(iframe_obj, text) {
- // 이미지 경로 재지정 (rewrite mod)
- var srcPathRegx = /src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/g;//'
- text = text.replace(srcPathRegx, 'src="'+request_uri+'$3/$4.$5"');
-
- // href 경로 재지정 (rewrite mod)
- var hrefPathRegx = /href=("|\'){1}(\.\/)?\?([^"\']+)("|\'){1}/g;//'
- text = text.replace(hrefPathRegx, 'href="'+request_uri+'?$3"');
+function editorReplaceHTML(iframe_obj, content) {
+ // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+ content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5) {
+ if(m1=="url(") { m2=''; m4=')'; } else { if(typeof(m2)=='undefined') m2 = '"'; if(typeof(m4)=='undefined') m4 = '"'; if(typeof(m5)=='undefined') m5 = ''; }
+ var val = jQuery.trim(m3).replace(/^\.\//,'');
+ if(/^(http|https|ftp|telnet|mms|\/|\.\.)/i.test(val)) return m0;
+ return m1+m2+request_uri+val+m4+m5;
+ });
var srl = parseInt(iframe_obj.id.replace(/^.*_/,''),10);
- editorRelKeys[srl]["pasteHTML"](text);
+ editorRelKeys[srl]["pasteHTML"](content);
}
// WYSIWYG 모드를 저장하는 확장기능
@@ -202,14 +207,33 @@ xe.XE_GET_WYSYWYG_CONTENT = jQuery.Class({
$ON_MSG_APP_READY : function() {
this.oApp.addConverter("IR_TO_WYSIWYG", this.TO_WYSIWYG_SET);
+ this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO_HTMLSrc);
},
TO_WYSIWYG_SET : function(content) {
- var srcPathRegx = /src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/g;//'
- var hrefPathRegx = /href=("|\'){1}(\.\/)?\?([^"\']+)("|\'){1}/g;//'
- content = content.replace(srcPathRegx, 'src="'+request_uri+'$3/$4.$5"');
- content = content.replace(hrefPathRegx, 'href="'+request_uri+'?$3"');
+ // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+ content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5) {
+ if(m1=="url(") { m2=''; m4=')'; } else { if(typeof(m2)=='undefined') m2 = '"'; if(typeof(m4)=='undefined') m4 = '"'; if(typeof(m5)=='undefined') m5 = ''; }
+ var val = jQuery.trim(m3).replace(/^\.\//,'');
+ if(/^(http|https|ftp|telnet|mms|\/|\.\.)/i.test(val)) return m0;
+ return m1+m2+request_uri+val+m4+m5;
+ });
+
return content;
+ },
+
+ IR_TO_HTMLSrc : function(content) {
+ // src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+ content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>|\))*/ig, function(m0,m1,m2,m3,m4,m5) {
+ var uriReg = new RegExp('^'+request_uri.replace('\/','\\/'),'ig');
+ if(m1=="url(") { m2=''; m4=')'; } else { if(typeof(m2)=='undefined') m2 = '"'; if(typeof(m4)=='undefined') m4 = '"'; if(typeof(m5)=='undefined') m5 = ''; }
+ var val = jQuery.trim(m3);
+ if(uriReg.test(val)) val = val.replace(uriReg,'');
+ else val = m3;
+ return m1+m2+val+m4+m5;
+ });
+ return content;
+
}
});
diff --git a/modules/editor/skins/xpresseditor/skin.xml b/modules/editor/skins/xpresseditor/skin.xml
index 399c5ac0b..5f3eae897 100644
--- a/modules/editor/skins/xpresseditor/skin.xml
+++ b/modules/editor/skins/xpresseditor/skin.xml
@@ -1,11 +1,11 @@
XpressEditor Skin
- XpressEditor fckeditor
+ XpressEditor Skin
XpressEditor Skin
XpressEditorスキン
XpressEditor皮肤
- XpressEditor面板
+ XpressEditor面板
XpressEditor based on SmartEditor Basic by 행복한고니
diff --git a/modules/editor/skins/xquared/skin.xml b/modules/editor/skins/xquared/skin.xml
index fd628d649..bd069f763 100644
--- a/modules/editor/skins/xquared/skin.xml
+++ b/modules/editor/skins/xquared/skin.xml
@@ -4,7 +4,7 @@
Xquared编辑器皮肤
XE Xquared Editor Skin
XE Xquared Editor de la piel
- XE Xquared Editor Skin
+ XE Xquaredエディタースキン
XE Xquared Editor面板
오픈소스 에디터인 Xquared를 이용한 위지윅 에디터입니다.
diff --git a/modules/editor/styles/default/editor.css b/modules/editor/styles/default/editor.css
new file mode 100644
index 000000000..07c475249
--- /dev/null
+++ b/modules/editor/styles/default/editor.css
@@ -0,0 +1,21 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+html, body { height:100%; background-color:transparent; padding:0; margin:0;}
+.xe_content{ color:#000; font-size:12px;}
+
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{ padding:10px; margin:0 15px; }
+
+.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
+.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
+.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
+.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
+.xe_content blockquote.q5{ border:2px solid #707070;}
+.xe_content blockquote.q6{ border:1px dashed #707070;}
+.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
diff --git a/modules/editor/styles/default/editor.html b/modules/editor/styles/default/editor.html
new file mode 100755
index 000000000..f90b184c7
--- /dev/null
+++ b/modules/editor/styles/default/editor.html
@@ -0,0 +1,10 @@
+
+
+
+XpressEngine
+
+
+
+
diff --git a/modules/editor/styles/default/img/bg_qmark.gif b/modules/editor/styles/default/img/bg_qmark.gif
new file mode 100644
index 000000000..5a8a44625
Binary files /dev/null and b/modules/editor/styles/default/img/bg_qmark.gif differ
diff --git a/modules/editor/styles/default/skin.xml b/modules/editor/styles/default/skin.xml
new file mode 100644
index 000000000..70aad283e
--- /dev/null
+++ b/modules/editor/styles/default/skin.xml
@@ -0,0 +1,15 @@
+
+
+ XE 기본 서식
+ XEデフォルトスタイル
+ XE預設樣式
+
+ XE 기본 문서 서식입니다.
+ 있는 그대로 표시가 될 뿐 편집/ 출력시 아무런 영향을 끼치지 않습니다.
+
+ 0.0.1
+ 2009-05-23
+
+ 정찬명
+
+
diff --git a/modules/editor/styles/default/style.css b/modules/editor/styles/default/style.css
new file mode 100755
index 000000000..9786899bf
--- /dev/null
+++ b/modules/editor/styles/default/style.css
@@ -0,0 +1,20 @@
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+/* xe_content */
+.xe_content{ color:#000; font-size:12px;}
+
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{ padding:10px; margin:0 15px; }
+
+.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
+.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
+.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
+.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
+.xe_content blockquote.q5{ border:2px solid #707070;}
+.xe_content blockquote.q6{ border:1px dashed #707070;}
+.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
diff --git a/modules/editor/styles/default/style.ini b/modules/editor/styles/default/style.ini
new file mode 100644
index 000000000..e8c7365cf
--- /dev/null
+++ b/modules/editor/styles/default/style.ini
@@ -0,0 +1 @@
+style.css
diff --git a/modules/editor/styles/xeStyle/skin.xml b/modules/editor/styles/xeStyle/skin.xml
index 4451ac6d4..460b34343 100644
--- a/modules/editor/styles/xeStyle/skin.xml
+++ b/modules/editor/styles/xeStyle/skin.xml
@@ -1,13 +1,25 @@
XE 기본 서식 (하얀 배경)
+ XEデフォルトスタイル(白色背景)
+ XE預設樣式(白色背景)
XE 기본 문서 서식입니다.
문서 수정중에는 각 요소들이 구분되어 보입니다.
+
+ XEのデフォルトドキュメントのスタイルです。
+ ドキュメント編集中には、各要素が区分されて見えます。
+
+
+ XE編輯器預設樣式。
+ 문서 수정중에는 각 요소들이 구분되어 보입니다.
+
0.0.1
2009-04-17
정찬명
+ Chan-Myung Jeong
+ Chan-Myung Jeong
diff --git a/modules/editor/styles/xeStyleBlack/skin.xml b/modules/editor/styles/xeStyleBlack/skin.xml
index 7ae4cfd85..6e7aa8878 100644
--- a/modules/editor/styles/xeStyleBlack/skin.xml
+++ b/modules/editor/styles/xeStyleBlack/skin.xml
@@ -1,13 +1,25 @@
-
-
- XE 기본 서식 (검은 배경)
-
- XE 기본 문서 서식입니다.
- 문서 수정중에는 각 요소들이 구분되어 보입니다.
-
- 0.0.1
- 2009-04-17
-
- 정찬명
-
-
+
+
+ XE 기본 서식 (검은 배경)
+ XEデフォルトスタイル(黑色背景)
+ XE預設樣式(黑色背景)
+
+ XE 기본 문서 서식입니다.
+ 문서 수정중에는 각 요소들이 구분되어 보입니다.
+
+
+ XEのデフォルトドキュメントのスタイルです。
+ ドキュメント編集中には、各要素が区分されて見えます。
+
+
+ XE編輯器預設樣式。
+ 문서 수정중에는 각 요소들이 구분되어 보입니다.
+
+ 0.0.1
+ 2009-04-17
+
+ 정찬명
+ Chan-Myung Jeong
+ Chan-Myung Jeong
+
+
diff --git a/modules/editor/tpl/js/editor_common.js b/modules/editor/tpl/js/editor_common.js
index f7cc11bfb..742b12dc6 100644
--- a/modules/editor/tpl/js/editor_common.js
+++ b/modules/editor/tpl/js/editor_common.js
@@ -31,12 +31,12 @@ function editorFocus(editor_sequence) {
/**
* 자동 저장 기능
**/
-// 자동 저장 활성화 시키는 함수 (10초마다 자동저장)
+// 자동 저장 활성화 시키는 함수 (50초마다 자동저장)
function editorEnableAutoSave(fo_obj, editor_sequence) {
var title = fo_obj.title.value;
var content = editorRelKeys[editor_sequence]['content'].value;
editorAutoSaveObj = {"fo_obj":fo_obj, "editor_sequence":editor_sequence, "title":title, "content":content, locked:false};
- setTimeout(_editorAutoSave, 10000);
+ setTimeout(_editorAutoSave, 50000);
}
// ajax를 이용하여 editor.procEditorSaveDoc 호출하여 자동 저장시킴
@@ -80,8 +80,8 @@ function _editorAutoSave() {
show_waiting_message = true;
}
- // 10초마다 동기화를 시킴
- setTimeout(_editorAutoSave, 10000);
+ // 50초마다 동기화를 시킴
+ setTimeout(_editorAutoSave, 50000);
}
// 자동저장된 모든 메세지를 삭제하는 루틴
diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js
index e832b2ddc..38e9b3eb8 100755
--- a/modules/editor/tpl/js/uploader.js
+++ b/modules/editor/tpl/js/uploader.js
@@ -264,6 +264,7 @@ function completeReloadFileList(ret_obj, response_tags, settings) {
uploadedFiles[file_srl] = item[i];
var opt = new Option(item[i].source_filename+" ("+item[i].disp_file_size+")", file_srl, true, true);
listObj.options[listObj.options.length] = opt;
+ item[i].download_url = encodeURI(item[i].download_url);
if(/\.(jpg|jpeg|png|gif)$/i.test(item[i].download_url)) {
var loadingImage = new Image();
loadingImage.src = item[i].download_url;
diff --git a/modules/editor/tpl/popup.html b/modules/editor/tpl/popup.html
index 0354d1709..e1e981475 100644
--- a/modules/editor/tpl/popup.html
+++ b/modules/editor/tpl/popup.html
@@ -1 +1,3 @@
+
{$popup_content}
+
diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml
index 27040180c..c382cebb2 100644
--- a/modules/file/conf/module.xml
+++ b/modules/file/conf/module.xml
@@ -9,6 +9,7 @@
{$lang->cmd_download}
{$lang->date}
{$lang->ipaddress}
{$lang->nick_name}
-
- {@ $document_srl = $val->target_document_srl}
+
+ {@ $document_srl = $val->target_document_srl}
{@ $move_uri = getUrl('', 'document_srl', $document_srl).'#comment_'.$val->upload_target_srl}
-
- {@ $document_srl = $val->upload_target_srl}
+
+ {@ $document_srl = $val->upload_target_srl}
{@ $move_uri = getUrl('', 'document_srl', $document_srl)}
{@ $cur_upload_target_srl = $val->upload_target_srl}
-
-
- {$lang->cmd_save}
+
+
+ {$lang->is_stand_by}
- {$module_list[$val->module_srl]->browser_title} - {htmlspecialchars($document_list[$document_srl]->title)}
+ [{$lang->comment}]
+ [{$lang->module}]
+
+ [{$lang->cmd_temp_save}]
+ {$module_list[$val->module_srl]->browser_title}
+
+ - {$document_list[$document_srl]->getTitle()} {$document_list[$document_srl]->getTitle()}
+
- {$no}
- {htmlspecialchars($val->source_filename)} {FileHandler::filesize($val->file_size)}
+ {$no}
+ {htmlspecialchars($val->source_filename)} {FileHandler::filesize($val->file_size)}
+
- {$lang->is_valid}
+ {$lang->is_valid}
- {$lang->is_stand_by}
+ {$lang->is_stand_by}
- {$val->download_count}
- {zdate($val->regdate,"Y-m-d")}
- {$val->ipaddress} {$val->download_count}
+ {zdate($val->regdate,"Y-m-d")}
+ {$val->ipaddress}
+
+ {$document_list[$document_srl]->getNickName()}
+
+
+
+
diff --git a/modules/file/tpl/iframe.html b/modules/file/tpl/iframe.html
new file mode 100644
index 000000000..c7ce135a5
--- /dev/null
+++ b/modules/file/tpl/iframe.html
@@ -0,0 +1,22 @@
+
diff --git a/modules/homepage/conf/info.xml b/modules/homepage/conf/info.xml
index 83d0b703f..9f9582236 100644
--- a/modules/homepage/conf/info.xml
+++ b/modules/homepage/conf/info.xml
@@ -11,7 +11,7 @@
XE 내에서 Cafe를 분양하고 관리할 수 있는 기능을 제공합니다
提供一种在XE内迅速建立子站点的功能。
提供XE運作及管理虛擬網站的功能。
- Cafeを運営・管理する機能を提供します。
+ XEソリューションでCafeを運営・管理する機能を提供します。
0.2
2009-02-11
package
diff --git a/modules/homepage/homepage.smartphone.php b/modules/homepage/homepage.smartphone.php
new file mode 100644
index 000000000..045bdd983
--- /dev/null
+++ b/modules/homepage/homepage.smartphone.php
@@ -0,0 +1,16 @@
+compile($this->module_path.'tpl', 'smartphone');
+ $oSmartPhone->setContent($content);
+ }
+ }
+?>
diff --git a/modules/homepage/lang/jp.lang.php b/modules/homepage/lang/jp.lang.php
index 4b283c2c3..ab4d536a5 100644
--- a/modules/homepage/lang/jp.lang.php
+++ b/modules/homepage/lang/jp.lang.php
@@ -1,61 +1,61 @@
cafe = "CafeXE";
- $lang->cafe_id = "カフェへのアクセスID";
- $lang->cafe_title = "ホームページ名";
- $lang->cafe_description = 'カフェの説明';
- $lang->cafe_banner = 'カフェのバナーイメージ';
+ $lang->cafe_id = "CafeへのアクセスID";
+ $lang->cafe_title = "Cafe名";
+ $lang->cafe_description = 'Cafeの説明';
+ $lang->cafe_banner = 'Cafeのバナーイメージ';
$lang->module_type = "タイプ";
$lang->board = "掲示板";
$lang->page = "ページ";
$lang->module_id = "モジュール ID";
$lang->item_group_grant = "メニューを公開するグループ";
- $lang->cafe_info = "カフェの情報";
- $lang->cafe_admin = "カフェ管理者";
+ $lang->cafe_info = "Cafeの情報";
+ $lang->cafe_admin = "Cafe管理者";
$lang->do_selected_member = "選択した会員を : ";
- $lang->cafe_latest_documents = 'カフェの新規書き込み';
- $lang->cafe_latest_comments = 'カフェの新規コメント';
- $lang->mycafe_list = '登録したカフェ';
- $lang->cafe_creation_type = 'カフェアクセス方法';
- $lang->about_cafe_creation_type = '作成するカフェへのユーザーからのアクセス方法を定めてください。Site IDとは http://ドメイン/ID へアクセスが可能になり、ドメインアクセスとは登録したサブドメイン（http://domain.mydomain.net)にカフェが作成されます。';
- $lang->cafe_main_layout = 'カフェトップページのレイアウト';
+ $lang->cafe_latest_documents = 'Cafeの新規書き込み';
+ $lang->cafe_latest_comments = 'Cafeの新規コメント';
+ $lang->mycafe_list = '登録したCafe';
+ $lang->cafe_creation_type = 'Cafeアクセス方法';
+ $lang->about_cafe_creation_type = '作成するCafeへのユーザーからのアクセス方法を定めてください。Site IDとは「http://ドメイン/ID 」へアクセスが可能になり、ドメインアクセスとは登録したサブドメイン（ http://domain.mydomain.net )にCafeが作成されます。';
+ $lang->cafe_main_layout = 'Cafeトップページのレイアウト';
$lang->default_layout = 'デフォルトレイアウト';
- $lang->about_default_layout = 'カフェを作成する時のデフォルトレイアウトを指定します。';
+ $lang->about_default_layout = 'Cafeを作成する時のデフォルトレイアウトを指定します。';
$lang->enable_change_layout = 'レイアウト変更';
- $lang->about_change_layout = '選択すると、個々のカフェにてレイアウト変更が可能になります。';
+ $lang->about_change_layout = '選択すると、個々のCafeにてレイアウト変更が可能になります。';
$lang->allow_service = '許可サービス';
- $lang->about_allow_service = '個々のカフェで利用する基本サービスを設定します。';
+ $lang->about_allow_service = '個々のCafeで利用する基本サービスを設定します。';
- $lang->cmd_make_cafe = 'カフェ作成';
+ $lang->cmd_make_cafe = 'Cafe作成';
$lang->cmd_import = 'インポート';
$lang->cmd_export = 'エクスポート';
- $lang->cafe_creation_privilege = 'カフェの作成権限';
+ $lang->cafe_creation_privilege = 'Cafeの作成権限';
- $lang->cafe_main_mid = 'カフェメインID';
- $lang->about_cafe_main_mid = 'カフェのトップページを「http://ドメイン/ID 」のように設定するためのID値を入力して下さい。';
+ $lang->cafe_main_mid = 'CafeメインID';
+ $lang->about_cafe_main_mid = 'Cafeのトップページを「http://ドメイン/ID 」のように設定するためのID値を入力して下さい。';
$lang->default_menus = array(
'home' => 'ホーム',
'notice' => 'お知らせ',
'levelup' => 'レベルアップ',
'freeboard' => '自由掲示板',
- 'view_total' => '全文を表示',
- 'view_comment' => '一行の物語',
- 'cafe_album' => 'フォトギャラリー',
+ 'view_total' => '最新書き込み',
+ 'view_comment' => '最新コメント',
+ 'cafe_album' => '最新フォト',
'menu' => 'メニュー',
- 'default_group1' => 'スタンバイ会員',
+ 'default_group1' => '承認待ち会員',
'default_group2' => '準会員',
'default_group3' => '正会員',
);
$lang->cmd_admin_menus = array(
- "dispHomepageManage" => "カフェ設定",
+ "dispHomepageManage" => "Cafe設定",
"dispHomepageMemberGroupManage" => "会員のグループ管理",
"dispHomepageMemberManage" => "会員リスト",
"dispHomepageTopMenu" => "基本メニュー 管理",
@@ -63,11 +63,11 @@
"dispHomepageCounter" => "アクセス集計",
"dispHomepageMidSetup" => "モジュール詳細設定",
);
- $lang->cmd_cafe_registration = "カフェ作成";
- $lang->cmd_cafe_setup = "カフェ設定";
- $lang->cmd_cafe_delete = "カフェ削除";
+ $lang->cmd_cafe_registration = "Cafe作成";
+ $lang->cmd_cafe_setup = "Cafe設定";
+ $lang->cmd_cafe_delete = "Cafe削除";
$lang->cmd_go_home = "ホームへ移動";
- $lang->cmd_go_cafe_admin = 'カフェ全体管理';
+ $lang->cmd_go_cafe_admin = 'Cafe全体管理';
$lang->cmd_change_layout = "変更";
$lang->cmd_select_index = "初期ページ選択";
$lang->cmd_add_new_menu = "新しいメニュー追加";
@@ -75,17 +75,17 @@
$lang->about_default_language = "初めてアクセスするユーザーに見せるページの言語を指定します。";
$lang->about_cafe_act = array(
- "dispHomepageManage" => "カフェのレイアウトを変更します。",
- "dispHomepageMemberGroupManage" => "カフェ内のグループを管理します。",
- "dispHomepageMemberManage" => "カフェに登録されている会員を管理します。",
- "dispHomepageTopMenu" => "カフェのヘッダー（header、上段）や左側などのメニューを管理します。",
+ "dispHomepageManage" => "Cafeのレイアウトを変更します。",
+ "dispHomepageMemberGroupManage" => "Cafe内のグループを管理します。",
+ "dispHomepageMemberManage" => "Cafeに登録されている会員を管理します。",
+ "dispHomepageTopMenu" => "Cafeのヘッダー（header、上段）や左側などのメニューを管理します。",
"dispHomepageComponent" => "エディターのコンポーネント/アドオンをオンにしたら、設定を変更します。",
- "dispHomepageCounter" => "カフェへのアクセス状況を確認できます。",
- "dispHomepageMidSetup" => "カフェの掲示板、ページなどのモジュールを管理します。",
+ "dispHomepageCounter" => "Cafeへのアクセス状況を確認できます。",
+ "dispHomepageMidSetup" => "Cafeの掲示板、ページなどのモジュールを管理します。",
);
- $lang->about_cafe = "カフェサービス管理者は複数のカフェ作成、および各カフェを簡単に管理が出来ます。";
- $lang->about_cafe_title = "カフェ名は管理をするためだけに使われ、実サービスには表示されません。";
- $lang->about_menu_names = "カフェに使うメニュー名を言語別に指定出来ます。ID 」，請輸入想要的ID值。';
$lang->default_menus = array(
'home' => '首頁',
'notice' => '公告事項',
'levelup' => '等級審核',
'freeboard' => '自由討論',
- 'view_total' => '檢視全部',
- 'view_comment' => '故事線',
+ 'view_total' => '所有主題',
+ 'view_comment' => '所有評論',
'cafe_album' => '網站相簿',
'menu' => '選單',
'default_group1' => '待審會員',
@@ -86,7 +86,7 @@
$lang->about_cafe = "虛擬網站模組可快速建立網站，且容易進行設定。";
$lang->about_cafe_title = "只有在管理時才看的到此標題。";
$lang->about_menu_names = "可指定語言。
Cafe 기본 Skin
+ Cafe用デフォルトスキン
+ 虛擬網站預設面板
Cafe 기본 스킨입니다.
+
+ Cafe用のデフォルトスキンです。
+
+
+ 虛擬網站預設面板。
+
0.1
2009-04-03
zero
+ zero
+ zero
GPL
@@ -16,38 +26,67 @@
기본
+ デフォルト
+ 預設
제목
+ タイトル
+ 標題
제목을 적어주세요.
+ タイトルを入力して下さい。
+ 請輸入標題。
부제목
+ サブタイトル
+ 副標題
제목 옆에 나타날 부제목을 적어주세요.
+ タイトルの隣りに表示されるサブタイトルを入力して下さい。
+ 請輸入顯示在標題旁的副標題。
상세 설명
+ 詳細説明
+ 說明
제목 아래 표시될 설명을 입력하실 수 있습니다.
+ タイトルの下に表示される説明文を入力して下さい。
+ 請輸入顯示在標題下方的副標題。
카페 소개 제목
+ Cafeの紹介キャッチ
+ 虛擬網站標題
소개할 카페의 제목을 입력해주세요. (메인 노출)
+ 紹介するCafeのキャッチを入力して下さい。 (メインへ公開)
+ 請輸入虛擬網站的標題。 (メインへ公開)
카페 소개 내용
+ Cafeの紹介詳細
+ 虛擬網站說明
소개할 카페의 내용을 입력해주세요. (메인 노출)
+ 紹介するCafeの詳細説明を入力して下さい。 (メインへ公開)
+ 請輸入虛擬網站的簡介。 (メインへ公開)
카페 소개 이미지
+ Cafeの紹介イメージ
+ 虛擬網站圖片
소개할 카페의 내용에 포함되는 이미지를 등록해주세요. (메인 노출)
+ 紹介するCafeの内容に表示するイメージを登録して下さい。 (メインへ公開)
+ 請輸入虛擬網站想要使用的背景圖片。 (メインへ公開)
카페 소개 링크
+ Cafeの紹介URL
+ 虛擬網站連結
소개할 카페의 링크를 입력해주세요. (http:// 모두 포함)
+ 紹介するCafeのURLを入力して下さい。 (http:// を含む)
+ 請輸入虛擬網站連結。 (包含http:// )
-
diff --git a/modules/homepage/tpl/smartphone.html b/modules/homepage/tpl/smartphone.html
new file mode 100644
index 000000000..ac6154f8a
--- /dev/null
+++ b/modules/homepage/tpl/smartphone.html
@@ -0,0 +1,18 @@
+
diff --git a/modules/importer/lang/jp.lang.php b/modules/importer/lang/jp.lang.php
index b55106bf3..139f69624 100644
--- a/modules/importer/lang/jp.lang.php
+++ b/modules/importer/lang/jp.lang.php
@@ -1,6 +1,6 @@
preprocessing = 'データ移転のため、準備中です。';
// 項目
- $lang->importer = 'ZBデータ変換';
+ $lang->importer = 'XEデータ変換';
$lang->source_type = 'データ変換の対象';
$lang->type_member = '会員情報';
$lang->type_message = 'メッセージ情報';
diff --git a/modules/importer/lang/ko.lang.php b/modules/importer/lang/ko.lang.php
index e032b845f..a9387c371 100644
--- a/modules/importer/lang/ko.lang.php
+++ b/modules/importer/lang/ko.lang.php
@@ -1,6 +1,6 @@
site_srl = 0;
$site_args->index_module_srl = Context::get('index_module_srl');
$site_args->default_language = Context::get('change_lang_type');
+ $site_args->domain = $db_info->default_url;
$oModuleController = &getController('module');
$oModuleController->updateSite($site_args);
diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
index 85f030313..24488076b 100644
--- a/modules/install/lang/jp.lang.php
+++ b/modules/install/lang/jp.lang.php
@@ -1,6 +1,6 @@
'XMLライブラリ',
'iconv' => 'ICONVライブラリ',
'gd' => 'GDライブラリ',
- 'session' => 'Session.auto_start の設定',
+ 'session' => 'Session.auto_startの設定',
);
$lang->install_checklist_desc = array(
@@ -252,14 +252,14 @@ EndOfLicense;
$lang->admin_title = '管理者情報';
$lang->env_title = '環境設定';
- $lang->use_optimizer = 'オプティマイザ使用';
- $lang->about_optimizer = 'オプティマイザを使用すると多数の「CSS/JS」ファイルを、統合・圧縮して転送するのでレスポンスが早くなります。データファイルのパーミッションは「707」に設定して下さい。 ';
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
index d09543265..09b8c577f 100644
--- a/modules/install/lang/ko.lang.php
+++ b/modules/install/lang/ko.lang.php
@@ -1,6 +1,6 @@
'用 PHP的 PDO支援『sqlite3』。manual ',
'postgresql' => '使用 PostgreSql DB。',
- 'firebird' => '使用 Firebird DB。',
+ 'firebird' => '使用 Firebird DB。'%s' 的搜尋結果，約有%d 項";
- $lang->multimedia = "Images/ Movies";
+ $lang->multimedia = "圖片/影片";
$lang->is_search_option = array(
'document' => array(
diff --git a/modules/issuetracker/conf/module.xml b/modules/issuetracker/conf/module.xml
index 397847fe7..cf2f38e48 100644
--- a/modules/issuetracker/conf/module.xml
+++ b/modules/issuetracker/conf/module.xml
@@ -48,7 +48,7 @@
{$lang->milestone}
+ selected="selected" >{$lang->not_assigned}
milestone_srl==$milestone_srl)-->selected="selected">{$val->title}
diff --git a/modules/issuetracker/skins/xe_issuetracker/skin.xml b/modules/issuetracker/skins/xe_issuetracker/skin.xml
index 908f78b1b..8dc45deaf 100644
--- a/modules/issuetracker/skins/xe_issuetracker/skin.xml
+++ b/modules/issuetracker/skins/xe_issuetracker/skin.xml
@@ -18,8 +18,8 @@
zero
zero
- zero
- zero
+ zero
+ zero
zero
zero
@@ -28,16 +28,16 @@
일반
一般
- General
- General
+ General
+ General
普通
普通
검은색 배경용
黒色の背景
- For Black Background
- Antecedentes de Negro
+ For Black Background
+ Antecedentes de Negro
黑色背景
黑色背景
@@ -47,35 +47,35 @@
기본 설정
基本設定
- Default Settings
- Configuración predeterminada
+ Default Settings
+ Configuración predeterminada
默认设置
預設值
이슈트래커 제목
イシュートラッカー（IssueTracker）タイトル
- Issue Tracker Name
- Issue Tracker Nombre
+ Issue Tracker Name
+ Issue Tracker Nombre
IssueTracker标题
問題追蹤名稱
이슈트래커의 상단에 큰 제목으로 표시가 됩니다.
イシュートラッカー（IssueTracker）の上段に大きくタイトルが表示されます。
- It will be displayed on top of the issue tracker.
- Que se visualizará en la parte superior de la cuestión tracker.
+ It will be displayed on top of the issue tracker.
+ Que se visualizará en la parte superior de la cuestión tracker.
在IssueTracker顶部大标题显示。
將顯示在問題追蹤的最頂端。
이슈트래커 설명
イシュートラッカー（IssueTracker）説明
- Description
- Descripción
+ Description
+ Descripción
IssueTracker简要说明
說明
입력하시면 이슈트래커의 메인에 설명이 노출됩니다.
登録するとイシュートラッカー（IssueTracker）のメインに説明が表示されます。
- It will be displayed on main of the issue tracker if you input the description.
- Que se mostrará en el tema principal de seguimiento de si la descripción de entrada.
+ It will be displayed on main of the issue tracker if you input the description.
+ Que se mostrará en el tema principal de seguimiento de si la descripción de entrada.
将在IssueTracker页面中显示。
會顯示在問題追蹤頁面中。
diff --git a/modules/issuetracker/skins/xe_issuetracker/view_issue.html b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
index 994fef2fd..1c35c9a6f 100644
--- a/modules/issuetracker/skins/xe_issuetracker/view_issue.html
+++ b/modules/issuetracker/skins/xe_issuetracker/view_issue.html
@@ -9,7 +9,7 @@
{$oIssue->getTitle()} - {$oIssue->getStatus()} {$oIssue->getNickName()}
{$lang->milestone} :
{$oIssue->getMilestoneTitle()}
diff --git a/modules/layout/lang/zh-TW.lang.php b/modules/layout/lang/zh-TW.lang.php
index 04db26726..d847b1727 100644
--- a/modules/layout/lang/zh-TW.lang.php
+++ b/modules/layout/lang/zh-TW.lang.php
@@ -58,10 +58,10 @@
17 => '靠右對齊',
18 => '整體',
19 => '版面',
- 20 => '新增控件',
+ 20 => '新增Widget',
21 => '新增內容',
22 => '屬性',
- 23 => '控件樣式',
+ 23 => 'Widget樣式',
24 => '修改',
25 => '刪除',
26 => '對齊',
@@ -106,8 +106,8 @@
'description' => 'FaceOff Layout版面管理者，可於線上修改與設計版面。儲存 : 儲存設定內容 取消 : 不儲存設定內容並返回上一頁 重置 : 重新設置回到最原始的版面設定 模式 : 可設定版面模式為固定/ 變動/ 固定+變動(內容) 樣式 : 可設置兩個Extension區域和Content區域 對齊 : 可選擇版面的對齊方式 tab鍵 : 當沒有選取控件時，選擇順序是： Header, Footer, Body；當有選取控件時，將會選擇下一個控件。 Shift + tab鍵 : 功能和tab鍵相反 Esc鍵 : 當沒有選擇區域時，選擇順序是： Neck, Extension(e1,e2),Knee；當有選擇控件時，將會選則此控件所屬的區域。 方向鍵 : 當有選擇控件時，可利用方向鍵作移動。 tab鍵 : 當沒有選取Widget時，選擇順序是： Header, Footer, Body；當有選取Widget時，將會選擇下一個Widget。 Shift + tab鍵 : 功能和tab鍵相反 Esc鍵 : 當沒有選擇區域時，選擇順序是： Neck, Extension(e1,e2),Knee；當有選擇Widget時，將會選則此Widget所屬的區域。 方向鍵 : 當有選擇Widget時，可利用方向鍵作移動。 {$lang->msg_update_member}
-
+ {$lang->disable_read_document}
+
+
@@ -115,11 +125,19 @@
-
- {$lang->about_point_link_group}
+
+
+ group_reset == 'point_group')--> selected="selected">{$lang->point_group_reset_and_add}
+ group_reset == 'all')--> selected="selected">{$lang->point_group_add_only}
+
+
-
+ {$lang->about_point_link_group}
+
+
diff --git a/modules/point/tpl/js/point_admin.js b/modules/point/tpl/js/point_admin.js
index df916d43b..dc123c054 100644
--- a/modules/point/tpl/js/point_admin.js
+++ b/modules/point/tpl/js/point_admin.js
@@ -60,3 +60,11 @@ function updatePoint(member_srl, action)
procFilter(hF, update_point);
}
+
+function doPointReset(module_srls) {
+ var params = new Array();
+ var response_tags = new Array('error','message');
+ params['module_srls'] = module_srls;
+
+ exec_xml('point','procPointAdminReset',params,function(ret_obj) {alert(ret_obj['message']);}, response_tags);
+}
diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html
index 63a6bcb23..43bbea74e 100644
--- a/modules/point/tpl/point_module_config.html
+++ b/modules/point/tpl/point_module_config.html
@@ -1,4 +1,5 @@
+
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index 9d61ec66f..8ff51e31b 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -23,6 +23,8 @@
/**
* 피드 출력을 위한 변수 설정
**/
+ $site_module_info = Context::get('site_module_info');
+ $site_srl = $site_module_info->site_srl;
$mid = Context::get('mid'); ///< 대상 모듈 id, 없으면 전체로
$start_date = (int)Context::get('start_date');
$end_date = (int)Context::get('end_date');
@@ -46,7 +48,7 @@
// mid 가 선택되어 있지 않으면 전체
} else {
if($total_config->use_total_feed != 'N') {
- $rss_config = $oModuleModel->getModulePartConfigs('rss');
+ $rss_config = $oModuleModel->getModulePartConfigs('rss', $site_srl);
if($rss_config) {
foreach($rss_config as $module_srl => $config) {
if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N') {
diff --git a/modules/springnote/lang/jp.lang.php b/modules/springnote/lang/jp.lang.php
index 8e2f6855f..9f033a8f9 100644
--- a/modules/springnote/lang/jp.lang.php
+++ b/modules/springnote/lang/jp.lang.php
@@ -1,6 +1,6 @@
+
+
+
+
+
+
diff --git a/modules/tag/queries/getAllTagList.xml b/modules/tag/queries/getAllTagList.xml
new file mode 100644
index 000000000..c57852419
--- /dev/null
+++ b/modules/tag/queries/getAllTagList.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/tag/queries/getDocumentSrlByTag.xml b/modules/tag/queries/getDocumentSrlByTag.xml
new file mode 100644
index 000000000..1ed8cc737
--- /dev/null
+++ b/modules/tag/queries/getDocumentSrlByTag.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
diff --git a/modules/tag/queries/getDocumentsTagList.xml b/modules/tag/queries/getDocumentsTagList.xml
new file mode 100644
index 000000000..b33c2250a
--- /dev/null
+++ b/modules/tag/queries/getDocumentsTagList.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/tag/tag.model.php b/modules/tag/tag.model.php
index 606058384..7b5ef880e 100644
--- a/modules/tag/tag.model.php
+++ b/modules/tag/tag.model.php
@@ -28,11 +28,60 @@
if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
else $args->module_srl = $obj->module_srl;
$args->list_count = $obj->list_count;
+ $args->count = $obj->sort_index;
$output = executeQueryArray('tag.getTagList', $args);
if(!$output->toBool()) return $output;
return $output;
}
+
+
+ /**
+ * @brief tag로 document_srl를 가져오기
+ **/
+ function getDocumentSrlByTag($obj){
+ if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+ else $args->module_srl = $obj->module_srl;
+
+ $args->tag = $obj->tag;
+ $output = executeQueryArray('tag.getDocumentSrlByTag', $args);
+ if(!$output->toBool()) return $output;
+
+ return $output;
+ }
+
+ /**
+ * @brief document 에서 사용된 tag 가져오기
+ **/
+ function getDocumentsTagList($obj){
+ if(is_array($obj->document_srl)) $args->document_srl = implode(',', $obj->document_srl);
+ else $args->document_srl = $obj->document_srl;
+
+ $output = executeQueryArray('tag.getDocumentsTagList', $args);
+ if(!$output->toBool()) return $output;
+
+ return $output;
+ }
+
+ /**
+ * @brief 특정tag과 함께 사용된 tag목록
+ **/
+ function getTagWithUsedList($obj){
+ if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+ else $args->module_srl = $obj->module_srl;
+
+ $args->tag = $obj->tag;
+ $output = $this->getDocumentSrlByTag($args);
+ $document_srl = array();
+
+ if($output->data){
+ foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+ }
+ unset($args);
+ $args->document_srl = $document_srl;
+ $output = $this->getDocumentsTagList($args);
+ return $output;
+ }
}
?>
diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php
index 73276efce..2be76a994 100644
--- a/modules/trackback/trackback.controller.php
+++ b/modules/trackback/trackback.controller.php
@@ -58,7 +58,7 @@
// 엮인글 발송 링크 추가
$oDocumentController = &getController('document');
- $url = getUrl('module','trackback','act','dispTrackbackSend','document_srl', $document_srl);
+ $url = getUrl('','module','trackback','act','dispTrackbackSend','document_srl', $document_srl);
$oDocumentController->addDocumentPopupMenu($url,'cmd_send_trackback','./modules/document/tpl/icons/send_trackback.gif','popup');
return new Object();
@@ -143,8 +143,7 @@
$obj->module_srl = $oDocument->get('module_srl');
}
-
- // 엮인글를 입력
+ // 엮인글을 입력
$obj->trackback_srl = getNextSequence();
$obj->list_order = $obj->trackback_srl*-1;
$output = executeQuery('trackback.insertTrackback', $obj);
@@ -171,6 +170,9 @@
// 원본글에 알림(notify_message)가 설정되어 있으면 메세지 보냄
if(!$manual_inserted) $oDocument->notify(Context::getLang('trackback'), $obj->excerpt);
+ // trigger 호출 (after)
+ $output = ModuleHandler::triggerCall('trackback.insertTrackback', 'after', $obj);
+ if(!$output->toBool()) return $output;
return new Object();
}
@@ -187,6 +189,10 @@
if($trackback->data->trackback_srl != $trackback_srl) return new Object(-1, 'msg_invalid_request');
$document_srl = $trackback->data->document_srl;
+ // trigger 호출 (before)
+ $output = ModuleHandler::triggerCall('trackback.deleteTrackback', 'before', $trackback);
+ if(!$output->toBool()) return $output;
+
// document model 객체 생성
$oDocumentModel = &getModel('document');
@@ -207,6 +213,10 @@
$output = $oDocumentController->updateTrackbackCount($document_srl, $trackback_count);
$output->add('document_srl', $document_srl);
+ // trigger 호출 (before)
+ $output = ModuleHandler::triggerCall('trackback.deleteTrackback', 'after', $trackback);
+ if(!$output->toBool()) return $output;
+
return $output;
}
@@ -227,9 +237,12 @@
* 발송 후 결과처리는 하지 않는 구조임
**/
function sendTrackback($oDocument, $trackback_url, $charset) {
+ $oModuleController = &getController('module');
+
// 발송할 정보를 정리
$http = parse_url($trackback_url);
$obj->blog_name = str_replace(array('<','>','&','"'), array('<','>','&','"'), Context::getBrowserTitle());
+ $oModuleController->replaceDefinedLangCode($obj->blog_name);
$obj->title = $oDocument->getTitleText();
$obj->excerpt = $oDocument->getSummary(200);
$obj->url = getUrl('','document_srl',$oDocument->document_srl);
diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php
index bdabf8878..ce32bf0d6 100644
--- a/modules/trackback/trackback.model.php
+++ b/modules/trackback/trackback.model.php
@@ -89,7 +89,7 @@
if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
else $args->module_srl = $obj->module_srl;
$args->list_count = $obj->list_count;
- $args->site_srl = (int)$obj->site_srl;
+ if($obj->site_srl) $args->site_srl = (int)$obj->site_srl;
$args->sort_index = 'trackbacks.list_order';
$args->order = 'asc';
diff --git a/modules/widget/conf/info.xml b/modules/widget/conf/info.xml
index 70e837c3f..e142eef6d 100644
--- a/modules/widget/conf/info.xml
+++ b/modules/widget/conf/info.xml
@@ -6,14 +6,14 @@
Widget
Widget
Виджеты
- 控件
+ Widget
위젯 관리 모듈
控件管理模块。
ウィジェット管理モジュール
Module for managing widgets.
Módulo para el manejo de widgets.
Модуль для управления виджетами.
- 控件管理模組。
+ Widget管理模組。
0.1
2007-02-28
construction
diff --git a/modules/widget/lang/zh-TW.lang.php b/modules/widget/lang/zh-TW.lang.php
index 308fc9dc5..7222e084d 100644
--- a/modules/widget/lang/zh-TW.lang.php
+++ b/modules/widget/lang/zh-TW.lang.php
@@ -2,16 +2,16 @@
/**
* @file modules/widget/lang/zh-TW.lang.php
* @author zero 翻譯：royallin
- * @brief 控件(widget)模組正體中文語言
+ * @brief Widget模組正體中文語言
**/
$lang->cmd_generate_code = '建立原始碼';
- $lang->widget_name = '控件名稱';
- $lang->widget_maker = '控件作者';
+ $lang->widget_name = 'Widget名稱';
+ $lang->widget_maker = 'Widget作者';
$lang->widget_license = '版權';
- $lang->widget_history = '更新事項';
- $lang->widget_info = '控件資料';
+ $lang->widget_history = '更新紀錄';
+ $lang->widget_info = 'Widget資料';
$lang->widget_code = '原始碼';
$lang->widget_cache = '暫存';
@@ -26,26 +26,26 @@
$lang->widget_margin_right = '右';
$lang->widget_margin_bottom = '下';
$lang->widget_margin_left= '左';
- $lang->about_widget_fix_width = '選擇此項將固定控件顯示寬度。';
+ $lang->about_widget_fix_width = '選擇此項將固定Widget顯示寬度。';
$lang->about_widget_width = '請輸入寬度大小。';
- $lang->about_widget_position = '想要橫向顯示多個控件時，請選擇位置。';
- $lang->about_widget_margin = '想要橫向顯示多個控件時，請設置邊距。';
+ $lang->about_widget_position = '想要橫向顯示多個Widget時，請選擇位置。';
+ $lang->about_widget_margin = '想要橫向顯示多個Widget時，請設置邊距。';
$lang->about_widget_cache = '指定的時間內可以利用已暫存的資料。';
$lang->generated_code = '已建立的原始碼';
- $lang->widgetstyle= '控件樣式';
+ $lang->widgetstyle= 'Widget樣式';
- $lang->msg_widget_is_not_exists = '找不到%s控件！';
- $lang->msg_widget_object_is_null = '無法建立%s控件目標！';
- $lang->msg_widget_proc_is_null = '無法執行%s控件的 proc()！';
- $lang->msg_widget_skin_is_null = '請選擇一個可正常使用的控件面板';
+ $lang->msg_widget_is_not_exists = '找不到 %s Widget！';
+ $lang->msg_widget_object_is_null = '無法建立 %s Widget目標！';
+ $lang->msg_widget_proc_is_null = '無法執行 %s Widget的 proc()！';
+ $lang->msg_widget_skin_is_null = '請選擇一個可正常使用的Widget面板';
- $lang->about_widget_code = '輸入所選控件所需要的各項資料後，按『建立原始碼』按鈕，即可在頁面下方獲得運用在版面設計中的部分原始碼。';
- $lang->about_widget_code_in_page = '輸入下列各項必要資料後，按『建立原始碼』按鈕，即可把控件插入到頁面當中。';
- $lang->about_widget = "控件是在版面或頁面模組中使用的一種元件。\n不僅可以連結內部模組或外部Open API，而且通過設置可以有許多種用途。\n即使不使用XE的頁面或版面設計模組，也可以通過『建立原始碼』功能直接新增相對應控件。";
+ $lang->about_widget_code = '輸入所選Widget所需要的各項資料後，按『建立原始碼』按鈕，即可在頁面下方獲得運用在版面設計中的部分原始碼。';
+ $lang->about_widget_code_in_page = '輸入下列各項必要資料後，按『建立原始碼』按鈕，即可把Widget插入到頁面當中。';
+ $lang->about_widget = "Widget是在版面或頁面模組中使用的一種元件。\n不僅可以連結內部模組或外部Open API，而且通過設置可以有許多種用途。\n即使不使用XE的頁面或版面設計模組，也可以通過『建立原始碼』功能直接新增相對應Widget。";
$lang->cmd_content_insert = "新增內容";
- $lang->cmd_box_widget_insert = "新增控件箱";
+ $lang->cmd_box_widget_insert = "新增Widget Box";
$lang->cmd_remove_all_widgets = "全部清空";
$lang->cmd_widget_size = "大小";
diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css
index 4bbf47686..8a46287c3 100644
--- a/modules/widget/tpl/css/widget.css
+++ b/modules/widget/tpl/css/widget.css
@@ -49,8 +49,6 @@
#pageSizeLayer .color_input { background:#FFFFFF; border:1px solid #AAAAAA; padding:1px; font:8pt verdana; width:44px; }
#pageSizeLayer .submit { width:90%; border:1px solid #DEDEDE; background-color:#FFFFFF;}
-div.editor { width:700px; }
-
.help { padding:5px 0; background-color:#EFEFEF; border-top:1px solid #CCCCCC; }
ul.midCommand { float:left; margin:0 0 0 10px;; padding:0; *zoom:1; }
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index e71b7793e..5b76b6e6b 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -244,7 +244,7 @@ function doSyncPageContent() {
}
}
- editorStart(1, "module_srl", "content", false, 400 );
+ if(typeof(editorStart)!='undefined') editorStart(1, "module_srl", "content", false, 400 );
//editor_upload_start(1);
setFixedPopupSize();
diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php
index 79364df22..93f03aecb 100644
--- a/modules/widget/widget.admin.view.php
+++ b/modules/widget/widget.admin.view.php
@@ -30,8 +30,6 @@
* @brief 내용 직접 입력 위젯 팝업창 내용을 꾸힘
**/
function dispWidgetAdminAddContent() {
- $this->setLayoutFile("popup_layout");
-
$module_srl = Context::get('module_srl');
if(!$module_srl) return $this->stop("msg_invalid_request");
@@ -46,20 +44,12 @@
// 에디터 모듈의 getEditor를 호출하여 세팅
$oEditorModel = &getModel('editor');
- $option->primary_key_name = 'module_srl';
- $option->content_key_name = 'content';
- $option->allow_fileupload = true;
- $option->enable_autosave = false;
- $option->enable_default_component = true;
- $option->enable_component = true;
- $option->resizable = false;
- $option->height = 200;
- $editor = $oEditorModel->getEditor($module_srl, $option);
+ $editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
Context::set('editor', $editor);
-
-
+ $this->setLayoutFile("popup_layout");
$this->setTemplateFile('add_content_widget');
+
}
}
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 95560f8ae..956d631d9 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -501,6 +501,10 @@
$body = base64_decode($args->body);
}
+ // 에디터컴포넌트 변경
+ $oEditorController = &getController('editor');
+ $body = $oEditorController->transComponent($body);
+
$widget_content_header = sprintf('', $args->id, $style, $inner_style);
$widget_content_body = $body;
$widget_content_footer = '
XE维基默认皮肤
XE維基預設面板
- XE基本スキン
+ XEデフォルトスキン
XE Default Skin
@@ -14,38 +14,40 @@
XE維基預設面板
- XE基本スキン
+ XEデフォルトスキン
0.1
2009-01-31
-
haneul
+ haneul
+ haneul
haneul
haneul
- haneul
-
GPL
-
-
- 제목
- 제목을 적어주세요.
- Plase input the title.
-
-
- 부제목
- Subtitle
- 제목 옆에 나타날 부제목을 적어주세요.
- Please input the subtitle which will be displayed beside title.
-
-
- 상세 설명
- Description
- 게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.
- You may input description which will be displayed under the title.
-
-
+
제목
+ 제목
+ タイトル
+ 제목
+ 標題
+ 제목을 적어주세요.
Plase input the title.
タイトルを入力して下さい。
+ 제목을 적어주세요.
+ 請輸入標題。
+
부제목
Subtitle
サブタイトル
+ 부제목
+ 副標題
+ 제목 옆에 나타날 부제목을 적어주세요.
Please input the subtitle which will be displayed beside title.
タイトルの隣りに表示されるサブタイトルを入力して下さい。
+ 제목 옆에 나타날 부제목을 적어주세요.
+ 請輸入顯示在標題旁的副標題。
+
상세 설명
+ Description
詳細
+ 상세 설명
+ 說明
+ 게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.
You may input description which will be displayed under the title.
タイトルの下に表示される説明文を入力して下さい。
+ 게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.
+ 請輸入顯示在標題下方的說明。
+
diff --git a/modules/wiki/wiki.view.php b/modules/wiki/wiki.view.php
index 5a30c27fb..c872585f5 100644
--- a/modules/wiki/wiki.view.php
+++ b/modules/wiki/wiki.view.php
@@ -50,7 +50,6 @@
$entry = $oDocument->getTitleText();
Context::set('entry',$entry);
$output = $oDocumentModel->getHistories($document_srl, 10, $page);
- debugPrint($output);
if(!$output->toBool() || !$output->data)
{
Context::set('histories', array());
diff --git a/tests/index.php b/tests/index.php
index 13960f883..1f093d268 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -1,6 +1,9 @@
mid = $tmp_mid[0];
}
- if($args->mid) $args->srl = $oModuleModel->getModuleSrlByMid($args->mid);
+ if($args->mid) {
+ $args->srl = $oModuleModel->getModuleSrlByMid($args->mid);
+ if(is_array($args->srl)) {
+ $args->srl = $args->srl[0];
+ }
+ }
$obj->module_srl = $args->srl;
diff --git a/widgets/category/skins/default/category.html b/widgets/category/skins/default/category.html
index d7e4e8b45..a7749648b 100644
--- a/widgets/category/skins/default/category.html
+++ b/widgets/category/skins/default/category.html
@@ -1,40 +1,49 @@
-
-{@ $_pDepth = 0;}
-
-
-
-
-
+
+
+{@ $_pDepth = 0;}
+
+
+
+
diff --git a/widgets/category/skins/default/css/widget.css b/widgets/category/skins/default/css/widget.css
index 2f9cd497e..f5c916f1b 100644
--- a/widgets/category/skins/default/css/widget.css
+++ b/widgets/category/skins/default/css/widget.css
@@ -1,70 +1,70 @@
-@charset "utf-8";
-
-/* Widget Tree */
-.widgetTree { margin-top:10px;}
-.widgetTree a.title { background:url(../img/white/folder.gif) no-repeat left top; padding-left:20px;}
-.widgetTree a.strong { font-weight:bold; }
-.widgetTree span { font-size:9px; font-family:tahoma; padding:0; margin:0; color:#999;}
-.widgetTree ul span { margin-left:15px; }
-.widgetTree *{ margin:0; padding:0; font-size:12px;}
-.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
-.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1; margin-left:8px;}
-.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
-.widgetTree ul li a,
-.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
-.widgetTree ul li a {text-decoration:none; }
-.widgetTree ul li a.selected {font-weight:bold;}
-.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
-.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
-.widgetTree ul li ul li{ display:none;}
-.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
-.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
-.widgetTree ul li.nav_tree_on ul{ display:block;}
-.widgetTree ul li.nav_tree_on ul li{ display:block;}
-.widgetTree ul li.nav_tree_off ul{ display:none;}
-.widgetTree ul li.nav_tree_off ul li{ display:none;}
-.widgetTree .icon{ position:relative; left:16px;}
-
-/* widgetTree */
-.widgetTree{ color:#333;}
-.widgetTree a{ color:#333; text-decoration:none;}
-
-/* Widget Tree */
-.widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
-.widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
-.widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
-.widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
-
-.widgetContainer.black .widgetTree { margin-top:10px;}
-.widgetContainer.black .widgetTree a.title { background:url(../img/black/folder.gif) no-repeat left top; padding-left:20px;}
-.widgetContainer.black .widgetTree span { font-size:9px; font-family:tahoma; padding:0; margin:0; color:#333;}
-.widgetContainer.black .widgetTree ul span { margin-left:15px; }
-.widgetContainer.black .widgetTree *{ margin:0; padding:0; font-size:12px;}
-.widgetContainer.black .widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
-.widgetContainer.black .widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1; margin-left:8px;}
-.widgetContainer.black .widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
-.widgetContainer.black .widgetTree ul li a,
-.widgetContainer.black .widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
-.widgetContainer.black .widgetTree ul li a {text-decoration:none; }
-.widgetContainer.black .widgetTree ul li a.selected {font-weight:bold;}
-.widgetContainer.black .widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
-.widgetContainer.black .widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
-.widgetContainer.black .widgetTree ul li ul li{ display:none;}
-.widgetContainer.black .widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
-.widgetContainer.black .widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
-.widgetContainer.black .widgetTree ul li.nav_tree_on ul{ display:block;}
-.widgetContainer.black .widgetTree ul li.nav_tree_on ul li{ display:block;}
-.widgetContainer.black .widgetTree ul li.nav_tree_off ul{ display:none;}
-.widgetContainer.black .widgetTree ul li.nav_tree_off ul li{ display:none;}
-.widgetContainer.black .widgetTree .icon{ position:relative; left:16px;}
-
-/* widgetTree */
-.widgetContainer.black .widgetTree{ color:#999;}
-.widgetContainer.black .widgetTree a { color:#999; text-decoration:none;}
-
-/* Widget Tree */
-.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
-.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
-.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
-.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
-
+@charset "utf-8";
+
+/* Widget Tree */
+.widgetTree { margin-top:10px;}
+.widgetTree a.all { background:url(../img/white/folder.gif) no-repeat left top; padding-left:20px;}
+.widgetTree a.strong { font-weight:bold; }
+.widgetTree span { font-size:9px; font-family:tahoma; padding:0; margin:0; color:#999;}
+.widgetTree ul span { margin-left:15px; }
+.widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1; margin-left:8px;}
+.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetTree ul li a,
+.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetTree ul li a {text-decoration:none; }
+.widgetTree ul li a.selected {font-weight:bold;}
+.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetTree ul li ul li{ display:none;}
+.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetTree */
+.widgetTree{ color:#333;}
+.widgetTree a{ color:#333; text-decoration:none;}
+
+/* Widget Tree */
+.widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
+.widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+.widgetContainer.black .widgetTree { margin-top:10px;}
+.widgetContainer.black .widgetTree a.all { background:url(../img/black/folder.gif) no-repeat left top; padding-left:20px;}
+.widgetContainer.black .widgetTree span { font-size:9px; font-family:tahoma; padding:0; margin:0; color:#333;}
+.widgetContainer.black .widgetTree ul span { margin-left:15px; }
+.widgetContainer.black .widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetContainer.black .widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetContainer.black .widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1; margin-left:8px;}
+.widgetContainer.black .widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetContainer.black .widgetTree ul li a,
+.widgetContainer.black .widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetContainer.black .widgetTree ul li a {text-decoration:none; }
+.widgetContainer.black .widgetTree ul li a.selected {font-weight:bold;}
+.widgetContainer.black .widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -2px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetContainer.black .widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetContainer.black .widgetTree ul li ul li{ display:none;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetContainer.black .widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetContainer.black .widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetContainer.black .widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetTree */
+.widgetContainer.black .widgetTree{ color:#999;}
+.widgetContainer.black .widgetTree a { color:#999; text-decoration:none;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
diff --git a/widgets/content/conf/info.xml b/widgets/content/conf/info.xml
index 35b2c261e..20c9e04f2 100644
--- a/widgets/content/conf/info.xml
+++ b/widgets/content/conf/info.xml
@@ -8,7 +8,7 @@
게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.
게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.
以各种样式显示主题，评论，附件等站内内容的全局控件。
- 是種可輸出討論板、評論，附加檔案等內容的控件。
+ 是種可輸出討論板、評論，附加檔案等內容的組件。
掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。
0.1
2009-03-16
@@ -65,11 +65,11 @@
rss
- RSS
- RSS
- RSS
- RSS
- RSS
+ 피드 (RSS/ATOM)
+ Feed (RSS/ATOM)
+ Feed (RSS/ATOM)
+ Feed (RSS/ATOM)
+ Feed (RSS/ATOM)
@@ -539,7 +539,7 @@
新しく登録された書き込みに対して「New」の表示時間を指定します（時間単位）。
You may set the duration of indication for fresh item. (unit is hour)
Вы можете установить длительность индикации для нового объекта. (единица - час)
- 可設置最新更新主題的new圖案顯示時間。
+ 可設置最後更新主題的new圖案顯示時間。
text
@@ -584,53 +584,87 @@
+
+ select
+ HTML 출력 방식
+ HTML 출력 방식
+ HTML 출력 방식
+ HTML 출력 방식
+ HTML 출력 방식
+ HTML 출력 방식
+ TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)
+ TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)
+ TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)
+ TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)
+ TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)
+ TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)
+
+ table
+ Table
+ Table
+ Table
+ Table
+ Table
+ Table
+
+
+ list
+ UL (list)
+ UL (list)
+ UL (list)
+ UL (list)
+ UL (list)
+ UL (list)
+
diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php
index 3e6de89f1..36d9c0eca 100644
--- a/widgets/content/content.class.php
+++ b/widgets/content/content.class.php
@@ -51,10 +51,13 @@
// 썸네일 세로 크기
if(!$args->thumbnail_height) $args->thumbnail_height = 75;
-
+
// 보기 옵션
$args->option_view_arr = explode(',',$args->option_view);
+ // markup 옵션
+ if(!$args->markup_type) $args->markup_type = 'table';
+
// 내부적으로 쓰이는 변수 설정
$oModuleModel = &getModel('module');
$module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
@@ -252,6 +255,7 @@
$content_item = new contentItem( $args->module_srls_info[$module_srl]->browser_title );
$content_item->adds($oDocument->getObjectVars());
+ $content_item->setTitle($oDocument->getTitle());
$content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
$content_item->setDomain( $args->module_srls_info[$module_srl]->domain );
$content_item->setContent($oDocument->getSummary($args->content_cut_size));
@@ -302,7 +306,6 @@
$browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
$domain = $args->module_srls_info[$attribute->module_srl]->domain;
$category = $category_lists[$attribute->module_srl]->text;
- $attribute = $oDocument->getObjectVars();
$content = $oDocument->getSummary($args->content_cut_size);
$url = sprintf("%s#%s",$oDocument->getPermanentUrl() ,$oDocument->getCommentCount());
$thumbnail = $oDocument->getThumbnail($args->thumbnail_width,$args->thumbnail_height,$args->thumbnail_type);
@@ -619,6 +622,8 @@
$widget_info->list_type = $args->list_type;
$widget_info->tab_type = $args->tab_type;
+ $widget_info->markup_type = $args->markup_type;
+
// 탭형태일경우 탭에 대한 정보를 정리하고 module_srl로 되어 있는 key값을 index로 변경
if($args->tab_type != 'none' && $args->tab_type) {
$tab = array();
@@ -727,8 +732,16 @@
return $this->get('module_srl');
}
function getTitle($cut_size = 0, $tail='...'){
- if($cut_size) $title = cut_str($this->get('title'), $cut_size, $tail);
- else $title = $this->get('title');
+ $title = strip_tags($this->get('title'));
+
+ if($cut_size) $title = cut_str($title, $cut_size, $tail);
+
+ $attrs = array();
+ if($this->get('title_bold') == 'Y') $attrs[] = 'font-weight:bold';
+ if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = 'color:#'.$this->get('title_color');
+
+ if(count($attrs)) $title = sprintf("%s ", implode(';', $attrs), htmlspecialchars($title));
+
return $title;
}
function getContent(){
diff --git a/widgets/content/skins/default/css/widget.css b/widgets/content/skins/default/css/widget.css
index ba43c97a2..e3ce82672 100644
--- a/widgets/content/skins/default/css/widget.css
+++ b/widgets/content/skins/default/css/widget.css
@@ -22,6 +22,8 @@
.widgetTabA li a{ position:relative; left:2px; float:left; height:20px; padding:8px 15px 0 15px; text-decoration:none; font-size:12px; background-repeat:no-repeat; background-position:right 0;}
.widgetTabA li.active a{ background-position:right -30px; font-weight:bold; letter-spacing:-1px;}
+ul.widgetA { margin:0; padding:0; list-style:none; }
+ul.widgetA li { margin:0; padding:0; list-style:none; }
.widgetTableA { width:100%; font-size:12px; position:relative; border:0;}
.widgetTableA td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:1px 5px 1px 5px;}
.widgetTableA td.title{ width:100%; white-space:normal;}
@@ -107,6 +109,15 @@ dl.widgetDivider dd{ display:none; margin:0;}
.widgetTabA li a{ background-image:url(../img/white/buttonWidgetTab.gif);}
.widgetTabA li a{ color:#333;}
+.widgetA a.board { color:#333; padding-right:5px; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetA .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetA .category{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetA .replyNum a{ color:#ff1a1a;}
+.widgetA .trackbackNum a{ color:#66c;}
+.widgetA .author { color:#333;}
+.widgetA .date{ color:#333;}
+.widgetA .hour{ color:#888;}
+
.widgetTableA td.title a{ color:#333;}
.widgetTableA td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
.widgetTableA td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
diff --git a/widgets/content/skins/default/image_title.html b/widgets/content/skins/default/image_title.html
index a733e8aa9..92baabc65 100644
--- a/widgets/content/skins/default/image_title.html
+++ b/widgets/content/skins/default/image_title.html
@@ -1,60 +1,121 @@
-{@$have_first_thumbnail=false}
-
- {@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
- {@$have_first_thumbnail=true}
-
-
-
+
+
+ {@$have_first_thumbnail=false}
+
+ {@$thumbnail_idx = $widget_info->content_items[0]->getFirstThumbnailIdx() }
+ {@$have_first_thumbnail=true}
+
+
+
- style="padding-left:{$widget_info->thumbnail_width+10}px">
-
-
-
-
-
diff --git a/widgets/content/skins/default/normal.html b/widgets/content/skins/default/normal.html
index 540ced48f..9d2baeb56 100644
--- a/widgets/content/skins/default/normal.html
+++ b/widgets/content/skins/default/normal.html
@@ -1,50 +1,100 @@
-
-
-
-
-
+
+ {$item->printExtraImages()}
+
+
+
+ getMemberSrl())-->href="#" onclick="return false;" class="author member_{$item->getMemberSrl()}"href="{$item->getAuthorSite()}" onclick="window.open(this.href); return false;" class="author member"href="#" onclick="return false;" class="author member" >{$item->getNickName()}
+
+
+ {$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}
+
+
+
+ {@$_idx++}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/widgets/forum/conf/info.xml b/widgets/forum/conf/info.xml
index 06316026e..ebb94de31 100644
--- a/widgets/forum/conf/info.xml
+++ b/widgets/forum/conf/info.xml
@@ -30,7 +30,7 @@
Этот виджет отображает новейшие изделия из одной или нескольких борту в стиле форума. Описание будет отображаться с целевыми борту название и описание.
- 把一個或多個討論板顯示成論壇介面的控件。
+ 把一個或多個討論板顯示成論壇介面的widget。
論壇標題及說明，請參考各討論板裡的標題設置與說明。
0.1
@@ -62,7 +62,7 @@
You may set the duration of indication for fresh item. (unit is hour)
Usted puede configurar la duración de la indicación de un nuevo tema. (Unidad es hora)
Вы можете установить длительность индикации для нового объекта. (единица - час)
- 可設置最新修改主題的new圖案顯示時。
+ 可設置最後修改主題的new圖案顯示時間。
text
diff --git a/widgets/image_counter/conf/info.xml b/widgets/image_counter/conf/info.xml
index 5bde42909..b46510e85 100644
--- a/widgets/image_counter/conf/info.xml
+++ b/widgets/image_counter/conf/info.xml
@@ -38,9 +38,9 @@
Чтобы отображать график, GD библиотека должна быть установлена.
- 能新增到部落格或網站的圖形統計控件。
- 不設置控件大小、背景顏色時，將使用預設。
- 因程式需要自動繪出圖形，所以主機必須要安裝 GD。
+ 可新增到部落格或網站的圖形統計 Widget。
+ 不設定尺寸大小、背景顏色時，將使用預設。
+ 輸出圖形時，主機必須要安裝 GD library。
0.1
2007-08-27
@@ -97,7 +97,7 @@
指定圖片寬度。
預設是150px。只需輸入數字即可。
- 此寬度與代碼建立頁面的寬度是不同的。
+ 此寬度與原始碼建立頁面的寬度是不同的。
diff --git a/widgets/language_select/conf/info.xml b/widgets/language_select/conf/info.xml
index db17de141..fc81ae506 100644
--- a/widgets/language_select/conf/info.xml
+++ b/widgets/language_select/conf/info.xml
@@ -6,7 +6,7 @@
Language
Selcción del Idioma
Выбор языка
- 選擇語言
+ 語言選擇
사용자의 접속언어를 변경할 수 있는 select폼을 출력합니다.
言語を変更することが出来るセレクト（select）フォームを表示します。
可以实现多国语言相互切换。
diff --git a/widgets/logged_members/conf/info.xml b/widgets/logged_members/conf/info.xml
index 496e74568..cfe070e52 100644
--- a/widgets/logged_members/conf/info.xml
+++ b/widgets/logged_members/conf/info.xml
@@ -11,7 +11,7 @@
This widget displays on-line members.
显示在线会员列表的控件。
Este widget muestra en línea de los miembros.
- 顯示線上會員的控件。
+ 顯示線上會員的widget。
0.1
2008-06-18
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index 67d185b1a..4af360d6c 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -33,12 +33,12 @@
- {$lang->keep_signed}
Open ID
diff --git a/widgets/member_group/conf/info.xml b/widgets/member_group/conf/info.xml
index b9dce905e..d3ad15151 100644
--- a/widgets/member_group/conf/info.xml
+++ b/widgets/member_group/conf/info.xml
@@ -6,7 +6,7 @@
Muestra el grupo de usuario específico
会员列表
Отображение членов определенной группы
- 特定會員列表
+ 特定會員群組
특정 그룹에 속한 회원의 목록을 출력하는 위젯입니다.
아직 테스트용 위젯이며 해당 그룹에 지정된 수 이상의 회원이 있을 경우 최근 가입순서대로 출력이 됩니다.
@@ -38,8 +38,8 @@
Вы можете ввести группы для отображения в пространство ниже. Вы можете использовать запятую(,) для множественного ввода.
- 顯示特定用戶組會員列表的控件。
- 該組用戶數比要顯示的用戶數多時，按照最近註冊日期來顯示。(測試中的控件)
+ 顯示特定用戶組會員列表的widget。
+ 該組用戶數比要顯示的用戶數多時，按照最近註冊日期來顯示。(測試中)
要顯示的目標用戶組名稱以，(逗號)做區隔。
0.1
diff --git a/widgets/navigator/navigator.class.php b/widgets/navigator/navigator.class.php
index 372fecfba..e6b006f69 100644
--- a/widgets/navigator/navigator.class.php
+++ b/widgets/navigator/navigator.class.php
@@ -101,6 +101,10 @@
$obj->selected = $val['selected'];
$obj->open_window = $val['open_window'];
+ $obj->normal_btn = $val['normal_btn'];
+ $obj->hover_btn = $val['hover_btn'];
+ $obj->active_btn = $val['active_btn'];
+
$obj->child_count = 0;
$obj->childs = array();
diff --git a/widgets/navigator/skins/horiNavigator/navigator.html b/widgets/navigator/skins/horiNavigator/navigator.html
index c37e5c129..3d336a8cf 100755
--- a/widgets/navigator/skins/horiNavigator/navigator.html
+++ b/widgets/navigator/skins/horiNavigator/navigator.html
@@ -13,7 +13,7 @@ widget_navigator[{$widget_info->menu_srl}].load('{$widget_info->xml_file}');
+
+
{@ $_pDepth = $val->depth}
diff --git a/widgets/navigator/skins/tree/skin.xml b/widgets/navigator/skins/tree/skin.xml
index 9546b9f9b..7d2ef9889 100644
--- a/widgets/navigator/skins/tree/skin.xml
+++ b/widgets/navigator/skins/tree/skin.xml
@@ -3,11 +3,11 @@
메뉴 트리 출력 스킨
树形菜单皮肤
樹狀選單面板
- 메뉴 트리 출력 스킨
+ ツリー型メニュー用スキン
메뉴를 트리구조로 출력합니다.
树形菜单皮肤
以樹狀結構顯示選單。
- 메뉴를 트리구조로 출력합니다.
+ メニューをツリー型に表示します。
0.1
2009-02-10
- {$item->getContent()}
-
{zdate($item->get('regdate'),"y.m.d",false)} {zdate($item->get('regdate'),"H:i",false)}
+ {$item->getContent()}
+
{zdate($item->get('regdate'),"y.m.d",false)} {zdate($item->get('regdate'),"H:i",false)}
+
by {$item->getNickName()}
+
{$lang->comment}:{$item->getCommentCount()} {$lang->cmd_planet_good}:{$item->getVotedCount()}
diff --git a/widgets/point_status/conf/info.xml b/widgets/point_status/conf/info.xml
index 4441c733b..f9f859577 100644
--- a/widgets/point_status/conf/info.xml
+++ b/widgets/point_status/conf/info.xml
@@ -22,7 +22,7 @@
Cache must be 0.
- 顯示會員積分狀況的控件。
+ 顯示會員積分狀況的widget。
暫存要設為 0。
0.1
diff --git a/widgets/rank_count/conf/info.xml b/widgets/rank_count/conf/info.xml
index 20a1f462d..0b9033eca 100644
--- a/widgets/rank_count/conf/info.xml
+++ b/widgets/rank_count/conf/info.xml
@@ -13,7 +13,7 @@
Este widget muestra de artículos y comentarios ranking.
按发表主题/评论/附件/推荐/查看数显示会员排行的控件。
Этот виджет отображает рейтинг статей и комментариев.
- 顯示會員發表主題/評論/附檔/推薦/點閱排行的控件。
+ 顯示會員發表主題/評論/附檔/推薦/點閱排行的widget。
1.5
2009-02-23
diff --git a/widgets/rank_download/conf/info.xml b/widgets/rank_download/conf/info.xml
index 98dec5888..c3b1735db 100644
--- a/widgets/rank_download/conf/info.xml
+++ b/widgets/rank_download/conf/info.xml
@@ -36,7 +36,7 @@
N º de la lista
目录数
Число списка
- 目錄數
+ 列表數
출력될 목록의 수를 정하실 수 있습니다. (기본 5개)
出力するリスト数を指定します（デフォルト5個）。
You may set number of list that will be displayed. (default 5)
diff --git a/widgets/rank_point/conf/info.xml b/widgets/rank_point/conf/info.xml
index c6a519da6..b72b91167 100644
--- a/widgets/rank_point/conf/info.xml
+++ b/widgets/rank_point/conf/info.xml
@@ -13,7 +13,7 @@
Este widget muestra de los miembros del punto de la clasificación.
显示会员积分排行的控件。
Этот виджет отображает рейтинг поитов пользователей.
- 顯示會員點數排行的控件。
+ 顯示會員點數排行的widget。
1.0
2007-08-29
@@ -36,7 +36,7 @@
N º de la lista
Количество Список
目录数
- 目錄數
+ 列表數
출력될 목록의 수를 정하실 수 있습니다. (기본 5개)
出力するリストの数を指定します（デフォルト5個）。
You may set number of list that will be displayed. (default 5)
diff --git a/widgets/rss_reader/conf/info.xml b/widgets/rss_reader/conf/info.xml
index 85747b3f3..57e798234 100644
--- a/widgets/rss_reader/conf/info.xml
+++ b/widgets/rss_reader/conf/info.xml
@@ -11,7 +11,7 @@
RSS阅读器控件。
This widget displays data retrieved from RSS feed.
Этот виджет отображает данные, полученные посредством RSS.
- RSS閱讀器控件。
+ RSS閱讀器widget。
#7
2007-10-26
diff --git a/widgets/site_info/conf/info.xml b/widgets/site_info/conf/info.xml
index 37da2e0a8..47d9e44f3 100644
--- a/widgets/site_info/conf/info.xml
+++ b/widgets/site_info/conf/info.xml
@@ -6,7 +6,7 @@
バーチャル(Virtual)サイト情報
cafeXE와 같은 분양형 가상 사이트의 정보를 출력하는 위젯입니다.
显示子站点信息的控件。
- 可輸出顯示cafeXE資訊的控件。
+ 可輸出顯示虛擬網站資訊的widget。
cafeXEのような分譲型バーチャル(Virtual)サイトの情報を出力するウィジェットです。
0.1
2009-02-16
diff --git a/widgets/tab_newest_document/conf/info.xml b/widgets/tab_newest_document/conf/info.xml
index bde38c56c..da675ec6e 100644
--- a/widgets/tab_newest_document/conf/info.xml
+++ b/widgets/tab_newest_document/conf/info.xml
@@ -132,7 +132,7 @@
新しく登録された書き込みに対して「New」の表示時間を指定します（時間単位）。
You may set the duration of indication for fresh item. (unit is hour)
Вы можете установить длительность индикации для нового объекта. (единица - час)
- 可設置最新更新主題的new圖案顯示時間。
+ 可設置最後更新主題的new圖案顯示時間。
text
diff --git a/widgets/webzine/conf/info.xml b/widgets/webzine/conf/info.xml
index a4de055fe..ef4637073 100644
--- a/widgets/webzine/conf/info.xml
+++ b/widgets/webzine/conf/info.xml
@@ -116,7 +116,7 @@
You may set the duration for indication of new item for newest article. (unit is hour)
Usted puede configurar la duración de la indicación de un nuevo tema. (Unidad es hora)
Вы можете установить длительность индикации для нового объекта. (единица - час)
- 可設置最新更新主題的new圖案顯示時間。
+ 可設置最後更新主題的new圖案顯示時間。
text
diff --git a/widgetstyles/colorbox/skin.xml b/widgetstyles/colorbox/skin.xml
index a97102c7f..0b0d15295 100644
--- a/widgetstyles/colorbox/skin.xml
+++ b/widgetstyles/colorbox/skin.xml
@@ -9,7 +9,7 @@
Baisc squared widget style
각진 면으로 꾸며진 위젯스타일 입니다.
可變換多種色彩外框的控件樣式。
- ウィジェットのスタイルです。
+ 面のウィジェットスタイルです。
0.1
2009-03-10
preview.gif
@@ -118,6 +118,7 @@
Más información URL
URL를 등록합니다.
Register an URL.
+ URLを登録します。
URL para registrarse.
diff --git a/widgetstyles/colorbox/widgetstyle.html b/widgetstyles/colorbox/widgetstyle.html
index 85994befa..1ecae57f0 100644
--- a/widgetstyles/colorbox/widgetstyle.html
+++ b/widgetstyles/colorbox/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/line/widgetstyle.html b/widgetstyles/line/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/line/widgetstyle.html
+++ b/widgetstyles/line/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/memo/widgetstyle.html b/widgetstyles/memo/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/memo/widgetstyle.html
+++ b/widgetstyles/memo/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/postitWire/widgetstyle.html b/widgetstyles/postitWire/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/postitWire/widgetstyle.html
+++ b/widgetstyles/postitWire/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/roundWire/widgetstyle.html b/widgetstyles/roundWire/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/roundWire/widgetstyle.html
+++ b/widgetstyles/roundWire/widgetstyle.html
@@ -4,7 +4,7 @@
-
@@ -71,7 +71,7 @@
「もっと見る」URL
http:// 포함한 URL를 등록합니다.
Destination of a link 'more'. Register an URL including http://
- http:// 포함한 URL를 등록합니다.
+ 「http://」を含んだURLを登録します。
더보기 텍스트
diff --git a/widgetstyles/simpleRound/skin.xml b/widgetstyles/simpleRound/skin.xml
index 92bb68b02..1d565f4a7 100644
--- a/widgetstyles/simpleRound/skin.xml
+++ b/widgetstyles/simpleRound/skin.xml
@@ -5,7 +5,7 @@
シンプルラウンド
둥근 선으로 꾸며진 위젯스타일 입니다.
可變換多種線條外框的控件樣式。
- ウィジェットのスタイルです。
+ ラウンドな線のウィジェットスタイルです。
0.1
2009-03-10
preview.gif
@@ -26,7 +26,7 @@
widgetBoxC
심플 라운드
- 심플 라운드
+ シンプルラウンド
@@ -72,6 +72,7 @@
more URL
「もっと見る」URL
URL를 등록합니다.
+ URLを登録します。
더보기 이미지
diff --git a/widgetstyles/simpleRound/widgetstyle.html b/widgetstyles/simpleRound/widgetstyle.html
index 3e1e05f04..e7aa44ea8 100644
--- a/widgetstyles/simpleRound/widgetstyle.html
+++ b/widgetstyles/simpleRound/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/simpleSquare/widgetstyle.html b/widgetstyles/simpleSquare/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/simpleSquare/widgetstyle.html
+++ b/widgetstyles/simpleSquare/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/simpleTitle/widgetstyle.html b/widgetstyles/simpleTitle/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/simpleTitle/widgetstyle.html
+++ b/widgetstyles/simpleTitle/widgetstyle.html
@@ -4,7 +4,7 @@
-
더보기 이미지
diff --git a/widgetstyles/squareWire/widgetstyle.html b/widgetstyles/squareWire/widgetstyle.html
index 3e1e05f04..fb48ceb3f 100644
--- a/widgetstyles/squareWire/widgetstyle.html
+++ b/widgetstyles/squareWire/widgetstyle.html
@@ -4,7 +4,7 @@
-
{$component->title}
-
-