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

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-11-07 10:48:06 +09:00
parent 41747382d0 35a7ab09c1
commit c4f91d62db
20 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/auth_list.php
View File

@ -103,9 +103,9 @@ $colspan = 5;
continue;
}
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<input type="hidden" name="au_menu[<?php echo $i ?>]" value="<?php echo $row['au_menu'] ?>">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>">

4
adm/board_list.php
View File

@ -119,10 +119,10 @@ $colspan = 16;
$one_update = '<a href="./board_form.php?w=u&amp;bo_table='.$row['bo_table'].'&amp;'.$qstr.'">수정</a>';
$one_copy = '<a href="./board_copy.php?bo_table='.$row['bo_table'].'" class="board_copy" target="win_board_copy">복사</a>';
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo get_text($row['bo_subject']) ?></label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">

4
adm/boardgroup_list.php
View File

@ -125,10 +125,10 @@ $colspan = 11;
$s_upd = '<a href="./boardgroup_form.php?'.$qstr.'&amp;w=u&amp;gr_id='.$row['gr_id'].'">수정</a>';
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<input type="hidden" name="group_id[<?php echo $i ?>]" value="<?php echo $row['gr_id'] ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['gr_subject'] ?> 그룹</label>

4
adm/boardgroupmember_list.php
View File

@ -110,9 +110,9 @@ $colspan = 7;
$mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['mb_nick'] ?> 회원</label>
<input type="checkbox" name="chk[]" value="<?php echo $row['gm_id'] ?>" id="chk_<?php echo $i ?>">

4
adm/mail_list.php
View File

@ -57,10 +57,10 @@ $colspan = 7;
$num = number_format($total_count - ($page - 1) * $config['cf_page_rows'] - $i);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<input type="checkbox" id="chk_<?php echo $i ?>" name="chk[]" value="<?php echo $row['ma_id'] ?>" title="메일선택">
</td>

4
adm/mail_select_list.php
View File

@ -96,9 +96,9 @@ include_once('./admin.head.php');
$ma_list .= $cr . $row['mb_email'] . "||" . $row['mb_id'] . "||" . $row['mb_name'] . "||" . $row['mb_nick'] . "||" . $row['mb_datetime'];
$cr = "\n";
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_num"><?php echo $i ?></td>
<td class="td_mbid"><?php echo $row['mb_id'] ?></td>
<td class="td_mbname"><?php echo $row['mb_name'] ?></td>

6
adm/member_list.php
View File

@ -187,7 +187,7 @@ $colspan = 15;
$address = $row['mb_zip1'] ? $row['mb_addr1'].' '.$row['mb_addr2'] : '';
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
switch($row['mb_certify']) {
case 'hp':
@ -209,7 +209,7 @@ $colspan = 15;
}
?>
<tr <?php echo $tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td headers="mb_list_chk" class="td_chk" rowspan="2">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>" id="mb_id_<?php echo $i ?>">
<label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $row['mb_name']; ?> <?php echo $row['mb_nick']; ?>님</label>
@ -235,7 +235,7 @@ $colspan = 15;
<td headers="mb_list_grp" rowspan="2" class="td_numsmall"><?php echo $group ?></td>
<td headers="mb_list_mng" rowspan="2" class="td_mngsmall"><?php echo $s_mod ?> <?php echo $s_grp ?></td>
</tr>
<tr <?php echo $tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td headers="mb_list_nick" class="td_name sv_use"><div><?php echo $mb_nick ?></div></td>
<td headers="mb_list_mailc" class="td_chk"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td headers="mb_list_mailr" class="td_chk"><input type="checkbox" name="mb_mailling[<?php echo $i; ?>]" <?php echo $row['mb_mailling']?'checked':''; ?> value="1"></td>

4
adm/point_list.php
View File

@ -151,10 +151,10 @@ function point_clear()
if($row['po_expired'] == 1)
$expr = ' txt_expired';
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<input type="hidden" name="mb_id[<?php echo $i ?>]" value="<?php echo $row['mb_id'] ?>" id="mb_id_<?php echo $i ?>">
<input type="hidden" name="po_id[<?php echo $i ?>]" value="<?php echo $row['po_id'] ?>" id="po_id_<?php echo $i ?>">

4
adm/poll_list.php
View File

@ -105,10 +105,10 @@ $colspan = 7;
$s_mod = '<a href="./poll_form.php?'.$qstr.'&amp;w=u&amp;po_id='.$row['po_id'].'">수정</a>';
//$s_del = '<a href="javascript:post_delete(\'poll_form_update.php\', \''.$row['po_id'].'\');">삭제</a>';
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<input type="checkbox" name="chk[]" value="<?php echo $row['po_id'] ?>" id="chk_<?php echo $i ?>" title="투표선택">
</td>

4
adm/popular_list.php
View File

