From dc941805d4d09d83a753891d205dc54cdc9180a7 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 9 Jun 2008 05:18:19 +0000 Subject: [PATCH] =?UTF-8?q?#445=20=EC=9C=84=EC=A0=AF=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=EC=8B=9C=20mid=5Flist=EA=B0=80=20?= =?UTF-8?q?=EC=95=84=EB=8B=8C=20mid=EB=9D=BC=EB=8A=94=20=EC=A7=80=EC=8B=9C?= =?UTF-8?q?=EC=96=B4=EB=A1=9C=20=EB=8B=A8=EC=9D=BC=20mid=EB=A5=BC=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=ED=95=98=EA=B2=8C=20=ED=95=98=EA=B3=A0=20arc?= =?UTF-8?q?hive=5Flist,=20tag=5Flist=EC=9D=98=20mid=5Flist=EB=A5=BC=20mid?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4253 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/common.js | 2 +- modules/widget/tpl/widget_generate_code.html | 18 ++++++++++++++++++ .../tpl/widget_generate_code_in_page.html | 15 +++++++++++++++ widgets/archive_list/archive_list.class.php | 16 ++++++++++------ widgets/archive_list/conf/info.xml | 4 ++-- .../skins/blog_archive_list/archive_list.html | 2 +- widgets/tag_list/conf/info.xml | 4 ++-- widgets/tag_list/skins/blog_tag_list/tags.html | 2 +- widgets/tag_list/tag_list.class.php | 12 +++++++++--- 9 files changed, 59 insertions(+), 16 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index c942c1519..d3ff24680 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -795,7 +795,7 @@ if(xIE4Up) { else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++; else this.selectedIndex--; } else { - this.oldonchange(); + if(this.oldonchange) this.oldonchange(); } } diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html index 1b0899769..815bf69b4 100644 --- a/modules/widget/tpl/widget_generate_code.html +++ b/modules/widget/tpl/widget_generate_code.html @@ -95,6 +95,24 @@ + + + + + +

{nl2br($var->description)}

diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html index c105d5bc4..28a2d981f 100644 --- a/modules/widget/tpl/widget_generate_code_in_page.html +++ b/modules/widget/tpl/widget_generate_code_in_page.html @@ -108,6 +108,21 @@ + + +

{nl2br($var->description)}

diff --git a/widgets/archive_list/archive_list.class.php b/widgets/archive_list/archive_list.class.php index 542073b49..932d17c47 100644 --- a/widgets/archive_list/archive_list.class.php +++ b/widgets/archive_list/archive_list.class.php @@ -15,21 +15,25 @@ * 결과를 만든후 print가 아니라 return 해주어야 한다 **/ function proc($args) { - // 위젯 자체적으로 설정한 변수들을 체크 - $title = $args->title; - $mid_list = explode(",",$args->mid_list); + if($args->mid_list) { + $tmp_mid = explode(",",$args->mid_list); + $mid = $tmp_mid[0]; + } else { + $mid = $args->mid; + } // DocumentModel::getMonthlyArchivedList()를 이용하기 위한 변수 정리 - $obj->mid = $mid_list; + $obj->mid = $mid; // document 모듈의 model 객체를 받아서 getMonthlyArchivedList() method를 실행 $oDocumentModel = &getModel('document'); $output = $oDocumentModel->getMonthlyArchivedList($obj); // 템플릿 파일에서 사용할 변수들을 세팅 - if(count($mid_list)==1) $widget_info->module_name = $mid_list[0]; + $widget_info->module_name = $mid; + $widget_info->mid = $mid; - $widget_info->title = $title; + $widget_info->title = $args->title; $widget_info->archive_list = $output->data; Context::set('widget_info', $widget_info); diff --git a/widgets/archive_list/conf/info.xml b/widgets/archive_list/conf/info.xml index 10571f870..93125b133 100644 --- a/widgets/archive_list/conf/info.xml +++ b/widgets/archive_list/conf/info.xml @@ -54,14 +54,14 @@ Este será el título del reporte. Это будет заголовком отчета. - + 대상 모듈 对象模块 モジュール Target Module Módulo objetivo Модуль назначения - mid_list + mid 선택하신 모듈에 등록된 글을 대상으로 합니다. 把被选模块作为统计对象。 チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。 diff --git a/widgets/archive_list/skins/blog_archive_list/archive_list.html b/widgets/archive_list/skins/blog_archive_list/archive_list.html index 94d41ee45..e8b347dfa 100644 --- a/widgets/archive_list/skins/blog_archive_list/archive_list.html +++ b/widgets/archive_list/skins/blog_archive_list/archive_list.html @@ -29,7 +29,7 @@
  • {zdate($val->month,'Y. m')} ({$val->count})
    • -
  • {zdate($val->month,'Y. m')} ({$val->count})
    • +
  • {zdate($val->month,'Y. m')} ({$val->count})
    • diff --git a/widgets/tag_list/conf/info.xml b/widgets/tag_list/conf/info.xml index eae4f07a3..07111dce4 100644 --- a/widgets/tag_list/conf/info.xml +++ b/widgets/tag_list/conf/info.xml @@ -51,14 +51,14 @@ Usted puede definir el número de etiquetas a mostrar. (predefinido: 20) Вы можете сконфигурировать число тегов для показа. (стандарт: 20)     - + 대상 모듈 模块对象 モジュール Target Module Módulo Objetivo Модуль назначения - mid_list + mid 선택하신 모듈에 등록된 꼬리표를 대상으로 합니다. 将把被选模块当中的标签作为对象。 チェックされたモジュールに登録されたタグを対象とします。 diff --git a/widgets/tag_list/skins/blog_tag_list/tags.html b/widgets/tag_list/skins/blog_tag_list/tags.html index 2f10930b2..8b1e1a6c6 100644 --- a/widgets/tag_list/skins/blog_tag_list/tags.html +++ b/widgets/tag_list/skins/blog_tag_list/tags.html @@ -45,7 +45,7 @@ {htmlspecialchars($val->tag)} - {htmlspecialchars($val->tag)} + {htmlspecialchars($val->tag)} diff --git a/widgets/tag_list/tag_list.class.php b/widgets/tag_list/tag_list.class.php index 0f9a5bd7a..a06b5d0f7 100644 --- a/widgets/tag_list/tag_list.class.php +++ b/widgets/tag_list/tag_list.class.php @@ -19,10 +19,15 @@ $title = $args->title; $list_count = (int)$args->list_count; if(!$list_count) $list_count = 20; - $mid_list = explode(",",$args->mid_list); + if($args->mid_list) { + $tmp_mid = explode(",",$args->mid_list); + $mid = $tmp_mid[0]; + } else { + $mid = $args->mid; + } // TagModel::getTagList()를 이용하기 위한 변수 정리 - $obj->mid = $mid_list; + $obj->mid = $mid; $obj->list_count = $list_count; // tag 모듈의 model 객체를 받아서 getTagList() method를 실행 @@ -30,9 +35,10 @@ $output = $oTagModel->getTagList($obj); // 템플릿 파일에서 사용할 변수들을 세팅 - if(count($mid_list)==1) $widget_info->module_name = $mid_list[0]; + $widget_info->module_name = $mid; $widget_info->title = $title; + $widget_info->mid = $mid; if(count($output->data)) {