diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index c2d40815c..741e842ef 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -42,6 +42,7 @@ $lang->cmd_open_all = "모두열기"; $lang->cmd_reload = "다시읽기"; $lang->cmd_close = "닫기"; + $lang->cmd_open = "열기"; $lang->cmd_remake_cache = "캐시파일 재생성"; $lang->enable = '가능'; diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.html b/modules/editor/components/colorpicker_bg/tpl/popup.html index 93b7d825f..c58727b58 100644 --- a/modules/editor/components/colorpicker_bg/tpl/popup.html +++ b/modules/editor/components/colorpicker_bg/tpl/popup.html @@ -11,7 +11,7 @@ blank # - + diff --git a/modules/editor/components/colorpicker_bg/tpl/popup.js b/modules/editor/components/colorpicker_bg/tpl/popup.js index a0d060d32..6e00dfb1e 100644 --- a/modules/editor/components/colorpicker_bg/tpl/popup.js +++ b/modules/editor/components/colorpicker_bg/tpl/popup.js @@ -41,3 +41,9 @@ function printColor(blank_img_src) { function printColorBlock(code, blank_img_src) { return "
\"color\"<\/div>"; } + +/* 수동 색상 변경시 */ +function manual_select_color(obj) { + if(obj.value.length!=6) return; + xGetElementById("preview_color").style.backgroundColor = "#"+obj.value; +} diff --git a/modules/editor/components/colorpicker_text/tpl/popup.html b/modules/editor/components/colorpicker_text/tpl/popup.html index f3e1135a8..1a361f35a 100644 --- a/modules/editor/components/colorpicker_text/tpl/popup.html +++ b/modules/editor/components/colorpicker_text/tpl/popup.html @@ -11,7 +11,7 @@ blank # - + diff --git a/modules/editor/components/colorpicker_text/tpl/popup.js b/modules/editor/components/colorpicker_text/tpl/popup.js index 54ad3d99f..128b449f9 100644 --- a/modules/editor/components/colorpicker_text/tpl/popup.js +++ b/modules/editor/components/colorpicker_text/tpl/popup.js @@ -42,3 +42,9 @@ function printColor(blank_img_src) { function printColorBlock(code, blank_img_src) { return "
\"color\"<\/div>"; } + +/* 수동 색상 변경시 */ +function manual_select_color(obj) { + if(obj.value.length!=6) return; + xGetElementById("preview_color").style.backgroundColor = "#"+obj.value; +} diff --git a/modules/editor/components/quotation/lang/ko.lang.php b/modules/editor/components/quotation/lang/ko.lang.php index 0068f299c..b35514498 100644 --- a/modules/editor/components/quotation/lang/ko.lang.php +++ b/modules/editor/components/quotation/lang/ko.lang.php @@ -6,4 +6,25 @@ **/ $lang->quotation = "인용구 사용하기"; + $lang->quotation_use_folder = "폴더기능 사용"; + $lang->quotation_opener = "열기 버튼 이름"; + $lang->quotation_closer = "닫기 버튼 이름"; + $lang->quotation_border_color = "테두리 색"; + $lang->quotation_border_thickness = "테두리 굵기"; + + $lang->quotation_border_style = "테두리 종류"; + $lang->quotation_border_style_list = array( + "none" => "없음", + "solid" => "실선", + "dotted" => "점선", + "left_solid" => "좌측 실선", + "right_solid" => "우측 실선", + ); + + $lang->quotation_bg_color = "배경 색"; + + $lang->quotation_opener = "열기 링크 이름"; + $lang->quotation_opener = "닫기 링크 이름"; + $lang->quotation_cmd_opener = "더 보기..."; + $lang->quotation_cmd_closer = "닫기"; ?> diff --git a/modules/editor/components/quotation/tpl/blank.gif b/modules/editor/components/quotation/tpl/blank.gif new file mode 100644 index 000000000..35d42e808 Binary files /dev/null and b/modules/editor/components/quotation/tpl/blank.gif differ diff --git a/modules/editor/components/quotation/tpl/popup.css b/modules/editor/components/quotation/tpl/popup.css index 7cc309f7f..a515f3ea8 100644 --- a/modules/editor/components/quotation/tpl/popup.css +++ b/modules/editor/components/quotation/tpl/popup.css @@ -1,5 +1,5 @@ .editor_window { - width:400px; + width:550px; text-align:center; } @@ -16,7 +16,6 @@ text-align:center; } - .header { float:left; width:100px; @@ -30,7 +29,7 @@ .body { float:left; - width:250px; + width:405px; text-align:left; margin:5px; font-size:9pt; @@ -41,6 +40,26 @@ font-size:9pt; } +.editor_input { + width:50px; + height:13px; + font-size:9pt; + border:1px solid #AAAAAA; +} + +.editor_input_long { + width:350px; + height:13px; + font-size:9pt; + border:1px solid #AAAAAA; +} + +.editor_select { + width:80px; + height:14px; + font-size:9pt; +} + .editor_button_area { clear:both; text-align:center; @@ -53,4 +72,33 @@ margin-top:4px; background-color:#FFFFFF; border:1px solid #AAAAAA; + height:16px; + font-size:8pt; +} + +img.color_icon { + width:14px; + height:14px; + border:1px solid #FFFFFF; +} + +img.color_icon_over { + width:14px; + height:14px; + border:1px solid #000000; + cursor:pointer; +} + +img.border_preview_color { + width:30px; + height:16px; + border:1px solid #000000; + background-color:#88EE22; +} + +img.bg_preview_color { + width:30px; + height:16px; + border:1px solid #000000; + background-color:#FFFFFF; } diff --git a/modules/editor/components/quotation/tpl/popup.html b/modules/editor/components/quotation/tpl/popup.html index a89887214..46203f582 100644 --- a/modules/editor/components/quotation/tpl/popup.html +++ b/modules/editor/components/quotation/tpl/popup.html @@ -2,26 +2,74 @@ -
-
-
{$lang->multimedia_url}
-
+ +
+
{$lang->quotation}
-
{$lang->multimedia_caption}
-
+
{$lang->quotation_use_folder}
+
-
{$lang->multimedia_width}
-
px
+
-
{$lang->multimedia_height}
-
px
+
{$lang->quotation_opener}
+
-
{$lang->multimedia_auto_start}
-
+
{$lang->quotation_closer}
+
-
- - -
- -
+
+ +
{$lang->quotation_border_style}
+
+ +
+ +
{$lang->quotation_border_thickness}
+
px
+ +
{$lang->quotation_border_color}
+
+
+ +
+
+ + + + + + +
blank#
+
+
+ +
{$lang->quotation_bg_color}
+
+
+ +
+
+ + + + + + +
blank#
+
+
+ +
+ + +
+
+ diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js index 56f315a2c..1b846a9e7 100644 --- a/modules/editor/components/quotation/tpl/popup.js +++ b/modules/editor/components/quotation/tpl/popup.js @@ -2,7 +2,8 @@ * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여 * 있으면 가져와서 원하는 곳에 삽입 **/ -function getMultimedia() { +function getQuotation() { + return; // 부모 위지윅 에디터에서 선택된 영역이 있는지 확인 if(typeof(opener)=="undefined") return; @@ -23,10 +24,10 @@ function getMultimedia() { } -function insertMultimedia(obj) { +function insertQuotation(obj) { if(typeof(opener)=="undefined") return; - var url = xGetElementById("multimedia_url").value; + var url = xGetElementById("_url").value; var caption = xGetElementById("multimedia_caption").value; @@ -56,4 +57,53 @@ function insertMultimedia(obj) { window.close(); } -xAddEventListener(window, "load", getMultimedia); +/* 색상 클릭시 */ +function select_color(type, code) { + xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code; + xGetElementById(type+"_color_input").value = code; +} + +/* 수동 색상 변경시 */ +function manual_select_color(type, obj) { + if(obj.value.length!=6) return; + xGetElementById(type+"_preview_color").style.backgroundColor = "#"+obj.value; +} + +/* 색상표를 출력 */ +function printColor(type, blank_img_src) { + var colorTable = new Array('22','44','66','88','AA','CC','EE'); + var html = ""; + + for(var i=0;i<8;i+=1) html += printColorBlock(type, i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16)+i.toString(16), blank_img_src); + + for(var i=0; i\"color\"<\/div>"; + } else { + return "
\"color\"<\/div>"; + } +} + +/* 폴더 여닫기 기능 toggle */ +function toggle_folder(obj) { + if(obj.checked) xGetElementById("folder_area").style.display = "block"; + else xGetElementById("folder_area").style.display = "none"; + setFixedPopupSize(); +} + +xAddEventListener(window, "load", getQuotation); diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index 9a48dbd0d..c1f22fb3f 100644 --- a/modules/editor/lang/ko.lang.php +++ b/modules/editor/lang/ko.lang.php @@ -6,5 +6,5 @@ **/ $lang->msg_component_is_not_founded = '%s 에디터 컴포넌트를 찾을 수 없습니다'; - $lang->about_dblclick_in_editor = '글 작성중 글자, 이미지, 에디터컴포넌트의 결과물등에서 더블클릭을 하시면 상세한 설정이 가능합니다'; + $lang->about_dblclick_in_editor = '글 작성중 배경, 글자, 이미지, 에디터컴포넌트의 결과물등에서 더블클릭을 하시면 상세한 설정이 가능합니다'; ?> diff --git a/modules/editor/tpl/lang/ko.lang.php b/modules/editor/tpl/lang/ko.lang.php index 190b7f7b8..c853678ab 100644 --- a/modules/editor/tpl/lang/ko.lang.php +++ b/modules/editor/tpl/lang/ko.lang.php @@ -56,5 +56,4 @@ $lang->edit->icon_align_left = '글의 왼쪽으로'; $lang->edit->icon_align_middle = '가운데 정렬'; $lang->edit->icon_align_right = '글의 우측으로'; - ?>