From be407d41aadeee965a5dd5729e13d9d2b062ccd6 Mon Sep 17 00:00:00 2001 From: zero Date: Mon, 20 Apr 2009 01:48:06 +0000 Subject: [PATCH] =?UTF-8?q?1.=20=ED=8C=9D=EC=97=85=EC=B0=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=8C=9D=EC=97=85=EB=8B=AB=EA=B8=B0=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC(=EC=9A=B0=EC=83=81=EB=8B=A8)=EC=9D=98=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=EC=99=80=20=EB=B3=B8=EB=AC=B8=EC=9D=B4=20=EC=A1=B0?= =?UTF-8?q?=EA=B8=88=EC=94=A9=20=EC=88=A8=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=202.=20=EC=95=A0=EB=93=9C=EC=98=A8=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=20=EC=84=A4=EC=A0=95=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=9D=98=20=EC=9D=B4=EB=A6=84=EC=9D=B4=20Arr?= =?UTF-8?q?ay=EB=A1=9C=20=EB=82=98=EC=98=A4=EB=8A=94=20=EB=AC=B8=EC=A0=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95.=203.=20xe=20default=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20=EB=B9=84?= =?UTF-8?q?=EB=B0=80=EA=B8=80=20=EC=84=A4=EC=A0=95=EA=B3=BC=20=EC=83=81?= =?UTF-8?q?=EA=B4=80=EC=97=86=EC=9D=B4=20=EC=82=AC=EC=9A=A9=ED=95=A0=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=204.=20=EA=B8=B0=EB=B3=B8=20=EC=84=9C=EC=8B=9D?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EA=B8=80=EC=9D=98=20=EA=B8=80=EC=9E=90?= =?UTF-8?q?=ED=81=AC=EA=B8=B0=EB=A5=BC=2012px=20=EB=A1=9C=20=EA=B3=A0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6143 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/common.js | 3 +++ modules/addon/addon.admin.view.php | 1 - modules/admin/tpl/css/admin.css | 2 +- modules/board/skins/xe_default/write_form.html | 2 ++ modules/editor/styles/xeStyle/style.css | 2 +- modules/editor/styles/xeStyleBlack/style.css | 2 +- 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/js/common.js b/common/js/common.js index 7d824bcf0..11ca32da3 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -504,6 +504,7 @@ function zbxe_folder_close(id) { **/ var _popupHeight = 0; function setFixedPopupSize() { + var headerObj = jQuery('#popHeader'); var bodyObj = jQuery('#popBody'); if(bodyObj.length) { @@ -512,6 +513,8 @@ function setFixedPopupSize() { } } + bodyObj.css({paddingRight:30}); + var w = jQuery("#popup_content").width(); w = w< 400 ? 400 : w; var h = jQuery("#popup_content").height(); diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php index e853f3b76..abef8efe9 100644 --- a/modules/addon/addon.admin.view.php +++ b/modules/addon/addon.admin.view.php @@ -56,7 +56,6 @@ $module_categories = $oModuleModel->getModuleCategories(); foreach($mid_list as $module_srl => $module) { - $module->browser_title = $oModuleAdminModel->getLangCode($module->site_srl, $module->browser_title); $module_categories[$module->module_category_srl]->list[$module_srl] = $module; } } else { diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css index bdc3a4f9e..7f6dec799 100644 --- a/modules/admin/tpl/css/admin.css +++ b/modules/admin/tpl/css/admin.css @@ -130,7 +130,7 @@ .boxModelControler .buttonArea{ padding:15px 0 0 0; text-align:center;} #popup_content { border:2px solid #777; margin:0; font-size:12px; background:#fff; position:relative;} -#popup_content .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; } +#popup_content .xButton { position:absolute; top:9px; right:18px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; } #popup_content .xButton span { position:relative; z-index:-1; visibility:hidden; } #popup_content * { font-size:12px; } #popHeadder h4.xeAdmin, #popHeadder h1.xeAdmin, #popHeadder h3.xeAdmin { font-size:14px !important; font-family:Dotum !important; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; border:none !important; margin:0 !important;} diff --git a/modules/board/skins/xe_default/write_form.html b/modules/board/skins/xe_default/write_form.html index 1a7ab5cd0..6db898374 100644 --- a/modules/board/skins/xe_default/write_form.html +++ b/modules/board/skins/xe_default/write_form.html @@ -68,10 +68,12 @@ +
isSecret())-->checked="checked" id="is_secret" />
+
allowComment())-->checked="checked" id="allow_comment" /> diff --git a/modules/editor/styles/xeStyle/style.css b/modules/editor/styles/xeStyle/style.css index c41cecbcf..bfe49b4b8 100755 --- a/modules/editor/styles/xeStyle/style.css +++ b/modules/editor/styles/xeStyle/style.css @@ -1,7 +1,7 @@ @charset "utf-8"; /* NHN > UIT Center > Open UI Technology Team > Jeong Chan Myeong(dece24@nhncorp.com) */ /* xe_content */ -.xe_content{ color:#000;} +.xe_content{ color:#000; font-size:12px;} .xe_content blockquote.q1, .xe_content blockquote.q2, diff --git a/modules/editor/styles/xeStyleBlack/style.css b/modules/editor/styles/xeStyleBlack/style.css index e3d865f15..c890460f2 100755 --- a/modules/editor/styles/xeStyleBlack/style.css +++ b/modules/editor/styles/xeStyleBlack/style.css @@ -1,5 +1,5 @@ /* xe_content */ -.xe_content{ color:#fff;} +.xe_content{ color:#fff; font-size:12px;} .xe_content blockquote.q1, .xe_content blockquote.q2,