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
This commit is contained in:
gnuboard
2013-02-18 15:47:03 +09:00
parent e122b376ee 3312cd2377
commit aaf97d254b
7 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/board_list.php
View File

@ -168,11 +168,17 @@ $colspan = 8;
</table>
<div class="btn_list">
<<<<<<< HEAD
<input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택수정">
<!-- <input type="submit" name="act_button" value="선택수정"> -->
<?if ($is_admin == 'super') {?>
<input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택삭제">
<!-- <input type="submit" name="act_button" value="선택삭제"> -->
=======
<input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택수정">
<?if ($is_admin == 'super') {?>
<input type="submit" name="act_button" onclick="document.pressed=this.value" value="선택삭제">
>>>>>>> 3312cd2377e2b47707196bdb3df5cdab13720d51
<a href="./board_form.php">게시판추가</a>
<?}?>
</div>