diff --git a/common/css/default.css b/common/css/default.css index 3bec10be1..1dc33c586 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -17,29 +17,29 @@ FORM { display:inline; } -A.bold { +a.bold { font-weight:bold; } -A.editor_blue_text:link { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} -A.editor_blue_text:visited { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} -A.editor_blue_text:active { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} -A.editor_blue_text:hover { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} +a.editor_blue_text:link { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} +a.editor_blue_text:visited { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} +a.editor_blue_text:active { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} +a.editor_blue_text:hover { color: #17B1B7; text-decoration:none; border-bottom:2px solid #17B1B7;} -A.editor_red_text:link { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717; } -A.editor_red_text:visited { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717;} -A.editor_red_text:active { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717;} -A.editor_red_text:hover { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717;} +a.editor_red_text:link { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717; } +a.editor_red_text:visited { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717;} +a.editor_red_text:active { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717;} +a.editor_red_text:hover { color: #B71717; text-decoration:none; border-bottom:2px solid #B71717;} -A.editor_yellow_text:link { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308; } -A.editor_yellow_text:visited { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308;} -A.editor_yellow_text:active { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308;} -A.editor_yellow_text:hover { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308;} +a.editor_yellow_text:link { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308; } +a.editor_yellow_text:visited { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308;} +a.editor_yellow_text:active { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308;} +a.editor_yellow_text:hover { color: #6A8308; text-decoration:none; border-bottom:2px solid #6A8308;} -A.editor_green_text:link { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} -A.editor_green_text:visited { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} -A.editor_green_text:active { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} -A.editor_green_text:hover { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} +a.editor_green_text:link { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} +a.editor_green_text:visited { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} +a.editor_green_text:active { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} +a.editor_green_text:hover { color: #08830B; text-decoration:none; border-bottom:2px solid #08830B;} .folder_opener { display: block; } .folder_closer { display: none; } diff --git a/modules/editor/components/urllink/lang/ko.lang.php b/modules/editor/components/urllink/lang/ko.lang.php index b166124f6..d80332ae6 100644 --- a/modules/editor/components/urllink/lang/ko.lang.php +++ b/modules/editor/components/urllink/lang/ko.lang.php @@ -7,4 +7,15 @@ $lang->urllink_title = "제목"; $lang->urllink_url = "URL"; + $lang->urllink_open_window = "새창열기"; + $lang->urllink_bold = " 글자 굵게"; + + $lang->urllink_color = "링크 색상 "; + $lang->urllink_color_blue = "파란색"; + $lang->urllink_color_red = "붉은색"; + $lang->urllink_color_yellow = "노란색"; + $lang->urllink_color_green = "녹색"; + + $lang->about_url_link_open_window = "선택하시면 링크 선택시 새창으로 열립니다"; + $lang->about_url_link_bold = "선택하시면 링크의 글자가 굵게 표시됩니다"; ?> diff --git a/modules/editor/components/urllink/tpl/popup.css b/modules/editor/components/urllink/tpl/popup.css index 78dc4df2c..10f448441 100644 --- a/modules/editor/components/urllink/tpl/popup.css +++ b/modules/editor/components/urllink/tpl/popup.css @@ -39,7 +39,9 @@ .editor_button_area { clear:both; text-align:center; - margin:5px; + background-color:#EEEEEE; + padding-top:5px; + height:30px; } .editor_button { diff --git a/modules/editor/components/urllink/tpl/popup.html b/modules/editor/components/urllink/tpl/popup.html index a5650af60..e3d7ed9a0 100644 --- a/modules/editor/components/urllink/tpl/popup.html +++ b/modules/editor/components/urllink/tpl/popup.html @@ -9,9 +9,35 @@
{$lang->urllink_url}
-
- - +
{$lang->urllink_open_window}
+
+ +
{$lang->urllink_bold}
+
+ +
{$lang->urllink_color}
+
+ + + + + + + + + + + + + + + +
+ +
+ + +
diff --git a/modules/editor/components/urllink/tpl/popup.js b/modules/editor/components/urllink/tpl/popup.js index 8ab1872b6..68a6bce9a 100644 --- a/modules/editor/components/urllink/tpl/popup.js +++ b/modules/editor/components/urllink/tpl/popup.js @@ -21,15 +21,43 @@ function setText() { var text = fo_obj.text.value; var url = fo_obj.url.value; + var open_window = false; + var bold = false; + var link_class = ""; - var link = text; - if(url) link = ""+text+""; + if(!text) { + window.close(); + return; + } + + if(fo_obj.open_window.checked) open_window = true; + if(fo_obj.bold.checked) bold= true; + if(xGetElementById("color_blue").checked) link_class = "editor_blue_text"; + else if(xGetElementById("color_red").checked) link_class = "editor_red_text"; + else if(xGetElementById("color_yellow").checked) link_class = "editor_yellow_text"; + else if(xGetElementById("color_green").checked) link_class = "editor_green_text"; + + var link = ""; + if(open_window) { + link = ""; var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl) opener.editorReplaceHTML(iframe_obj, link); opener.focus(); - self.close(); + window.close(); } xAddEventListener(window, "load", getText); diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html index 5c2d3a2b0..0d71200b1 100644 --- a/modules/editor/tpl/editor.html +++ b/modules/editor/tpl/editor.html @@ -1,5 +1,5 @@ - - + + diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 24d2f4f81..f4e135d5f 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -50,7 +50,7 @@ function editorStart(upload_target_srl) { var contentHtml = ''+ //''+ ''+ - ''+ + ''+ ''+ ''+ content+