diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html index 5b89db5a7..54e5a3d68 100644 --- a/modules/editor/components/poll_maker/tpl/popup.html +++ b/modules/editor/components/poll_maker/tpl/popup.html @@ -7,6 +7,7 @@ +
{$component_info->title} ver. {$component_info->version} {$lang->about_component}
diff --git a/modules/poll/lang/ko.lang.php b/modules/poll/lang/ko.lang.php index 0c02fb518..4f460deb7 100644 --- a/modules/poll/lang/ko.lang.php +++ b/modules/poll/lang/ko.lang.php @@ -6,8 +6,8 @@ **/ $lang->poll_stop_date = "설문조사 종료일"; - $lang->poll_total_count = "참가자"; - $lang->poll_check_count = "필수 선택 항목수"; + $lang->poll_join_count = "참가자"; + $lang->poll_checkcount = "필수 선택 항목수"; $lang->cmd_delete_checked_poll = '선택항목 삭제'; $lang->cmd_apply_poll = '설문 참여'; diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php index 964cf5005..61b84aa64 100644 --- a/modules/poll/poll.controller.php +++ b/modules/poll/poll.controller.php @@ -17,6 +17,8 @@ * @brief 팝업창에서 설문 작성 완료후 저장을 누를때 설문 등록 **/ function procInsert() { + $upload_target_srl = Context::get('upload_target_srl'); + $stop_year = Context::get('stop_year'); $stop_month = Context::get('stop_month'); $stop_day = Context::get('stop_day'); @@ -64,6 +66,7 @@ $poll_args->list_order = $poll_srl*-1; $poll_args->stop_date = $args->stop_date; $poll_args->poll_count = 0; + $poll_args->upload_target_srl = $upload_target_srl; $output = executeQuery('poll.insertPoll', $poll_args); if(!$output->toBool()) { $oDB->rollback(); @@ -80,6 +83,7 @@ $title_args->poll_count = 0; $title_args->list_order = $title_args->poll_index_srl * -1; $title_args->member_srl = $member_srl; + $title_args->upload_target_srl = $upload_target_srl; $output = executeQuery('poll.insertPollTitle', $title_args); if(!$output->toBool()) { $oDB->rollback(); @@ -93,6 +97,7 @@ $item_args->poll_index_srl = $title_args->poll_index_srl; $item_args->title = $v; $item_args->poll_count = 0; + $item_args->upload_target_srl = $upload_target_srl; $output = executeQuery('poll.insertPollItem', $item_args); if(!$output->toBool()) { $oDB->rollback(); diff --git a/modules/poll/queries/insertPoll.xml b/modules/poll/queries/insertPoll.xml index f545628d3..c75bfc37a 100644 --- a/modules/poll/queries/insertPoll.xml +++ b/modules/poll/queries/insertPoll.xml @@ -8,6 +8,7 @@ + diff --git a/modules/poll/queries/insertPollItem.xml b/modules/poll/queries/insertPollItem.xml index b3e4204b5..d2fc3c24f 100644 --- a/modules/poll/queries/insertPollItem.xml +++ b/modules/poll/queries/insertPollItem.xml @@ -7,6 +7,7 @@ + diff --git a/modules/poll/queries/insertPollTitle.xml b/modules/poll/queries/insertPollTitle.xml index ad0bbaf79..5a2bf83e2 100644 --- a/modules/poll/queries/insertPollTitle.xml +++ b/modules/poll/queries/insertPollTitle.xml @@ -9,6 +9,7 @@ + diff --git a/modules/poll/schemas/poll.xml b/modules/poll/schemas/poll.xml index c4ff210af..fd673fd2e 100644 --- a/modules/poll/schemas/poll.xml +++ b/modules/poll/schemas/poll.xml @@ -1,6 +1,7 @@ + diff --git a/modules/poll/schemas/poll_item.xml b/modules/poll/schemas/poll_item.xml index ff84be882..7961db71b 100644 --- a/modules/poll/schemas/poll_item.xml +++ b/modules/poll/schemas/poll_item.xml @@ -2,6 +2,7 @@ +
diff --git a/modules/poll/schemas/poll_title.xml b/modules/poll/schemas/poll_title.xml index 37c8dce51..77c72a450 100644 --- a/modules/poll/schemas/poll_title.xml +++ b/modules/poll/schemas/poll_title.xml @@ -4,6 +4,7 @@ + diff --git a/modules/poll/tpl/css/poll.css b/modules/poll/tpl/css/poll.css index a5db3d32c..782371122 100644 --- a/modules/poll/tpl/css/poll.css +++ b/modules/poll/tpl/css/poll.css @@ -20,7 +20,7 @@ float:left; } -.poll_total_count { +.poll_join_count { float:right; } diff --git a/modules/poll/tpl/filter/delete_checked.xml b/modules/poll/tpl/filter/delete_checked.xml new file mode 100644 index 000000000..a0d39d59a --- /dev/null +++ b/modules/poll/tpl/filter/delete_checked.xml @@ -0,0 +1,12 @@ + +
+ + + + + + + + + +
 diff --git a/modules/poll/tpl/form.html b/modules/poll/tpl/form.html index b9b56be53..8c7e6a4a6 100644 --- a/modules/poll/tpl/form.html +++ b/modules/poll/tpl/form.html @@ -41,7 +41,7 @@
- {$lang->poll_check_count} : {$val->checkcount} + {$lang->poll_checkcount} : {$val->checkcount}
diff --git a/modules/poll/tpl/js/poll.js b/modules/poll/tpl/js/poll.js index 495379790..e497eee65 100644 --- a/modules/poll/tpl/js/poll.js +++ b/modules/poll/tpl/js/poll.js @@ -1,7 +1,7 @@ /* 설문 참여 함수 */ function doPoll(fo_obj) { - var check_count = new Array(); + var checkcount = new Array(); var item = new Array(); for(var i=0;i-1) { var t = name.split('_'); var poll_srl_index = parseInt(t[1],10); - check_count[poll_srl_index] = obj.value; + checkcount[poll_srl_index] = obj.value; item[poll_srl_index] = new Array(); } else if(name.indexOf('item_')>-1) { @@ -24,8 +24,8 @@ function doPoll(fo_obj) { } var poll_srl_indexes = ""; - for(var poll_srl_index in check_count) { - var count = check_count[poll_srl_index]; + for(var poll_srl_index in checkcount) { + var count = checkcount[poll_srl_index]; var items = item[poll_srl_index]; if(count > items.length) { alert(poll_alert_lang); diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html index ea9e3ac6b..e80251445 100644 --- a/modules/poll/tpl/poll_list.html +++ b/modules/poll/tpl/poll_list.html @@ -15,15 +15,15 @@ {$lang->no} {$lang->title} - {$lang->poll_check_count} - {$lang->poll_total_count} + {$lang->poll_checkcount} + {$lang->poll_join_count} {$lang->regdate} {$no} - {$val->title} + {$val->title} {$val->checkcount} {$val->poll_count} {zdate($val->regdate,"Y-m-d H:i")} diff --git a/modules/poll/tpl/result.html b/modules/poll/tpl/result.html index 0a2a0af3f..cd9ea037a 100644 --- a/modules/poll/tpl/result.html +++ b/modules/poll/tpl/result.html @@ -3,8 +3,8 @@
-
- {$lang->poll_total_count} : {number_format($poll->poll_count)} +
+ {$lang->poll_join_count} : {number_format($poll->poll_count)}
{$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")}