diff --git a/modules/editor/components/quotation/lang/ko.lang.php b/modules/editor/components/quotation/lang/ko.lang.php index b35514498..69881efbe 100644 --- a/modules/editor/components/quotation/lang/ko.lang.php +++ b/modules/editor/components/quotation/lang/ko.lang.php @@ -14,11 +14,11 @@ $lang->quotation_border_style = "테두리 종류"; $lang->quotation_border_style_list = array( - "none" => "없음", - "solid" => "실선", - "dotted" => "점선", - "left_solid" => "좌측 실선", - "right_solid" => "우측 실선", + "없음", + "실선", + "점선", + "좌측 실선", + "우측 실선", ); $lang->quotation_bg_color = "배경 색"; diff --git a/modules/editor/components/quotation/tpl/blank.gif b/modules/editor/components/quotation/tpl/images/blank.gif similarity index 100% rename from modules/editor/components/quotation/tpl/blank.gif rename to modules/editor/components/quotation/tpl/images/blank.gif diff --git a/modules/editor/components/quotation/tpl/images/border_dotted.gif b/modules/editor/components/quotation/tpl/images/border_dotted.gif new file mode 100644 index 000000000..eaf1ae738 Binary files /dev/null and b/modules/editor/components/quotation/tpl/images/border_dotted.gif differ diff --git a/modules/editor/components/quotation/tpl/images/border_left_dotted.gif b/modules/editor/components/quotation/tpl/images/border_left_dotted.gif new file mode 100644 index 000000000..101259cb7 Binary files /dev/null and b/modules/editor/components/quotation/tpl/images/border_left_dotted.gif differ diff --git a/modules/editor/components/quotation/tpl/images/border_left_solid.gif b/modules/editor/components/quotation/tpl/images/border_left_solid.gif new file mode 100644 index 000000000..10b7e789f Binary files /dev/null and b/modules/editor/components/quotation/tpl/images/border_left_solid.gif differ diff --git a/modules/editor/components/quotation/tpl/images/border_solid.gif b/modules/editor/components/quotation/tpl/images/border_solid.gif new file mode 100644 index 000000000..9fbf79f57 Binary files /dev/null and b/modules/editor/components/quotation/tpl/images/border_solid.gif differ diff --git a/modules/editor/components/quotation/tpl/popup.css b/modules/editor/components/quotation/tpl/popup.css index a515f3ea8..97a79d511 100644 --- a/modules/editor/components/quotation/tpl/popup.css +++ b/modules/editor/components/quotation/tpl/popup.css @@ -92,10 +92,17 @@ img.color_icon_over { img.border_preview_color { width:30px; height:16px; - border:1px solid #000000; + border:1px solid #EEEEEE; background-color:#88EE22; } +img.border_preview_none_color { + width:30px; + height:12px; + border:1px solid #EEEEEE; + background-color:#FFFFFF; +} + img.bg_preview_color { width:30px; height:16px; diff --git a/modules/editor/components/quotation/tpl/popup.html b/modules/editor/components/quotation/tpl/popup.html index 46203f582..ec83f9501 100644 --- a/modules/editor/components/quotation/tpl/popup.html +++ b/modules/editor/components/quotation/tpl/popup.html @@ -21,11 +21,41 @@
{$lang->quotation_border_style}
- +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
{$lang->quotation_border_thickness}
@@ -35,13 +65,13 @@
- + @@ -53,13 +83,13 @@
blankblank #
- + diff --git a/modules/editor/components/quotation/tpl/popup.js b/modules/editor/components/quotation/tpl/popup.js index 1b846a9e7..df9a08bf3 100644 --- a/modules/editor/components/quotation/tpl/popup.js +++ b/modules/editor/components/quotation/tpl/popup.js @@ -61,12 +61,27 @@ function insertQuotation(obj) { function select_color(type, code) { xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code; xGetElementById(type+"_color_input").value = code; + + if(type=="border") { + xGetElementById("border_style_solid_icon").style.backgroundColor = "#"+code; + xGetElementById("border_style_dotted_icon").style.backgroundColor = "#"+code; + xGetElementById("border_style_left_solid_icon").style.backgroundColor = "#"+code; + xGetElementById("border_style_left_dotted_icon").style.backgroundColor = "#"+code; + } } /* 수동 색상 변경시 */ function manual_select_color(type, obj) { if(obj.value.length!=6) return; - xGetElementById(type+"_preview_color").style.backgroundColor = "#"+obj.value; + code = obj.value; + xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code; + + if(type=="border") { + xGetElementById("border_style_solid_icon").style.backgroundColor = "#"+code; + xGetElementById("border_style_dotted_icon").style.backgroundColor = "#"+code; + xGetElementById("border_style_left_solid_icon").style.backgroundColor = "#"+code; + xGetElementById("border_style_left_dotted_icon").style.backgroundColor = "#"+code; + } } /* 색상표를 출력 */
blankblank #