diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php index 7382c8cb8..c325f2acd 100644 --- a/addons/member_extra_info/member_extra_info.addon.php +++ b/addons/member_extra_info/member_extra_info.addon.php @@ -73,13 +73,13 @@ // 4. 자신의 쪽지함 보기 기능 추가 $menu_str = Context::getLang('cmd_view_message_box'); - $menu_link = "location.href.setQuery('act','dispMemberMessages')"; - $menu_list .= sprintf("\n%s,%s,move_url(%s,'sendMessage', true)", Context::getRequestUri().'/modules/member/tpl/images/icon_message_box.gif', $menu_str, $menu_link); + $menu_link = "current_url.setQuery('act','dispMemberMessages')"; + $menu_list .= sprintf("\n%s,%s,move_url(%s,'Y')", Context::getRequestUri().'/modules/member/tpl/images/icon_message_box.gif', $menu_str, $menu_link); // 5. 친구 목록 보기 $menu_str = Context::getLang('cmd_view_friend'); - $menu_link = "location.href.setQuery('module','member').setQuery('act','dispMemberFriend')"; - $menu_list .= sprintf("\n%s,%s,popopen(%s,'sendMessage', true)", Context::getRequestUri().'/modules/member/tpl/images/icon_friend_box.gif',$menu_str, $menu_link); + $menu_link = "current_url.setQuery('act','dispMemberFriend')"; + $menu_list .= sprintf("\n%s,%s,move_url(%s,'Y')", Context::getRequestUri().'/modules/member/tpl/images/icon_friend_box.gif',$menu_str, $menu_link); // 아니라면 쪽지 발송, 친구 등록 추가 diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index 01b673ae2..5b8db4e9f 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -65,6 +65,7 @@ // context 변수를 $GLOBALS의 변수로 지정 $this->context = &$GLOBALS['__Context__']; $this->context->lang = &$GLOBALS['lang']; + $this->context->_COOKIE = $_COOKIE; // 기본적인 DB정보 세팅 $this->_loadDBInfo(); diff --git a/common/css/default.css b/common/css/default.css index 8c75ff64b..5934d60ba 100644 --- a/common/css/default.css +++ b/common/css/default.css @@ -22,7 +22,7 @@ html { width:100%; position:relative;} body { font-size:.75em; margin:2em;} img { border:none;} label { cursor:pointer;} -select { height:1.6em;} +/*select { height:1.6em;}*/ option { padding-right:.5em;} li { list-style:none;} a { text-decoration:none;} diff --git a/common/js/common.js b/common/js/common.js index 11cacf3f4..c3cc0f12f 100644 --- a/common/js/common.js +++ b/common/js/common.js @@ -108,8 +108,9 @@ function sendMailTo(to) { **/ function move_url(url, open_wnidow) { if(!url) return false; - if(typeof(open_wnidow)=='undefined') open_wnidow = false; + if(typeof(open_wnidow)=='undefined') open_wnidow = 'N'; if(open_wnidow=='N') open_wnidow = false; + else open_wnidow = true; if(/^\./.test(url)) url = request_uri+url; @@ -241,6 +242,14 @@ function setFixedPopupSize() { var w = xWidth("popup_content"); var h = xHeight("popup_content"); + var obj_list = xGetElementsByTagName('div'); + for(i=0;iw) w = ww; + } + // 윈도우에서는 브라우저 상관없이 가로 픽셀이 조금 더 늘어나야 한다. if(xUA.indexOf('windows')>0) { if(xOp7Up) w += 10; @@ -248,8 +257,7 @@ function setFixedPopupSize() { else w += 6; } window.resizeTo(w,h); - - var w1 = xWidth(window.document.body); + var h1 = xHeight(window.document.body); window.resizeBy(0,h-h1); } diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php index 0f3fa2ee3..c307492c3 100644 --- a/common/lang/ko.lang.php +++ b/common/lang/ko.lang.php @@ -88,6 +88,7 @@ $lang->ipaddress = 'IP 주소'; $lang->path = '경로'; $lang->cart = '선택항목'; + $lang->friend = '친구'; $lang->mid = '모듈이름'; $lang->layout = '레이아웃'; diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 099780945..eb7e524e2 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -17,10 +17,10 @@ - + //]]> {Context::getHtmlHeader()} diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php index 592d7a969..782b90f09 100644 --- a/modules/blog/blog.view.php +++ b/modules/blog/blog.view.php @@ -282,11 +282,12 @@ // 댓글이 없다면 오류 if(!$comment) return $this->dispBlogMessage('msg_invalid_request'); + Context::set('document_srl',$comment->document_srl); + // 글을 수정하려고 할 경우 권한이 없는 경우 비밀번호 입력화면으로 if($comment_srl&&$comment&&!$comment->is_granted) return $this->setTemplateFile('input_password_form'); // 필요한 정보들 세팅 - Context::set('document_srl',$document_srl); Context::set('comment_srl',$comment_srl); Context::set('comment', $comment); @@ -315,6 +316,8 @@ // 삭제하려는 글이 없으면 에러 if(!$comment) return $this->dispBlogContent(); + Context::set('document_srl',$comment->document_srl); + // 권한이 없는 경우 비밀번호 입력화면으로 if($comment_srl&&$comment&&!$comment->is_granted) return $this->setTemplateFile('input_password_form'); diff --git a/modules/blog/skins/xe_blog/css/white.css b/modules/blog/skins/xe_blog/css/white.css index 2c2ea13a1..656d89cf9 100644 --- a/modules/blog/skins/xe_blog/css/white.css +++ b/modules/blog/skins/xe_blog/css/white.css @@ -237,3 +237,13 @@ Jeong, Chan Myeong 070601~070630 .buttonWrite ul { text-align:center; clear:both; display:block;} .buttonWrite li { margin-top:.5em; float:right; margin-right:.3em;} + +.smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;} +.smallBox.w268 { width:268px;} +.smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;} +.smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; } +.smallBox .complex { padding:1.5em 2em 2em 2em;} +.smallBox .inputPassword { position:relative; border:none; padding:2em 2em 1.5em 0em;} +.smallBox .inputPassword .inputTypeText { float:left; margin-right:.5em;} +.smallBox .inputPassword legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} +.smallBox .inputPassword .button { display:block; float:right; margin-left:.4em;} diff --git a/modules/blog/skins/xe_blog/delete_comment_form.html b/modules/blog/skins/xe_blog/delete_comment_form.html index a3ed7cf27..13f471032 100644 --- a/modules/blog/skins/xe_blog/delete_comment_form.html +++ b/modules/blog/skins/xe_blog/delete_comment_form.html @@ -1,23 +1,28 @@ -
+
+ +
+

