diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php index e36a3d97c..295ba9fa3 100644 --- a/modules/editor/lang/ko.lang.php +++ b/modules/editor/lang/ko.lang.php @@ -19,6 +19,6 @@ $lang->msg_component_is_inserted = '선택하신 컴포넌트는 이미 입력되어 있습니다'; $lang->msg_component_is_first_order = '선택하신 컴포넌트는 첫번째에 위치하고 있습니다'; $lang->msg_component_is_last_order = '선택하신 컴포넌트는 마지막에 위치하고 있습니다'; - $lang->msg_load_saved_doc = "자동저장된 글이 있습니다. 복구하시겠습니까?\n복구하지 않으시면 삭제됩니다"; + $lang->msg_load_saved_doc = "자동저장된 글이 있습니다. 복구하시겠습니까?\n글을 다 쓰신 후 저장하시면 자동저장본은 사라집니다"; $lang->msg_auto_saved = "자동 저장되었습니다"; ?> diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index 39c380cbe..85037fe6f 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -661,18 +661,23 @@ if(!$GLOBALS['_transImageNameList'][$member_srl]) { // 이미지 이름 체크 $image_name_file = sprintf('./files/attach/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl); - if(file_exists($image_name_file)) { - list($width, $height, $type, $attrs) = getimagesize($image_name_file); - $text = sprintf('image', $image_name_file, $width, $height); - } + if(file_exists($image_name_file)) list($name_width, $name_height, $type, $attrs) = getimagesize($image_name_file); // 이미지 마크 체크 (가로 길이 20px 이내의 마크만 고려하고 직접 style로 표시를 해 준다, css를 쓸수가 없으므로) $image_mark_file = sprintf('./files/attach/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl); - if(file_exists($image_mark_file)) { - list($width, $height, $type, $attrs) = getimagesize($image_mark_file); - $buff = sprintf('%s', $image_mark_file, $width+2, $text); + if(file_exists($image_mark_file)) list($mark_width, $mark_height, $type, $attrs) = getimagesize($image_mark_file); + + if(!$name_width && !$mark_width) return $matches[0]; + + if($name_width) { + if($mark_height && $mark_height > $name_height) $top_margin = ($mark_height - $name_height)/2; + else $top_margin = 0; + $text = sprintf('image', $image_name_file, $name_width, $name_height, $top_margin); } + if($mark_width) $buff = sprintf('
%s
', $image_mark_file, $mark_width+2, $mark_height, $text); + else $buff = $text; + $GLOBALS['_transImageNameList'][$member_srl] = str_replace($matches[4], $buff, $matches[0]); } diff --git a/plugins/login_info/skins/default/login_info.html b/plugins/login_info/skins/default/login_info.html index 0784ddf93..d7455d4db 100644 --- a/plugins/login_info/skins/default/login_info.html +++ b/plugins/login_info/skins/default/login_info.html @@ -11,7 +11,7 @@
- {$logged_info->nick_name} +
{$logged_info->nick_name}
{$lang->cmd_logout} diff --git a/plugins/login_info/skins/default/normal/style.css b/plugins/login_info/skins/default/normal/style.css index 493043c79..4f7e40f24 100644 --- a/plugins/login_info/skins/default/normal/style.css +++ b/plugins/login_info/skins/default/normal/style.css @@ -6,7 +6,7 @@ } .login_info_default_normal .top_box { - height:16px; + height:22px; border-bottom:2px dotted #DDDDDD; overflow:hidden; margin-bottom:5px;