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 
Conflicts:
	adm/board_list.php
	bbs/memo.php
	bbs/memo_form_update.php
	bbs/memo_view.php
	head.sub.php
This commit is contained in:
gnuboard
2013-01-18 10:04:16 +09:00
parent 77ff0946a5 fca2c7be50
commit e4466de88a
47 changed files with 743 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
adm/board_list.php
View File

@ -115,9 +115,18 @@ var list_delete_php = 'board_list_delete.php';
<th scope="col"><?=subject_sort_link('bo_table')?>TABLE</a></th>
<th scope="col"><?=subject_sort_link('bo_skin', '', 'desc')?>스킨</a></th>
<th scope="col"><?=subject_sort_link('bo_subject')?>제목</a></th>
<<<<<<< HEAD
<th scope="col">포인트</th>
<th scope="col">검색</th>
<th scope="col"><?=subject_sort_link('bo_use')?>사용여부</a></th>
=======
<th scope="col">읽기P<span class="sound_only">포인트</span></th>
<th scope="col">쓰기P<span class="sound_only">포인트</span></th>
<th scope="col">댓글P<span class="sound_only">포인트</span></th>
<th scope="col">다운P<span class="sound_only">포인트</span></th>
<th scope="col">검색<br>사용</th>
<th scope="col">검색<br>순서</th>
>>>>>>> fca2c7be504cccbd5466136a893f3d3ed875554c
<th scope="col">관리</th>
</tr>
</thead>
@ -146,6 +155,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
<td>
<?=get_skin_select("board", "bo_skin_$i", "bo_skin[$i]", $row['bo_skin']);?>
</td>
<<<<<<< HEAD
<td><input type="text" id="bo_subject_<?=$i?>" name="bo_subject[<?=$i?>]" class="required" value="<?=get_text($row['bo_subject'])?>" title="게시판제목" size="20" required="required"></td>
<td>
<label for="bo_read_point_<?=$i?>">읽기</label>
@ -162,6 +172,15 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
<input type="checkbox" id="bo_use_search_<?=$i?>" name="bo_use_search[<?=$i?>]" <?=$row['bo_use_search']?"checked":""?> value="1">
<label for="bo_order_search_<?=$i?>">순서</label>
<input type="text" id="bo_order_search_<?=$i?>" name="bo_order_search[<?=$i?>]" value="<?=$row['bo_order_search']?>" size="1">
=======
<td><input type="text" id="bo_subject[<?=$i?>]" name="bo_subject[<?=$i?>]" class="required" value="<?=get_text($row['bo_subject'])?>" title="게시판제목" size="10" required="required"></td>
<td><input type="text" name="bo_read_point[<?=$i?>]" value="<?=$row['bo_read_point']?>" size="1" title="읽기"></td>
<td><input type="text" name="bo_write_point[<?=$i?>]" value="<?=$row['bo_write_point']?>" size="1" title="쓰기"></td>
<td><input type="text" name="bo_comment_point[<?=$i?>]" value="<?=$row['bo_comment_point']?>" size="1" title="댓글"></td>
<td><input type="text" name="bo_download_point[<?=$i?>]" value="<?=$row['bo_download_point']?>" size="1" title="다운"></td>
<td><input type="checkbox" id="bo_use_search_<?=$i?>" name="bo_use_search[<?=$i?>]" <?=$row['bo_use_search']?"checked":""?> value="1" title="검색사용"></td>
<td><input type="text" id="bo_order_search_<?=$i?>" name="bo_order_search[<?=$i?>]" value="<?=$row['bo_order_search']?>" size="1" title="검색순서"></td>
>>>>>>> fca2c7be504cccbd5466136a893f3d3ed875554c
</td>
<td>
<select id="bo_use_<?=$i?>" name="bo_use[<?=$i?>]">