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

관리자: merge 충돌 수정

Browse Source
This commit is contained in:
whitedot
2013-02-18 11:20:21 +09:00
parent 351ff09ace
commit 7b45e607fb
3 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/boardgroup_list.php
View File

@ -88,17 +88,13 @@ var list_update_php = "./boardgroup_list_update.php";
접근사용 옵션은 해당 그룹에 속한 모든 게시판에 적용됩니다.
</p>
<<<<<<< HEAD
<?if ($is_admin == 'super') {?>
<div id="btn_add">
<a href="./boardgroup_form.php" id="bo_gr_add">게시판그룹 추가</a>
</div>
<?}?>
<form id="fboardgrouplist" name="fboardgrouplist" method="post">
=======
<form id="fboardgrouplist" name="fboardgrouplist" method="post" action="./boardgroup_list_update.php">
>>>>>>> 75f31cd998e7ebb2d18eed50b548a4ac81fa39b3
<input type="hidden" name="sst" value="<?=$sst?>">
<input type="hidden" name="sod" value="<?=$sod?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">

4
adm/member_list.php
View File

@ -100,17 +100,13 @@ $colspan = 15;
<h2>회원 목록</h2>
<p>회원자료 삭제 시 다른 회원이 기존 회원아이디를 사용하지 못하도록 회원아이디, 이름, 별명은 삭제하지 않고 영구 보관합니다.</p>
<<<<<<< HEAD
<? if ($is_admin == 'super') {?>
<div id="btn_add">
<a href="./member_form.php" id="member_add">회원추가</a>
</div>
<?}?>
<form id="fmemberlist" name="fmemberlist" method="post" action="./member_list_update.php" onsubmit="return fmemberlist_submit(this);">
=======
<form id="fmemberlist" name="fmemberlist" method="post" action="./member_list_update.php">
>>>>>>> 6ed598e865fecf9bd14c8d69b500f5d2b05a1046
<input type="hidden" name="sst" value="<?=$sst?>">
<input type="hidden" name="sod" value="<?=$sod?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">

3
adm/poll_list.php
View File

@ -72,12 +72,10 @@ $colspan = 6;
<section class="cbox">
<h2>투표목록</h2>
<<<<<<< HEAD
<div id="btn_add">
<a href="./poll_form.php" id="poll_add">투표 추가</a>
</div>
=======
<form id="fpolllist" name="fpolllist" method="post" action="./poll_delete.php">
<input type="hidden" name="sst" value="<?=$sst?>">
<input type="hidden" name="sod" value="<?=$sod?>">
@ -85,7 +83,6 @@ $colspan = 6;
<input type="hidden" name="stx" value="<?=$stx?>">
<input type="hidden" name="page" value="<?=$page?>">
<input type="hidden" name="token" value="<?=$token?>">
>>>>>>> 75f31cd998e7ebb2d18eed50b548a4ac81fa39b3
<table>
<thead>
<tr>