diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 608eee4d9..080e095ff 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -361,7 +361,7 @@
/**
* @brief 월별 글 보관현황을 가져옴
**/
- function getgetMonthlyArchivedList($obj) {
+ function getMonthlyArchivedList($obj) {
if($obj->mid) {
$oModuleModel = &getModel('module');
$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
@@ -371,7 +371,6 @@
// 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
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;
$output = executeQuery('document.getMonthlyArchivedList', $args);
if(!$output->toBool()) return $output;
@@ -380,5 +379,28 @@
return $output;
}
+
+ /**
+ * @brief 특정달의 일별 글 현황을 가져옴
+ **/
+ function getDailyArchivedList($obj) {
+ if($obj->mid) {
+ $oModuleModel = &getModel('module');
+ $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+ unset($obj->mid);
+ }
+
+ // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
+ if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+ else $args->module_srl = $obj->module_srl;
+ $args->regdate = $obj->regdate;
+
+ $output = executeQuery('document.getDailyArchivedList', $args);
+ if(!$output->toBool()) return $output;
+
+ if(!is_array($output->data)) $output->data = array($output->data);
+
+ return $output;
+ }
}
?>
diff --git a/modules/document/queries/getDailyArchivedList.xml b/modules/document/queries/getDailyArchivedList.xml
new file mode 100644
index 000000000..06718ffeb
--- /dev/null
+++ b/modules/document/queries/getDailyArchivedList.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/archive_list/archive_list.class.php b/plugins/archive_list/archive_list.class.php
index 9654cd108..c8253b978 100644
--- a/plugins/archive_list/archive_list.class.php
+++ b/plugins/archive_list/archive_list.class.php
@@ -24,7 +24,7 @@
// document 모듈의 model 객체를 받아서 getMonthlyArchivedList() method를 실행
$oDocumentModel = &getModel('document');
- $output = $oDocumentModel->getgetMonthlyArchivedList($obj);
+ $output = $oDocumentModel->getMonthlyArchivedList($obj);
// 템플릿 파일에서 사용할 변수들을 세팅
if(count($mid_list)==1) $plugin_info->module_name = $mid_list[0];
diff --git a/plugins/calendar/calendar.class.php b/plugins/calendar/calendar.class.php
index 3a6b5e363..810e1b3b2 100644
--- a/plugins/calendar/calendar.class.php
+++ b/plugins/calendar/calendar.class.php
@@ -19,12 +19,16 @@
$title = $args->title;
$mid_list = explode(",",$args->mid_list);
- // DocumentModel::getMonthlyArchivedList()를 이용하기 위한 변수 정리
+ // DocumentModel::getDailyArchivedList()를 이용하기 위한 변수 정리
$obj->mid = $mid_list;
+ $obj->regdate = date("Ym");
- // document 모듈의 model 객체를 받아서 getMonthlyArchivedList() method를 실행
+ // document 모듈의 model 객체를 받아서 getDailyArchivedList() method를 실행
$oDocumentModel = &getModel('document');
- $output = $oDocumentModel->getgetMonthlyArchivedList($obj);
+ $output = $oDocumentModel->getDailyArchivedList($obj);
+ print "
";
+ print_r($output);
+ print "";
// 템플릿 파일에서 사용할 변수들을 세팅
if(count($mid_list)==1) $plugin_info->module_name = $mid_list[0];
diff --git a/plugins/calendar/skins/blog_calendar_list/list.html b/plugins/calendar/skins/blog_calendar_list/list.html
index 45adb1194..a9635b872 100644
--- a/plugins/calendar/skins/blog_calendar_list/list.html
+++ b/plugins/calendar/skins/blog_calendar_list/list.html
@@ -4,8 +4,8 @@
-
-
+
+
@@ -13,7 +13,7 @@
-
+
diff --git a/plugins/calendar/skins/blog_calendar_list/normal/style.css b/plugins/calendar/skins/blog_calendar_list/normal/style.css
index 5cdf3f5a3..d5f4a063b 100644
--- a/plugins/calendar/skins/blog_calendar_list/normal/style.css
+++ b/plugins/calendar/skins/blog_calendar_list/normal/style.css
@@ -1,51 +1,51 @@
-.archive_list_normal {
+.calendar_normal {
}
-.archive_list_normal .archive_list_box {
+.calendar_normal .calendar_box {
margin-bottom:5px;
}
-.archive_list_normal .archive_list_box .title_box {
+.calendar_normal .calendar_box .title_box {
padding:5px;
height:14px;
overflow:hidden;
color:#888888;
}
-.archive_list_normal .archive_list_box .title_box .title {
+.calendar_normal .calendar_box .title_box .title {
font-weight:bold;
height:14px;
float:left;
}
-.archive_list_normal .archive_list_box .archive_box {
+.calendar_normal .calendar_box .archive_box {
padding:5px;
clear:both;
border:3px solid #EEEEEE;
overflow:hidden;
}
-.archive_list_normal .archive_list_box .archive {
+.calendar_normal .calendar_box .archive {
float:left;
margin-right:5px;
color:#AAAAAA;
}
-.archive_list_normal .archive_list_box .archive A {
+.calendar_normal .calendar_box .archive A {
text-decoration:none;
color:#555555;
}
-.archive_list_normal .archive_list_box .archive A:hover {
+.calendar_normal .calendar_box .archive A:hover {
text-decoration:underline;
color:#000000;
}
-.archive_list_normal .archive_list_box .archive A:visited {
+.calendar_normal .calendar_box .archive A:visited {
color:#AAAAAA;
}
-.archive_list_normal .archive_list_box .archive .archive A {
+.calendar_normal .calendar_box .archive .archive A {
font-size:7pt;
font-family:tahoma;
color:#AAAAAA;
diff --git a/plugins/calendar/skins/blog_calendar_list/skin.xml b/plugins/calendar/skins/blog_calendar_list/skin.xml
index b0de8e26b..ab44e2850 100644
--- a/plugins/calendar/skins/blog_calendar_list/skin.xml
+++ b/plugins/calendar/skins/blog_calendar_list/skin.xml
@@ -1,9 +1,9 @@
- 월별 보관 현황 목록 출력
+ 달력 및 글 현황 표시
제로
- 월별 보관 현황 목록을 출력합니다.
+ calendar플러그인의 블로그에 어울리는 기본 스킨입니다.