git-svn-id: http://xe-core.googlecode.com/svn/trunk@1256 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/blog/blog.view.php

@@ -158,7 +158,7 @@
             $args->sort_index = 'list_order'; ///< 소팅 값
 
             // 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
-            $output = $oDocumentModel->getDocumentList($args);
+            $output = $oDocumentModel->getDocumentList($args, true);
 
             // 템플릿에 쓰기 위해서 document_model::getDocumentList() 의 return object에 있는 값들을 세팅
             Context::set('total_count', $output->total_count);

modules/blog/skins/default/comment.html

@@ -1,11 +1,8 @@
 <!-- 댓글 정보 출력 -->
 <a name="comment_top_{$document_srl}"></a>
-<div>
-    {$lang->comment} : {count($document->comment_list)}
-</div>
 
 <!-- 댓글 출력 -->
-<div>
+<div id="comment_{$document_srl}" style="display:none">
     <!-- 댓글 목록 -->
 
     <!--@if($document->comment_list)-->
@@ -67,9 +64,7 @@
     <!--@end-->
 
     <!-- 댓글 입력 폼 -->
-
     <!--@if($grant->write_comment && $document->lock_comment == 'N')-->
-        <!--#include("./comment_form.html")-->
+        <div id="comment_form_{$document_srl}"></div>
     <!--@end-->
-
 </div>

modules/blog/skins/default/js/blog.js

@@ -4,6 +4,24 @@
  * @brief  blog 모듈의 javascript
  **/
 
+/**
+ * 댓글 오픈
+ **/
+function doDisplayComment(document_srl) {
+    var comment_zone = xGetElementById('comment_'+document_srl);
+    if(comment_zone.style.display == "none") comment_zone.style.display = "block";
+    else comment_zone.style.display = "none";
+}
+
+/**
+ * 엮인글 오픈
+ **/
+function doDisplayTrackback(document_srl) {
+    var trackback_zone = xGetElementById('trackback_'+document_srl);
+    if(trackback_zone.style.display == "none") trackback_zone.style.display = "block";
+    else trackback_zone.style.display = "none";
+}
+
 /* 글쓰기 작성후 */
 function completeDocumentInserted(ret_obj) {
     var error = ret_obj['error'];

modules/blog/skins/default/layout.html

@@ -58,8 +58,12 @@
             <!--@end-->
 
             <!--@if($logged_info->is_admin == 'Y')-->
-                <!-- 관리자일 경우 블로그 관리 메뉴 -->
+
                 <div class="layout_admin">
+                    <!-- 글쓰기 버튼 -->
+                    <a href="{getUrl('act','dispBlogWrite','document_srl','')}">{$lang->cmd_write}</a> |
+
+                    <!-- 관리자일 경우 블로그 관리 메뉴 -->
                     <a href="#" onclick="location.href='{getUrl('act','dispBlogAdminBlogInfo','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_management}</a>
                 </div>
             <!--@end-->
@@ -77,16 +81,14 @@
         </div>
     <!--@end-->
 
-    <!--@if($grant->list)-->
+    <!-- 검색 -->
-        <!-- 검색 -->
+    <div class="layout_search">
-        <div class="layout_search">
+        <form action="./" method="get">
-            <form action="./" method="get">
+            <input type="hidden" name="mid" value="{$mid}" />
-                <input type="hidden" name="mid" value="{$mid}" />
+            <input type="text" class="search_keyword" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
-                <input type="text" class="search_keyword" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+            <input type="submit" class="search_button" value="{$lang->cmd_search}" />
-                <input type="submit" class="search_button" value="{$lang->cmd_search}" />
+        </form>
-            </form>
+    </div>
-        </div>
-    <!--@end-->
 
 </div>
 

modules/blog/skins/default/list.html

@@ -9,29 +9,21 @@
     <!--@end-->
 </div>
 
-<!-- 버튼 -->
-<div>
-    <!--@if($grant->write_document)-->
-        <!-- 글쓰기 버튼 -->
-        <a href="{getUrl('act','dispBlogWrite','document_srl','')}">[{$lang->cmd_write}]</a> 
-    <!--@end-->
-</div>
-
 <!--@if($grant->list)-->
 
 <!-- 페이지 네비게이션 -->
-<div>
+<div style="margin-top:20px;text-align:center">
-<a href="{getUrl('page','','document_srl','')}">[{$lang->first_page}]</a>
+    <a href="{getUrl('page','','document_srl','')}">[{$lang->first_page}]</a>
 
-<!--@while($page_no = $page_navigation->getNextPage())-->
+    <!--@while($page_no = $page_navigation->getNextPage())-->
-<!--@if($page == $page_no)-->
+    <!--@if($page == $page_no)-->
-{$page_no}
+    {$page_no}
-<!--@else-->
+    <!--@else-->
-<a href="{getUrl('page',$page_no,'document_srl','')}">[{$page_no}]</a>
+    <a href="{getUrl('page',$page_no,'document_srl','')}">[{$page_no}]</a>
-<!--@end-->
+    <!--@end-->
-<!--@end-->
+    <!--@end-->
 
-<a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}">[{$lang->last_page}]</a>
+    <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}">[{$lang->last_page}]</a>
 </div>
 
 <!--@end-->

