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

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-16 09:19:46 +09:00
parent 5759a65cfd ade38bab84
commit f2b184e5b1
56 changed files with 834 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/boardgroupmember_list.php
View File

@ -111,7 +111,7 @@ $colspan = 7;
<td class="td_grid"><?php echo $group ?></td>
<td class="td_mbid"><?php echo $row['mb_id'] ?></td>
<td class="td_mbname"><?php echo $row['mb_name'] ?></td>
<td class="td_name"><?php echo $mb_nick ?></td>
<td class="td_name sv_use"><?php echo $mb_nick ?></td>
<td class="td_time"><?php echo substr($row['mb_today_login'],2,8) ?></td>
<td class="td_time"><?php echo $row['gm_datetime'] ?></td>
</tr>

4
adm/index.php
View File

@ -99,7 +99,7 @@ $colspan = 12;
<tr>
<td><?php echo $mb_id ?></td>
<td class="td_mbname"><?php echo $row['mb_name'] ?></td>
<td class="td_name"><div><?php echo $mb_nick ?></div></td>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td class="td_num"><?php echo $row['mb_level'] ?></td>
<td class="td_bignum"><a href="./point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo number_format($row['mb_point']) ?></a></td>
<td class="td_boolean"><?php echo $row['mb_mailling']?'예':'아니오'; ?></td>
@ -281,7 +281,7 @@ $colspan = 7;
<tr>
<td class="td_mbid"><a href="./point_list.php?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo $row['mb_id'] ?></a></td>
<td class="td_mbname"><?php echo $row2['mb_name'] ?></td>
<td class="td_name"><div><?php echo $mb_nick ?></div></td>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td class="td_time"><?php echo $row['po_datetime'] ?></td>
<td><?php echo $link1.$row['po_content'].$link2 ?></td>
<td class="td_bignum"><?php echo number_format($row['po_point']) ?></td>

4
adm/member_list.php
View File

@ -193,7 +193,7 @@ $colspan = 15;
<label for="chk_<?php echo $i; ?>" class="sound_only">회원선택</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
</td>
<td class="td_name"><?php echo $mb_id ?></td>
<td class="td_name sv_use"><?php echo $mb_id ?></td>
<td class="td_mbname"><?php echo $row['mb_name']; ?></td>
<td><?php echo $row['mb_hp']; ?></td>
<td colspan="6" class="td_addr"><?php echo $address; ?></td>
@ -202,7 +202,7 @@ $colspan = 15;
<td rowspan="2"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
</tr>
<tr <?php echo $tr_bg; ?>>
<td class="td_name"><div><?php echo $mb_nick ?></div></td>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td class="">
<?php
if ($leave_msg || $intercept_msg) echo $leave_msg.' '.$intercept_msg;

2
adm/point_list.php
View File

@ -150,7 +150,7 @@ function point_clear()
</td>
<td class="td_mbid"><a href="?sfl=mb_id&amp;stx=<?php echo $row['mb_id'] ?>"><?php echo $row['mb_id'] ?></a></td>
<td class="td_mbname"><?php echo $row2['mb_name'] ?></td>
<td class="td_name"><div><?php echo $mb_nick ?></div></td>
<td class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td class="td_time"><?php echo $row['po_datetime'] ?></td>
<td class="td_pt_log"><?php echo $link1 ?><?php echo $row['po_content'] ?><?php echo $link2 ?></td>
<td class="td_num td_pt"><?php echo number_format($row['po_point']) ?></td>