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

This commit is contained in:
gnuboard
2013-01-24 18:12:55 +09:00
7 changed files with 80 additions and 44 deletions

View File

@ -45,7 +45,7 @@ hr {display:none}
/* 중간 레이아웃 */
#wrapper {margin:0 auto;padding-bottom:30px;width:980px;zoom:1}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#wrapper_title {font-size:1.2em}
#wrapper_title {margin-bottom:20px;font-size:1.2em}
#lnb {float:right;width:220px}
#container {float:left;width:730px;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
@ -70,26 +70,37 @@ hr {display:none}
#visit dt {float:left;margin:0;padding:10px 0 10px;color:#fff}
#visit dd {float:left;margin:0 30px 0 0;padding:10px;color:#fff}
#visit a {display:inline-block;margin:5px 0;padding:10px;color:#fff;text-decoration:none}
# {}
#ft_catch {padding:30px 0;text-align:center}
#ft_copy {background:#414141}
#ft_copy p {margin:0 auto;width:980px;color:#4a9ab8}
#ft_copy b {color:#079cd3}
#ft_copy b {color:#fff}
/* ///// 콘텐츠별 스타일 ///// */
/* PC 초기화면 */
#idx_catch {margin-bottom:10px;padding: 25px 0 25px}
/* 버튼 */
.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #0c6fa7 !important;background:#0075b8 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none;line-height:2.2em}
.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949 !important;background:#494949 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn_confirm {text-align:center} /* 서식단계 진행 */
.btn_submit {padding:0 10px;height:28px;border:0;background:#0075b8;color:#fff;letter-spacing:-0.1em;vertical-align:top}
.btn_cancel {display:inline-block;padding:0 10px;height:26px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em}
.btn_frmline {padding:0 7px 0 5px;height:22px;border:0;background:#0075b8;color:#fff;letter-spacing:-0.1em;vertical-align:top;line-height:2em}
.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
.btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2.5em;cursor:pointer}
/* ///// 기본테이블 ///// */
table {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
tfoot th {border-top:1px solid #c9c9c9;border-bottom:1px solid #c9c9c9}
tfoot td {border-color:#c9c9c9;background:#f9f9f5;font-weight:bold;text-align:center}
caption {padding:0 0 10px;text-align:left}
th {padding:12px 0 8px;border-top:3px solid #484848;border-bottom:1px solid #a9a9a9}
th {padding:12px 0 8px;border-top:3px solid #666;border-bottom:1px solid #a9a9a9}
th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9}
td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;word-break:break-all}
table a {color:#000;text-decoration:none}
.empty_table {padding:85px 0;text-align:center}
/* 폼 테이블 */
@ -114,7 +125,7 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
.td_board {width:120px;text-align:center}
.td_num {width:50px;text-align:center}
.td_bignum {width:80px;text-align:center}
.td_mb_id {width:120px;text-align:center}
.td_mb_id {width:100px;text-align:center}
.td_nick {width:100px;text-align:center}
.td_name {width:100px;text-align:left}
.td_name div {position:relative}
@ -136,7 +147,7 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
.ol_pwlabel {position:absolute;top:35px;left:5px;color:#696969;font-size:0.9em}
#auto_login {}
#auto_login_label {letter-spacing:-0.1em}
#ol_submit {width:60px;height:24px;border:1px solid #d1d1d1;background:#f7f7f2;font-size:0.9em;font-weight:bold;letter-spacing:-0.1em;vertical-align:top}
#ol_submit {width:60px;height:24px;border:1px solid #d1d1d1;background:#f7f7f2;font-size:0.9em;font-weight:bold;vertical-align:top}
#ol_before ul {float:right;margin:7px 0 13px;zoom:1}
#ol_before ul:after {display:block;visibility:hidden;clear:both;content:""}
#ol_before li {float:left;margin-left:5px;padding-top:2px}
@ -149,7 +160,7 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
#ol_after_private:after {display:block;visibility:hidden;clear:both;content:""}
#ol_after_private li {float:left}
#ol_after_private a {display:block;padding-top:8px;height:37px;background:#f0f0f0;text-align:center}
#ol_after_private a strong {display:block;padding-top:5px;color:#09aeeb}
#ol_after_private a strong {display:block;padding-top:5px;color:#ff4679}
#ol_after_memo {width:50px;margin-right:1px}
#ol_after_pt {width:90px;margin-right:1px}
#ol_after_scrap {width:48px;line-height:2.6em !important}
@ -163,7 +174,7 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
#poll li {padding:3px 0}
#poll footer {padding:0 14px 14px;text-align:right}
/* 최근게시물 스킨 */
/* 최근게시물 스킨 (latest) */
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px;border-right:1px solid #ececec;border-bottom:1px solid #ececec;background:#fff}
.lt ul {margin:0;padding:0;list-style:none}
.lt li {padding:3px 0}
@ -172,6 +183,10 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
.lt_more {text-align:center}
.lt_more a {display:block}
/* 최근게시물 스킨 (new) */
#new_sch {margin-bottom:10px;text-align:right}
#new_sch legend {width:0;height:0;overflow:hidden}
/* 전체검색결과 스킨 */
#sch_result_detail {margin:0;padding:15px 0;border:0;text-align:right}
#sch_result {padding:10px 0 0 0;border-top:1px solid #ddd;background:url('../img/sch_result_bg.jpg') repeat-y}
@ -210,16 +225,33 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
/* 게시판 쓰기 */
#bo_w caption {padding:0;height:0;overflow:hidden}
/* 게시판 목록 */
.btn_bo_adm input {padding:0 10px;height:26px;border:1px solid #494949;background:#494949;color:#fff;text-decoration:none}
.bo_fx {margin-bottom:5px;zoom:1}
.bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
.bo_fx ul {margin:0;padding:0;list-style:none}
.btn_bo_user {float:right;margin:0;padding:0;list-style:none}
.btn_bo_user li {float:left;margin-left:5px}
.btn_bo_adm {float:left}
.btn_bo_adm li {float:left;margin-right:5px}
#bo_sch legend {width:0;height:0;overflow:hidden}
#bo_list caption {padding:0;height:0;color:transparent;overflow:hidden} /* ff에서 감추기 위해 color:transparent 사용 */
#bo_list td {line-height:1em}
#bo_list strong {color:#0075b8}
.bo_notice {background:#f5f5f5}
.bo_cate_link {display:inline-block;margin:0 5px 0 0;padding:0 8px 0 0;border-right:1px solid #ddd;font-weight:bold;text-decoration:none}
.bo_current {color:#0075b8}
.td_subject img {margin-left:5px}
.cnt_cmt {display:inline-block;margin:0 4px;color:#0075b8}
/* 게시판 읽기 */
#bo_v_title {}
#bo_v {position:relative;margin-bottom:30px;border-top:3px solid #666;border-bottom:1px solid #ccc;zoom:1}
#bo_v_h1 {margin:0 0 10px !important;padding:15px 0 0 10px}
#bo_v_info {padding:0 0 10px;border-bottom:1px solid #efeada;zoom:1}
#bo_v_info:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_h1 {margin:0 0 10px !important;padding:15px 10px 0 10px}
#bo_v_info {padding:0 0 10px;border-bottom:1px solid #efeada}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info dl {margin:0;padding:0 0 0 10px}
#bo_v_info dt {float:left}
#bo_v_info dd {float:left;margin:0 20px 0 10px}
#bo_v_info div {padding:0 10px}
#bo_v_info strong {display:inline-block;margin:0 10px 0 5px;font-weight:normal}
#bo_v_top {zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
@ -227,22 +259,23 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
#bo_v_atc {zoom:1}
#bo_v_atc:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_atc h1 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_atc p {padding:15px 20px;min-height:200px;height:auto !important;height:200px;border:1px solid #eee;background:#fff;line-height:1.8em}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
#bo_v_file li {border-bottom:1px solid #ddd;background:#f7f7f7}
#bo_v_file a {display:inline-block;padding:8px 10px 7px}
#bo_v_file strong {text-decoration:underline}
.bo_v_file_cnt {display:inline-block;margin:0 10px;color:#ff4679}
.bo_v_file_cnt {display:inline-block;margin:0 10px;color:#0075b8}
#bo_v_link h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_link ul {margin:0;padding:0;list-style:none}
#bo_v_link li {border-bottom:1px solid #ddd;background:#f7f7f7}
#bo_v_link a {display:inline-block;padding:8px 10px 7px}
#bo_v_link strong {text-decoration:underline}
.bo_v_link_cnt {display:inline-block;margin:0 10px;color:#ff4679}
.bo_v_link_cnt {display:inline-block;margin:0 10px;color:#0075b8}
#bo_v_con {padding:20px;min-height:200px;height:auto !important;height:200px;border:1px solid #eee;background:#fff;line-height:1.8em}
#bo_v form {padding-top:20px}
#bo_v_act {margin:20px 0;text-align:center}
#bo_v_act a {margin-right:5px;vertical-align:top}
#bo_v_act strong {color:#ff4679}
#bo_v_act strong {color:#0075b8}
#bo_v_bot {zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_bot h2 {margin:0;padding:0;height:0;overflow:hidden}
@ -275,7 +308,7 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
.bo_vc_act {float:right;margin:0;list-style:none;zoom:1}
.bo_vc_act:after {display:block;visibility:hidden;clear:both;content:""}
.bo_vc_act li {float:left;margin-left:5px}
#bo_vc_w {position:relative;padding-top:20px}
#bo_vc_w {position:relative}
#bo_vc_w #char_cnt {position:absolute;top:5px;right:10px}
#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}
@ -283,8 +316,8 @@ td {padding:8px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9
#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}
/* 사이드뷰 */
#sideview {z-index:1000;position:absolute;top:15px;left:20px;border:1px solid #999;background:#f9f9f9}
#sideview ul {margin:0;padding:0;list-style:none}
#sideview {z-index:1000;position:absolute;top:15px;left:20px;margin:0 !important;padding:0 !important;border:1px solid #999;background:#f9f9f9}
#sideview ul {margin:0 !important;padding:0 !important;list-style:none !important}
#sideview a {display:inline-block;padding:5px 10px 4px;width:100px;border-bottom:1px solid #ddd;color:#000;font-weight:normal;text-decoration:none}
/* pagination */

View File

@ -2,13 +2,9 @@
if (!defined('_GNUBOARD_')) exit;
// 최신글 추출
function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40, $position='left')
function latest($skin_dir='', $bo_table, $rows=10, $subject_len=40)
{
global $g4;
static $lt_count=0;
if ($position == 'right')
$lt_count++;
if (!$skin_dir) $skin_dir = 'basic';
$latest_skin_path = skin_path().'/latest/'.$skin_dir;

View File

@ -12,12 +12,21 @@ include_once('./_head.php');
$sql = " select bo_table from {$g4['board_table']} order by gr_id, bo_table ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.
// 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
$lt_style = "";
if ($i%2==1) $lt_style = "margin-left:20px";
else $lt_style = "";
?>
<div style="float:left;<?=$lt_style?>">
<?
// 이 함수가 바로 최신글을 추출하는 역할을 합니다.
// 스킨은 입력하지 않을 경우 관리자 > 환경설정의 최신글 스킨경로를 기본 스킨으로 합니다.
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
echo latest("neo", $row['bo_table'], 5, 25, 'right');
// 사용방법
// latest(스킨, 게시판아이디, 출력라인, 글자수);
echo latest("neo", $row['bo_table'], 5, 25);
?>
</div>
<?
}
?>
<!-- 메인화면 최신글 끝 -->

View File

@ -124,7 +124,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
</div>
<p><?=$view['content'];?></p>
<div id="bo_v_con"><?=$view['content'];?></div>
<?//echo $view[rich_content]; // {이미지:0} 과 같은 코드를 사용할 경우?>
<!-- 테러 태그 방지용 --></xml></xmp><a href=""></a><a href=''></a>

View File

@ -2,7 +2,7 @@
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
?>
<div class="lt" style="<?=$lt_count%2==0?'margin-left:20px;':'';?>">
<div class="lt">
<strong class="lt_title"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>"><?=$bo_subject?></a></strong>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>

View File

@ -3,17 +3,18 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<!-- 검색 -->
<form name="fnew" method="get">
<fieldset id="new_search">
<fieldset id="new_sch">
<legend>상세검색</legend>
<form name="fnew" method="get">
<?=$group_select?>
<select id="view" name="view" onchange="select_change()" title="검색종류">
<option value="">전체게시물
<option value="w">원글만
<option value="c">코멘트만
</select>
<input type="text" id="mb_id" name="mb_id" class="fieldset_input" value="<?=$mb_id?>" title="검색어">
<input type="submit" class="fieldset_submit" value="검색">
<input type="text" id="mb_id" name="mb_id" class="fs_input" value="<?=$mb_id?>" title="검색어">
<input type="submit" class="fs_submit" value="검색">
</form>
<script>
function select_change()
{
@ -23,7 +24,6 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
document.getElementById("view").value = "<?=$view?>";
</script>
</fieldset>
</form>
<!-- 검색 끝 -->
<!-- 제목 시작 -->
@ -50,7 +50,7 @@ for ($i=0; $i<count($list); $i++)
<td class="td_board"><a href="./board.php?bo_table=<?=$list[$i]['bo_table']?>"><?=$bo_subject?></a></td>
<td><a href="<?=$list[$i]['href']?>"><?=$list[$i]['comment']?><?=$wr_subject?></a></td>
<td class="td_name"><div><?=$list[$i]['name']?></div></td>
<td class="td_datetime"><?=$list[$i]['datetime2']?></td>
<td class="td_date"><?=$list[$i]['datetime2']?></td>
</tr>
<? } ?>
@ -60,6 +60,4 @@ for ($i=0; $i<count($list); $i++)
</tbody>
</table>
<div class="pg">
<?=$write_pages?>
</div>
<?=$write_pages?>

View File

@ -8,7 +8,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<footer id="ft">
<h1><?=$config['cf_title']?> 정보</h1>
<?=popular('neo'); // 인기검색어 ?>
<?=popular('neo',100); // 인기검색어 ?>
<?=visit("neo"); // 방문자수 ?>
<div id="ft_catch"><img src="<?=$g4['path']?>/img/ft_catch.jpg" alt="Sharing All Possibilities"></div>
<div id="ft_copy">