diff --git a/modules/poll/lang/lang.xml b/modules/poll/lang/lang.xml index bf3988f28..50e9fa6af 100644 --- a/modules/poll/lang/lang.xml +++ b/modules/poll/lang/lang.xml @@ -250,37 +250,60 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/widgets/pollWidget/skins/default/css/poll.css b/widgets/pollWidget/skins/default/css/poll.css index 0893f37b5..2cc79457d 100644 --- a/widgets/pollWidget/skins/default/css/poll.css +++ b/widgets/pollWidget/skins/default/css/poll.css @@ -1,31 +1,28 @@ +.rx_poll_default_wrap{max-width:100%;} .pollWidget{padding:5px;} -.poll_table{table-layout:fixed;width:100%;padding:0;border:none} -.poll_table td{padding:0;margin:0} -.poll_table td.h{background:url(../images/top_bg.png) repeat-x left top} -.poll_table td.title{height:28px;background:url(../images/top_title_bg.png) repeat-x left top;padding:0 20px 0 20px;color:#C3C3C4} -.poll_table td.title strong{color:#FFFFFF;font-weight:bold} -.poll_table td.l{border-left:1px solid #E5E5E5} -.poll_table td.r{border-right:1px solid #E5E5E5} -.poll_table td.poll_content{padding:18px 13px 18px 13px} -.poll_table td.poll_button{border:1px solid #E5E5E5;border-bottom:none;background-color:#F6F6F5} -.poll_table td.poll_button div{padding:5px 0 2px 0;text-align:center} -.poll_table td.b{background-color:#F6F6F5;height:7px} -.poll_table td.b img{width:100%;height:6px;border-bottom:1px solid #E5E5E5} -.poll_table td.bb{height:7px} -.poll_table td.bb img{width:100%;height:6px;border-bottom:1px solid #E5E5E5} -.poll_table td.poll_content div.title{color:#000000;background-color:#F5F5F5;border-top:2px solid #C1C0BD;border-bottom:2px solid #C1C0BD;font-weight:bold;padding:7px 0 7px 10px;margin-bottom:10px} -.poll_table td.poll_content div.item_text{color:#636363;padding:0 10px 0 10px;margin-top:10px} -.poll_table td.poll_content div.item_text strong{font-weight:bold;color:#000000;font-family:돋움;font-size:12px} -.poll_table td.poll_content table.item_bar_table{width:100%;table-layout:fixed;border-bottom:1px solid #EDEDED;margin-top:10px} -.poll_table td.poll_content table.noborder{border-bottom:none;margin-bottom:10px} -.poll_table td.poll_content table.item_bar_table td.bar{padding:0 0 5px 0;background:url(../images/back_bar.png) repeat-x left center} -.poll_table td.poll_content table.item_bar_table td.bar img{width:100%;height:6px} -.poll_table td.poll_content table.item_bar_table td.status{font-size:.9em;padding-bottom:5px;color:#636363;padding-left:15px} -.poll_table td.poll_content table.item_bar_table td.status strong{font-weight:bold;color:#58C011} -.poll_table td.poll_content div.item{color:#636363;border-bottom:1px solid #EDEDED;padding:5px 0 8px 10px;margin-bottom:3px} -.poll_table td.poll_content div.noborder{border-bottom:none;margin-bottom:10px} -.poll_table td.poll_content div.checkcount{border-bottom:1px dashed #EDEDED;padding:0 0 8px 10px;margin-bottom:3px;text-align:right;color:#636363} -.poll_table tr.cap>td{font-size:0;line-height:0;height:7px;overflow:hidden} -.item.add{-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box; } -.item.add *{-moz-box-sizing: border-box;-webkit-box-sizing: border-box;box-sizing: border-box; } -.item.add input[type='text']{width:90%;width:-webkit-calc(100% - 35px);width:-moz-calc(100% - 35px);width:calc(100% - 35px);} \ No newline at end of file +.rx_poll_default{border-radius: 10px;border:1px solid #e0e0e0;overflow:auto; background-color:#ffffff; color:#000000; font-size:12px; font-family:"Open Sans","나눔바른고딕",NanumBarunGothic,"맑은 고딕","Malgun Gothic","돋움",Dotum,"애플 SD 산돌고딕 Neo","Apple SD Gothic Neo",AppleGothic,Helvetica,sans-serif;} +.rx_poll_default .rx_poll_header{padding:13px 15px 10px;overflow:auto;background: #000;background: linear-gradient(-180deg, #212121, #424242);color:#e0e0e0;} +.rx_poll_default .rx_poll_h_strong{color:#FFFFFF;font-weight:bold} +.rx_poll_default .rx_poll_content{padding: 15px;} +.rx_poll_default .rx_poll_content .title{background-color:#f5f5f5;border-top:2px solid #bdbdbd;border-bottom:2px solid #bdbdbd;font-weight:bold;padding:7px 10px;margin-bottom:10px} +.rx_poll_default .rx_poll_content .rx_poll_default_item,.rx_poll_default .rx_poll_content .poll_vote .checkcount,.rx_poll_default .rx_poll_content .poll_vote .poll_item label{padding: 10px 0px;} +.rx_poll_default .rx_poll_content .rx_poll_default_item .item_text strong{display:inline-block; padding-right:10px; margin-right:10px;border-right:2px solid #e0e0e0;} +.rx_poll_default .rx_poll_content .rx_poll_default_item>div.item_bar{height:22px;position:relative;margin:6px 0px;background-color:#eeeeee;} +.rx_poll_default .rx_poll_content .rx_poll_default_item>div.item_bar div.item_bar{position:absolute;top:0px;left:0;background-color:#66bb6a;} +.rx_poll_default .rx_poll_content .rx_poll_default_item div.item_bar .item_bar_text{position:absolute;top:0px;right:3px;} +.rx_poll_default div.poll_button{background-color:#f5f5f5;padding:10px 15px;width:auto;text-align:center} +.rx_poll_default .rx_poll_content .poll_vote{margin:5px 0px;} +.rx_poll_default .rx_poll_content .poll_vote .poll_item, .rx_poll_default .rx_poll_content .poll_vote .poll_item_add{position:relative;border-bottom:1px solid #e0e0e0;} +.rx_poll_default .rx_poll_content .poll_vote .poll_item label{display:block;width:auto} +.rx_poll_default .rx_poll_content .poll_vote .poll_item .poll_item_delete{position:absolute;right:0;top:7px;} + +.rx_poll_default .rx_poll_content .poll_vote .poll_item_add input[type="text"]{width:100%; + line-height: 25px; + font-size: 14px; + margin: 0; + padding: 8px 0; + outline: none; + border: none; + border-bottom:1px solid #e0e0e0; +} +.rx_poll_default .rx_poll_content .poll_vote .poll_item_add input[type="button"]{position:absolute;right:0;top:7px;} \ No newline at end of file diff --git a/widgets/pollWidget/skins/default/css/poll.min.css b/widgets/pollWidget/skins/default/css/poll.min.css deleted file mode 100644 index 8085235f3..000000000 --- a/widgets/pollWidget/skins/default/css/poll.min.css +++ /dev/null @@ -1 +0,0 @@ -.poll_table{table-layout:fixed;width:100%;padding:0;border:0}.poll_table td{padding:0;margin:0}.poll_table td.h{background:url(../images/top_bg.png) repeat-x left top}.poll_table td.title{height:28px;background:url(../images/top_title_bg.png) repeat-x left top;padding:0 20px;color:#C3C3C4}.poll_table td.title strong{color:#FFF;font-weight:700}.poll_table td.l{border-left:1px solid #E5E5E5}.poll_table td.r{border-right:1px solid #E5E5E5}.poll_table td.poll_content{padding:18px 13px}.poll_table td.poll_button{border:1px solid #E5E5E5;border-bottom:0;background-color:#F6F6F5}.poll_table td.poll_button div{padding:5px 0 2px;text-align:center}.poll_table td.b{background-color:#F6F6F5;height:7px}.poll_table td.b img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}.poll_table td.bb{height:7px}.poll_table td.bb img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}.poll_table td.poll_content div.title{color:#000;background-color:#F5F5F5;border-top:2px solid #C1C0BD;border-bottom:2px solid #C1C0BD;font-weight:700;padding:7px 0 7px 10px;margin-bottom:10px}.poll_table td.poll_content div.item_text{color:#636363;padding:0 10px;margin-top:10px}.poll_table td.poll_content div.item_text strong{font-weight:700;color:#000;font-family:돋움;font-size:12px}.poll_table td.poll_content table.item_bar_table{width:100%;table-layout:fixed;border-bottom:1px solid #EDEDED;margin-top:10px}.poll_table td.poll_content table.noborder{border-bottom:0;margin-bottom:10px}.poll_table td.poll_content table.item_bar_table td.bar{padding:0 0 5px;background:url(../images/back_bar.png) repeat-x left center}.poll_table td.poll_content table.item_bar_table td.bar img{width:100%;height:6px}.poll_table td.poll_content table.item_bar_table td.status{font-size:.9em;padding-bottom:5px;color:#636363;padding-left:15px}.poll_table td.poll_content table.item_bar_table td.status strong{font-weight:700;color:#58C011}.poll_table td.poll_content div.item{color:#636363;border-bottom:1px solid #EDEDED;padding:5px 0 8px 10px;margin-bottom:3px}.poll_table td.poll_content div.noborder{border-bottom:0;margin-bottom:10px}.poll_table td.poll_content div.checkcount{border-bottom:1px dashed #EDEDED;padding:0 0 8px 10px;margin-bottom:3px;text-align:right;color:#636363}.poll_table tr.cap>td{font-size:0;line-height:0;height:7px;overflow:hidden} \ No newline at end of file diff --git a/widgets/pollWidget/skins/default/js/poll.js b/widgets/pollWidget/skins/default/js/poll.js index e41ed8b32..c86e92b8f 100644 --- a/widgets/pollWidget/skins/default/js/poll.js +++ b/widgets/pollWidget/skins/default/js/poll.js @@ -1,25 +1,25 @@ -function initTemplete(type) +function initRxDefaultTemplete(type, poll_srl) { switch(type) { case 'poll': if(typeof window.template == 'undefined') { - var source = jQuery("#entry-template").html(); + var source = jQuery("#entry-template-" + poll_srl).html(); window.template = Handlebars.compile(source); } break; case 'result': if(typeof window.template_result == 'undefined') { - var source = jQuery("#entry-template-result").html(); + var source = jQuery("#entry-template-result-" + poll_srl).html(); window.template_result = Handlebars.compile(source); } break; case 'members': if(typeof window.template_member == 'undefined') { - var source = jQuery("#entry-template-members").html(); + var source = jQuery("#entry-template-members-" + poll_srl).html(); window.template_member = Handlebars.compile(source); } break; @@ -68,13 +68,13 @@ function doPoll(fo_obj) { if(data.error!=0) alert(data.message); else { - loadPollResult(poll_srl); + loadRxDefaultPollResult(poll_srl); jQuery("#poll_" + poll_srl + "_gotoresult_button").css({ display: "none" }); jQuery("#poll_" + poll_srl + "_result_nobutton").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + poll_srl + "_result_yesbutton").css({ @@ -96,14 +96,14 @@ function addItem(poll_srl,poll_srl_indexes) { }); jQuery("#poll_" + poll_srl + "_result_nobutton").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + poll_srl + "_result_yesbutton").css({ display: "none" }); - loadPoll(poll_srl); + loadRxDefaultPoll(poll_srl); } }); return false; @@ -120,32 +120,32 @@ function deleteItem(poll_srl,poll_srl_indexes,poll_item_srl) { }); jQuery("#poll_" + poll_srl + "_result_nobutton").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + poll_srl + "_result_yesbutton").css({ display: "none" }); - loadPoll(poll_srl); + loadRxDefaultPoll(poll_srl); } }); return false; } -function loadPoll(poll_srl,data) +function loadRxDefaultPoll(poll_srl,data) { if(typeof data == 'undefined') { jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){ - loadPoll(parseInt(data.poll.poll_srl),data); + loadRxDefaultPoll(parseInt(data.poll.poll_srl),data); }); } else { jQuery("#stop_date_"+poll_srl).html(data.poll.stop_date); - initTemplete('poll'); + initRxDefaultTemplete('poll',poll_srl); var template = window.template; var context = Object; var additem = data.caniadditem; @@ -174,7 +174,7 @@ function loadPoll(poll_srl,data) } } -function showPollMemberNext(poll_srl,poll_item_srl) +function showRxDefaultPollMemberNext(poll_srl,poll_item_srl) { if(typeof window.cur_page == 'undefined') { @@ -184,7 +184,7 @@ function showPollMemberNext(poll_srl,poll_item_srl) window.cur_page++; jQuery.exec_json("poll.getPollitemInfo", {"poll_srl":poll_srl,"poll_item":poll_item_srl,"page":window.cur_page}, function(data){ - initTemplete('members'); + initRxDefaultTemplete('members',poll_srl); var template = window.template_member; var context = Object; @@ -213,12 +213,12 @@ function showPollMemberNext(poll_srl,poll_item_srl) return false; } -function showPollMember(poll_srl,poll_item_srl) +function showRxDefaultPollMember(poll_srl,poll_item_srl) { window.cur_page = 1; jQuery.exec_json("poll.getPollitemInfo", {"poll_srl":poll_srl,"poll_item":poll_item_srl,"page":window.cur_page}, function(data){ - initTemplete('members'); + initRxDefaultTemplete('members',poll_srl); var template = window.template_member; var context = Object; var title = poll_member_lang; @@ -246,7 +246,7 @@ function showPollMember(poll_srl,poll_item_srl) jQuery("#poll_content_" + poll_srl + "_result").html(html); jQuery("#poll_" + poll_srl + "_gotoresult_button").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + poll_srl + "_result_nobutton").css({ @@ -254,19 +254,19 @@ function showPollMember(poll_srl,poll_item_srl) }); jQuery("#poll_" + poll_srl + "_result_yesbutton").css({ - display: "table-row" + display: "block" }); }); return false; } -function loadPollResult(poll_srl,data) +function loadRxDefaultPollResult(poll_srl,data) { if(typeof data == 'undefined') { jQuery.exec_json("poll.getPollinfo", {"poll_srl":poll_srl}, function(data){ - loadPollResult(parseInt(data.poll.poll_srl),data); + loadRxDefaultPollResult(parseInt(data.poll.poll_srl),data); }); } else @@ -274,7 +274,7 @@ function loadPollResult(poll_srl,data) jQuery("#stop_date_result_" + poll_srl).html(data.poll.stop_date); jQuery("#poll_count_result_" + poll_srl).html(data.poll.poll_count); - initTemplete('result'); + initRxDefaultTemplete('result',poll_srl); var template = window.template_result; var context = Object; var showMembers = (data.poll.poll_type==1 || data.poll.poll_type==3); @@ -322,7 +322,7 @@ function loadPollResult(poll_srl,data) jQuery(function($){ /* View poll result */ - $('._poll_result').click(function(){ + $('._rx_default_poll_result').click(function(){ var cls = $(this).attr('class'), srl, skin; try{ @@ -332,7 +332,7 @@ jQuery(function($){ if(!srl) return false; jQuery("#poll_" + srl + "_result_button").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + srl + "_result_nobutton").css({ @@ -340,16 +340,16 @@ jQuery(function($){ }); jQuery("#poll_" + srl + "_result_yesbutton").css({ - display: "table-row" + display: "block" }); - loadPollResult(srl); + loadRxDefaultPollResult(srl); return false; }); /* goto poll result */ - $('._gotoresult_screen').click(function(){ + $('._rx_default_gotoresult_screen').click(function(){ var cls = $(this).attr('class'), srl, skin; try{ @@ -363,20 +363,20 @@ jQuery(function($){ }); jQuery("#poll_" + srl + "_result_nobutton").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + srl + "_result_yesbutton").css({ display: "none" }); - loadPollResult(srl); + loadRxDefaultPollResult(srl); return false; }); /* View poll screen */ - $('._poll_screen').click(function(){ + $('._rx_default_poll_screen').click(function(){ var cls = $(this).attr('class'), srl, skin; try{ @@ -390,14 +390,14 @@ jQuery(function($){ }); jQuery("#poll_" + srl + "_result_nobutton").css({ - display: "table-row" + display: "block" }); jQuery("#poll_" + srl + "_result_yesbutton").css({ display: "none" }); - loadPoll(srl); + loadRxDefaultPoll(srl); return false; }); diff --git a/widgets/pollWidget/skins/default/pollview.html b/widgets/pollWidget/skins/default/pollview.html index 20909baa3..d7f32c116 100644 --- a/widgets/pollWidget/skins/default/pollview.html +++ b/widgets/pollWidget/skins/default/pollview.html @@ -5,16 +5,16 @@ var poll_member_lang = "{$lang->poll_item_members}"; jQuery(document).ready(function(){ var data = {json_encode($poll_data)}; - if(data.poll.is_polled==0) loadPoll({$poll_srl},data); + if(data.poll.is_polled==0) loadRxDefaultPoll({$poll_srl},data); else { - loadPollResult({$poll_srl},data); + loadRxDefaultPollResult({$poll_srl},data); jQuery("#poll_{$poll_srl}_result_button").css({ display: "none" }); jQuery("#poll_{$poll_srl}_result_nobutton").css({ - display: "table-row" + display: "block" }); jQuery("#poll_{$poll_srl}_result_yesbutton").css({ @@ -23,37 +23,41 @@ } }); -
+
diff --git a/widgets/pollWidget/skins/default/skin.xml b/widgets/pollWidget/skins/default/skin.xml index d57fa5d25..75c5048b1 100644 --- a/widgets/pollWidget/skins/default/skin.xml +++ b/widgets/pollWidget/skins/default/skin.xml @@ -1,41 +1,50 @@ - 설문조사 기본 스킨 - 投票系统默认皮肤 - アンケート調査デフォルトスキン - Default Skin of teh Poll - Skin mặc định của thăm dò - 投票系統預設面板 - Oylamanın Varsayılan Dış Görünümü - 설문조사 기본 스킨 - 投票系统默认皮肤。 - アンケート調査デフォルトスキン - Default Skin of the Poll - Skin mặc định của thăm dò. - 投票系統預設面板。 - Oylamanın Varsayılan Dış Görünümü - 2.0 - 2015-06-09 + 설문조사 기본 스킨 + 投票系统默认皮肤 + アンケート調査デフォルトスキン + Default Skin of teh Poll + Skin mặc định của thăm dò + 投票系統預設面板 + Oylamanın Varsayılan Dış Görünümü + 설문조사 기본 스킨 + 投票系统默认皮肤。 + アンケート調査デフォルトスキン + Default Skin of the Poll + Skin mặc định của thăm dò. + 投票系統預設面板。 + Oylamanın Varsayılan Dış Görünümü + 2.0.1 + 2016-01-24 - - NAVER - NAVER - NAVER - NAVER - NAVER - NAVER - NAVER - + + misol + misol + misol + misol + misol + misol + misol + + + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + NAVER + - - - 기본 - Mặc định - 默认 - デフォルト - Default - 預設 - Varsayılan - - + + + 기본 + Mặc định + 默认 + デフォルト + Default + 預設 + Varsayılan + + diff --git a/widgets/pollWidget/skins/simple/css/poll.min.css b/widgets/pollWidget/skins/simple/css/poll.min.css deleted file mode 100644 index 557ee0b50..000000000 --- a/widgets/pollWidget/skins/simple/css/poll.min.css +++ /dev/null @@ -1 +0,0 @@ -.simple_poll{table-layout:fixed;padding:0;margin:0;border:0}.simple_poll td{padding:0;margin:0}.simple_poll td.title{text-align:right}.simple_poll td .itemDiv{border-top:1px solid #BBB;margin-top:3px;padding:3px 0}.simple_poll td .title{color:#000;font-weight:700;letter-spacing:-1px}.simple_poll td .checkcount{color:#AAA}.simple_poll td .item{color:#636363;margin:5px 0}.simple_poll td .item input{margin:0;padding:0}.simple_poll td .item label{letter-spacing:-1px}.simple_poll td .resultItem{color:#636363;margin:6px 0 0 10px;letter-spacing:-1px}.simple_poll td .barBox{margin-left:10px}.simple_poll td .barBox .bar{margin:3px 0}.simple_poll td .barBox .status{color:#AAA}.simple_poll td.stopDate{color:#AAA;border-top:1px solid #BBB;padding-top:3px}.simple_poll td.stopDate a{color:#AAA;text-decoration:none}.simple_poll td.poll_button{text-align:left;padding-top:3px}.simple_poll td.poll_button .poll_button{border:1px solid #EEE;background-color:#AAA;color:#FFF;font-weight:700;padding:1px 3px;height:20px}.simple_poll td.b{background-color:#F6F6F5;height:7px}.simple_poll td.b img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}.simple_poll td.bb{height:7px}.simple_poll td.bb img{width:100%;height:6px;border-bottom:1px solid #E5E5E5} \ No newline at end of file