From aa141569c141b0ee22aae0dcce26a81418ecdb06 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 22 Aug 2007 00:36:09 +0000
Subject: [PATCH] =?UTF-8?q?#104=20=EB=B6=84=EB=A5=98=ED=95=AD=EB=AA=A9=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=20=ED=9B=84=20=EA=B8=80=20=EC=84=A0=ED=83=9D?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B6=84=EB=A5=98=EA=B0=80=20=EC=9D=B4=EC=96=B4?=
 =?UTF-8?q?=EC=A7=80=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8=EC=A0=9C?=
 =?UTF-8?q?=EC=99=80=20=EA=B2=80=EC=83=89=ED=9B=84=20=EC=83=88=EC=B0=BD?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B8=80=EC=9D=B4=20=EB=9C=A8=EB=8D=98=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
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@2369 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/board.view.php                      |  2 +-
 modules/board/skins/cozy_simple_gallery/list.html | 12 ++----------
 modules/board/skins/cozy_simple_list/list.html    |  6 +-----
 modules/board/skins/cozy_simple_webzine/list.html | 12 ++----------
 modules/board/skins/xe_gallery/list.html          | 12 ++----------
 modules/board/skins/xe_list/list.html             |  6 +-----
 modules/board/skins/xe_webzine/list.html          | 12 ++----------
 7 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index aa2f2657a..00708e3d0 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -94,7 +94,7 @@
             $this->setCommentEditor(0, 100);
 
             // 만약 document_srl은 있는데 page가 없다면 글만 호출된 경우 page를 구해서 세팅해주자..
-            if($document_srl && !$page && ($oDocument->isExists()&&!$oDocument->isNotice())) {
+            if($document_srl && !$page && ($oDocument->isExists()&&!$oDocument->isNotice()) && !Context::get('category') && !Context::get('search_keyword')) {
                 $page = $oDocumentModel->getDocumentPage($document_srl, $this->module_srl, $this->list_count);
                 Context::set('page', $page);
             }
diff --git a/modules/board/skins/cozy_simple_gallery/list.html b/modules/board/skins/cozy_simple_gallery/list.html
index 78bf2f938..d1589baeb 100644
--- a/modules/board/skins/cozy_simple_gallery/list.html
+++ b/modules/board/skins/cozy_simple_gallery/list.html
@@ -62,11 +62,7 @@
                 <!--@end-->
 
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
@@ -111,11 +107,7 @@
                             <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
                         <!--@end-->
                         <!--@if($grant->view)-->
-                            <!--@if($search_target && $search_keyword)-->
-                                <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="window.open(this.href,'viewDocument');return false;">{$document->getTitleText(8,'')}</a>
-                            <!--@else-->
-                            <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText(8,'')}</a>
-                            <!--@end-->
+                            <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                         <!--@else-->
                             {$document->getTitleText(8,'')}
                         <!--@end-->
diff --git a/modules/board/skins/cozy_simple_list/list.html b/modules/board/skins/cozy_simple_list/list.html
index b93e4e1c8..ceb7d51fa 100644
--- a/modules/board/skins/cozy_simple_list/list.html
+++ b/modules/board/skins/cozy_simple_list/list.html
@@ -80,11 +80,7 @@
                 <!--@end-->
 
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
diff --git a/modules/board/skins/cozy_simple_webzine/list.html b/modules/board/skins/cozy_simple_webzine/list.html
index 71b4f4cc6..dc60c8204 100644
--- a/modules/board/skins/cozy_simple_webzine/list.html
+++ b/modules/board/skins/cozy_simple_webzine/list.html
@@ -62,11 +62,7 @@
                 <!--@end-->
 
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
@@ -107,11 +103,7 @@
                 <!--@end-->
 
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
diff --git a/modules/board/skins/xe_gallery/list.html b/modules/board/skins/xe_gallery/list.html
index 66f1834fc..017c75966 100644
--- a/modules/board/skins/xe_gallery/list.html
+++ b/modules/board/skins/xe_gallery/list.html
@@ -61,11 +61,7 @@
                     <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
                 <!--@end-->
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                    <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
@@ -108,11 +104,7 @@
                             <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
                         <!--@end-->
                         <!--@if($grant->view)-->
-                            <!--@if($search_target && $search_keyword)-->
-                                <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="window.open(this.href,'viewDocument');return false;">{$document->getTitleText(8,'')}</a>
-                            <!--@else-->
-                            <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText(8,'')}</a>
-                            <!--@end-->
+                            <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                         <!--@else-->
                             {$document->getTitleText(8,'')}
                         <!--@end-->
diff --git a/modules/board/skins/xe_list/list.html b/modules/board/skins/xe_list/list.html
index c012e4e3b..348c3b88e 100644
--- a/modules/board/skins/xe_list/list.html
+++ b/modules/board/skins/xe_list/list.html
@@ -95,11 +95,7 @@
                 <!--@end-->
 
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                    <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
diff --git a/modules/board/skins/xe_webzine/list.html b/modules/board/skins/xe_webzine/list.html
index 78d9e3518..bbe7fed8a 100644
--- a/modules/board/skins/xe_webzine/list.html
+++ b/modules/board/skins/xe_webzine/list.html
@@ -78,11 +78,7 @@
                 <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
                 <!--@end-->
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                    <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->
@@ -120,11 +116,7 @@
                 <strong>{$category_list[$document->get('category_srl')]->title}</strong>
                 <!--@end-->
                 <!--@if($grant->view)-->
-                    <!--@if($search_target && $search_keyword)-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}" onclick="winopen(this.href,'viewDocument');return false;">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@else-->
-                    <a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                    <!--@end-->
+                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
                 <!--@else-->
                     {$document->getTitleText($module_info->subject_cut_size)}
                 <!--@end-->