diff --git a/modules/editor/components/poll_maker/tpl/popup.css b/modules/editor/components/poll_maker/tpl/popup.css index b79f9fd67..6eb217949 100644 --- a/modules/editor/components/poll_maker/tpl/popup.css +++ b/modules/editor/components/poll_maker/tpl/popup.css @@ -1,7 +1,7 @@ -@charset "utf-8"; -@import url(../../../../../modules/admin/tpl/css/admin.css); -@import url(../../../../../common/css/bootstrap.min.css); - +@charset "UTF-8"; +div.xe_mobile { + display:none!important; +} .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; } @@ -19,3 +19,4 @@ li a { text-decoration:none; color:#666666;} #popFooter .fl { margin-left:10px; } #popFooter .fr { margin-right:10px; } .poll_box { margin-bottom:15px; } + diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html index 1f07abd6b..16864d2be 100644 --- a/modules/editor/components/poll_maker/tpl/popup.html +++ b/modules/editor/components/poll_maker/tpl/popup.html @@ -5,10 +5,11 @@ - +{@Context::addMetaTag('viewport', 'width=device-width, user-scalable=no', FALSE);} +

{$component_info->title} ver. {$component_info->version}

@@ -19,23 +20,27 @@
- + @@ -55,8 +60,8 @@ $(function(){
- - + +
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php index bf631ce1c..c954d77fb 100644 --- a/modules/poll/poll.controller.php +++ b/modules/poll/poll.controller.php @@ -19,7 +19,12 @@ class pollController extends poll */ function procPollInsert() { - $stop_date = Context::get('stop_date'); + $stop_date = intval(Context::get('stop_date')); + // mobile input date format can be different + if($stop_date != Context::get('stop_date')) + { + $stop_date = date('Ymd', strtodate(Context::get('stop_date'))); + } if($stop_date < date('Ymd')) { $stop_date = date('YmdHis', $_SERVER['REQUEST_TIME']+60*60*24*30); diff --git a/widgets/pollWidget/skins/default/css/poll.css b/widgets/pollWidget/skins/default/css/poll.css index 9c95d8e38..c1e4e030a 100644 --- a/widgets/pollWidget/skins/default/css/poll.css +++ b/widgets/pollWidget/skins/default/css/poll.css @@ -1,3 +1,4 @@ +@charset "UTF-8"; .rx_poll_default_wrap{max-width:100%;} .rx_poll_default_wrap .pollWidget{padding:5px;} .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","애플 SD 산돌고딕 Neo","Apple SD Gothic Neo","돋움",Dotum,AppleGothic,Helvetica,sans-serif;} @@ -16,7 +17,10 @@ .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%; +.rx_poll_default .rx_poll_content .poll_vote .poll_item_add input[type="text"]{ + -webkit-appearance: none; + border-radius: 0; + width:100%; line-height: 25px; font-size: 14px; margin: 0; diff --git a/widgets/pollWidget/skins/simple/css/poll.css b/widgets/pollWidget/skins/simple/css/poll.css index fd899645a..5d0f57f5f 100644 --- a/widgets/pollWidget/skins/simple/css/poll.css +++ b/widgets/pollWidget/skins/simple/css/poll.css @@ -1,6 +1,7 @@ +@charset "UTF-8"; .rx_poll_smpl_wrap{max-width:100%;} .rx_poll_smpl_wrap .pollWidget{padding:5px;} -.rx_poll_smpl{box-shadow: 0 0 2px rgba(0, 0, 0, 0.25);overflow:auto; background-color:#ffffff; color:#000000; font-size:12px; font-family:"Open Sans","나눔바른고딕",NanumBarunGothic,"맑은 고딕","Malgun Gothic","애플 SD 산돌고딕 Neo","Apple SD Gothic Neo","돋움",Dotum,AppleGothic,Helvetica,sans-serif;} +.rx_poll_smpl{box-shadow: 0 0 2px rgba(0, 0, 0, 0.25);border:1px solid #e0e0e0;overflow:auto; background-color:#ffffff; color:#000000; font-size:12px; font-family:"Open Sans","나눔바른고딕",NanumBarunGothic,"맑은 고딕","Malgun Gothic","애플 SD 산돌고딕 Neo","Apple SD Gothic Neo","돋움",Dotum,AppleGothic,Helvetica,sans-serif;} .rx_poll_smpl .rx_poll_header{padding:13px 15px 10px;overflow:auto;border-bottom:2px solid #bdbdbd;} .rx_poll_smpl .rx_poll_h_strong{font-weight:bold} .rx_poll_smpl .rx_poll_content{padding: 15px;} @@ -17,6 +18,8 @@ .rx_poll_smpl .rx_poll_content .poll_vote .poll_item .poll_item_delete{position:absolute;right:0;top:7px;} .rx_poll_smpl .rx_poll_content .poll_vote .poll_item_add input[type="text"]{ + -webkit-appearance: none; + border-radius: 0; width:100%; box-sizing: border-box; line-height: 25px;