From f550e4501227c6f58e7c3a63317e87546838e91e Mon Sep 17 00:00:00 2001
From: YJSoft <yjsoft@yjsoft.pe.kr>
Date: Fri, 12 Jun 2015 18:50:13 +0900
Subject: [PATCH] Poll Maker v2

---
 modules/editor/components/poll_maker/info.xml |   4 +--
 .../poll_maker/poll_maker.class.php           |  24 ++++++++++++----
 .../poll_maker/poll_maker_component.png       | Bin 0 -> 3586 bytes
 .../components/poll_maker/tpl/popup.html      |  27 ++++++++++++++----
 .../editor/components/poll_maker/tpl/popup.js |   1 -
 5 files changed, 41 insertions(+), 15 deletions(-)
 create mode 100644 modules/editor/components/poll_maker/poll_maker_component.png

diff --git a/modules/editor/components/poll_maker/info.xml b/modules/editor/components/poll_maker/info.xml
index a5043e192..b43f90178 100644
--- a/modules/editor/components/poll_maker/info.xml
+++ b/modules/editor/components/poll_maker/info.xml
@@ -18,8 +18,8 @@
     <description xml:lang="ru">Вы можете присоединить опрос при написании статей. Компонент опросов зависит от настроек модуля отпросов.</description>
     <description xml:lang="zh-TW">發表主題時可以附加投票調查。投票調查組件受投票調查模組設置的影響。</description>
     <description xml:lang="tr">Oylamaları yazı makalelerine ekleyebilirsiniz. Oylama bileşeni, oylama modülü ayarlarından ayarlanır.</description>
-    <version>1.7</version>
-    <date>2013-11-27</date>
+    <version>2.0</version>
+    <date>2015-06-09</date>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
         <name xml:lang="vi">NAVER</name>
diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php
index d8f17739b..54f8016d8 100644
--- a/modules/editor/components/poll_maker/poll_maker.class.php
+++ b/modules/editor/components/poll_maker/poll_maker.class.php
@@ -27,7 +27,7 @@ class poll_maker extends EditorHandler
 	{
 		// Wanted Skins survey
 		$oModuleModel = getModel('module');
-		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'modules/poll/');
+		$skin_list = $oModuleModel->getSkins(_XE_PATH_ . 'widgets/pollWidget/');
 		Context::set('skin_list', $skin_list);
 		// Pre-compiled source code to compile template return to
 		$tpl_path = $this->component_path.'tpl';
@@ -45,17 +45,29 @@ class poll_maker extends EditorHandler
 	 */
 	function transHTML($xml_obj)
 	{
-		$poll_srl = $xml_obj->attrs->poll_srl;
+		$args = new stdClass();
+
+		$args->poll_srl = $xml_obj->attrs->poll_srl;
 		$skin = $xml_obj->attrs->skin;
 		if(!$skin) $skin = 'default';
+		$args->skin = $skin;
 
 		preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
 		$width = $matches[2];
 		if(!$width) $width = 400;
-		$style = sprintf('width:%dpx', $width);
-		// poll model object creation to come get it return html
-		$oPollModel = getModel('poll');
-		return $oPollModel->getPollHtml($poll_srl, $style, $skin);
+		$args->style = sprintf('width:%dpx', $width);
+
+		// Set a path of the template skin (values of skin, colorset settings)
+		$tpl_path = sprintf('%sskins/%s', _XE_PATH_ . 'widgets/pollWidget/', $args->skin);
+		$tpl_file = 'pollview';
+
+		Context::set('colorset', $args->colorset);
+		Context::set('poll_srl', $args->poll_srl);
+		Context::set('style', $args->style);
+
+		// Compile a template
+		$oTemplate = &TemplateHandler::getInstance();
+		return $oTemplate->compile($tpl_path, $tpl_file);
 	}
 }
 /* End of file poll_maker.class.php */
