git-svn-id: http://xe-core.googlecode.com/svn/trunk@554 201d5d3c-b55e-5fd7-737f-ddc643e51545

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 = "배경 색";

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;

modules/editor/components/quotation/tpl/popup.html

@@ -21,11 +21,41 @@
 
     <div class="header">{$lang->quotation_border_style}</div>
     <div class="body">
-      <select id="border_style" class="editor_select">
-        <!--@foreach($lang->quotation_border_style_list as $key => $val)-->
-        <option value="{$key}">{$val}</option>
-        <!--@end-->
-      </select>
+      <div>
+        <input type="radio" name="border_style" value="" id="border_style_none" />
+        <label for="border_style_none">
+          <img src="./images/blank.gif" class="border_preview_none_color" />
+          {$lang->quotation_border_style_list[0]}
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="border_style" value="solid" id="border_style_solid" checked="true" />
+        <label for="border_style_solid">
+          <img src="./images/border_solid.gif" class="border_preview_color" id="border_style_solid_icon"/>
+          {$lang->quotation_border_style_list[1]}
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="border_style" value="dotted" id="border_style_dotted" />
+        <label for="border_style_dotted">
+          <img src="./images/border_dotted.gif" class="border_preview_color" id="border_style_dotted_icon"/>
+          {$lang->quotation_border_style_list[2]}
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="border_style" value="left_solid" id="border_style_left_solid" />
+        <label for="border_style_left_solid">
+          <img src="./images/border_left_solid.gif" class="border_preview_color" id="border_style_left_solid_icon"/>
+          {$lang->quotation_border_style_list[3]}
+        </label>
+      </div>
+      <div>
+        <input type="radio" name="border_style" value="left_dotted" id="border_style_left_dotted" />
+        <label for="border_style_left_dotted">
+          <img src="./images/border_left_dotted.gif" class="border_preview_color" id="border_style_left_dotted_icon"/>
+          {$lang->quotation_border_style_list[4]}
+        </label>
+      </div>
     </div>
 
     <div class="header">{$lang->quotation_border_thickness}</div>
@@ -35,13 +65,13 @@
     <div class="body">
       <div>
         <script type="text/javascript">
-          printColor("border", "{$tpl_path}/blank.gif");
+          printColor("border", "{$tpl_path}/images/blank.gif");
         </script>
       </div>
       <div>
         <table border="0" cellspacing="0">
         <tr>
-          <td><img src="./blank.gif" alt="blank" class="border_preview_color" id="border_preview_color" /></td>
+          <td><img src="./images/border_solid.gif" alt="blank" class="border_preview_color" id="border_preview_color" /></td>
           <td>#</td>
           <td><input type="text" id="border_color_input" size="6" maxlength="6" class="editor_input" value="88EE22" onkeyup="manual_select_color('border',this)"/></td>
         </tr>
@@ -53,13 +83,13 @@
     <div class="body">
       <div>
         <script type="text/javascript">
-          printColor("bg", "{$tpl_path}/blank.gif");
+          printColor("bg", "{$tpl_path}/images/blank.gif");
         </script>
       </div>
       <div>
         <table border="0" cellspacing="0">
         <tr>
-          <td><img src="./blank.gif" alt="blank" class="bg_preview_color" id="bg_preview_color" /></td>
+          <td><img src="./images/blank.gif" alt="blank" class="bg_preview_color" id="bg_preview_color" /></td>
           <td>#</td>
           <td><input type="text" id="bg_color_input" size="6" maxlength="6" class="editor_input" value="FFFFFF" onkeyup="manual_select_color('bg',this)"/></td>
         </tr>

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;
+  }
 }
 
 /* 색상표를 출력 */