From f7e29bb6544006ba4d5f30263f1075d8d73f86fa Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 30 Jul 2007 04:05:51 +0000 Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EA=B7=BC=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EC=B6=9C=EC=8B=9C=20=EB=8C=80=EC=83=81=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EB=93=A4=EC=9D=98=20=EB=AC=B8=EC=84=9C?= =?UTF-8?q?=EB=B3=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=201=EA=B0=9C=EC=94=A9?= =?UTF-8?q?=EB=A7=8C=EC=9D=84=20=EB=8C=80=EC=83=81=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=B6=94?= =?UTF-8?q?=EC=B6=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=8A=A4=ED=82=A8=EC=97=90=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=EC=9E=90=20=EB=8B=89=EB=84=A4=EC=9E=84=20=ED=91=9C?= =?UTF-8?q?=EC=8B=9C=ED=95=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/trunk@2076 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/css/default.css | 2 +- modules/document/document.model.php | 4 +-- modules/file/queries/getOneFileInDocument.xml | 20 +++++++++++ widgets/newest_images/newest_images.class.php | 33 +++++++++++++++---- .../skins/default/css/normal.css | 5 ++- widgets/newest_images/skins/default/list.html | 5 +-- 6 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 modules/file/queries/getOneFileInDocument.xml diff --git a/common/css/default.css b/common/css/default.css index 2f777220c..832217788 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -32,7 +32,7 @@ form { margin:0; padding:0; } .iePngFix { behavior:url(./common/js/iePngFix.htc); } /* Input Style Definition */ -.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1.4em; padding:.2em 0 0 .3em; background:#ffffff; font-size:1em; margin-bottom:-2px;} +.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1.4em; padding:.2em 0 0 .3em; background:#ffffff; font-size:1em; } .inputTypeText:hover, .inputTypeText:focus { background:#f4f4f4; } .inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; background:#ffffff; font-size:1em;} diff --git a/modules/document/document.model.php b/modules/document/document.model.php index 40787bc76..b31dd3d27 100644 --- a/modules/document/document.model.php +++ b/modules/document/document.model.php @@ -33,8 +33,8 @@ /** * @brief 여러개의 문서들을 가져옴 (페이징 아님) **/ - function getDocuments($document_srl_list, $is_admin = false) { - if(is_array($document_srl_list)) $document_srls = implode(',',$document_srl_list); + function getDocuments($document_srls, $is_admin = false) { + if(is_array($document_srls)) $document_srls = implode(',',$document_srls); // DB에서 가져옴 $args->document_srls = $document_srls; diff --git a/modules/file/queries/getOneFileInDocument.xml b/modules/file/queries/getOneFileInDocument.xml new file mode 100644 index 000000000..590105455 --- /dev/null +++ b/modules/file/queries/getOneFileInDocument.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/widgets/newest_images/newest_images.class.php b/widgets/newest_images/newest_images.class.php index 6ca751ec9..ad124f527 100644 --- a/widgets/newest_images/newest_images.class.php +++ b/widgets/newest_images/newest_images.class.php @@ -25,19 +25,38 @@ if(!$list_count) $list_count = 5; $mid_list = explode(",",$args->mid_list); - // DocumentModel::getDocumentList()를 이용하기 위한 변수 정리 + // 템플릿 파일에서 사용할 변수들을 세팅 + if(count($mid_list)==1) $widget_info->module_name = $mid_list[0]; + + // 변수 정리 $obj->mid = $mid_list; $obj->sort_index = $order_target; $obj->list_count = $list_count*2; - // document 모듈의 model 객체를 받아서 getDocumentList() method를 실행 - $oDocumentModel = &getModel('document'); - $output = $oDocumentModel->getDocumentList($obj); + // mid에 해당하는 module_srl을 구함 + $oModuleModel = &getModel('module'); + $module_srl_list = $oModuleModel->getModuleSrlByMid($obj->mid); - // 템플릿 파일에서 사용할 변수들을 세팅 - if(count($mid_list)==1) $widget_info->module_name = $mid_list[0]; + $obj->module_srls = implode(",",$module_srl_list); + + // 정해진 모듈에서 문서별 파일 목록을 구함 + $files_output = executeQuery("file.getOneFileInDocument", $obj); + + // 결과에서 문서 번호만을 따로 추출 + if($files_output->data) { + foreach($files_output->data as $key => $val) { + $document_srl = $val->upload_target_srl; + $document_srl_list[] = $document_srl; + } + } + + if(!count($document_srl_list)) return; + + $oDocumentModel = &getModel('document'); + $documents_output = $oDocumentModel->getDocuments($document_srl_list); + if(!count($documents_output)) return; - $widget_info->document_list = $output->data; + $widget_info->document_list = $documents_output; $widget_info->title_length = $title_length; $widget_info->thumbnail_width = $thumbnail_width; $widget_info->list_count = $list_count; diff --git a/widgets/newest_images/skins/default/css/normal.css b/widgets/newest_images/skins/default/css/normal.css index ef0b56689..d31e9f0b5 100644 --- a/widgets/newest_images/skins/default/css/normal.css +++ b/widgets/newest_images/skins/default/css/normal.css @@ -2,6 +2,5 @@ .ni_box .ni_item { float:left; margin:3px; list-style:none; text-align:center;} .ni_box .ni_item a { color:#444444; text-decoration:none; } .ni_box .ni_item a:visited { color:#AAAAAA; text-decoration:none; } -.ni_box .ni_item a:hover { font-weight:bold; letter-spacing:-1px; } -.ni_box .ni_item img { padding:5px; } -.ni_box .ni_item img:hover { border:1px solid #888888; padding:4px;} +.ni_box .ni_item .thumbnail { border:1px solid #DDDDDD; padding:4px; } +.ni_box .ni_item .thumbnail:hover { border:1px solid #888888; padding:4px;} diff --git a/widgets/newest_images/skins/default/list.html b/widgets/newest_images/skins/default/list.html index f428eda28..297dc486d 100644 --- a/widgets/newest_images/skins/default/list.html +++ b/widgets/newest_images/skins/default/list.html @@ -13,12 +13,13 @@
  • - + -
    {$oDocument->getTitleText($widget_info->title_length)} +
    {$oDocument->getTitleText($widget_info->title_length)}
    +
    {$oDocument->getNickName()}
    • {@ $count++}