From 83e02e05c40fb9f916b4560006db9c1b7c9531d9 Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 18 Dec 2008 05:49:45 +0000 Subject: [PATCH] =?UTF-8?q?#17044128=20=EC=BB=A8=ED=85=90=EC=B8=A0=20?= =?UTF-8?q?=EC=9C=84=EC=A0=AF=EC=9D=84=20=EA=B2=8C=EC=8B=9C=EA=B8=80?= =?UTF-8?q?=EB=A1=9C=20=EC=A0=80=EC=9E=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=9A=A9=EB=9F=89=20=EC=A0=9C=ED=95=9C=20?= =?UTF-8?q?=EC=97=86=EA=B2=8C=20=ED=95=98=EA=B3=A0=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=85=B8=EC=B6=9C=EB=90=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=EB=98=90=EB=A1=9D=20=EC=88=98=EC=A0=95?= 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@5116 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- classes/widget/WidgetHandler.class.php | 29 +-- .../document/document.admin.controller.php | 8 +- modules/page/tpl/css/page.css | 9 +- .../page/tpl/filter/insert_page_content.xml | 1 - modules/page/tpl/page_content_modify.html | 44 +++-- modules/widget/conf/module.xml | 4 + modules/widget/tpl/add_content_widget.html | 5 +- modules/widget/tpl/css/widget.css | 24 ++- modules/widget/tpl/js/widget.js | 163 ++++++++++++++--- modules/widget/widget.admin.view.php | 7 +- modules/widget/widget.controller.php | 166 ++++++++++++++++++ 11 files changed, 385 insertions(+), 75 deletions(-) diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php index d1c2c0161..4bd1aa7df 100644 --- a/classes/widget/WidgetHandler.class.php +++ b/classes/widget/WidgetHandler.class.php @@ -121,6 +121,7 @@ $widget_padding_bottom = $args->widget_padding_bottom; $inner_style = sprintf("padding:%dpx %dpx %dpx %dpx !important; padding:none !important;", $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left); + $oDocumentModel = &getModel('document'); /** * 위젯 출력물을 구함 **/ @@ -129,7 +130,12 @@ switch($widget) { // 내용 직접 추가일 경우 case 'widgetContent' : - $body = base64_decode($args->body); + if($args->document_srl) { + $oDocument = $oDocumentModel->getDocument($args->document_srl); + $body = $oDocument->getContent(false,false,false); + } else { + $body = base64_decode($args->body); + } $output = sprintf('
%s
', $style, $inner_style, $body); break; @@ -149,15 +155,16 @@ switch($widget) { // 내용 직접 추가일 경우 case 'widgetContent' : - $body = base64_decode($args->body); + if($args->document_srl) { + $oDocument = $oDocumentModel->getDocument($args->document_srl); + $body = $oDocument->getContent(false,false,false); + } else { + $body = base64_decode($args->body); + } $oWidgetController = &getController('widget'); $output = sprintf( - '
'. - '
'. - '
'. - '
'. - '
'. + '
'. '
'. '
'. '
'. @@ -169,6 +176,7 @@ '
', $style, $args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom, + $args->document_srl, $inner_style, $body, base64_encode($body) @@ -179,9 +187,6 @@ case 'widgetBox' : $output = sprintf( '
'. - '
'. - '
'. - '
'. '
'. '
'. '
'. @@ -203,10 +208,6 @@ $output = sprintf( '
'. - '
'. - '
'. - '
'. - '
'. '
'. '
'. '
'. diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php index 2b43a0ea0..7397ba74e 100644 --- a/modules/document/document.admin.controller.php +++ b/modules/document/document.admin.controller.php @@ -338,10 +338,14 @@ $oDocumentController->updateTrackbackCount($obj->document_srl, $success_count); } } + + $copied_srls[$document_srl] = $obj->document_srl; } - $oDB->commit(); - return new Object(); + + $output = new Object(); + $output->add('copied_srls', $copied_srls); + return $output; } /** diff --git a/modules/page/tpl/css/page.css b/modules/page/tpl/css/page.css index 5a4cf8021..8fe47844c 100644 --- a/modules/page/tpl/css/page.css +++ b/modules/page/tpl/css/page.css @@ -1,8 +1,9 @@ @charset "utf-8"; h3 { margin:0 10px 0 10px; } -.widget_list { margin:10px; } -.widget_list a { margin-bottom:10px; } -.editor_box { margin:0 10px 10px 10px; } -.button_box { float:right; overflow:hidden; } .adminLayer { margin-top:30px; } + +.buttonBox { border:2px solid #EEEEEE; padding:5px; overflow:hidden; *zoom:1;} +.buttonBox .fr { height:28px; } +.buttonBox .fl { height:28px; } +.buttonBox .buttonDiv { margin:2px 0; padding:0; border-top:1px solid #EEEEEE; clear:both; } diff --git a/modules/page/tpl/filter/insert_page_content.xml b/modules/page/tpl/filter/insert_page_content.xml index 58e3b5c2e..05a2c2166 100644 --- a/modules/page/tpl/filter/insert_page_content.xml +++ b/modules/page/tpl/filter/insert_page_content.xml @@ -1,7 +1,6 @@
- diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html index 0896cb1c0..24d4f0d23 100644 --- a/modules/page/tpl/page_content_modify.html +++ b/modules/page/tpl/page_content_modify.html @@ -15,25 +15,41 @@ -
- - - - -
+
-
- - - +
+ +
+
+ + + +
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+