From 861fc151e17c8bc8708ad52223ec8a079f98f517 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 11 Mar 2013 13:44:13 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#167=20?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=9A=8C=EC=9B=90=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B0=BE=EA=B8=B0=20=EB=A9=94=EC=9D=BC=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85=20=EB=B0=8F=20=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/password_lost2.skin.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/skin/member/basic/password_lost2.skin.php b/skin/member/basic/password_lost2.skin.php index 8d9ec40b2..f9d79d432 100644 --- a/skin/member/basic/password_lost2.skin.php +++ b/skin/member/basic/password_lost2.skin.php @@ -71,18 +71,21 @@ $content .= "
"; $content .= "

"; $content .= "회원 패스워드가 변경되었습니다."; $content .= "

"; -$content .= "

"; -$content .= addslashes($mb['mb_name'])."(".addslashes($mb['mb_nick']).")"."회원님은 ".G4_TIME_YMDHIS." 에 회원정보 찾기 요청을 하셨습니다.
"; +$content .= ""; +$content .= "".$config['cf_title'].""; +$content .= ""; +$content .= "

"; +$content .= addslashes($mb['mb_name'])." (".addslashes($mb['mb_nick']).")"." 회원님은 ".G4_TIME_YMDHIS." 에 회원정보 찾기 요청을 하셨습니다.
"; $content .= "저희 사이트는 관리자라도 회원님의 비밀번호를 알 수 없기 때문에, 비밀번호를 알려드리는 대신 새로운 비밀번호를 생성하여 안내 해드리고 있습니다.
"; -$content .= "다음에서 변경될 패스워드를 확인하신 후, 패스워드 변경 링크를 클릭 하십시오.
"; +$content .= "다음에서 변경될 패스워드를 확인하신 후, 패스워드 변경 링크를 클릭 하십시오.
"; $content .= "패스워드가 변경되었다는 인증 메세지가 출력되면, 홈페이지에서 회원아이디와 변경된 패스워드를 입력하시고 로그인 하십시오.
"; $content .= "로그인 후에는 정보수정 메뉴에서 새 패스워드로 변경하십시오."; $content .= "

"; -$content .= "

"; -$content .= "회원아이디 ".$mb['mb_id']; +$content .= "

"; +$content .= "회원아이디 ".$mb['mb_id']."
"; $content .= "변경될 패스워드 ".$change_password.""; $content .= "

"; -$content .= "/\" style=\"display:block;padding:30px 0;background:#484848;color:#fff;text-decoration:none;text-align:center\">홈페이지 바로가기"; +$content .= "패스워드 변경"; $content .= "
"; $content .= ""; From a16b76d5132accec1b694413f7995f5ce70cd663 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 11 Mar 2013 13:44:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#167=20?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=ED=9A=8C=EC=9B=90=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=B0=BE=EA=B8=B0=20=EB=A9=94=EC=9D=BC=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85=20=EB=B0=8F=20=EC=8A=A4=ED=83=80=EC=9D=BC?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/member/basic/password_lost2.skin.php | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/skin/member/basic/password_lost2.skin.php b/skin/member/basic/password_lost2.skin.php index f9d79d432..b32585831 100644 --- a/skin/member/basic/password_lost2.skin.php +++ b/skin/member/basic/password_lost2.skin.php @@ -42,29 +42,6 @@ $href = G4_BBS_URL.'/password_lost_certify.php?mb_no='.$mb['mb_no'].'&mb_dat $subject = $config['cf_title']."요청하신 회원 아이디/패스워드 정보입니다."; $content = ""; -$content .= '
'; -$content .= '

요청하신 계정정보는 다음과 같습니다.

'; -$content .= '
'; -$content .= '
    '; -$content .= '
  • 회원아이디 : '.$mb['mb_id'].'
    • '; -$content .= '
  • 변경 패스워드 : '.$change_password.'
    • '; -$content .= '
  • 이름 : '.addslashes($mb['mb_name']).'
    • '; -$content .= '
  • 별명 : '.addslashes($mb['mb_nick']).'
    • '; -$content .= '
  • 이메일주소 : '.addslashes($mb['mb_email']).'
    • '; -$content .= '
  • 요청일시 : '.G4_TIME_YMDHIS.'
    • '; -$content .= '
  • 홈페이지 : '.G4_URL.'
    • '; -$content .= '
'; -$content .= '
'; -$content .= '

'.$href.'

'; -$content .= '

'; -$content .= '1. 위의 링크를 클릭하십시오. 링크가 클릭되지 않는다면 링크를 브라우저의 주소창에 직접 복사해 넣으시기 바랍니다.
'; -$content .= '2. 링크를 클릭하시면 패스워드가 변경 되었다는 인증 메세지가 출력됩니다.
'; -$content .= '3. 홈페이지에서 회원아이디와 위에 적힌 변경 패스워드로 로그인 하십시오.
'; -$content .= '4. 로그인 하신 후 새로운 패스워드로 변경하시면 됩니다.'; -$content .= '

'; -$content .= '

감사합니다.

'; -$content .= '

[끝]

'; -$content .= '
'; $content .= "
"; $content .= "
"; From f3210e8b51ddc3efd2e797e3cb042916e708f04d Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 11 Mar 2013 13:51:10 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#367=20?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EA=B0=A4=EB=9F=AC=EB=A6=AC?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20no=20image=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 3 ++- skin/board/gallery/list.skin.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/css/default.css b/css/default.css index 9a636a873..23aa7d480 100644 --- a/css/default.css +++ b/css/default.css @@ -508,7 +508,8 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#333;color:#fff; .bo_img_href a:link, .bo_img_href a:focus, .bo_img_href a:hover {text-decoration:none} -.bo_img_href strong {display:block;width:174px;height:124px;background:#f7f7f7;text-align:center;line-height:10em} +.bo_img_href strong, +.bo_img_href span {display:block;width:174px;height:124px;background:#f7f7f7;text-align:center;line-height:10em} .bo_img_text_href {margin:10px 0 !important} .bo_img_text_href a {font-weight:bold} diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php index eacd0d8be..976e76915 100644 --- a/skin/board/gallery/list.skin.php +++ b/skin/board/gallery/list.skin.php @@ -94,7 +94,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); $imgsrc = G4_DATA_URL.'/file/'.$bo_table.'/'.$thumb; $img_content = ''.$file['bf_content'].''; } else { - $img_content = 'no image'; + $img_content = 'no image'; } echo $img_content; From a24bde07d32f5c16c567fb8faa442f8fcbbf0814 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 11 Mar 2013 13:51:58 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20#367=20?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EA=B0=A4=EB=9F=AC=EB=A6=AC?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=EC=8A=A4=ED=82=A8=20no=20image=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/mobile.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/mobile.css b/css/mobile.css index 0a8bee0cf..4232bbd37 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -446,7 +446,8 @@ input.required:focus {border:0;background:#21272e !important;color:#fff;line-hei .bo_img_href a:link, .bo_img_href a:focus, .bo_img_href a:hover {text-decoration:none} -.bo_img_href strong {display:block;width:174px;height:124px;background:#f7f7f7;text-align:center;line-height:10em} +.bo_img_href strong, +.bo_img_href span {display:block;width:174px;height:124px;background:#f7f7f7;text-align:center;line-height:10em} .bo_img_text_href {margin:1em 0 !important} .bo_img_text_href a {color:#000;font-weight:bold;text-decoration:none}