{$lang->confirm_delete}

+
+ + - - - - - - - -
{$lang->confirm_delete}
- - -
- +
+
+ +
+ +
+ + +
diff --git a/modules/blog/skins/xe_blog/delete_form.html b/modules/blog/skins/xe_blog/delete_form.html index e0890106c..77d0cbe86 100644 --- a/modules/blog/skins/xe_blog/delete_form.html +++ b/modules/blog/skins/xe_blog/delete_form.html @@ -1,27 +1,27 @@ -
+
+ +
+

{$lang->confirm_delete}

+
+ + - - - - - - - - - - - -
{$lang->confirm_delete}
{$lang->title}{$oDocument->getTitleText()}
- - -
+
+
+ +
+ +
- + +
diff --git a/modules/blog/skins/xe_blog/delete_trackback_form.html b/modules/blog/skins/xe_blog/delete_trackback_form.html index 4ca0aabfc..b6436a752 100644 --- a/modules/blog/skins/xe_blog/delete_trackback_form.html +++ b/modules/blog/skins/xe_blog/delete_trackback_form.html @@ -1,23 +1,29 @@ -
+
+ +
+

{$lang->confirm_delete}

+
+ + - - - - - - - -
{$lang->confirm_delete}
- - -
- +
+
+ +
+ +
+ + +
+ diff --git a/modules/blog/skins/xe_blog/input_password_form.html b/modules/blog/skins/xe_blog/input_password_form.html index 0a26427de..439573237 100644 --- a/modules/blog/skins/xe_blog/input_password_form.html +++ b/modules/blog/skins/xe_blog/input_password_form.html @@ -1,27 +1,32 @@ -
+
+ +
+

{$lang->msg_input_password}

+
+ + - - - - - - - - - - - -
{$lang->msg_input_password}
{$lang->password}
- - -
- +
+ {$lang->msg_input_password} + +
+ +
+ +
+ + + +
+ diff --git a/modules/board/board.view.php b/modules/board/board.view.php index 3e9568042..0c5ac0b6f 100644 --- a/modules/board/board.view.php +++ b/modules/board/board.view.php @@ -242,11 +242,12 @@ // 댓글이 없다면 오류 if(!$comment) return $this->dispBoardMessage('msg_invalid_request'); + Context::set('document_srl',$comment->document_srl); + // 글을 수정하려고 할 경우 권한이 없는 경우 비밀번호 입력화면으로 if($comment_srl&&$comment&&!$comment->is_granted) return $this->setTemplateFile('input_password_form'); // 필요한 정보들 세팅 - Context::set('document_srl',$document_srl); Context::set('comment_srl',$comment_srl); Context::set('comment', $comment); @@ -275,6 +276,8 @@ // 삭제하려는 글이 없으면 에러 if(!$comment) return $this->dispBoardContent(); + Context::set('document_srl',$comment->document_srl); + // 권한이 없는 경우 비밀번호 입력화면으로 if($comment_srl&&$comment&&!$comment->is_granted) return $this->setTemplateFile('input_password_form'); diff --git a/modules/board/skins/xe_list/css/white.css b/modules/board/skins/xe_list/css/white.css index 51ab75803..08e1bab94 100644 --- a/modules/board/skins/xe_list/css/white.css +++ b/modules/board/skins/xe_list/css/white.css @@ -116,6 +116,7 @@ Jeong, Chan Myeong 070601~070630 .buttonTypeA .leftCap { width:2px; height:24px; background:url(../images/white/buttonTypeALeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} .buttonTypeA .rightCap { width:2px; height:24px; background:url(../images/white/buttonTypeARight.gif) no-repeat; margin:0 -1px 0 .4em;} .buttonTypeA .icon { margin:0 .2em;} +.buttonTypeA input { border:none; cursor:pointer; background:url(../images/white/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; _position:relative; _top:3px;} .buttonTypeB { display:block; cursor:pointer; background:url(../images/white/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; font-size:.9em; white-space:nowrap;} .buttonTypeB:hover { text-decoration:none;} @@ -123,6 +124,7 @@ Jeong, Chan Myeong 070601~070630 .buttonTypeB .leftCap { width:2px; height:21px; background:url(../images/white/buttonTypeBLeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} .buttonTypeB .rightCap { width:2px; height:21px; background:url(../images/white/buttonTypeBRight.gif) no-repeat; margin:0 -1px 0 .4em;} .buttonTypeB .icon { margin:0 .2em;} +.buttonTypeB input { border:none; cursor:pointer; background:url(../images/white/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; _position:relative; _top:4px;} /* button of list page */ .buttonRight { position:relative; float:right; top:-3em; margin:0 0 -3em 0; _top:-3.5em; padding-right:.5em; overflow:visible;} @@ -273,3 +275,13 @@ Jeong, Chan Myeong 070601~070630 .buttonWrite ul { text-align:center; clear:both; display:block;} .buttonWrite li { margin-top:.5em; float:right; margin-right:.3em;} .buttonWrite input { border:none; cursor:pointer; background:url(../images/white/buttonTypeACenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; white-space:nowrap;border:0px; _position:relative; _top:3px;} + +.smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;} +.smallBox.w268 { width:268px;} +.smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;} +.smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; } +.smallBox .complex { padding:1.5em 2em 2em 2em;} +.smallBox .inputPassword { position:relative; border:none; padding:2em 2em 1.5em 0em;} +.smallBox .inputPassword .inputTypeText { float:left; margin-right:.5em;} +.smallBox .inputPassword legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} +.smallBox .inputPassword .button { display:block; float:right; margin-left:.4em;} diff --git a/modules/board/skins/xe_list/delete_comment_form.html b/modules/board/skins/xe_list/delete_comment_form.html index a3ed7cf27..13f471032 100644 --- a/modules/board/skins/xe_list/delete_comment_form.html +++ b/modules/board/skins/xe_list/delete_comment_form.html @@ -1,23 +1,28 @@ -
+
+ +
+

