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:
chicpro
2013-01-18 15:14:26 +09:00
parent 955ba6c464 d8f2a32ad1
commit f99ffdb502
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
css/default.css
View File

@ -263,7 +263,7 @@ a {color:#000;text-decoration:none}
.td_nick {width:120px;text-align:center}
.td_name {width:120px;text-align:left}
.td_name div {position:relative}
#sideview {z-index:1000;position:absolute;top:15px;left:0;border:1px solid #999;background:#f9f9f9}
#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}
.td_date {width:60px;text-align:center}
@ -294,10 +294,10 @@ a {color:#000;text-decoration:none}
#sch_result_bo .cnt_cmt {color:#000}
#sch_result_atc dt a {display:inline-block;margin-bottom:15px;font-size:1.2em;font-weight:bold}
#sch_result_atc dd {margin:0 0 30px;border-bottom:1px solid #ddd}
#sch_result_atc li {padding:10px 0}
#sch_result_atc p {margin-top:10px}
#sch_result_atc b {display:inline-block;margin:0 10px 0 0}
#sch_result_atc b span {display:inline-block;margin:0 10px 0 0}
#sch_result_atc li {padding:13px 0;border-bottom:1px solid #f0f0f0}
#sch_result_atc p {padding:5px 0}
#sch_result_atc a {display:inline-block;margin:0 10px 0 0}
#sch_result_atc .cmt_def {display:inline-block;margin:0 10px 0 0}
.sch_more {padding:10px 0 15px;text-align:right}
.sch_more a {color:#818385}
.sch_sideview {display:inline-block}
@ -488,7 +488,8 @@ a {color:#000;text-decoration:none}
/* 자기소개 */
#profile table {margin-bottom:15px}
#profile section {margin:0 auto 20px;width:90%;border-bottom:1px solid #d9d9d9}
#profile h2 {margin:0;font-family:"gulim"}
#profile h2 {margin:0;padding-left:10px;font-family:"gulim"}
#profile p {padding-left:10px}
/* 쪽지 읽기 */
#memo_view section {margin:0 auto 20px;width:90%;border-bottom:1px solid #d9d9d9}

2
lib/common.lib.php
View File

@ -453,7 +453,7 @@ function search_font($stx, $str)
}
// 지정된 검색 폰트의 색상, 배경색상으로 대체
$replace = "<span style='background-color:{$config['cf_search_bgcolor']}; color:{$config['cf_search_color']};'>\\1</span>";
$replace = "<b style='background-color:{$config['cf_search_bgcolor']}; color:{$config['cf_search_color']};'>\\1</b>";
return preg_replace("/($pattern)/i", $replace, $str);
}

2
skin/member/neo/memo_form.skin.php
View File

@ -16,7 +16,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<caption>쪽지쓰기</caption>
<tbody>
<tr>
<th scope="row"><label for="me_recv_mb_id">받는 회원아이디</label></th>
<th scope="row"><label for="me_recv_mb_id">받는 회원아이디<strong class="sound_only">필수</strong></label></th>
<td>
<input type="text" id="me_recv_mb_id" name="me_recv_mb_id" class="frm_input required" size="47" required value="<?=$me_recv_mb_id?>">
<span class="frm_info">여러 회원에게 보낼때는 컴마(,)로 구분하세요.</span>

25
skin/member/neo/register_form.skin.php
View File

@ -19,7 +19,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<table class="frm_tbl">
<caption>사이트 이용정보 입력</caption>
<tr>
<th scope="row"><label for="reg_mb_id">아이디</label></th>
<th scope="row"><label for="reg_mb_id">아이디<strong class="sound_only">필수</strong></label></th>
<td>
<input type="text" id="reg_mb_id" name="mb_id" class="frm_input minlength_3 <?=$required?> <?=$readonly?>" value="<?=$member['mb_id']?>" maxlength="20" <?=$required?> <?=$readonly?> title="회원아이디">
<span id="msg_mb_id"></span>
@ -27,11 +27,11 @@ var member_skin_path = "<?=$member_skin_path?>";
</td>
</tr>
<tr>
<th scope="row"><label for="reg_mb_password">패스워드</label></th>
<th scope="row"><label for="reg_mb_password">패스워드<strong class="sound_only">필수</strong></label></th>
<td><input type="password" id="reg_mb_password" name="mb_password" class="frm_input minlength_3 <?=$required?>" maxlength="20" <?=$required?> title="패스워드"></td>
</tr>
<tr>
<th scope="row"><label for="reg_mb_password_re">패스워드 확인</label></th>
<th scope="row"><label for="reg_mb_password_re">패스워드 확인<strong class="sound_only">필수</strong></label></th>
<td><input type="password" id="reg_mb_password_re" name="mb_password_re" class="frm_input minlength_3 <?=$required?>" maxlength="20" <?=$required?> title="패스워드 확인"></td>
</tr>
</table>
@ -39,7 +39,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<table class="frm_tbl">
<caption>개인정보 입력</caption>
<tr>
<th scope="row"><label for="reg_mb_name">이름</label></th>
<th scope="row"><label for="reg_mb_name">이름<strong class="sound_only">필수</strong></label></th>
<td>
<input id="reg_mb_name" name="mb_name" class="frm_input hangul nospace <?=$required?> <?=$readonly?>" value="<?=$member['mb_name']?>" size="10" <?=$required?> <?=$readonly?> title="이름">
<? if ($w=='') { echo "<span class=\"frm_info\">공백없이 한글만 입력하세요.</span>"; } ?>
@ -47,7 +47,7 @@ var member_skin_path = "<?=$member_skin_path?>";
</tr>
<? if ($req_nick) { ?>
<tr>
<th scope="row"><label for="reg_mb_nick">별명</label></th>
<th scope="row"><label for="reg_mb_nick">별명<strong class="sound_only">필수</strong></label></th>
<td>
<input type="hidden" name="mb_nick_default" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>">
<input type="text" id="reg_mb_nick" name="mb_nick" class="frm_input required nospace" maxlength="20" size="10" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" required title="별명">
@ -61,7 +61,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<? } ?>
<tr>
<th scope="row"><label for="reg_mb_email">E-mail</label></th>
<th scope="row"><label for="reg_mb_email">E-mail<? if ($config['cf_use_email_certify']) {?><strong class="sound_only">필수</strong><?}?></label></th>
<td>
<input type="hidden" name="old_email" value="<?=$member['mb_email']?>">
<input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" size="50" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?> title="E-mail">
@ -77,21 +77,21 @@ var member_skin_path = "<?=$member_skin_path?>";
<? if ($config['cf_use_homepage']) { ?>
<tr>
<th scope="row"><label for="reg_mb_homepage">홈페이지</label></th>
<th scope="row"><label for="reg_mb_homepage">홈페이지<? if ($config['cf_req_homepage']){?><strong class="sound_only">필수</strong><?}?></label></th>
<td><input type="text" id="reg_mb_homepage" name="mb_homepage" class="frm_input <?=$config['cf_req_homepage']?"required":"";?>" maxlength="255" <?=$config['cf_req_homepage']?"required":"";?> value="<?=$member['mb_homepage']?>"></td>
</tr>
<? } ?>
<? if ($config['cf_use_tel']) { ?>
<tr>
<th scope="row"><label for="reg_mb_tel">전화번호</label></th>
<th scope="row"><label for="reg_mb_tel">전화번호<? if ($config['cf_req_tel']) {?><strong class="sound_only">필수</strong><?}?></label></th>
<td><input type="text" id="reg_mb_tel" name="mb_tel" class="frm_input <?=$config['cf_req_tel']?"required":"";?>" maxlength="20" <?=$config['cf_req_tel']?"required":"";?> value="<?=$member['mb_tel']?>"></td>
</tr>
<? } ?>
<? if ($config['cf_use_hp']) { ?>
<tr>
<th scope="row"><label for="reg_mb_hp">핸드폰번호</label></th>
<th scope="row"><label for="reg_mb_hp">핸드폰번호<? if ($config['cf_req_hp']) {?><strong class="sound_only">필수</strong><?}?></label></th>
<td><input type="text" id="reg_mb_hp" name="mb_hp" class="frm_input <?=$config['cf_req_hp']?"required":"";?>" maxlength="20" <?=$config['cf_req_hp']?"required":"";?> value="<?=$member[mb_hp]?>"></td>
</tr>
<? } ?>
@ -100,7 +100,10 @@ var member_skin_path = "<?=$member_skin_path?>";
$zip_href = './zip.php?frm_name=fregisterform&amp;frm_zip1=mb_zip1&amp;frm_zip2=mb_zip2&amp;frm_addr1=mb_addr1&amp;frm_addr2=mb_addr2';
?>
<tr>
<th scope="row">주소</th>
<th scope="row">
주소
<? if ($config['cf_req_addr']) {?><strong class="sound_only">필수</strong><? } ?>
</th>
<td>
<input type="text" id="reg_mb_zip1" name="mb_zip1" class="frm_input <?=$config['cf_req_addr']?"required":"";?>" size="2" maxlength="3" <?=$config['cf_req_addr']?"required":"";?> value="<?=$member['mb_zip1']?>" title="우편번호 앞자리">
-
@ -117,7 +120,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<caption>기타 개인설정</caption>
<? if ($config['cf_use_signature']) { ?>
<tr>
<th scope="row"><label for="reg_mb_signature">서명</label></th>
<th scope="row"><label for="reg_mb_signature">서명<? if ($config['cf_req_signature']){?><strong class="sound_only">필수</strong><?}?></label></th>
<td><textarea id="reg_mb_signature" name="mb_signature" class="<?=$config['cf_req_signature']?"required":"";?>" <?=$config['cf_req_signature']?"required":"";?>><?=$member['mb_signature']?></textarea></td>
</tr>
<? } ?>

4
skin/search/neo/search.skin.php
View File

@ -109,12 +109,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {
if ($list[$idx][$i][wr_is_comment])
{
$comment_def = "<span>댓글</span>";
$comment_def = "<span class=\"cmt_def\">댓글</span>";
$comment_href = "#c_".$list[$idx][$i][wr_id];
}
?>
<li>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><b><?=$comment_def?><?=$list[$idx][$i][subject]?></b></a>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>"><?=$comment_def?><?=$list[$idx][$i][subject]?></a>
<span class="sch_datetime"><?=$list[$idx][$i][wr_datetime]?></span>
<a href="<?=$list[$idx][$i][href]?><?=$comment_href?>" target="_blank">새창</a>
<p><?=$list[$idx][$i][content]?></p>