firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
gnuboard
2013-02-01 13:48:31 +09:00
parent f734abb143 a0b0e45180
commit 2407030ef0
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bbs/view_comment.php
View File

@ -118,7 +118,7 @@ include_once($board_skin_path.'/view_comment.skin.php');
//echo "<script src='G4_PATH/js/filter.js'></script>\n";
if (!$member['mb_id']) // 비회원일 경우에만
echo '<script src="'.G4_PATH.'/js/md5.js"></script>'.PHP_EOL;
echo '<script src="'.G4_JS_URL.'/md5.js"></script>'.PHP_EOL;
@include_once($board_skin_path.'/view_comment.tail.skin.php');
?>

13
css/adm.css
View File

@ -148,16 +148,21 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border
.td_category {width:120px;text-align:center}
.visit_bar {position:relative}
.visit_bar span {position:absolute;top:-8px;left:0;height:15px;background:#ddd}
/* 사이드뷰 */
#sideview {z-index:1000;position:absolute;top:15px;left:20px;border:1px solid #999;background:#f9f9f9}
#sideview ul {list-style:none}
#sideview a {display:inline-block;padding:5px 10px 4px;width:100px;border-bottom:1px solid #ddd}
/* 메일 테스트, 세션파일일괄삭제 */
#fsendmailtest p,
#session_del p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.75em}
#cache_del p {margin-bottom:20px;padding:13px;border:1px solid #ced9de;background:#fff;font-size:0.75em}
/* 사이드뷰 */
.sv {display:inline-block;position:relative;font-weight:normal}
.sv .sv_wrap {display:none;margin-top:5px;border:1px solid #eee;background:#f7f7f2}
.sv_nojs .sv_wrap {display:block;width:100px !important}
.sv .sv_wrap a {display:block;padding:3px;border-bottom:1px solid #eee}
.sv_on {z-index:1000;display:block !important;position:absolute;top:10px;left:20px;width:100px !important;height:auto !important;background:#ddd;overflow:auto}
.sv_member,
.sv_guest {font-weight:bold}
/* pagination */
.pg {clear:both;margin:0 0 10px;padding-top:20px;font-size:0.75em;text-align:center}
.pg_wrap {display:inline-block;border:1px solid #c7cfd5;letter-spacing:-4px}

8
lib/common.lib.php
View File

@ -958,7 +958,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$tmp_name = "";
if ($mb_id) {
$tmp_name = "<a href=\"#\" class=\"sv_member\">$name</a>";
$tmp_name = "<a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"win_profile(this.href); return false;\">$name</a>";
if ($config['cf_use_member_icon']) {
$mb_dir = substr($mb_id,0,2);
@ -971,13 +971,13 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$tmp_name = '<img src="'.$icon_file_url.'" width="'.$width.'" height="'.$height.'" border="0" alt="">';
if ($config['cf_use_member_icon'] == 2) // 회원아이콘+이름
$tmp_name = $tmp_name . ' <a href="#" class="sv_member">'.$name.'</a>';
$tmp_name = $tmp_name . " <a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"win_profile(this.href); return false;\">$name</a>";
}
}
$title_mb_id = '['.$mb_id.']';
} else {
$tmp_name = '<a href="#" class="sv_guest">'.$name.'</a>';
$tmp_name = "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=wr_name,1&stx=".$name."\" title=\"$name 이름으로 검색\"class=\"sv_guest\">$name</a>";
$title_mb_id = '[비회원]';
}
@ -987,7 +987,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$str = "<strong class=\"sv\">\n";
$str .= $tmp_name."\n";
$str2 .= "<span class=\"sv_wrap\">\n";
$str2 = "<span class=\"sv_wrap\">\n";
if($mb_id)
$str2 .= "<a href=\"".G4_BBS_URL."/memo_form.php?me_recv_mb_id=".$mb_id."\" onclick=\"win_memo(this.href); return false;\">쪽지보내기</a>\n";
if($email)

5
skin/board/neo/view_comment.skin.php
View File

@ -26,8 +26,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
?>
<article id="c_<?=$comment_id?>" <?if ($cmt_depth) {?>style="margin-left:<?=$cmt_depth?>px"<?}?>>
<header>
<h1><?=$list[$i]['wr_name']?><span class="sound_only">님의 댓글</span></h1>
<?=$list[$i]['name']?>
<h1><?=$list[$i]['name']?><span class="sound_only">님의 댓글</span></h1>
<? if ($cmt_depth) {?><img src="<?=$board_skin_url?>/img/icon_reply.gif" class="icon_reply" alt="댓글의 댓글"><? } ?>
<? if ($is_ip_view) { ?>
아이피
@ -211,7 +210,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
}
}
<? echo chk_captcha_js(); ?>
<? if($is_guest) echo chk_captcha_js(); ?>
return true;
}