{$lang->confirm_delete}

+
+ + - - - - - - - -
{$lang->confirm_delete}
- - -
- +
+
+ +
+ +
+ + +
diff --git a/modules/board/skins/xe_list/delete_form.html b/modules/board/skins/xe_list/delete_form.html index e0890106c..77d0cbe86 100644 --- a/modules/board/skins/xe_list/delete_form.html +++ b/modules/board/skins/xe_list/delete_form.html @@ -1,27 +1,27 @@ -
+
+ +
+

{$lang->confirm_delete}

+
+ + - - - - - - - - - - - -
{$lang->confirm_delete}
{$lang->title}{$oDocument->getTitleText()}
- - -
+
+
+ +
+ +
- + +
diff --git a/modules/board/skins/xe_list/delete_trackback_form.html b/modules/board/skins/xe_list/delete_trackback_form.html index 4ca0aabfc..b6436a752 100644 --- a/modules/board/skins/xe_list/delete_trackback_form.html +++ b/modules/board/skins/xe_list/delete_trackback_form.html @@ -1,23 +1,29 @@ -
+
+ +
+

{$lang->confirm_delete}

+
+ + - - - - - - - -
{$lang->confirm_delete}
- - -
- +
+
+ +
+ +
+ + +
+ diff --git a/modules/board/skins/xe_list/images/white/bgH3.gif b/modules/board/skins/xe_list/images/white/bgH3.gif index 5542cf78e..0d07bb456 100644 Binary files a/modules/board/skins/xe_list/images/white/bgH3.gif and b/modules/board/skins/xe_list/images/white/bgH3.gif differ diff --git a/modules/board/skins/xe_list/input_password_form.html b/modules/board/skins/xe_list/input_password_form.html index 0a26427de..439573237 100644 --- a/modules/board/skins/xe_list/input_password_form.html +++ b/modules/board/skins/xe_list/input_password_form.html @@ -1,27 +1,32 @@ -
+
+ +
+

{$lang->msg_input_password}

