diff --git a/adm/auth_list.php b/adm/auth_list.php index 80d9fcb3e..fad76a840 100644 --- a/adm/auth_list.php +++ b/adm/auth_list.php @@ -73,7 +73,7 @@ $colspan = 5;

설정된 관리권한 내역

권한 r은 읽기권한, w는 쓰기권한, d는 삭제권한입니다.

-
+ @@ -129,7 +129,7 @@ $colspan = 5;
- +
opener.document.location.reload();"; +//echo ""; alert("복사에 성공 했습니다.", './board_copy.php?bo_table='.$bo_table.'&'.$qstr); ?> \ No newline at end of file diff --git a/adm/board_list.php b/adm/board_list.php index 4783e23df..f63296f83 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -68,7 +68,8 @@ $colspan = 15; - + +
diff --git a/adm/boardgroup_form.php b/adm/boardgroup_form.php index b997d0d80..a31dacb9c 100644 --- a/adm/boardgroup_form.php +++ b/adm/boardgroup_form.php @@ -123,7 +123,7 @@ include_once('./admin.head.php'); - 회원여분필드 + 여분필드 diff --git a/adm/boardgroup_list.php b/adm/boardgroup_list.php index ad21fa82d..920869f16 100644 --- a/adm/boardgroup_list.php +++ b/adm/boardgroup_list.php @@ -72,7 +72,8 @@ $colspan = 8; - + + diff --git a/adm/boardgroupmember_list.php b/adm/boardgroupmember_list.php index 29cacc157..79d815bc2 100644 --- a/adm/boardgroupmember_list.php +++ b/adm/boardgroupmember_list.php @@ -63,7 +63,8 @@ $colspan = 7; - + + diff --git a/adm/point_list.php b/adm/point_list.php index 3619b6734..80a8dd164 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -53,7 +53,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌 $mb = array(); if ($sfl == 'mb_id' && $stx) - $mb = get_member(isset($stx)); + $mb = get_member($stx); $g4['title'] = '포인트관리'; include_once ('./admin.head.php'); @@ -61,11 +61,6 @@ include_once ('./admin.head.php'); $colspan = 8; ?> - - + diff --git a/adm/point_list_delete.php b/adm/point_list_delete.php index 9a42102dd..e09bafd48 100644 --- a/adm/point_list_delete.php +++ b/adm/point_list_delete.php @@ -10,7 +10,7 @@ check_token(); $count = count($_POST['chk']); if(!$count) - alert("선택삭제 하실 항목을 하나이상 선택해 주세요."); + alert($_POST['act_button']." 하실 항목을 하나 이상 체크하세요."); for ($i=0; $i<$count; $i++) { diff --git a/adm/poll_list.php b/adm/poll_list.php index 37fda7e8d..b198bd513 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -64,7 +64,8 @@ $colspan = 6; - + + diff --git a/adm/popular_list.php b/adm/popular_list.php index b5160cd24..859b89f0b 100644 --- a/adm/popular_list.php +++ b/adm/popular_list.php @@ -82,7 +82,8 @@ var list_delete_php = 'popular_list.php'; - + + diff --git a/bbs/point.php b/bbs/point.php index 6e7d8b1b4..310c31fb3 100644 --- a/bbs/point.php +++ b/bbs/point.php @@ -38,7 +38,7 @@ for($i=0; $row=sql_fetch_array($result); $i++) { ?>
-

+

diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index 4684ddeff..baad1d0ea 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -182,8 +182,6 @@ if ($w == '') { set mb_id = '{$mb_id}', mb_password = '".sql_password($mb_password)."', mb_name = '{$mb_name}', - mb_sex = '{$mb_sex}', - mb_birth = '{$mb_birth}', mb_nick = '{$mb_nick}', mb_nick_date = '".G4_TIME_YMD."', mb_email = '{$mb_email}', @@ -286,10 +284,6 @@ if ($w == '') { if ($mb_open_default != $mb_open) $sql_open_date = " , mb_open_date = '".G4_TIME_YMD."' "; - $sql_sex = ""; - if (isset($mb_sex)) - $sql_sex = " , mb_sex = '{$mb_sex}' "; - // 이전 메일주소와 수정한 메일주소가 틀리다면 인증을 다시 해야하므로 값을 삭제 $sql_email_certify = ''; if ($old_email != $mb_email && $config['cf_use_email_certify']) @@ -323,7 +317,6 @@ if ($w == '') { {$sql_icon} {$sql_nick_date} {$sql_open_date} - {$sql_sex} {$sql_email_certify} {$sql_hp_certify} where mb_id = '$mb_id' "; diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index 3309ad7ed..e40110d92 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -134,6 +134,8 @@ if ($w == 'c') // 댓글 입력 $tmp_comment_reply = ''; } + $wr_subject = get_text(stripslashes($wr['wr_subject'])); + // SNS 등록 include_once("./write_comment_update.sns.php"); @@ -185,9 +187,6 @@ if ($w == 'c') // 댓글 입력 // 포인트 부여 insert_point($member['mb_id'], $board['bo_comment_point'], "{$board['bo_subject']} {$wr_id}-{$comment_id} 댓글쓰기", $bo_table, $comment_id, '댓글'); - - $wr_subject = get_text(stripslashes($wr['wr_subject'])); - // 메일발송 사용 if ($config['cf_email_use'] && $board['bo_use_email']) { diff --git a/css/mobile.css b/css/mobile.css index e4b4c8360..904c81599 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -132,7 +132,7 @@ a:active {color:#000;text-decoration:underline} .basic_tbl thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ .basic_tbl tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} .basic_tbl tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} -.basic_tbl td {padding:0.5em 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} +.basic_tbl td {padding:0.5em;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} .basic_tbl a {display:block;padding:0.5em;color:#000;text-decoration:none} .bo_sideview td {} /* 사이드뷰 사용하는 테이블 셀 패딩값 */ td.empty_table {padding:5em 0;text-align:center} @@ -166,7 +166,7 @@ td.empty_table {padding:5em 0;text-align:center} .td_nick {width:100px;text-align:center} .td_name {width:100px;text-align:left} .td_date {width:60px;text-align:center} -.td_datetime {width:130px;text-align:center} +.td_datetime {width:150px;text-align:center} .td_mng {width:80px;text-align:center} /* 광고 레이아웃 */ diff --git a/head.sub.php b/head.sub.php index 2c5568baa..4eea605c9 100644 --- a/head.sub.php +++ b/head.sub.php @@ -78,7 +78,7 @@ if ($is_admin) { if(G4_IS_MOBILE) { echo ''.PHP_EOL; } -if(!defined('G4_IS_ADMIN')) +//if(!defined('G4_IS_ADMIN')) echo $config['cf_add_script']; ?> diff --git a/mobile/skin/board/basic/view.skin.php b/mobile/skin/board/basic/view.skin.php index be5bbe6aa..cdcc4c3a8 100644 --- a/mobile/skin/board/basic/view.skin.php +++ b/mobile/skin/board/basic/view.skin.php @@ -166,8 +166,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php index 92757bf9e..8ae3ef6ca 100644 --- a/mobile/skin/board/basic/view_comment.skin.php +++ b/mobile/skin/board/basic/view_comment.skin.php @@ -32,6 +32,9 @@ var char_max = parseInt(); // 최대 작성일 + @@ -113,7 +116,7 @@ var char_max = parseInt(); // 최대 diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css index bda25bfc8..8cf767895 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -54,9 +54,9 @@ /* 게시판 읽기 */ #bo_v {margin-bottom:1.5em;padding-bottom:1.5em} -#bo_v_cate {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold} +#bo_v_table {padding:0 1em;color:#999;font-size:0.9em;font-weight:bold} -#bo_v_h1 {padding:0 0.7em 0.5em;font-size:1.2em} +#bo_v_title {padding:0 0.7em 0.5em;font-size:1.2em} #bo_v_info {padding:0 0.9em 1em;border-bottom:1px solid #ddd} #bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden} @@ -116,6 +116,10 @@ #bo_v_act_good, #bo_v_act_nogood {display:inline-block;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden} +#bo_v_sns {margin:0 0 2em;padding:0;list-style:none;zoom:1} +#bo_v_sns:after {display:block;visibility:hidden;clear:both;content:""} +#bo_v_sns li {float:left;margin:0 0.5em 0 0} + #bo_v form {padding-top:1.5em} /* 게시판 댓글 */ @@ -146,4 +150,9 @@ #bo_vc_w #char_cnt {display:block;margin-bottom:0.3em} #bo_vc_w textarea {width:99%} +#bo_vc_sns {margin:0;padding:0;list-style:none;zoom:1} +#bo_vc_sns:after {display:block;visibility:hidden;clear:both;content:""} +#bo_vc_sns li {float:left;margin:0 1em 0 0} +#bo_vc_sns input {margin:0 0 0 0.5em} + #bo_vc form {padding:0} \ No newline at end of file diff --git a/mobile/skin/board/gallery/view.skin.php b/mobile/skin/board/gallery/view.skin.php index be5bbe6aa..cdcc4c3a8 100644 --- a/mobile/skin/board/gallery/view.skin.php +++ b/mobile/skin/board/gallery/view.skin.php @@ -166,8 +166,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); } ?> diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php index bc789c16b..952184938 100644 --- a/mobile/skin/board/gallery/view_comment.skin.php +++ b/mobile/skin/board/gallery/view_comment.skin.php @@ -32,6 +32,9 @@ var char_max = parseInt(); // 최대 작성일 + @@ -113,6 +116,9 @@ var char_max = parseInt(); // 최대 + @@ -128,7 +134,7 @@ var char_max = parseInt(); // 최대
포인트 사용내역 목록
내용
- +
@@ -236,6 +242,8 @@ var char_max = parseInt(); // 최대 + document.getElementById("btn_submit").disabled = "disabled"; + return true; } diff --git a/plugin/sns/icon/facebook_cmt.png b/plugin/sns/icon/facebook_cmt.png new file mode 100644 index 000000000..67d294ec8 Binary files /dev/null and b/plugin/sns/icon/facebook_cmt.png differ diff --git a/plugin/sns/icon/me2day_cmt.png b/plugin/sns/icon/me2day_cmt.png new file mode 100644 index 000000000..cd7e21601 Binary files /dev/null and b/plugin/sns/icon/me2day_cmt.png differ diff --git a/plugin/sns/icon/twitter_cmt.png b/plugin/sns/icon/twitter_cmt.png new file mode 100644 index 000000000..f064d1cbb Binary files /dev/null and b/plugin/sns/icon/twitter_cmt.png differ diff --git a/skin/board/basic/view.sns.skin.php b/plugin/sns/view.sns.skin.php similarity index 100% rename from skin/board/basic/view.sns.skin.php rename to plugin/sns/view.sns.skin.php diff --git a/plugin/sns/view_comment_list.sns.skin.php b/plugin/sns/view_comment_list.sns.skin.php new file mode 100644 index 000000000..81ef04ab4 --- /dev/null +++ b/plugin/sns/view_comment_list.sns.skin.php @@ -0,0 +1,18 @@ + + +페이스북에도 등록됨 + + +트위터에도 등록됨 + + +미투데이에도 등록됨 + diff --git a/skin/board/basic/view_comment.sns.skin.php b/plugin/sns/view_comment_write.sns.skin.php similarity index 97% rename from skin/board/basic/view_comment.sns.skin.php rename to plugin/sns/view_comment_write.sns.skin.php index 18bd6e1a3..387ff216f 100644 --- a/skin/board/basic/view_comment.sns.skin.php +++ b/plugin/sns/view_comment_write.sns.skin.php @@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 if (!$board['bo_use_sns']) return; ?> - SNS 등록 + SNS 동시등록 - @@ -172,8 +168,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php'); ); // 최대 작성일 + @@ -113,7 +116,9 @@ var char_max = parseInt(); // 최대 - + @@ -141,7 +146,7 @@ var char_max = parseInt(); // 최대
- +
diff --git a/skin/member/basic/register_form.skin.php b/skin/member/basic/register_form.skin.php index df1874f23..9df0e56d5 100644 --- a/skin/member/basic/register_form.skin.php +++ b/skin/member/basic/register_form.skin.php @@ -219,7 +219,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - +