From 3c14b0936d447bf966e9aef85cde8aa9a0a70edf Mon Sep 17 00:00:00 2001 From: zero Date: Thu, 22 Mar 2007 09:41:33 +0000 Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@611 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/editor/components/slide_show/icon.gif | Bin 1332 -> 1402 bytes .../components/slide_show/lang/ko.lang.php | 21 ++-- ...ide_show.class.ph => slide_show.class.php} | 28 +----- .../components/slide_show/tpl/popup.css | 18 +--- .../components/slide_show/tpl/popup.html | 59 +++-------- .../editor/components/slide_show/tpl/popup.js | 94 ++++-------------- 6 files changed, 47 insertions(+), 173 deletions(-) rename modules/editor/components/slide_show/{slide_show.class.ph => slide_show.class.php} (58%) diff --git a/modules/editor/components/slide_show/icon.gif b/modules/editor/components/slide_show/icon.gif index 6151e27922349589675b09a6b474000c447592e3..f5a20f9d00d6742648e5678f9a34dbf0d9583b9b 100644 GIT binary patch delta 1214 zcmV;v1VQ_>3i=9vM@dFFIblrz5CG@T0C#tHczAeud3kzzdUk?ddwY9)e0-XFHDi`M zeSLj^gI0cier1?GfPjErkcnrSK!JgQhl@d9l8l3cgNBYogoK1-laYyuiHeGfYL=s~ zhChpoi)xvrbf!v;jg4uZns=y7k&%&ls!o!Ul9ZH`bDhH^d#h`gmzQ^))|r`^c&eY8 znwol_*L<*eeWJyio11#NPn?{bk?t6Op`oFFv!RE(VWOg8;|hrw8gsokZerO}^Mi^5rlv$oTpRExWVr>CcjtlpHX&y}msm8;N)x44z8 z(3Y&wj>2(}#a@oC;Hs*skHuq=#$BtctBthKtgNh=uh5yV(UP;!ny}HDu+p1H0 zw6wIFxaFO>=BT*Sr@7Oh&3&J{=eW4Iq05t@%#)$L=%&zusM2(&(1N_YysFWJvccNH z!NJMMoW#V$#nZ3L%ge*ry3fyl&&Sf^!rZ^f)a29C)63Q5)YR0~)z#P6*WBFP-QC^b z;Naom;o{=r+J02?e^^K?B?zF=I-|A?)K;J_37{O>+kaD@b>NR z@#*mQ?D6;Q@%HQT_wDib@$vEP^7riX_wMue^78WU^Y`!b`0(@h^7HgL@AUWa^Y`=f z^YHZd@bvic^!W1h_Ve`g@b&lf^z`!e_w@Dm_4W1l_xJet`1$$y`}_O+{QUj>{gayl za+AOUDw7QZCVx!;5C8xO{s5f`97wRB!Gj1BDqP6W*(5z=s7RD3rJ|HCj~Z&+$g$ua zP{4?Z94S)PDK-}~c3jD_AQ@b5x(ESeNRXKiB~Z8;W0FnFpDe2oi!&$){Kyc(t*pCDWh!k_y001o#8(`I~GOG_7 z6*G$PFn?je#Szq}8UC-BS|QCYz37PmP-F~i766+%0r22#Jb?1&r+(rDV1lzB08k|&fI(eQyaLIZizG5fBWpqu3K&d2DUc-qyf9^B0g8f^ z695!~j6rznITuy{Qc?*3L^#99REQul)jtD8(Mp_{#yJWYa)RNE2Q)U|gfM%0vH<`w z*h>aS1py4O!KXl>j@l(w#u;G156fXPRVJBCIuISI=;BK+yxdaDv9;KON*j=Dn$@!n cMRJH3U{q_ZwQ4-V%r9*~>+QGTh8qw7I|;0mvj6}9 delta 1177 zcmV;K1ZMmC3bYD;M@dFFIblHn4*=)g02mL$84$x75yKl2!yFUD9TdbK6~rGF#2^>N zAsNLY8pR|W#wH%dCm+WtAjc~s$SozvE+)t?C&@4<$ucU*G%dG#xactUl zf?jfM+H-E&ntL^4mOOxiR%MtzcyrudkcnrSK!=M#dUf1il8lCqL}ZhZYL=s~hCgbV zrF5oBX`Y&Qs7!jQPK}A-bDhI`t7~_i)|8Lqc&eXzpVxe_czvS9db&@2qS=SCZ+^T| zf~LoRy;y-|q}qVKQ-Quxo0sK(v!RE(VT7mLhrm{VwxfWxsfWF6ioIor!B~i?-O-;^ zi^5rlv$oTpRExWVi>%(1tIwmK=as9^m8;N)x45LB=asC`maNc@!f}wrUXHHdkHuq= z#$AoH(32_w9)F#((U{3)p0d%NveKBzYL&F(m$l=Y%V*KAZlbl*uB+;qx8$#^>YKRb zv99W!x#p<2)2F%9pv`@syXT?HlcCI$p}pv)(1NJabf?gQs?mhHx9z*Q?Xtnz$;h0> z#PG$_ugl5t%*ye@*}BKl+uHTr z-1gqx_T=OE=H>Y6>G|vI?B?zE=I!_9?)K;I_UG^Q>F@IE@AByI_U-TS>G1dN?)vQU z_wVof?eX^O^7rlW_wDlc?DO~T^Y`!b_wV!g^6~rd^Y`-e^zZcd@$>ia^!M=e`1A7n z@$~rf^c?i?_4oAi{POkp^!4}k^!)Yp{P*|$`uhF+{Qi@10&t;7 zaT`dmpuvL(6DnM&P@pMBchpFfc&6eRIiMJ7+_+I-qgc?Wi5w|%*eyR7Gjd$XQsA9r zf#PI|WNA_!A3}%#vt!Z^%by*&t)V6e4J1l~^Z*jWc&T01P%Hym}QYL9NjeQE}Afij*c=WzYe#7iKowO1wC2h{mjK{_2>@)O z9yelqJxDbXHJJ1lr3;5j!T?7E|GSF2i0AR>51YVT@0L~Ot7dP5m0KfqqWW@~` z!HD7`Cz=rQiI0Dx$TA0r(3JoHBG_mr0syU`(qdIg24M|BGjcNpRf_0n#xF#MN#rbZ z6gdY$u&7W00R>>d0ymvd06+*+awClm5(HoX2HFv%3IG;lqhleuEb~k=%pgU924O9hlP(T1Xf{Jjk diff --git a/modules/editor/components/slide_show/lang/ko.lang.php b/modules/editor/components/slide_show/lang/ko.lang.php index 107223fa4..505d0f610 100644 --- a/modules/editor/components/slide_show/lang/ko.lang.php +++ b/modules/editor/components/slide_show/lang/ko.lang.php @@ -1,20 +1,13 @@ - * @brief 위지윅에디터(editor) 모듈 > 이미지링크(image_link) 컴포넌트의 언어팩 + * @brief 위지윅에디터(editor) 모듈 > 슬라이드쇼(slide_show) 컴포넌트의 언어팩 **/ - $lang->imagelink = "이미지 자료 연결"; - $lang->image_url = "이미지 경로"; - $lang->image_alt = "설명 입력"; - $lang->image_scale = "이미지크기"; - $lang->image_align = "정렬 방법 "; - $lang->image_align_normal = "한 문단을 차지"; - $lang->image_align_left = "글의 왼쪽으로"; - $lang->image_align_middle = "가운데"; - $lang->image_align_right = "글의 우측으로"; - $lang->image_border = "경계선 두께"; - - $lang->cmd_get_scale = "크기 구하기"; + $lang->slide_show = "슬라이드쇼 제작"; + $lang->width = "가로크기"; + $lang->height = "세로크기"; + $lang->image_list = "이미지 목록"; + $lang->about_image_list = "슬라이드쇼에 추가할 파일을 선택하세요. 선택후 드래그 또는 shift+클릭(범위선택), ctrl+클릭(개별선택) 가능합니다"; ?> diff --git a/modules/editor/components/slide_show/slide_show.class.ph b/modules/editor/components/slide_show/slide_show.class.php similarity index 58% rename from modules/editor/components/slide_show/slide_show.class.ph rename to modules/editor/components/slide_show/slide_show.class.php index 211444b22..21d488e93 100644 --- a/modules/editor/components/slide_show/slide_show.class.ph +++ b/modules/editor/components/slide_show/slide_show.class.php @@ -1,11 +1,11 @@ upload_target_srl = $upload_target_srl; $this->component_path = $component_path; } @@ -41,25 +41,7 @@ * DocumentModule::transContent() 에서 해당 컴포넌트의 transHtml() method를 호출하여 고유코드를 html로 변경 **/ function transHTML($xml_obj) { - $src = $xml_obj->attrs->src; - $alt = $xml_obj->attrs->alt; - $width = $xml_obj->attrs->width; - $height = $xml_obj->attrs->height; - $align = $xml_obj->attrs->align; - $border = $xml_obj->attrs->border; - - $src = str_replace(array('&','"'), array('&','&qout;'), $src); - if(!$alt) $alt = $src; - - $output = array(); - $output = array("src=\"".$src."\""); - if($alt) $output[] = "alt=\"".$alt."\""; - if($alt) $output[] = "title=\"".$alt."\""; - if($width) $output[] = "width=\"".$width."\""; - if($height) $output[] = "height=\"".$height."\""; - if($align) $output[] = "align=\"".$align."\""; - if($border) $output[] = "border=\"".$border."\""; - return ""; + return; } } diff --git a/modules/editor/components/slide_show/tpl/popup.css b/modules/editor/components/slide_show/tpl/popup.css index c2fc5eeb7..66b767376 100644 --- a/modules/editor/components/slide_show/tpl/popup.css +++ b/modules/editor/components/slide_show/tpl/popup.css @@ -35,22 +35,14 @@ font-size:9pt; } -.body label { - cursor:pointer; - font-size:9pt; +.image_list { + width:380px; } -.image_align { - margin:0px 0px 5px 0px; - float:left; - width:150px; -} - -.image_url { - width:350px; - height:13px; +.about_image_list { + margin-top:10px; font-size:9pt; - border:1px solid #AAAAAA; + color:#AAAAAA; } .editor_input { diff --git a/modules/editor/components/slide_show/tpl/popup.html b/modules/editor/components/slide_show/tpl/popup.html index 07e9c9b3a..99aacdf5b 100644 --- a/modules/editor/components/slide_show/tpl/popup.html +++ b/modules/editor/components/slide_show/tpl/popup.html @@ -3,59 +3,26 @@
+
-
{$lang->imagelink}
+
{$lang->slide_show}
-
{$lang->image_url}
-
+
{$lang->width}
+
px
-
{$lang->image_scale}
+
{$lang->height}
+
px
+ +
{$lang->image_list}
- px - px - +
+ +
+
{$lang->about_image_list}
- -
{$lang->image_alt}
-
- -
{$lang->image_align}
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- -
{$lang->image_border}
-
px
-
diff --git a/modules/editor/components/slide_show/tpl/popup.js b/modules/editor/components/slide_show/tpl/popup.js index 2dd39dcf0..f51d302d0 100644 --- a/modules/editor/components/slide_show/tpl/popup.js +++ b/modules/editor/components/slide_show/tpl/popup.js @@ -1,92 +1,32 @@ -/** - * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 이미지가 있는지 체크하여 - * 있으면 가져와서 원하는 곳에 삽입 - **/ -function getImage() { - // 부모 위지윅 에디터에서 선택된 영역이 있는지 확인 +var selected_node = null; +function getSlideShow() { + // 부모창이 있는지 체크 if(typeof(opener)=="undefined") return; - // url이 미리 입력되어 있을 경우 scale구해줌 - if(xGetElementById("image_url").value) { - setTimeout(function() { getImageScale(); }, 500); - return; + // 부모창의 업로드 이미지 목록을 모두 가져와서 세팅 + var fo = xGetElementById("fo"); + var upload_target_srl = fo.upload_target_srl.value; + var parent_list_obj = opener.xGetElementById("uploaded_file_list_"+upload_target_srl); + var list_obj = xGetElementById("image_list"); + + var length = parent_list_obj.length; + for(var i=0;i