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 15:31:08 +09:00
parent 25404f4ee9 46b6073526
commit 811f56b3df
6 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
css/adm.css
View File

@ -113,7 +113,6 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border
.td_num {width:60px;text-align:center}
.td_bignum {width:120px;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}
/* 인덱스 */
@ -156,10 +155,10 @@ fieldset button:focus, .fieldset_submit:focus {padding:0 15px;height:23px;border
/* 사이드뷰 */
.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 .sv_wrap {display:none;margin-top:5px;border:1px solid #666;background:#484848}
.sv_nojs .sv_wrap {display:block}
.sv .sv_wrap a {display:inline-block;padding:3px;width:94px;border-bottom:1px solid #555;color:#fff}
.sv_on {z-index:1000;display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd}
.sv_member,
.sv_guest {font-weight:bold}

12
css/default.css
View File

@ -119,7 +119,7 @@ table a {color:#000;text-decoration:none}
.frm_input {padding:2px 2px 3px;border:1px solid #d7d7d7;background:#fff;vertical-align:middle}
.frm_tbl textarea:focus,
.frm_input:focus {padding:3px 3px 4px;border:0;background:#494949;color:#fff}
.frm_tbl textarea {width:90%}
.frm_tbl textarea {width:90%;height:150px}
.frm_address {display:block;margin-top:5px}
.frm_file {display:block;margin-bottom:5px}
.frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent}
@ -476,14 +476,14 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
#bo_vc_warea {clear:both;position:relative;margin:0 90px 10px 0}
#bo_vc_warea textarea {padding:3px;width:100%;height:50px;border:1px solid #ddd;background:#fff;vertical-align:middle}
#bo_vc_warea textarea:focus {padding:4px;border:0;background:#494949;color:#fff}
#bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:20px;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em}
#bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:0;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em}
/* 사이드뷰 */
.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 .sv_wrap {display:none;margin-top:5px;border:1px solid #666;background:#484848}
.sv_nojs .sv_wrap {display:block}
.sv .sv_wrap a {display:inline-block;padding:3px;width:94px;border-bottom:1px solid #555;color:#fff !important}
.sv_on {z-index:1000;display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important;background:#ddd}
.sv_member,
.sv_guest {font-weight:bold}

6
lib/common.lib.php
View File

@ -960,7 +960,7 @@ function get_sideview($mb_id, $name='', $email='', $homepage='')
$tmp_name = "";
if ($mb_id) {
$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>";
$tmp_name = "<a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>";
if ($config['cf_use_member_icon']) {
$mb_dir = substr($mb_id,0,2);
@ -973,13 +973,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=\"".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>";
$tmp_name = $tmp_name . " <a href=\"".G4_BBS_URL."/profile.php?mb_id=".$mb_id."\" class=\"sv_member\" title=\"$name 자기소개\" target=\"_blank\" onclick=\"return false;\">$name</a>";
}
}
$title_mb_id = '['.$mb_id.']';
} else {
$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>";
$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\" onclick=\"return false;\">$name</a>";
$title_mb_id = '[비회원]';
}

10
lib/thumb.lib.php
View File

@ -4,8 +4,8 @@ if (!defined('_GNUBOARD_')) exit;
/*******************************************************************************
썸네일 Class
사용법 :
사용법 :
$thumb = new g4_thumbnail(경로, 썸네일이미지폭);
$thumb->run(이미지 경로가 포함된 컨텐츠);
@ -57,11 +57,11 @@ class g4_thumb {
$width = $this->get_width();
$source = null;
$size = @getimagesize($srcimg);
if ($size[2] == 1)
if ($size[2] == 1)
$source = @imagecreatefromgif($srcimg);
else if ($size[2] == 2)
$source = @imagecreatefromjpeg($srcimg);
else if ($size[2] == 3)
else if ($size[2] == 3)
$source = @imagecreatefrompng($srcimg);
if ($source == null)
@ -111,7 +111,7 @@ class g4_thumb {
if ($size[0] < $this->width) {
return "<img src='$thumb' width='$size[0]' />";
} else {
return "<a href='$src' target='_blank' title='클릭하시면 이미지가 크게 보입니다.'><img src='$thumb' width='{$this->width}' border='0' /></a>";
return "<a href='$src' target='_blank' title='새창으로 크게 보기'><img src='$thumb' width='{$this->width}' border='0' /></a>";
}
}
}

3
skin/board/neo/list.skin.php
View File

@ -64,7 +64,6 @@ if ($is_nogood) $colspan++;
<input type="hidden" name="sw" value="">
<table>
<caption><?=$board['bo_subject']?> 글목록</caption>
<thead>
<tr>
<th scope="col">번호</th>
@ -118,7 +117,7 @@ if ($is_nogood) $colspan++;
if (isset($list[$i]['icon_secret'])) echo $list[$i]['icon_secret'];
?>
</td>
<td class="td_name"><?=$list[$i]['name']?></td>
<td class="td_name" style="z-index:2"><?=$list[$i]['name']?></td>
<td class="td_date"><?=$list[$i]['datetime2']?></td>
<td class="td_num"><?=$list[$i]['wr_hit']?></td>
<? if ($is_good) { ?><td class="td_num"><?=$list[$i]['wr_good']?></td><? } ?>

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

@ -104,7 +104,7 @@ echo $option_hidden;
<tr>
<th scope="row"><label for="wr_content">내용<strong class="sound_only">필수</strong></label></th>
<td><?=editor_html("wr_content", $content, $is_dhtml_editor);?></td>
<td class="wr_content"><?=editor_html("wr_content", $content, $is_dhtml_editor);?></td>
</tr>
<? for ($i=1; $is_link && $i<=G4_LINK_COUNT; $i++) { ?>