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 11:47:14 +09:00
parent 205ea78a8d 9434108266
commit 4bdce8da8f
6 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/adm.css
View File

@ -112,7 +112,7 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border
.td_chk {width:30px;text-align:center}
.td_num {width:60px;text-align:center}
.td_bignum {width:120px;text-align:center}
.td_mbid, .td_mbnick, .td_mbname {width:80px;text-align:center}
.td_mbid, .td_mbnick, .td_mbname {width:100px;text-align:left}
.td_mbnick div, .td_mbname div {position:relative} /* 파이어폭스에서 사이드뷰 위치를 잡기 위함 */
.td_time {width:150px;text-align:center}
.td_boolean {width:50px;text-align:center}

7
css/default.css
View File

@ -480,11 +480,10 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
/* 사이드뷰 */
.sv {display:inline-block;position:relative;font-weight:normal}
.sv .sv_wrap {display:block;margin-top:5px;border:1px solid #eee;background:#f7f7f2}
.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;position:absolute;top:10px;left:20px;width:100px !important;height:auto !important;background:#ddd;overflow:auto}
.sv_off {display:block;position:absolute;margin:0 !important;width:0;height:0;border:0 !important;overflow:hidden}
.sv_off a {margin:0;padding:0;width:0;height:0;overflow:hidden}
.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}

14
js/common.js
View File

@ -570,11 +570,9 @@ $(function(){
// 사이드뷰
var sv_hide = false;
$('.sv_wrap').addClass('sv_off');
$('.sv_member, .sv_guest').click(function() {
$('.sv_wrap').removeClass('sv_on').addClass('sv_off');
$(this).closest('.sv').find('.sv_wrap').removeClass('sv_off').addClass('sv_on');
$('.sv_wrap').removeClass('sv_on');
$(this).closest('.sv').find('.sv_wrap').addClass('sv_on');
});
$('.sv, .sv_wrap').hover(
@ -588,8 +586,8 @@ $(function(){
$('.sv_member, .sv_guest').focusin(function() {
sv_hide = false;
$('.sv_wrap').removeClass('sv_on').addClass('sv_off');
$(this).closest('.sv').find('.sv_wrap').removeClass('sv_off').addClass('sv_on');
$('.sv_wrap').removeClass('sv_on');
$(this).closest('.sv').find('.sv_wrap').addClass('sv_on');
});
$('.sv_wrap a').focusin(function() {
@ -602,13 +600,13 @@ $(function(){
$(document).click(function() {
if(sv_hide) {
$('.sv_wrap').removeClass('sv_on').addClass('sv_off');
$('.sv_wrap').removeClass('sv_on');
}
});
$(document).focusin(function() {
if(sv_hide) {
$('.sv_wrap').removeClass('sv_on').addClass('sv_off');
$('.sv_wrap').removeClass('sv_on');
}
});
});

23
lib/common.lib.php
View File

@ -987,28 +987,29 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$str = "<strong class=\"sv\">\n";
$str .= $tmp_name."\n";
$str .= "<span class=\"sv_wrap\">\n";
$str2 .= "<span class=\"sv_wrap\">\n";
if($mb_id)
$str .= "<a href=\"".G4_BBS_URL."/memo_form.php?me_recv_mb_id=".$mb_id."\" onclick=\"win_memo(this.href); return false;\">쪽지보내기</a>\n";
$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)
$str .= "<a href=\"".G4_BBS_URL."/formmail.php?mb_id=".$mb_id."&amp;name=".urlencode($name)."&amp;email=".$email."\" onclick=\"win_email(this.href); return false;\">메일보내기</a>\n";
$str2 .= "<a href=\"".G4_BBS_URL."/formmail.php?mb_id=".$mb_id."&amp;name=".urlencode($name)."&amp;email=".$email."\" onclick=\"win_email(this.href); return false;\">메일보내기</a>\n";
if($homepage)
$str .= "<a href=\"".$homepage."\" target=\"_blank\">홈페이지</a>\n";
$str2 .= "<a href=\"".$homepage."\" target=\"_blank\">홈페이지</a>\n";
if($mb_id)
$str .= "<a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" onclick=\"win_profile(this.href); return false;\">자기소개</a>\n";
$str2 .= "<a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" onclick=\"win_profile(this.href); return false;\">자기소개</a>\n";
if($bo_table) {
if($mb_id)
$str .= "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=mb_id,1&amp;stx=".$mb_id."\">아이디로 검색</a>\n";
$str2 .= "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=mb_id,1&amp;stx=".$mb_id."\">아이디로 검색</a>\n";
else
$str .= "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=wr_name,1&stx=".$name."\">이름으로 검색</a>\n";
$str2 .= "<a href=\"".G4_BBS_URL."/board.php?bo_table=".$bo_table."&amp;sca=".$sca."&amp;sfl=wr_name,1&stx=".$name."\">이름으로 검색</a>\n";
}
if($mb_id)
$str .= "<a href=\"".G4_BBS_URL."/new.php?mb_id=".$mb_id."\">전체게시물</a>\n";
$str2 .= "<a href=\"".G4_BBS_URL."/new.php?mb_id=".$mb_id."\">전체게시물</a>\n";
if($is_admin == "super" && $mb_id) {
$str .= "<a href=\"".G4_ADMIN_URL."/member_form.php?w=u&amp;mb_id=".$mb_id."\" target=\"_blank\">회원정보변경</a>\n";
$str .= "<a href=\"".G4_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";
$str2 .= "<a href=\"".G4_ADMIN_URL."/member_form.php?w=u&amp;mb_id=".$mb_id."\" target=\"_blank\">회원정보변경</a>\n";
$str2 .= "<a href=\"".G4_ADMIN_URL."/point_list.php?sfl=mb_id&amp;stx=".$mb_id."\" target=\"_blank\">포인트내역</a>\n";
}
$str .= "</span>\n";
$str2 .= "</span>\n";
$str .= $str2."\n<noscript class=\"sv_nojs\">".$str2."</noscript>";
$str .= "</strong>";
return $str;

2
skin/board/neo/view.skin.php
View File

@ -162,7 +162,7 @@ function board_move(href)
}
</script>
<script src="<?=$g4['path']?>/js/board.js"></script>
<script src="<?=G4_JS_URL?>/board.js"></script>
<!-- 게시글 보기 끝 -->
<script>

4
skin/member/neo/register_result.skin.php
View File

@ -1,5 +1,5 @@
<?
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<div id="reg_result" class="cbg">
@ -39,5 +39,5 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</div>
<div class="btn_confirm">
<a href="<?=$g4['url']?>/" class="btn01">메인으로</a>
<a href="<?=G4_URL?>/" class="btn01">메인으로</a>
</div>