From 2efc96a0615636131f10095545276e4c10bb6a89 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 16 Apr 2007 00:56:51 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1143
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 layouts/sample_layout/conf/info.xml            | 2 +-
 modules/board/board.class.php                  | 2 +-
 modules/board/skins/default/view_document.html | 8 ++++++--
 modules/document/document.model.php            | 9 ++++++++-
 modules/layout/layout.model.php                | 2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/layouts/sample_layout/conf/info.xml b/layouts/sample_layout/conf/info.xml
index 4af03bb6d..dafba288b 100644
--- a/layouts/sample_layout/conf/info.xml
+++ b/layouts/sample_layout/conf/info.xml
@@ -34,7 +34,7 @@
         </var>
     </extra_vars>
     <menus>
-        <menu id="main_menu">
+        <menu id="main_menu" default="true">
             <name xml:lang="ko">주 메뉴</name>
             <maxdepth>2</maxdepth>
         </menu>
diff --git a/modules/board/board.class.php b/modules/board/board.class.php
index 8caff098e..9908984fd 100644
--- a/modules/board/board.class.php
+++ b/modules/board/board.class.php
@@ -7,7 +7,7 @@
 
     class board extends ModuleObject {
 
-        var $search_option = array('title','content','title_content','user_name','user_id'); ///< 검색 옵션
+        var $search_option = array('title','content','title_content','user_name','user_id','tag'); ///< 검색 옵션
 
         var $skin = "default"; ///< 스킨 이름
         var $list_count = 20; ///< 한 페이지에 나타날 글의 수
diff --git a/modules/board/skins/default/view_document.html b/modules/board/skins/default/view_document.html
index ddce887ba..328ac5532 100644
--- a/modules/board/skins/default/view_document.html
+++ b/modules/board/skins/default/view_document.html
@@ -61,10 +61,14 @@
     </tr>
     <!--@end-->
 
-    <!--@if($document->tags)-->
+    <!--@if($document->tag_list)-->
     <tr>
         <th>{$lang->tag}</th>
-        <td>{htmlspecialchars($document->tags)}</td>
+        <td>
+            <!--@foreach($document->tag_list as $val)-->
+                <a href="{getUrl('search_target','tag','search_keyword',$val,'document_srl','')}">{htmlspecialchars($val)}</a>
+            <!--@end-->
+        </td>
     </tr>
     <!--@end-->
 
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index e353ad7a9..1168b16d0 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -72,6 +72,13 @@
                 $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);
             
             return $document;
@@ -181,7 +188,7 @@
                             if($search_keyword=='Y') $args->s_is_secret = 'Y';
                             else $args->s_is_secret = '';
                         break;
-                    case 'tags' :
+                    case 'tag' :
                             if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
                             $args->s_tags = $search_keyword;
                         break;
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 3f90da943..a7ce0f6ae 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -203,7 +203,7 @@
             $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count);
             for($i=0;$i<$menu_count;$i++) {
                 $id = $menus[$i]->attrs->id;
-
+                if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $id);
                 $buff .= sprintf('$layout_info->menu->{%s}->id = "%s";',$id, $menus[$i]->attrs->id);
                 $buff .= sprintf('$layout_info->menu->{%s}->name = "%s";',$id, $menus[$i]->name->body);
                 $buff .= sprintf('$layout_info->menu->{%s}->maxdepth = "%s";',$id, $menus[$i]->maxdepth->body);