From 120b53b10969479ccb3efc2590704a67c51cfa35 Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 8 Jan 2008 06:15:13 +0000 Subject: [PATCH] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80/=EB=8C=93=EA=B8=80?= =?UTF-8?q?=EC=9D=98=20getContent()=EC=97=90=201.=20=ED=8C=9D=EC=97=85?= =?UTF-8?q?=EB=A9=94=EB=89=B4(=EC=9D=B4=20=EA=B2=8C=EC=8B=9C=EA=B8=80?= =?UTF-8?q?=EC=9D=84..=20=EB=93=B1),=202.=20=EC=B6=94=EA=B0=80=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20(zone,=20=EC=A3=BC=EC=84=9D=EA=B0=90=EC=8B=B8?= =?UTF-8?q?=EA=B8=B0)=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=98=B5=EC=85=98?= =?UTF-8?q?=EC=9D=84=20=EB=91=90=EC=96=B4=EC=84=9C=20=EC=8A=A4=ED=82=A8=20?= =?UTF-8?q?=EC=A0=9C=EC=9E=91=EC=8B=9C=20=EB=B3=B4=EB=8B=A4=20=EC=9E=90?= =?UTF-8?q?=EC=9C=A0=EC=8A=A4=EB=9F=AC=EC=9A=B4=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=ED=95=A0=20=EC=88=98=20=EC=9E=88=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=ED=95=98=EA=B3=A0=20=EC=9D=B4=EB=A5=BC=20=EB=B0=94?= =?UTF-8?q?=ED=83=95=EC=9C=BC=EB=A1=9C=20=EA=B2=8C=EC=8B=9C=EA=B8=80?= =?UTF-8?q?=EC=9D=98=20=EC=9D=B8=EC=87=84=EC=8B=9C=EC=97=90=20=EC=A0=9C?= =?UTF-8?q?=EB=AA=A9/=EA=B8=80=EC=93=B4=EC=9D=B4/=EB=82=A0=EC=9E=90/?= =?UTF-8?q?=EB=B3=B8=EB=AC=B8=EB=A7=8C=20=EB=82=98=EC=98=A4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= 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@3499 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/comment.item.php | 27 ++++++++++++--------------- modules/document/document.item.php | 27 +++++++++++++-------------- modules/document/tpl/css/document.css | 2 ++ modules/document/tpl/print_page.html | 13 ++++++++----- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 824f7a928..a4b852181 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -154,7 +154,7 @@ return htmlspecialchars($content); } - function getContent($add_comment_info = true) { + function getContent($add_popup_menu = true, $add_content_info = true) { if($this->isSecret() && !$this->isAccessible()) return Context::getLang('msg_is_secret'); $content = $this->get('content'); @@ -162,25 +162,22 @@ // url에 대해서 정규표현식으로 치환 $content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1$2://$3',' '.$content); - // 추가 정보 출력을 하지 않는 경우 - if(!$add_comment_info) { + // 이 댓글을... 팝업메뉴를 출력할 경우 + if($add_popup_menu) { + $content = sprintf( + '%s
%s
', + $content, + $this->comment_srl, Context::getLang('cmd_comment_do') + ); + } + + // 컨텐츠에 대한 조작이 가능한 추가 정보를 설정하였을 경우 + if($add_content_info) { $content = sprintf( '
%s
', $this->comment_srl, $this->get('member_srl'), $this->comment_srl, $this->get('member_srl'), $content, - $this->comment_srl, $this->get('member_srl'), - $this->comment_srl, $this->get('member_srl') - ); - // 추가 정보 출력을 하지 않는 경우 "이 댓글을.." 메뉴 추가 - } else { - $content = sprintf( - '
%s
%s
', - $this->comment_srl, $this->get('member_srl'), - $this->comment_srl, $this->get('member_srl'), - $content, - $this->comment_srl, Context::getLang('cmd_comment_do'), - $this->comment_srl, $this->get('member_srl'), $this->comment_srl, $this->get('member_srl') ); } diff --git a/modules/document/document.item.php b/modules/document/document.item.php index 85645d6d0..f362fa5b2 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -209,7 +209,7 @@ return htmlspecialchars($content); } - function getContent($add_document_info = true) { + function getContent($add_popup_menu = true, $add_content_info = true) { if(!$this->document_srl) return; if($this->isSecret() && !$this->isGranted()) return Context::getLang('msg_is_secret'); @@ -221,8 +221,17 @@ // url에 대해서 정규표현식으로 치환 $content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1$2://$3',' '.$content); - // 추가 정보 출력을 하지 않는 경우 - if(!$add_document_info) { + // 이 게시글을... 팝업메뉴를 출력할 경우 + if($add_popup_menu) { + $content = sprintf( + '%s
%s
', + $content, + $this->document_srl, Context::getLang('cmd_document_do') + ); + } + + // 컨텐츠에 대한 조작이 가능한 추가 정보를 설정하였을 경우 + if($add_content_info) { $content = sprintf( '
%s
', $this->document_srl, $this->get('member_srl'), @@ -231,18 +240,8 @@ $this->document_srl, $this->get('member_srl'), $this->document_srl, $this->get('member_srl') ); - // 추가 정보를 출력시 "이 게시물을..'이라는 메뉴 추가 - } else { - $content = sprintf( - '
%s
%s
', - $this->document_srl, $this->get('member_srl'), - $this->document_srl, $this->get('member_srl'), - $content, - $this->document_srl, Context::getLang('cmd_document_do'), - $this->document_srl, $this->get('member_srl'), - $this->document_srl, $this->get('member_srl') - ); } + return $content; } diff --git a/modules/document/tpl/css/document.css b/modules/document/tpl/css/document.css index fec819620..3397e16ee 100644 --- a/modules/document/tpl/css/document.css +++ b/modules/document/tpl/css/document.css @@ -3,3 +3,5 @@ .document_list input { float:left; margin-right:10px; } .document_list address { float:left; width:100px; margin-right:10px; overflow:hidden; white-space:nowrap;} .document_list .document_title { } + +div.printContent { padding:20px; } diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html index 60a495e73..27b100108 100644 --- a/modules/document/tpl/print_page.html +++ b/modules/document/tpl/print_page.html @@ -1,15 +1,18 @@ -

{$oDocument->getTitleText()}

+
-
{$oDocument->get('nick_name')}
-
{$oDocument->getRegdate()}
+

{$oDocument->getTitleText()}

-
+
{$oDocument->get('nick_name')}
+
{$oDocument->getRegdate()}
-
{$oDocument->getContent(false)}
+
+
{$oDocument->getContent(false, false)}
+ +