@ -112,10 +112,10 @@ var list_delete_php = 'popular_list.php';
for ($i=0; $row=sql_fetch_array($result); $i++) {
$word = get_text($row['pp_word']);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_chk">
<input type="checkbox" name="chk[]" value="<?php echo $row['pp_id'] ?>" id="chk_<?php echo $i ?>" title="<?php echo $word ?> 선택">
</td>

4
adm/visit_browser.php
View File

@ -65,10 +65,10 @@ while ($row=sql_fetch_array($result)) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_num"><?php echo $no ?></td>
<td class="td_category"><?php echo $key ?></td>
<td>

4
adm/visit_date.php
View File

@ -56,10 +56,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_category"><a href="./visit_list.php?fr_date=<?php echo $key ?>&amp;to_date=<?php echo $key ?>"><?php echo $key ?></a></td>
<td>
<div class="visit_bar">

4
adm/visit_domain.php
View File

@ -76,9 +76,9 @@ while ($row=sql_fetch_array($result)) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_num"><?php echo $no ?></td>
<td class="td_category"><?php echo $link ?><?php echo $key ?><?php echo $link2 ?></td>
<td>

4
adm/visit_hour.php
View File

@ -55,9 +55,9 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_category"><?php echo $hour ?></td>
<td>
<div class="visit_bar">

6
adm/visit_list.php
View File

@ -78,9 +78,9 @@ $result = sql_query($sql);
if ($brow == '기타') { $brow = '<span title="'.$row['vi_agent'].'">'.$brow.'</span>'; }
if ($os == '기타') { $os = '<span title="'.$row['vi_agent'].'">'.$os.'</span>'; }
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_category"><?php echo $ip ?></td>
<td><?php echo $link ?><?php echo $title ?><?php echo $link2 ?></td>
<td class="td_category"><?php echo $brow ?></td>
@ -98,7 +98,7 @@ $result = sql_query($sql);
</div>
<?php
if (isset($domain))
if (isset($domain))
$qstr .= "&amp;domain=$domain";
$qstr .= "&amp;page=";

4
adm/visit_month.php
View File

@ -57,10 +57,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_category"><a href="./visit_date.php?fr_date=<?php echo $key ?>-01&amp;to_date=<?php echo $key ?>-31"><?php echo $key ?></a></td>
<td>
<div class="visit_bar">

4
adm/visit_os.php
View File

@ -69,10 +69,10 @@ while ($row=sql_fetch_array($result)) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_num"><?php echo $no ?></td>
<td class="td_category"><?php echo $key ?></td>
<td>

4
adm/visit_week.php
View File

@ -52,10 +52,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_category"><?php echo $weekday[$i] ?></td>
<td>
<div class="visit_bar">

4
adm/visit_year.php
View File

@ -57,10 +57,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
$rate = ($count / $sum_count * 100);
$s_rate = number_format($rate, 1);
$tr_bg = $i%2 ? 'class="tr_bg1"' : 'class="tr_bg0"';
$tr_bg = 'tr_bg'.($i%2);
?>
<tr<?php echo ' '.$tr_bg; ?>>
<tr class="<?php echo $tr_bg; ?>">
<td class="td_category"><a href="./visit_month.php?fr_date=<?php echo $key ?>-01-01&amp;to_date=<?php echo $key ?>-12-31"><?php echo $key ?></a></td>
<td>
<div class="visit_bar">

8
css/admin.css
View File

@ -256,7 +256,6 @@ tfoot th {}
tfoot td {font-weight:bold;text-align:center}
table .tr_bg0 {background:#fff}
table .tr_bg1 {background:#f0f3f7}
table .tr_bg0escrow {background:#f3f7e7}
table .tr_bg0escrow td {border-color:#e4efbb}
table .tr_bg1escrow {background:#edf1e3}
@ -400,7 +399,6 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
.txt_true {color:#e8180c}
.txt_false {color:#ccc}
.banner_or_img {margin:10px 0 0}
.banner_or_img button {display:block;margin:5px 0 0}
.txt_active {color:#5d910b}
@ -649,15 +647,15 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
/* 새창 기본 스타일 */
.new_win {}
.new_win h1 {margin-bottom:20px;padding:0 20px;min-width:480px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win h1 {margin-bottom:20px;padding:0 20px;min-width:320px/* 적정값으로 변경하여 사용하세요. */;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win h2 {margin:0 20px 10px}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px}
.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none}
.new_win_desc {margin:0 20px}
.new_win .anchor {margin:0 20px 5px}
.new_win_desc {margin:0 auto;width:93%}
.new_win .anchor {margin:0 auto 5px;width:93%}
.new_win .tbl_wrap {margin:0 20px 20px;padding:0}
.new_win .local_sch, .new_win .local_cmd, .new_win .local_desc01, .new_win .local_desc02, .new_win .local_ov {min-width:480px}