From f63c58674a5ae1f740a2e7904e68da2a41822abf Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 6 Dec 2007 07:06:08 +0000 Subject: [PATCH] =?UTF-8?q?#291=20=EC=9B=B9=EC=A7=84=ED=98=95=20=EC=9C=84?= =?UTF-8?q?=EC=A0=AF=EC=9D=98=20=EC=A0=95=EB=A0=AC=20=EC=88=9C=EC=84=9C?= =?UTF-8?q?=EA=B0=80=20=EC=A0=81=EC=9A=A9=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=ED=96=88=EA=B3=A0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B0=80=20?= =?UTF-8?q?=EC=97=86=EB=8D=94=EB=9D=BC=EB=8F=84=20=EB=85=B8=EC=B6=9C?= =?UTF-8?q?=EC=9D=B4=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= 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@3163 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- .../webzine/skins/xe_official/css/normal.css | 2 +- widgets/webzine/skins/xe_official/list.html | 7 ++- widgets/webzine/webzine.class.php | 48 +++++++++++++------ 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/widgets/webzine/skins/xe_official/css/normal.css b/widgets/webzine/skins/xe_official/css/normal.css index 13cf54ef6..2953f356e 100644 --- a/widgets/webzine/skins/xe_official/css/normal.css +++ b/widgets/webzine/skins/xe_official/css/normal.css @@ -15,7 +15,7 @@ .nw_box .thumbnailBox .thumbnail img { padding:4px; border:1px solid #DEDEDE; } .nw_box .thumbnailBox .thumbnail img:hover { border:1px solid #54564b; } -.nw_box .thumbnailBox .desc { padding-left:5px; } +.nw_box .thumbnailBox .desc { padding-left:5px; padding-bottom:5px; } .nw_box .thumbnailBox .titleBox { margin-top:8px; margin-bottom:5px;} diff --git a/widgets/webzine/skins/xe_official/list.html b/widgets/webzine/skins/xe_official/list.html index 36ab6e583..85dd80802 100644 --- a/widgets/webzine/skins/xe_official/list.html +++ b/widgets/webzine/skins/xe_official/list.html @@ -17,14 +17,17 @@ {@ $oDocument = $widget_info->document_list[$i*$widget_info->cols_list_count + $j]} + {@ $_existsThumbnail = $oDocument->thumbnailExists($widget_info->thumbnail_width,$widget_info->thumbnail_height,$widget_info->thumbnail_type) } rows_list_count>1)-->class="bottomBorder"> + + - - +
+
diff --git a/widgets/webzine/webzine.class.php b/widgets/webzine/webzine.class.php index e94797d8e..863a15fb3 100644 --- a/widgets/webzine/webzine.class.php +++ b/widgets/webzine/webzine.class.php @@ -43,6 +43,15 @@ $widget_info->cols_list_count = (int)$args->cols_list_count; if(!$widget_info->cols_list_count) $widget_info->cols_list_count = 2; + // 정렬 대상 + $widget_info->order_target = $args->order_target; + if(!in_array($widget_info->order_target, array('list_order','update_order'))) $widget_info->order_target = 'list_order'; + + // 정렬 순서 + $widget_info->order_type = $args->order_type; + if(!in_array($widget_info->order_type, array('asc','desc'))) $widget_info->order_type = 'asc'; + + // 노출 여부 체크 if($args->display_author!='Y') $widget_info->display_author = 'N'; else $widget_info->display_author = 'Y'; @@ -62,29 +71,40 @@ // 템플릿 파일에서 사용할 변수들을 세팅 if(count($mid_list)==1) $widget_info->module_name = $mid_list[0]; - // 변수 정리 - $obj->list_count = $widget_info->rows_list_count * $widget_info->cols_list_count; - // mid에 해당하는 module_srl을 구함 $oModuleModel = &getModel('module'); $module_srl_list = $oModuleModel->getModuleSrlByMid($mid_list); - if(is_array($module_srl_list)) $obj->module_srls = implode(",",$module_srl_list); - else $obj->module_srls = $module_srl_list; - $obj->direct_download = 'Y'; - $obj->isvalid = 'Y'; + if(is_array($module_srl_list)) $obj->module_srl = implode(",",$module_srl_list); + else $obj->module_srl = $module_srl_list; + $obj->sort_index = $widget_info->order_target; + $obj->order_type = $widget_info->order_type=="desc"?"asc":"desc"; + $obj->list_count = $widget_info->rows_list_count * $widget_info->cols_list_count; - // 정해진 모듈에서 문서별 파일 목록을 구함 - $files_output = executeQueryArray("file.getOneFileInDocument", $obj); + $output = executeQueryArray('widgets.newest_document.getNewestDocuments', $obj); + // document 모듈의 model 객체를 받아서 결과를 객체화 시킴 $oDocumentModel = &getModel('document'); - if(count($files_output->data)) { - foreach($files_output->data as $key => $val) { + + // 오류가 생기면 그냥 무시 + if(!$output->toBool()) return; + + // 결과가 있으면 각 문서 객체화를 시킴 + if(count($output->data)) { + foreach($output->data as $key => $attribute) { + $document_srl = $attribute->document_srl; + $oDocument = null; - $oDocument = $oDocumentModel->getDocument(); - $oDocument->setAttribute($val); - $document_list[] = $oDocument; + $oDocument = new documentItem(); + $oDocument->setAttribute($attribute); + + $document_list[$key] = $oDocument; } + } else { + + $document_list = array(); + } + $document_count = count($document_list); $total_count = $widget_info->rows_list_count * $widget_info->cols_list_count; for($i=$document_count;$i<$total_count;$i++) $document_list[] = new DocumentItem();