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

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

Browse Source
This commit is contained in:
gnuboard
2013-12-05 15:07:14 +09:00
parent c05d81cf29 43d018f11e
commit e92e852145
10 changed files with 56 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
adm/board_copy_update.php
View File

@ -43,7 +43,6 @@ $sql = " insert into {$g5['board_table']}
bo_download_level = '{$board[bo_download_level]}',
bo_html_level = '{$board[bo_html_level]}',
bo_link_level = '{$board[bo_link_level]}',
bo_trackback_level = '{$board[bo_trackback_level]}',
bo_count_modify = '{$board[bo_count_modify]}',
bo_count_delete = '{$board[bo_count_delete]}',
bo_read_point = '{$board[bo_read_point]}',

3
adm/board_form.php
View File

@ -434,7 +434,8 @@ $pg_anchor = '<ul class="anchor">
<tr>
<th scope="row"><label for="bo_use_sideview">글쓴이 사이드뷰</label></th>
<td>
<input type="checkbox" name="bo_use_sideview" value="1" id="bo_use_sideview" <?php echo $board['bo_use_sideview']?'checked':''; ?>>사용 (글쓴이 클릭시 나오는 레이어 메뉴)
<input type="checkbox" name="bo_use_sideview" value="1" id="bo_use_sideview" <?php echo $board['bo_use_sideview']?'checked':''; ?>>
사용 (글쓴이 클릭시 나오는 레이어 메뉴)
</td>
<td class="td_grpset">
<input type="checkbox" name="chk_grp_use_sideview" value="1" id="chk_grp_use_sideview">

1
adm/sql_write.sql
View File