modules/blog/skins/default/trackback.html

@@ -1,16 +1,11 @@
-<!-- 엮인글 정보 출력 -->
-<div>
-    {$lang->trackback} : {count($document->trackback_list)}
-</div>
-
 <!-- 엮인글 목록 -->
+<div id="trackback_{$document_srl}" style="display:none">
 <!--@if($document->trackback_list)-->
-<div>
     <!--@foreach($document->trackback_list as $key => $val)-->
     <a name="trackback_{$val->trackback_srl}"></a>
 
     <div style="margin-left:{$val->depth*15}px" >
-        <table>
+        <table border="1">
         <col width="120" />
         <col width="*" />
         <tr>
@@ -42,5 +37,5 @@
     </div>
 
     <!--@end-->
-</div>
 <!--@end-->
+</div>

modules/blog/skins/default/view_document.html

@@ -103,6 +103,11 @@
     <!--@end-->
 </div>
 
+<!-- 댓글/ 엮인글 정보 출력 -->
+<div>
+    <a href="#" onclick="doDisplayComment('{$document_srl}');return false;">{$lang->comment} : {count($document->comment_list)}</a>, 
+    <a href="#" onclick="doDisplayTrackback('{$document_srl}');return false;">{$lang->trackback} : {count($document->trackback_list)}</a>
+</div>
 
 <!-- 엮인글 파일 include -->
 <!--@if($document->allow_trackback=='Y')-->

modules/document/document.model.php

@@ -119,7 +119,7 @@
         /**
          * @brief module_srl값을 가지는 문서의 목록을 가져옴
          **/
-        function getDocumentList($obj) {
+        function getDocumentList($obj, $get_extra_info = false) {
 
             if(!in_array($obj->sort_index, array('list_order', 'update_order'))) $obj->sort_index = 'list_order';
 
@@ -234,13 +234,50 @@
             $oMemberModel = &getModel('member');
             $member_srl = $oMemberModel->getLoggedMemberSrl();
 
+            // document controller 객체 생성
+            $oDocumentController = &getController('document');
+
             foreach($output->data as $key => $document) {
+                // 권한 부여
                 $is_granted = false;
 
-                if($this->isGranted($document->document_srl) || $is_admin) $is_granted = true;
+                if($this->isGranted($document->document_srl)) $is_granted = true;
                 elseif($member_srl && $member_srl == $document->member_srl) $is_granted = true;
 
-                $output->data[$key]->is_granted = $is_granted;
+                $document->is_granted = $is_granted;
+
+                $document_srl = $document->document_srl;
+
+                // 댓글 가져오기
+                if($document->comment_count && $document->allow_comment == 'Y') {
+                    $oCommentModel = &getModel('comment');
+                    $document->comment_list = $oCommentModel->getCommentList($document_srl, $is_admin);
+                }
+
+                // 트랙백 가져오기
+                if($document->trackback_count && $document->allow_trackback == 'Y') {
+                    $oTrackbackModel = &getModel('trackback');
+                    $document->trackback_list = $oTrackbackModel->getTrackbackList($document_srl, $is_admin);
+                }
+
+                // 첨부파일 가져오기
+                if($document->uploaded_count) {
+                    $oFileModel = &getModel('file');
+                    $file_list = $oFileModel->getFiles($document_srl, $is_admin);
+                    $document->uploaded_list = $file_list;
+                }
+
+                // 태그 정리
+                if($document->tags) {
+                    $tag_list = explode(',',$document->tags);
+                    $tag_count = count($tag_list);
+                    for($i=0;$i<$tag_count;$i++) if(trim($tag_list[$i])) $document->tag_list[] = trim($tag_list[$i]);
+                }
+
+                $document->content = sprintf('<!--BeforeDocument(%d,%d)-->%s<!--AfterDocument(%d,%d)-->', $document_srl, $document->member_srl, $document->content, $document_srl, $document->member_srl);
+
+                $output->data[$key] = $document;
+            
             }
             return $output;
         }