diff --git a/modules/editor/components/poll_maker/poll_maker_component.png b/modules/editor/components/poll_maker/poll_maker_component.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bff13da311abaee9a4ade623dca48bf325c5444
GIT binary patch
literal 3586
zcmeHKYc!O57k?;pLevqtge2WaC70ZZ&=FE@Q4VUvxKxvIou-;{$t}h;#?+f!8bg{H
z%rJykDlsQaqZy1`!Z3(&9W&lXosaLw_shH1`S4%Q`aS=>f6s3}d+ojUPI7Uwliseh
z9RL7n2YVY=01(Lp&#`Ud;G5#dSv>F|0&}&q1}eK$CPA<@(CWMu092<-uKS6B__v$(
zUN8XI@$bzel6`cCGRTzcU}JSD>MD1@B3y;8Brz0#M4gHQ5)Zo=mraZA&(|P}$=$QG
zwzhwN?9j02R@;ZN6tTp2K~JV<YMwuDK4y7x*W;rTvSJ3kho8t|-$r(Q>Vh<w@Y}~p
zWO6+X72ijgTI>qDJ$QO{H5Jn(k(QoLGc+`$HLY=Q%|&O=1=U4-WxsCnL$(Uz1*x_J
zSg38KB0hV)$u3>>rL*~}CSvJp;ADAe(K#FrM`wt<t@F_vjGd+OmRRAXhU_>!`lD+%
zl>wip<r2U?oMBl1p15s5?t+j%Tbj*r9?$_ES5#Eo2o;eHsNQ?e-(r0ZWi4u%@<kpr
zj()xsIM=}I{=?N9$U-wk)j#>00ByxJz_uO`*aS=7^9OGp+JnxJP3KJz1Og3`nB|Fb
z9l(0il+d^1CukvpAcHCTEUy>j-Zb?Jk@yMxF8?BNaReD<LBAI5nk_%Uar`fmLs}qX
zBIxHQ&l33w@-_v6ByyXwHkBMt=KcbX&|f5v9sX95*9HfEf|9>UentQ)`6rzJS$5i7
z*QTnPx@i_0rYqWEP$+b6r#9A9@q)eQ5eW&2$&qx6%H$7jtLqE29y>L}sg;T!Z3@1<
z$h4UR+l%eU-8*yI7`{jh91gD}Ch|V8_bcEU5F3JJ6!mo;SPw62JXLiY=2~9A%nsZM
zej`qB>ryQ#JK4@enS5*H?Al~0w!6pK;tFy{^0|F}LB!@v(>dhwK;&Y($Kl$}`4G(x
zTTNs-?uh%GCYt%+=wCV-UxmU(jTYDU<vNTEOP8?Ru^jiK3K^gV#GImbP2BZ*Yf%w$
zV#E4;N2}O+!_pfn^$Jp|!#Y@U``GZ0cgo>X$@a(8ha0sE3YjPO-xnoEjpn~sL#|&y
z7I}M-Uy5}=V6cn(?(d4$>OPya@UNKK#8IeSCI9m7s7(9N>fU*MHEx93!pF&qCF@on
zo7<lZ+Yy9y&*+lODzE$3)k$rx9c|C3qSOM)Q!Tcx9fIIvI`3Glqv7TKCo@Mu+qhgO
z=W^q4g9-Y*h4uBPK9&>@eEpEDlB>5i-p8H-RVH8857PSf;LOB9Qd@UN5YFHY>s_=R
zc}P|Z4FBA+gi)Hjw1P@Yh^x0t^xRN$UyOsvnV{rE$sK-$z4B5#d~V&4ECe)7`@ERx
zpr9hE;1FunKB3$2Q7ux}XzQ^|<^$Des%9;P3D4CKMT3{=K9+aEbj85%+dgfU>fgoh
zd4zk}E{%7!UB+$NyfR{UPExP@A1|mHW-?1O(*?(mp#!-7`GA^7|EAAsCl@j=mv2ux
z2PTCPKbkDXnmSXN{Qh{y*?oSKqu9~dy-jV$71Ho{9m38Wr?imr1AyFza-Bz8@A*d~
zTsHd#R1=WvU}PN91Rid7v*Ex{k^k0E@V0k|Xm@vmZULcroJ6>T3^;(FR*^QRiSxxR
zsPH(J!$7QWIT<@r$Z1zb2s>*oAkjbC&Fh;^+}%j!)6J&5$787RhRdq7x4ZXFeRhi2
z__k2sEYNQqXCW*CksFz_%Y6sZ!<kd<zdHvfXVu8ShKF0=lv?w;YG|A~_4WBZr~J2c
z7lzH2F7!~du!~E65mK0RwLz*E`+9F@y^KkFTpmY_6gBm=7dbl(q44K^K(lHEEL1^>
z5ucmO*{JO%pw*&w*i9CoIO%BLo*+U%iO-=~m5|cbW|&#Oxqak!v(rZPSm709(*SSm
zp>AD2-}u{XSHuQ&h`B1AB*`gLy(PYdG3SWT;TH88N~FjXcLMZ&ih!f?g0o=>b2k^P
zq{C;5QLnO8oXVuAgxqfih@0jD{q+_ZEPHTJ7bcG)@VF>6v2ociIDKL%fn4|9KNGu9
z%m_F>RK+dvCaZgh)vP_pZ#Sy_jLu1jER_ors;x*TC6^shiM+k{!<Mr}`$qK^*VMQ{
z9L%+?`hnDPrPog5#wOT~W=xkl;#R%Q!5b4xLgGlcc-N9XAJQ`7TS!d_<F_`)e460j
z@<RQ79|Eby&bZTF<a-fy>N|o14~<mWUDU>j!f=Yy1<MO?W|g@)Uea?>HP7m=)^K|t
z&FH^Ayl_W+@sO5ly0m59bYm`7e1??Ylly|G*T9BT44)&iW<8vreDAgxnG8G77Cf9X
zI(?T}wrq%khK=vN6v*y*$4}NnPnrqV8tMFu<d6a5j;e+0-d1!515a_P4&FZEM<La_
zn<Y5tJt~;=4X-Fg59lV;sv*b)PBp$5PhNc6n{iv!L5O&B;=1y#PJ4M<RXLUwPIcS-
zGoRgPV!;=!v=oB)OrsvR<X%NZzk|e7>?F~gu$TD9S|jbVA)UMuv&csAxP9AVGT{t}
z%=-%hy-beLm-)9(lfz(zi+@JfUD=KP4Fz*6!|6K2mUd3TD7ml3+0^jysF`to(VZ_h
z=JN#=%P*#W#P;}_7UZ`Ozq*(g!Iv^6*_cavp|hw?PreeXvaD18J9d@-md@<&4><-6
z{90J#feJ2q+(iz>dIV07(-mU{(QXw_6UakzaVG3YL{$vWouJEZ5;A8(6Ik>BJl0Ug
zZ7Ghz9RJcZ#+PZd(|?nzWD?&)U3g_<(0=n<RL&VUnBCxP<!46hyQ!v!Rcwt6=4B&p
zieHO6R(hFca~pcFw)_>6v%fZ?s}DzG$@RANb`42I_pQATBzIPfS<nUHg92xm!61v7
zKhRC7OT|8t@z$lXMhQzxi%P!XdkSAhLSziFR5#2iiy|)!g8$4op(y*^Q{i1+70hQq
z>iOMtPC#9hX#^{Dn!3m0`|}w5JIDLCT)idBL!(o|Uf?ky-Req_@C^)v>*wityV}T+
zb#b`(qQo2W750g-A?u#5kEqD2Y9B)@gKUo!2=5lIGZnsbbt@u_E5i<^4H`_HPN{#a
z`IQM<1zw?1epay!=i?+}QF09WkrAvqiS$GZBjTLi<itS6`;=zHNMvH}T&BsMm8gTb
z=y)AZSC;Dfy>ZondUL=mUdWgl{xt6QH1EV7P=AF*tw9}I|CPk-%nu@?*zphtfkFr%
zzNbRvjf5wi3nH#I%FbT{|EJ4&*RpXnZq|hc#XW1n3+>*{&XgYvT)4PLSU3N~r2mJb
z^pX|M$SU6W@Qo^m4~I!ba5tLRt7xlHEWM~94{thITqEDNq6n`~-DoY0V?%>?c6PIb
zdCRL6FH1&FPUfxg*U=D75B-3;PyAbB6unH;0EafCfB0a~GA4tRnWUFFL0=X7g2fG9
zD7to<G?ri>`fD_7+PCxG6H~?Nv!a%X`n!O~U|0HQa0G|j|I0bpeFI!2niGJV(YUIH
z`ExP6iO)k9fjk-(Da@Z4sLyq`5b%0<%@S%-@GWoS1`*2xL=q|69b9pGpjA|ZK52k}
z!C+pdrlw{=?GZa27~bL3Yz6idcV#8&_44{UI4BaE{C{pg(tPEP*Bk9>NR{bO40c07
YHx^N2M=;X@_cp-6*2$*Q`p*ad0X8SCDF6Tf

literal 0
HcmV?d00001

diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index 605235f0e..458a58ab2 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -18,8 +18,8 @@
 		<div class="x_control-group">
 			<label for="" class="x_control-label">{$lang->poll_stop_date}</label>
 			<div class="x_controls">
-				<input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*7)}" />
-				<input type="date" class="inputDate" value="{date('Y-m-d',time()+60*60*24*7)}" />
+				<input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*30)}" />
+				<input type="date" class="inputDate" value="{date('Y-m-d',time()+60*60*24*30)}" />
 <script>
 (function($){
 $(function(){
@@ -31,7 +31,7 @@ $(function(){
 		, onSelect:function(){
 			$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""));
 		}
-		,minDate: new Date("{date('Y-m-d',time())}")
+		,minDate: new Date("{date('Y-m-d',time()+60*60*24*30)}")
 	};
 	$.extend(option,$.datepicker.regional['{$lang_type}']);
 	$(".inputDate").datepicker(option);
@@ -42,15 +42,30 @@ $(function(){
 			</div>
 		</div>
 		<div class="x_control-group">
-			<label for="" class="x_control-label">{$lang->skin}</label>
+			<label for="skin" class="x_control-label">{$lang->skin}</label>
 			<div class="x_controls">
-				<select name="skin">
+				<select id="skin" name="skin">
 				<!--@foreach($skin_list as $skin=>$skin_info)-->
-				<option value="{$skin}">{$skin_info->title} (skin by {$skin_info->maker->name})</option>
+				<option value="{$skin}">{$skin_info->title} (skin by <!--@foreach($skin_info->author as $author=>$author_info)-->{@ $authorname = array(); $authorname[] = $author_info->name; }<!--@end-->{implode(",",$authorname)})</option>
 				<!--@end-->
 				</select>
 			</div>
 		</div>
+
+		<div class="x_control-group">
+			<label class="x_control-label">사용자 공개</label>
+			<div class="x_controls">
+				<input type="radio" name="show_vote" value="1" /> 투표한 사용자 공개
+				<input type="radio" name="show_vote" value="0" checked="checked" /> 투표한 사용자 비공개
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label class="x_control-label">항목 추가</label>
+			<div class="x_controls">
+				<input type="radio" name="add_item" value="2" /> 항목 추가 가능
+				<input type="radio" name="add_item" value="0" checked="checked" /> 항목 추가 금지
+			</div>
+		</div>
 	<div id="poll_source" style="display:none">
 		<div class="table">
 		<table class="x_table x_table-striped x_table-hover">
diff --git a/modules/editor/components/poll_maker/tpl/popup.js b/modules/editor/components/poll_maker/tpl/popup.js
index 68b39729b..e695e4a50 100644
--- a/modules/editor/components/poll_maker/tpl/popup.js
+++ b/modules/editor/components/poll_maker/tpl/popup.js
@@ -16,7 +16,6 @@ function completeInsertPoll(ret_obj) {
     if(!poll_srl) return null;
 
     var text = "<img src=\"../../../../common/img/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"display:block;width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\"  />";
-
     alert(ret_obj['message']);
 
 	opener.editorFocus(opener.editorPrevSrl);