diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php index dda44c901..f4e9d5336 100644 --- a/modules/editor/components/poll_maker/poll_maker.class.php +++ b/modules/editor/components/poll_maker/poll_maker.class.php @@ -23,6 +23,11 @@ * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다 **/ function getPopupContent() { + // 설문조사 스킨을 구함 + $oModuleModel = &getModel('module'); + $skin_list = $oModuleModel->getSkins("./modules/poll/"); + Context::set('skin_list', $skin_list); + // 템플릿을 미리 컴파일해서 컴파일된 소스를 return $tpl_path = $this->component_path.'tpl'; $tpl_file = 'popup.html'; @@ -39,6 +44,8 @@ **/ function transHTML($xml_obj) { $poll_srl = $xml_obj->attrs->poll_srl; + $skin = $xml_obj->attrs->skin; + if(!$skin) $skin = 'default'; preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches); $width = $matches[2]; @@ -47,7 +54,7 @@ // poll model 객체 생성해서 html 얻어와서 return $oPollModel = &getModel('poll'); - return $oPollModel->getPollHtml($poll_srl, $style); + return $oPollModel->getPollHtml($poll_srl, $style, $skin); } } ?> diff --git a/modules/editor/components/poll_maker/tpl/popup.css b/modules/editor/components/poll_maker/tpl/popup.css index a85f967ec..43eb2c09a 100644 --- a/modules/editor/components/poll_maker/tpl/popup.css +++ b/modules/editor/components/poll_maker/tpl/popup.css @@ -1,8 +1,19 @@ @charset "utf-8"; @import url(../../../../../modules/admin/tpl/css/admin.css); -.pollButton { clear:both; margin:.5em 0 0 0; height:20px; } -.pollButton label { vertical-align:middle; color:#888888; } +.display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; font-family:tahoma; } + +.adminTable { margin-bottom:0 !important; } + +.pollButton { clear:both; overflow:hidden; border:1px solid #E3E3E2; border-top:none; background-color:#FAF8F4; padding:4px; } +.pollButton .fl { padding:5px 0 0 10px; color:#AAAAAA; } +.pollButton .fl label { vertical-align:middle; color:#888888; } +.pollButton .fr { padding:5px 10px 0 0; color:#AAAAAA; } +.pollButton .fr a { color:#444444; text-decoration:none; font-weight:bold;} +.pollButton .fr a.delPoll { color:red; font-weight:normal;} li { list-style:none; margin-right:5px; float:left; color:#666666} li a { text-decoration:none; color:#666666;} + +#popFooter .fl { margin-left:10px; } +#popFooter .fr { margin-right:10px; } diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html index d14b4f66c..4aa1b9675 100644 --- a/modules/editor/components/poll_maker/tpl/popup.html +++ b/modules/editor/components/poll_maker/tpl/popup.html @@ -3,6 +3,18 @@ + + + + + + + + + + + + @@ -16,6 +28,7 @@ +