@ -14,7 +14,6 @@ CREATE TABLE `__TABLE_NAME__` (
`wr_link2` text NOT NULL,
`wr_link1_hit` int(11) NOT NULL DEFAULT '0',
`wr_link2_hit` int(11) NOT NULL DEFAULT '0',
`wr_trackback` varchar(255) NOT NULL,
`wr_hit` int(11) NOT NULL DEFAULT '0',
`wr_good` int(11) NOT NULL DEFAULT '0',
`wr_nogood` int(11) NOT NULL DEFAULT '0',

1
bbs/new.php
View File

@ -73,6 +73,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$row2 = sql_fetch(" select * from {$tmp_write_table} where wr_id = '{$row['wr_parent']}' ");
$row3 = sql_fetch(" select mb_id, wr_name, wr_email, wr_homepage, wr_datetime from {$tmp_write_table} where wr_id = '{$row['wr_id']}' ");
$list[$i] = $row2;
$list[$i]['wr_id'] = $row['wr_id'];
$list[$i]['mb_id'] = $row3['mb_id'];
$list[$i]['wr_name'] = $row3['wr_name'];
$list[$i]['wr_email'] = $row3['wr_email'];

1
css/admin.css
View File

@ -117,6 +117,7 @@ h2.h2_frm {padding-top:15px}
.compare_wrap section {margin:10px 0;padding-top:10px}
.compare_wrap h3 {margin:10px 0 20px;text-align:center}
.compare_wrap .tbl_frm {margin:0}
.compare_wrap .frm_input {background:#fff}
.compare_wrap .btn_confirm {padding:10px 0 0}
.compare_left {float:left;width:49%}
.compare_right {float:right;width:49%}

8
css/default.css
View File

@ -167,7 +167,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_head01 {margin:0 0 10px}
.tbl_head01 caption {padding:0;font-size:0;line-height:0;overflow:hidden}
.tbl_head01 thead th {padding:12px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em}
.tbl_head01 thead th {padding:12px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
.tbl_head01 thead a {color:#383838}
.tbl_head01 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.tbl_head01 tfoot th, .tbl_head01 tfoot td {padding:10px 0;border-top:1px solid #c1d1d5;border-bottom:1px solid #c1d1d5;background:#d7e0e2;text-align:center}
@ -177,7 +177,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_head02 {margin:0 0 10px}
.tbl_head02 caption {padding:0;font-size:0;line-height:0;overflow:hidden}
.tbl_head02 thead th {padding:5px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em}
.tbl_head02 thead th {padding:5px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
.tbl_head02 thead a {color:#383838}
.tbl_head02 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.tbl_head02 tfoot th, .tbl_head02 tfoot td {padding:10px 0;border-top:1px solid #c1d1d5;border-bottom:1px solid #c1d1d5;background:#d7e0e2;text-align:center}
@ -254,8 +254,8 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7
/* 사이드뷰 */
.sv_wrap {display:inline-block;position:relative;font-weight:normal}
.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111}
.sv_wrap .sv a {display:inline-block;margin:0;padding:3px;width:94px;border-bottom:1px solid #283646;color:#fff}
.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646}
.sv_wrap .sv a {display:inline-block;margin:0;padding:3px;width:94px;border-bottom:1px solid #283646;background:#111;color:#fff !important}
.sv_wrap a:focus, .sv_wrap a:hover, .sv_wrap a:active {text-decoration:none}
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto}
.sv_nojs .sv {display:block}

4
css/mobile.css
View File

@ -137,7 +137,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_head01 {}
.tbl_head01 caption {padding:0 0 10px;color:#777;text-align:left}
.tbl_head01 thead th {padding:12px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em}
.tbl_head01 thead th {padding:12px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
.tbl_head01 thead a {color:#383838}
.tbl_head01 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.tbl_head01 tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
@ -147,7 +147,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_head02 {}
.tbl_head02 caption {padding:0 0 10px;color:#777;text-align:left}
.tbl_head02 thead th {padding:5px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em}
.tbl_head02 thead th {padding:5px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
.tbl_head02 thead a {color:#383838}
.tbl_head02 thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
.tbl_head02 tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}

2
install/gnuboard5.sql
View File

@ -35,7 +35,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_download_level` tinyint(4) NOT NULL DEFAULT '0',
`bo_html_level` tinyint(4) NOT NULL DEFAULT '0',
`bo_link_level` tinyint(4) NOT NULL DEFAULT '0',
`bo_trackback_level` tinyint(4) NOT NULL DEFAULT '0',
`bo_count_delete` tinyint(4) NOT NULL DEFAULT '0',
`bo_count_modify` tinyint(4) NOT NULL DEFAULT '0',
`bo_read_point` int(11) NOT NULL DEFAULT '0',
@ -55,7 +54,6 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
`bo_use_name` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_signature` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_ip_view` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_trackback` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_list_view` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_list_file` tinyint(4) NOT NULL DEFAULT '0',
`bo_use_list_content` tinyint(4) NOT NULL DEFAULT '0',

91
mobile/skin/qa/basic/list.skin.php
View File

@ -1,10 +1,5 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
// 선택옵션으로 인해 셀합치기가 가변적으로 변함
$colspan = 6;
if ($is_checkbox) $colspan++;
?>
<link rel="stylesheet" href="<?php echo $qa_skin_url ?>/style.css">
@ -42,55 +37,45 @@ if ($is_checkbox) $colspan++;
<input type="hidden" name="sca" value="<?php echo $sca; ?>">
<input type="hidden" name="page" value="<?php echo $page; ?>">
<div class="tbl_head01 tbl_wrap">
<table>
<caption><?php echo $board['bo_subject'] ?> 목록</caption>
<thead>
<tr>
<th scope="col">번호</th>
<?php if ($is_checkbox) { ?>
<th scope="col">
<label for="chkall" class="sound_only">현재 페이지 게시물 전체</label>
<input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);">
</th>
<?php } ?>
<th scope="col">분류</th>
<th scope="col">제목</th>
<th scope="col">글쓴이</th>
<th scope="col">상태</th>
<th scope="col">등록일</th>
</tr>
</thead>
<tbody>
<?php
for ($i=0; $i<count($list); $i++) {
?>
<tr>
<td class="td_num"><?php echo $list[$i]['num']; ?></td>
<?php if ($is_checkbox) { ?>
<td class="td_chk">
<label for="chk_qa_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject']; ?></label>
<input type="checkbox" name="chk_qa_id[]" value="<?php echo $list[$i]['qa_id'] ?>" id="chk_qa_id_<?php echo $i ?>">
</td>
<?php } ?>
<td><?php echo $list[$i]['category']; ?></td>
<td class="td_subject">
<a href="<?php echo $list[$i]['view_href']; ?>">
<?php echo $list[$i]['subject']; ?>
</a>
<?php echo $list[$i]['icon_file']; ?>
</td>
<td class="td_name"><?php echo $list[$i]['name']; ?></td>
<td class="td_stat <?php echo ($list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($list[$i]['qa_status'] ? '답변완료' : '답변대기'); ?></td>
<td class="td_date"><?php echo $list[$i]['date']; ?></td>
</tr>
<?php
}
?>
<?php if ($is_checkbox) { ?>
<div id="list_chk">
<label for="chkall" class="sound_only">게시물 전체</label>
<input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);">
</div>
<?php } ?>
<?php if ($i == 0) { echo '<tr><td colspan="'.$colspan.'" class="empty_table">게시물이 없습니다.</td></tr>'; } ?>
</tbody>
</table>
<div class="ul_wrap ul_01">
<ul>
<?php
for ($i=0; $i<count($list); $i++) {
?>
<li class="bo_li<?php if ($is_checkbox) echo ' bo_adm'; ?>">
<?php if ($is_checkbox) { ?>
<div class="li_chk">
<label for="chk_qa_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject']; ?></label>
<input type="checkbox" name="chk_qa_id[]" value="<?php echo $list[$i]['qa_id'] ?>" id="chk_qa_id_<?php echo $i ?>">
</div>
<?php } ?>
<div class="li_title">
<a href="<?php echo $list[$i]['view_href']; ?>">
<strong><?php echo $list[$i]['category']; ?></strong>
<?php echo $list[$i]['subject']; ?>
</a>
</div>
<div class="li_info">
<span><?php echo $list[$i]['num']; ?></span>
<span><?php echo $list[$i]['name']; ?></span>
<span><?php echo $list[$i]['date']; ?></span>
<span><?php echo $list[$i]['icon_file']; ?></span>
</div>
<div class="li_stat <?php echo ($list[$i]['qa_status'] ? 'txt_done' : 'txt_rdy'); ?>"><?php echo ($list[$i]['qa_status'] ? '답변완료' : '답변대기'); ?></div>
</li>
<?php
}
?>
<?php if ($i == 0) { echo '<li class="empty_list">게시물이 없습니다.</li>'; } ?>
</ul>
</div>
<div class="bo_fx">

33
mobile/skin/qa/basic/style.css
View File

@ -26,20 +26,6 @@
#bo_w .btn_cancel {}
#bo_w .btn_frmline {} /* 우편번호검색버튼 등 */
/* 기본테이블 */
/* 목록 테이블 */
#bo_list .tbl_head01 {}
#bo_list .tbl_head01 caption {}
#bo_list .tbl_head01 thead th {}
#bo_list .tbl_head01 thead a {}
#bo_list .tbl_head01 thead th input {} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
#bo_list .tbl_head01 tfoot th {}
#bo_list .tbl_head01 tfoot td {}
#bo_list .tbl_head01 tbody th {}
#bo_list .tbl_head01 td {}
#bo_list .tbl_head01 a {}
#bo_list td.empty_table {}
/* 읽기 내 테이블 */
#bo_v .tbl_head01 {}
#bo_v .tbl_head01 caption {}
@ -77,17 +63,14 @@
/* ### 기본 스타일 커스터마이징 끝 ### */
/* 게시판 목록 */
#bo_list .td_chk {width:30px;text-align:center}
#bo_list .td_group {width:100px;text-align:center}
#bo_list .td_board {width:120px;text-align:center}
#bo_list .td_num {width:50px;text-align:center}
#bo_list .td_numbig {width:80px;text-align:center}
#bo_list .td_mb_id {width:100px;text-align:center}
#bo_list .td_nick {width:100px;text-align:center}
#bo_list .td_name {width:100px;text-align:left}
#bo_list .td_date {width:60px;text-align:center}
#bo_list .td_datetime {width:150px;text-align:center}
#bo_list .td_mng {width:80px;text-align:center}
#bo_list #list_chk {padding:0 10px 10px}
#bo_list .ul_wrap ul {margin:0;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#bo_list .ul_wrap li {position:relative;padding:8px 10px;border-bottom:1px solid #e9e9e9}
#bo_list .ul_wrap li.bo_adm {padding:8px 10px 8px 30px}
#bo_list .ul_wrap a {display:block;padding:0 0 10px}
#bo_list .ul_wrap .li_chk {position:absolute;top:8px;left:10px}
#bo_list .ul_wrap .li_info span {display:inline-block;margin:0 5px 0 0;vertical-align:middle}
#bo_list .ul_wrap .li_stat {position:absolute;bottom:8px;right:10px}
#bo_cate h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#bo_cate ul {margin:5px 10px;padding-left:1px;zoom:1}