+
+ + - - - - - - - - - - - -
{$lang->msg_input_password}
{$lang->password}
- - -
- +
+ {$lang->msg_input_password} + +
+ +
+ +
+ + + +
+ diff --git a/modules/editor/tpl/css/editor.css b/modules/editor/tpl/css/editor.css index db6c38110..d296c65b7 100644 --- a/modules/editor/tpl/css/editor.css +++ b/modules/editor/tpl/css/editor.css @@ -22,7 +22,7 @@ .xeEditor .close { cursor:pointer; position:absolute; top:0; right:0; _top:3px; _right:15px;} .xeEditor .textAreaDragIndicator { text-align:center; background:url(../images/lineTextAreaDrag.gif) repeat-x left center; margin-bottom:1em;} .xeEditor .textAreaDragIndicatorBar { background:url(../images/buttonTextAreaDrag.gif) no-repeat center; margin-bottom:1em;position:relative;cursor:move;height:14px;} -.xeEditor .editor_iframe_box { clear:both; border:1px solid #EFEFEF; } +.xeEditor .editor_iframe_box { clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:.5em; } div.editor_autosaved_message { font-size:9pt; font-weight:bold; color:#888888; display:none; position:absolute; top:10px; right:10px; } diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html index 948cc2e7b..1a55a4ded 100644 --- a/modules/editor/tpl/editor.html +++ b/modules/editor/tpl/editor.html @@ -104,14 +104,14 @@ -
- +
close {$lang->about_dblclick_in_editor}
+
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js index 8b81411c4..47cb724c8 100755 --- a/modules/editor/tpl/js/editor.js +++ b/modules/editor/tpl/js/editor.js @@ -29,7 +29,7 @@ function editorStart(upload_target_srl, resizable, height) { // iframe_area를 찾음 var iframe_area = xGetElementById("editor_iframe_area_"+upload_target_srl); - xInnerHtml(iframe_area, ""); + xInnerHtml(iframe_area, ""); // iframe obj를 찾음 var iframe_obj = editorGetIFrame(upload_target_srl); @@ -617,5 +617,8 @@ function eOptionClick(obj) { // Editor Info Close function closeEditorInfo() { xGetElementById('editorInfo').style.display='none'; + var expire = new Date(); + expire.setTime(expire.getTime()+ (7000 * 24 * 3600000)); + xSetCookie('EditorInfo', '1', expire); } diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js index 7a5c1cf6b..54115a274 100755 --- a/modules/editor/tpl/js/uploader.js +++ b/modules/editor/tpl/js/uploader.js @@ -26,12 +26,12 @@ function editor_upload_form_set(upload_target_srl) { // SWFUploader load var uploader_name = "swf_uploader_"+upload_target_srl; var embed_html = ""; - var flashVars = 'uploadProgressCallback=editor_upload_progress&uploadFileErrorCallback=editor_upload_error_handle&allowedFiletypesDescription='+uploader_setting["allowed_filetypes_description"]+'&autoUpload=true&allowedFiletypes='+uploader_setting["allowed_filetypes"]+'&maximumFilesize='+uploader_setting["allowed_filesize"]+'&uploadQueueCompleteCallback=editor_display_uploaded_file&uploadScript='+escape('../../../../?act=procFileUpload&upload_target_srl='+upload_target_srl+'&PHPSESSID='+xGetCookie(zbxe_session_name)); + var flashVars = 'uploadProgressCallback=editor_upload_progress&uploadFileErrorCallback=editor_upload_error_handle&allowedFiletypesDescription='+uploader_setting["allowed_filetypes_description"]+'&autoUpload=true&allowedFiletypes='+uploader_setting["allowed_filetypes"]+'&maximumFilesize='+uploader_setting["allowed_filesize"]+'&uploadQueueCompleteCallback=editor_display_uploaded_file&uploadScript='+escape(request_uri+'?act=procFileUpload&upload_target_srl='+upload_target_srl+'&PHPSESSID='+xGetCookie(zbxe_session_name)); - if(navigator.widgets&&navigator.mimeTypes&&navigator.mimeTypes.length) { - embed_html = ''; + if(navigator.plugins&&navigator.mimeTypes&&navigator.mimeTypes.length) { + embed_html = ''; } else { - embed_html = ''; + embed_html = ''; } if(xIE4Up) { diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php index f2846ed0c..af879e68c 100644 --- a/modules/member/lang/ko.lang.php +++ b/modules/member/lang/ko.lang.php @@ -114,6 +114,7 @@ $lang->msg_content_is_null = '내용을 입력해주세요'; $lang->msg_allow_message_to_friend = '친구에게만 쪽지 수신을 허용한 사용자라서 쪽지 발송을 하지 못했습니다'; $lang->msg_disallow_message = '쪽지 수신을 거부한 사용자라서 쪽지 발송을 하지 못했습니다'; + $lang->msg_insert_group_name = '그룹명을 입력해 주세요'; $lang->msg_not_uploaded_image_name = '이미지 이름을 등록할 수가 없습니다'; $lang->msg_not_uploaded_image_mark = '이미지 마크를 등록할 수가 없습니다'; diff --git a/modules/member/member.view.php b/modules/member/member.view.php index 66721a710..5c123f689 100644 --- a/modules/member/member.view.php +++ b/modules/member/member.view.php @@ -188,6 +188,8 @@ if($message->message_srl == $message_srl) Context::set('message', $message); } + // 각 쪽지들의 갯수 구함 + // 목록 추출 $output = $oMemberModel->getMessages($message_type); @@ -205,7 +207,7 @@ * @brief 새 쪽지 보여줌 **/ function dispMemberNewMessage() { - //$this->setLayoutFile('popup_layout'); + $this->setLayoutFile('popup_layout'); // 로그인이 되어 있지 않으면 오류 표시 if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); @@ -229,7 +231,7 @@ * @brief 쪽지 발송 출력 **/ function dispMemberSendMessage() { - //$this->setLayoutFile("popup_layout"); + $this->setLayoutFile("popup_layout"); // 로그인이 되어 있지 않으면 오류 표시 if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); @@ -261,8 +263,6 @@ * @brief 친구 목록 보기 **/ function dispMemberFriend() { - //$this->setLayoutFile("popup_layout"); - // 로그인이 되어 있지 않으면 오류 표시 if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); @@ -301,7 +301,7 @@ * @brief 친구 추가 **/ function dispMemberAddFriend() { - //$this->setLayoutFile("popup_layout"); + $this->setLayoutFile("popup_layout"); // 로그인이 되어 있지 않으면 오류 표시 if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); @@ -327,7 +327,7 @@ * @brief 친구 그룹 추가 **/ function dispMemberAddFriendGroup() { - //$this->setLayoutFile("popup_layout"); + $this->setLayoutFile("popup_layout"); // 로그인이 되어 있지 않으면 오류 표시 if(!Context::get('is_logged')) return $this->stop('msg_not_logged'); diff --git a/modules/member/queries/moveFriend.xml b/modules/member/queries/moveFriend.xml index 2ae898eb6..730b1b1be 100644 --- a/modules/member/queries/moveFriend.xml +++ b/modules/member/queries/moveFriend.xml @@ -7,6 +7,6 @@ - + diff --git a/modules/member/skins/default/add_friend.html b/modules/member/skins/default/add_friend.html index 2cf72615f..ad1da8ab9 100644 --- a/modules/member/skins/default/add_friend.html +++ b/modules/member/skins/default/add_friend.html @@ -1,40 +1,48 @@ -
+
+
+

{$lang->cmd_add_friend}

+
+
- -
-
- {$lang->cmd_add_friend} -
- - - - - - - - - - - - - -
{$lang->user_id}{$target_info->user_id}
{$lang->user_name}{$target_info->user_name}
{$lang->nick_name}
{$target_info->nick_name}
+ + +
+ + + + + + + + + + + + + +
{$lang->user_id}{$target_info->user_id}
{$lang->user_name}{$target_info->user_name}
{$lang->nick_name}
{$target_info->nick_name}
+ +
+ + add{$lang->cmd_add_friend_group}
-
- {$lang->friend_group} : - - {$lang->cmd_add_friend_group} -
- - +
+ +
+ +
+
diff --git a/modules/member/skins/default/add_friend_group.html b/modules/member/skins/default/add_friend_group.html index 7eeb59622..96c3996d7 100644 --- a/modules/member/skins/default/add_friend_group.html +++ b/modules/member/skins/default/add_friend_group.html @@ -1,28 +1,35 @@ -
+
- -
- - {$lang->cmd_rename_friend_group} - - {$lang->cmd_add_friend_group} - + +
+

+ + {$lang->cmd_rename_friend_group} + + {$lang->cmd_add_friend_group} + +

-
- {$lang->friend_group} : + +
+

{$lang->msg_insert_group_name}

+
-
- - - - - - + +
+
-
+ diff --git a/modules/member/skins/default/common_header.html b/modules/member/skins/default/common_header.html index a46afae48..9b3a37887 100644 --- a/modules/member/skins/default/common_header.html +++ b/modules/member/skins/default/common_header.html @@ -1,6 +1,7 @@ + {@ $colorset = "normal"; } diff --git a/modules/member/skins/default/css/normal.css b/modules/member/skins/default/css/normal.css index 0e4f70344..60179ede1 100644 --- a/modules/member/skins/default/css/normal.css +++ b/modules/member/skins/default/css/normal.css @@ -1,9 +1,11 @@ @charset "utf-8"; - div#memberModule .smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;} div#memberModule .smallBox.w268 { width:268px;} div#memberModule .smallBox.w298 { width:298px;} +div#memberModule .smallBox.w268pop { width:268px; margin:0; padding:0;} +div#memberModule .smallBox.w298pop { width:298px; margin:0; padding:0;} +div#memberModule .smallBox.w600pop { width:600px; margin:0; padding:0;} div#memberModule .smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;} div#memberModule .smallBox .header h3 { float:left; clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; background:url(../images/normal/lineH3.gif) no-repeat right bottom;} div#memberModule .smallBox .login { position:relative; border:none; padding:2em 0 1.5em 2em;} @@ -36,12 +38,18 @@ div#memberModule .smallBox .leftHeaderType th { color:#333333; text-align:left; div#memberModule .smallBox .leftHeaderType td { color:#444444;} div#memberModule .smallBox .inputTypeText { background:#fbfbfb;} div#memberModule .smallBox .group { border:1px solid #e0e1db; border-width:1px 0; overflow:hidden; padding:.5em 0; margin-top:.7em;} -div#memberModule .smallBox .group select { float:left; width:180px; margin-top:1px;} +div#memberModule .smallBox .group select { float:left; width:11em; margin-top:1px;} +div#memberModule .smallBox .pwModify { border:none;} +div#memberModule .smallBox .pwModify legend { position:absolute; overflow:hidden; width:1px; height:1px; font-size:.001em; text-indent:-100em;} +div#memberModule .smallBox .pwModify input { width:9em;} +div#memberModule .smallBox .pwModify br { display:block; margin-bottom:.2em} +div#memberModule .smallBox .pwModify p { text-align:center; margin-top:1em; color:#54564b;} + div#memberModule .readMessage { border:1px solid #e0e1db; border-top:none; margin-bottom:2em;} div#memberModule .readMessage .messageHeader { padding:1.5em; height:1em; overflow:hidden;} div#memberModule .readMessage .messageHeader h4 { float:left; padding-left:.5em; font-size:1em; background:url(../images/normal/iconArrow99.gif) no-repeat left .3em;} div#memberModule .readMessage .messageHeader address { float:right; white-space:nowrap;} -div#memberModule .readMessage .messageHeader address em { font-size:.9em; font-style:normal; color:#333333; margin-right:.3em;} +div#memberModule .readMessage .messageHeader address em { font-size:.9em; font-style:normal; color:#333333; margin-right:.3em; float:left;} div#memberModule .readMessage .messageHeader address em a { color:#333333;} div#memberModule .readMessage .messageHeader address .date { font:.8em Tahoma; color:#999999;} div#memberModule .readMessage .messageBody { border:1px solid #e0e1db; margin:0 1.5em 1.5em 1.5em; padding:1em; position:relative; color:#666666;} @@ -79,6 +87,7 @@ div#memberModule .buttonTypeB input { border:none; cursor:pointer; background:ur div#memberModule .buttonTypeB .leftCap { width:2px; height:21px; background:url(../images/normal/buttonTypeBLeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;} div#memberModule .buttonTypeB .rightCap { width:2px; height:21px; background:url(../images/normal/buttonTypeBRight.gif) no-repeat; margin:0 -1px 0 .4em;} div#memberModule .buttonTypeB .icon { margin:0 .2em;} +div#memberModule .buttonTypeGo { border:none; cursor:pointer; width:24px; height:20px; background:url(../images/normal/buttonTypeInput24.gif) no-repeat; font:.75em Tahoma; text-align:center;} div#memberModule .openid_button { display:inline; float:left;} div#memberModule .openid_user_id { background: url(../images/openid_input_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; line-height:1em; vertical-align:middle; float:left; margin-right:.5em; margin-bottom:.5em; color:#666666;} @@ -88,7 +97,7 @@ div#memberModule .boardHeader h3 { float:left; clear:both; font-size:1.2em; padd div#memberModule .boardHeader .essential { position:absolute; top:1.5em; right:1em; color:#54564b; font-size:.9em;} div#memberModule .boardHeader .essential:first-letter { color:#ff0000;} div#memberModule .boardHeader2 { width:100%; overflow:hidden; padding:1em 0 1em 0; color:#444444;} -div#memberModule .boardHeader2 h3 { float:left; font-size:1.4em; padding-left:1.2em; background:url(../img/iconH3.gif) no-repeat .5em center;} +div#memberModule .boardHeader2 h3 { float:left; font-size:1.4em; padding-left:1.2em; background:url(../images/normal/iconH3.gif) no-repeat .5em center;} div#memberModule .boardHeader2 .info { float:right; position:relative; top:.4em;} div#memberModule .boardHeader2 .info q { quotes:none; font-weight:bold;} div#memberModule .boardHeader2 .info strong { font:bold .9em Tahoma; color:#ff6600;} @@ -100,11 +109,95 @@ div#memberModule .button ul li { float:left; margin-right:.5em;} div#memberModule .agreementBox { border:1px solid #AAAAAA; margin:.5em 0 .5em 0; padding:1em 1em 0 1em; } div#memberModule .agreementBox .button { margin-top:2em; padding-top:1em; border-top:1px solid #eaebe7; overflow:hidden;} -div#memberModule .str_birthday { float:left; width:80px; height:21px; border-bottom:1px solid #EEEEEE; margin-right:.3em;} + +div#memberModule .textarea { clear:both; width:30em; height:5em; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:1px; margin-right:.3em; font-size:1em; } +div#memberModule .checkbox li { float:left; margin-right:2em; } +div#memberModule .checkbox li input { border:0px; } +div#memberModule .str_birthday { float:left; width:80px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px 3px 3px 18px; margin-right:.3em;} div#memberModule .button_birthday { float:left; margin-right:1em; } +div#memberModule .krZip .buttonZip { float:left; margin-right:1em; } +div#memberModule .krZip input { width:30em; } +div#memberModule .krZip .address2 { clear:both; } +div#memberModule .krZip .buttonZip { float:left; margin-right:1em; } +div#memberModule .extendDesc { clear:both; margin-top:0; font-size:.9em; color:#999999; } div#memberModule .memberImage { clear:both; } div#memberModule .memberImage .info { margin-bottom:.5em; float:left; margin-right:1em;} div#memberModule .memberImage .form { float:left; } div#memberModule .memberImage .form input { height:1.5em; margin:0 .3em 0 0; padding:0;} div#memberModule .memberImage .button { float:left; margin:0 .3em 0 0; padding:0;} + + +div#memberModule .boardInformation { width:100%; clear:both; margin:1em 0 .5em 0; overflow:hidden; color:#666666;} +div#memberModule .friendNum { float:left; background:url(../images/normal/iconFriend.gif) no-repeat .5em .4em; padding:.4em 0 0 2em;} +div#memberModule .friendNum strong { font:bold 11px Tahoma; color:#ff6600;} + +div#memberModule .boardList { width:100%; position:relative; border:1px solid #e0e1db;} +div#memberModule .boardList tr:first-child td, .boardList tr.first-child td { border-top:1px solid #e0e1db;} +div#memberModule .boardList tr.bg1 { background:#ffffff} +div#memberModule .boardList tr.bg2 { background:#fbfbfb;} + +div#memberModule .boardList th { color:#3e3f3e; font-weight:normal; border-bottom:1px solid #ffffff; padding:.8em .5em .5em .5em; background:#ffffff url(../images/normal/lineBoardListTh.gif) no-repeat left bottom; white-space:nowrap;} +div#memberModule .boardList th a { color:#3e3f3e;} +div#memberModule .boardList th:first-child, .boardList th.first-child { background-position:-3px bottom; border-left:1px solid #ffffff;} +div#memberModule .boardList th.check { padding:0;} +div#memberModule .boardList th.registDate {} +div#memberModule .boardList th.friendGroup {} +div#memberModule .boardList th.userId {} +div#memberModule .boardList th.userName {} +div#memberModule .boardList th.userNick {} +div#memberModule .boardList th select, .boardList th input { vertical-align:middle;} + +div#memberModule .boardList td { border-top:1px solid #eff0ed; padding:.5em;} +div#memberModule .boardList td.registDate { font:.8em Tahoma; color:#999999; text-align:center;} +div#memberModule .boardList td.check { text-align:center;} +div#memberModule .boardList td.user { color:#333333; font-size:.9em;} +div#memberModule .boardList td.user a { color:#333333;} +div#memberModule .boardList td.userId { font:.9em Tahoma;} +div#memberModule .boardList td.userName {} +div#memberModule .boardList td.userNick { font-size:.9em; color:#999999;} +div#memberModule .boardList td.friendGroup {} +div#memberModule .boardList td.sendMessage { text-align:center; padding:0;} +div#memberModule .boardList td.sendMessage .buttonFixedLeft { float:left; position:relative; margin-left:1em;} +div#memberModule .boardList td input { _margin:-3px;} +div#memberModule .boardList td.title {} +div#memberModule .boardList td.title.bold { font-size:1.2em; font-weight:bold;} +div#memberModule .boardList td.title.bold a { position:relative; top:.3em;} +div#memberModule .boardList td.title * { vertical-align:middle;} +div#memberModule .boardList td.title, .boardList td.title a { color:#444444;} +div#memberModule .boardList td.title a:visited { color:#777777;} +div#memberModule .boardList td.checkDate { font:.8em Tahoma; color:#333333; text-align:center;} + +/* pageNavigation */ +div#memberModule .pageNavigation { position:relative; display:block; padding:1.5em 0 2em 0; text-align:center; font:bold .8em Tahoma; } +div#memberModule .pageNavigation a { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#666666; display:inline-block; padding:1px 7px 2px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } +div#memberModule .pageNavigation a:hover { background:#F7F7F7; text-decoration:none; } +div#memberModule .pageNavigation a:visited { color:#999999;} +div#memberModule .pageNavigation a.goToFirst { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;} +div#memberModule .pageNavigation a.goToLast { border:none; border-right:1px solid #ffffff; border-left:1px solid #ffffff; z-index:99; vertical-align:top; padding:0px 7px 4px 6px;} +div#memberModule .pageNavigation a.goToFirst img, .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;} +div#memberModule .pageNavigation .current { position:relative; margin-left:-4px; font:bold 1em Tahoma; color:#ff6600; display:inline-block; padding:1px 7px 1px 6px; border-left:1px solid #dedfde; border-right:1px solid #CCCCCC; text-decoration:none; line-height:1em; } + + +/* button of list page */ +div#memberModule .buttonRight { position:relative; float:right; top:-3em; margin:0 0 -3em 0; _top:-3.5em; padding-right:.5em; overflow:visible;} +div#memberModule .buttonRight ul li { float:right; margin-left:.3em;} +div#memberModule .buttonLeft { position:relative; float:left; top:-3em; margin:0 0 -3em 0; _top:-3.5em; padding-left:.5em; overflow:visible;} +div#memberModule .buttonLeft ul li { float:left; margin-right:.3em;} +div#memberModule .buttonLeft ul li select { position:relative; top:1px; _top:2px;} + + +div#memberModule .instantMessage { float:right; overflow:hidden;} +div#memberModule .instantMessage li { float:left; padding:0 .8em 0 .8em; margin-left:-1px; background:url(../images/normal/line_1x10_e0e0e0.gif) no-repeat left center;} +div#memberModule .instantMessage li a { display:block; float:left; height:1em; _height:1.1em; overflow:hidden; font-size:1em; white-space:nowrap; color:#666666; padding-left:1.8em; background:url(../images/normal/iconInstantMessage.gif) no-repeat left top;} +div#memberModule .instantMessage li.on a { background-position:left -14px; font-weight:bold;} +div#memberModule .instantMessage li a strong { color:#ff6600;} + +div#memberModule .boardWrite { width:100%; position:relative;} +div#memberModule .boardWrite .boardEditor fieldset { width:auto; position:relative; border:1px solid #eaeae7; border-top:none;} +div#memberModule .boardWrite div.to { border-top:1px solid #eff0ed; padding:.5em 0; white-space:nowrap;} +div#memberModule .boardWrite div.to label.to { display:block; float:left; font-weight:bold; padding:.4em 0 0 1.5em; width:6em; white-space:nowrap;} +div#memberModule .boardWrite div.to input#to { width:70%;} +div#memberModule .boardWrite div.title { border-bottom:1px solid #eff0ed; border-top:1px solid #eff0ed; padding:.5em 0; white-space:nowrap;} +div#memberModule .boardWrite div.title label.title { display:block; float:left; font-weight:bold; padding:.4em 0 0 1.5em; width:6em; white-space:nowrap;} +div#memberModule .boardWrite div.title input#title { width:70%;} diff --git a/modules/member/skins/default/friends_list.html b/modules/member/skins/default/friends_list.html index 9829f3353..bfdb76c16 100644 --- a/modules/member/skins/default/friends_list.html +++ b/modules/member/skins/default/friends_list.html @@ -3,100 +3,94 @@ -
-
- -
-
- {$lang->friend_group} - {$lang->cmd_add_friend_group} -
+
+

{$lang->friend_group}

+
- -
- - + - +
+ {$lang->friend}{$total_count} {$lang->cmd_add_friend_group} +
- -
- - + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + {$lang->user_id}{$lang->user_name}{$lang->nick_name}{$lang->regdate}{$lang->cmd_send_message}
{$val->group_title}{$val->user_id}{$val->user_name}
{$val->nick_name}
{zdate($val->regdate,"Y-m-d")}{$lang->cmd_send_message}
- -
+ + - -
- - - - - - - - - - - - - - - - - - - - - -
{$lang->friend_group}{$lang->user_id}{$lang->user_name}{$lang->nick_name}{$lang->cmd_send_message}{$lang->regdate}
{$val->group_title}{$val->user_id}{$val->user_name}{$val->nick_name}{$lang->cmd_send_message}{zdate($val->regdate,"Y-m-d")}
- - -
- +
+
    +
  • +
  • - -
+ +
  • {$lang->cmd_move}
  • + +
    - - -
    + +
    + +
    - - - -
    - -
    - -
    diff --git a/modules/member/skins/default/images/normal/bottomGotoFirst.gif b/modules/member/skins/default/images/normal/bottomGotoFirst.gif new file mode 100644 index 000000000..e0297fecb Binary files /dev/null and b/modules/member/skins/default/images/normal/bottomGotoFirst.gif differ diff --git a/modules/member/skins/default/images/normal/bottomGotoLast.gif b/modules/member/skins/default/images/normal/bottomGotoLast.gif new file mode 100644 index 000000000..0a7141d0d Binary files /dev/null and b/modules/member/skins/default/images/normal/bottomGotoLast.gif differ diff --git a/modules/member/skins/default/images/normal/buttonTypeInput24.gif b/modules/member/skins/default/images/normal/buttonTypeInput24.gif new file mode 100644 index 000000000..0dcfc0e3d Binary files /dev/null and b/modules/member/skins/default/images/normal/buttonTypeInput24.gif differ diff --git a/modules/member/skins/default/images/normal/iconAdd.gif b/modules/member/skins/default/images/normal/iconAdd.gif new file mode 100644 index 000000000..f2bdb7868 Binary files /dev/null and b/modules/member/skins/default/images/normal/iconAdd.gif differ diff --git a/modules/member/skins/default/images/normal/iconCheck.gif b/modules/member/skins/default/images/normal/iconCheck.gif new file mode 100644 index 000000000..c4fb37ae0 Binary files /dev/null and b/modules/member/skins/default/images/normal/iconCheck.gif differ diff --git a/modules/member/skins/default/images/normal/iconFriend.gif b/modules/member/skins/default/images/normal/iconFriend.gif new file mode 100644 index 000000000..1daf6c66d Binary files /dev/null and b/modules/member/skins/default/images/normal/iconFriend.gif differ diff --git a/modules/member/skins/default/images/normal/iconInstantMessage.gif b/modules/member/skins/default/images/normal/iconInstantMessage.gif new file mode 100644 index 000000000..d63a69506 Binary files /dev/null and b/modules/member/skins/default/images/normal/iconInstantMessage.gif differ diff --git a/modules/member/skins/default/images/normal/iconInstantMessage2.gif b/modules/member/skins/default/images/normal/iconInstantMessage2.gif new file mode 100644 index 000000000..380548e91 Binary files /dev/null and b/modules/member/skins/default/images/normal/iconInstantMessage2.gif differ diff --git a/modules/member/skins/default/images/normal/lineBoardListTh.gif b/modules/member/skins/default/images/normal/lineBoardListTh.gif new file mode 100644 index 000000000..6d891d82c Binary files /dev/null and b/modules/member/skins/default/images/normal/lineBoardListTh.gif differ diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js index 8e3f6a0bd..134084946 100644 --- a/modules/member/skins/default/js/member.js +++ b/modules/member/skins/default/js/member.js @@ -198,3 +198,11 @@ function doMoveFriend() { var fo_obj = xGetElementById('fo_friend_list'); procFilter(fo_obj, move_friend); } + +/* 친구 그룹 선택 */ +function doJumpFriendGroup() { + var sel_obj = xGetElementById('jumpMenu'); + var sel_idx = sel_obj.selectedIndex; + var sel_val = sel_obj.options[sel_idx].value; + location.href = current_url.setQuery('friend_group_srl', sel_val); +} diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html index 42a5eb455..3ae6df136 100644 --- a/modules/member/skins/default/leave_form.html +++ b/modules/member/skins/default/leave_form.html @@ -1,40 +1,39 @@ -
    - {$lang->msg_leave_member} -
    - -
    - - - - -
    - {$lang->member_default_info} +
    +
    +

    {$lang->msg_leave_member}

    - - - - - - - - - -
    {$lang->user_id} - {$member_info->user_id} -
    {$lang->password1} - -
    - - - - -
    - - -
    + + + + + + +
    +
    + {$lang->msg_leave_member} + + + + + + + + + + +
    {$lang->user_id}{$member_info->user_id}
    +
    +
    + +
    + +
    diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html index 8eec72ccf..f58f254f7 100644 --- a/modules/member/skins/default/member_info.html +++ b/modules/member/skins/default/member_info.html @@ -82,13 +82,13 @@ class="first-child" {@ $dummy_chk = 1; }> {htmlspecialchars($val->column_title)} - + {htmlspecialchars($val->value[0])} - {htmlspecialchars($val->value[1])} - {htmlspecialchars($val->value[2])} - + {$val->value[0]} {htmlspecialchars($val->value[1])} - + {htmlspecialchars(implode(",",$val->value))} - + {zdate($val->value, "Y-m-d")} {htmlspecialchars($val->value)}  diff --git a/modules/member/skins/default/member_messages.html b/modules/member/skins/default/member_messages.html index 72693e54b..c56ada4d2 100644 --- a/modules/member/skins/default/member_messages.html +++ b/modules/member/skins/default/member_messages.html @@ -1,113 +1,107 @@ - -
    - - - - {$lang->message_box[$message_type]} ({number_format($total_count)}) - - - {$val} - - - {$lang->cmd_back} -
    - - - -
    - - - - - - - - - - - - - - - -
    - - {$lang->receiver} - - {$lang->sender} +
    +

    + + + {$val} + -

    {$message->nick_name} ({$message->user_id})
    {$lang->title}{htmlspecialchars($message->title)}
    {$message->content}
    - + + + + +
    +
    +

    {$message->title}

    +
    + {$message->nick_name} ({$message->user_id}) {zdate($message->regdate, "Y.m.d H:i:s")} +
    +
    + +
    {$message->title}
    + +
    -
    - +
  • {$lang->cmd_delete}
  • + +
    + -
    +
    + +
    + + - -
    - +
    + - - + - - - + + + - - - - - - - - - + + + + + + + + + + + + +
    + {$lang->receiver} {$lang->sender} {$lang->title}{$lang->regdate}{$lang->readed_date}{$lang->title}{$lang->regdate}{$lang->readed_date}
    {$val->nick_name} ({$val->user_id})
    - - {$val->title} - - {$val->title} - - {zdate($val->regdate,"Y-m-d")} - - {zdate($val->readed_date,"Y-m-d H:i:s")} - -
    {$val->nick_name}
    ({$val->user_id})
    + + {$val->title} + + {$val->title} + + {zdate($val->regdate,"Y-m-d")}{zdate($val->readed_date,"Y-m-d H:i:s")} 
    -
    - -
    - -
    + + -
    + +
    + +
    - -
    - [{$lang->first_page}] + - - - {$page_no} - - [{$page_no}] - - - - [{$lang->last_page}] -
    diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html index 3a5953fc9..760e9ab65 100644 --- a/modules/member/skins/default/modify_info.html +++ b/modules/member/skins/default/modify_info.html @@ -144,20 +144,22 @@ - - - - + + - + +
      - value)&&in_array($v, $val->value))-->checked="true"/>{$v} +
    • value)&&in_array($v, $val->value))-->checked="true"/>{$v}
    • +
    @@ -172,22 +174,24 @@ -
    - - -
    - -
    - - -
    +
    + + + -
    - +
    + +
    @@ -197,12 +201,12 @@ - {zdate($val->value,"Y-m-d")} - [{$lang->cmd_open_calendar}] +
    {zdate($val->value,"Y-m-d")}
    + -

    {$val->description}

    +
    {$val->description}
    diff --git a/modules/member/skins/default/modify_password.html b/modules/member/skins/default/modify_password.html index cb969145e..32527ff10 100644 --- a/modules/member/skins/default/modify_password.html +++ b/modules/member/skins/default/modify_password.html @@ -1,54 +1,51 @@ -
    - {$lang->msg_update_member} -
    - -
    - - - - -
    - {$lang->member_default_info} +
    +
    +

    {$lang->cmd_modify_member_password}

    - - - - - - - - - - - - - - - - - - - -
    {$lang->user_id} - {$member_info->user_id} -
    {$lang->current_password} - -
    {$lang->password1} - -
    - {$lang->password2} -
    {$lang->about_password}
    - - - - -
    - - -
    - +
    + + + + +
    +
    + {$lang->cmd_modify_member_password} + + + + + + + + + + + + + + +
    {$lang->user_id}{$member_info->user_id}
    + +
    + + {$lang->password2} +
    + +

    {$lang->about_password}

    +
    +
    + +
    + +
    + +
    +
    diff --git a/modules/member/skins/default/send_message.html b/modules/member/skins/default/send_message.html index 6073acb51..5bd3dca73 100644 --- a/modules/member/skins/default/send_message.html +++ b/modules/member/skins/default/send_message.html @@ -1,33 +1,39 @@ -
    -
    +
    +
    +

    {$lang->cmd_send_message}

    +
    + +
    + - - - - - - - - - - - - - - - - - - -
    {$lang->cmd_send_message}
    {$lang->receiver}
    {$receiver_info->nick_name} ({$receiver_info->user_id})
    {$lang->title}
    {$editor}
    - - -
    - + +
    +
    + +
    {$receiver_info->nick_name} ({$receiver_info->user_id})
    +
    +
    + + +
    + + {$editor} + +
    + +
    + +
    + + +