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,