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:
chicpro
2013-05-06 20:14:49 +09:00
parent 2089f7653d ed54791188
commit 1b052d2591
6 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/admin.lib.php
View File

@ -265,5 +265,5 @@ if (isset($page)) $arr_query[] = 'page='.$page;
$qstr = implode("&", $arr_query);
// 관리자에서는 추가 스크립트는 사용하지 않는다.
$config['cf_add_script'] = '';
//$config['cf_add_script'] = '';
?>

57
adm/member_list.php
View File

@ -120,25 +120,25 @@ $colspan = 15;
<tr>
<th scope="col" rowspan="2"><input type="checkbox" name="chkall" value="1" id="chkall" title="현재 페이지 회원 전체선택" onclick="check_all(this.form)"></th>
<th scope="col"><?php echo subject_sort_link('mb_id') ?>회원아이디</a></th>
<th scope="col"><?php echo subject_sort_link('mb_name') ?>이름</a>/<?php echo subject_sort_link('mb_level', '', 'desc') ?>권한</a></th>
<th scope="col"><?php echo subject_sort_link('mb_today_login', '', 'desc') ?>최종접속</a></th>
<th scope="col"><?php echo subject_sort_link('mb_name') ?>이름</a></th>
<th scope="col">휴대폰</th>
<th scope="col" colspan="6">주소</th>
<th scope="col"><?php echo subject_sort_link('mb_today_login', '', 'desc') ?>최종접속</a></th>
<th scope="col"><?php echo subject_sort_link('mb_point', '', 'desc') ?> 포인트</a></th>
<th scope="col" rowspan="2">관리</th>
</tr>
<tr>
<th scope="col">상태</th>
<th scope="col"><?php echo subject_sort_link('mb_nick') ?>별명</a></th>
<th scope="col"><?php echo subject_sort_link('mb_datetime', '', 'desc') ?>가입일</a></th>
<th scope="col">상태/<?php echo subject_sort_link('mb_level', '', 'desc') ?>권한</a></th>
<th scope="col">전화번호</th>
<th scope="col">본인<br>확인</th>
<th scope="col">성인<br>인증</th>
<th scope="col"><?php echo subject_sort_link('mb_mailling', '', 'desc') ?>메일<br>수신</a></th>
<th scope="col"><?php echo subject_sort_link('mb_open', '', 'desc') ?>정보<br>공개</a></th>
<th scope="col"><?php echo subject_sort_link('mb_email_certify', '', 'desc') ?>메일<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_hp_certify', '', 'desc') ?>본인<br>확인</a></th>
<th scope="col"><?php echo subject_sort_link('mb_adult', '', 'desc') ?>성인<br>인증</a></th>
<th scope="col"><?php echo subject_sort_link('mb_intercept_date', '', 'desc') ?>접근<br>차단</a></th>
<th scope="col">그룹</th>
<th scope="col"><?php echo subject_sort_link('mb_datetime', '', 'desc') ?>가입일</a></th>
<th scope="col" title="접근가능한 그룹수">접근그룹</th>
</tr>
</thead>
<tbody>
@ -183,10 +183,15 @@ $colspan = 15;
}
if ($intercept_title == '')
$intercept_title = '차단하기';
$address = $row['mb_zip1'] ? $row['mb_addr1'].' '.$row['mb_addr2'] : '';
$tr_bg = '';
if ($i%2 == 0) $tr_bg = 'class="tr_bg"';
?>
<tr>
<td class="td_chk td_tdiv" rowspan="2">
<tr <?php echo $tr_bg; ?>>
<td 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">회원선택</label>
<input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i ?>">
@ -194,35 +199,35 @@ $colspan = 15;
<td class="td_name"><?php echo $mb_id ?></td>
<td class="td_mbname">
<?php echo $row['mb_name'] ?>
<?php echo get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level']) ?>
</td>
<td><?php echo substr($row['mb_today_login'],2,8) ?></td>
<td>전화번호</td>
<td colspan="6" class="td_addr">주소</td>
<td><?php echo hyphen_hp_number($row['mb_hp']); ?></td>
<td colspan="6" class="td_addr"><?php echo $address; ?></td>
<td><?php echo substr($row['mb_today_login'],2,8); ?></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 rowspan="2" class="td_tdiv"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
<td rowspan="2"><?php echo $s_mod ?><br><?php echo $s_grp ?></td>
</tr>
<tr>
<td class=" td_tdiv">
<tr <?php echo $tr_bg; ?>>
<td class="td_name"><div><?php echo $mb_nick ?></div></td>
<td class="">
<?php
if ($leave_msg || $intercept_msg) echo $leave_msg.' '.$intercept_msg;
else echo "정상";
?>
<?php echo get_member_level_select("mb_level[$i]", 1, $member['mb_level'], $row['mb_level']) ?>
</td>
<td class="td_name td_tdiv"><div><?php echo $mb_nick ?></div></td>
<td class="td_tdiv"><?php echo substr($row['mb_datetime'],2,8) ?></td>
<td class="td_tdiv">휴대폰번호</td>
<td class="td_chk td_tdiv">본인</td>
<td class="td_chk td_tdiv">성인</td>
<td class="td_chk td_tdiv"><?php echo $row['mb_mailling']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk td_tdiv"><?php echo $row['mb_open']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk td_tdiv"><?php echo preg_match('/[1-9]/', $row['mb_email_certify'])?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk td_tdiv">
<td><?php echo $row['mb_tel']; ?></td>
<td class="td_chk"><?php echo $row['mb_mailling']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk"><?php echo $row['mb_open']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td 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 class="td_chk"><?php echo $row['mb_hp_certify']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk"><?php echo $row['mb_adult']?'<span class="txt_true">Yes</span>':'<span class="txt_false">No</span>'; ?></td>
<td class="td_chk">
<?php if(empty($row['mb_leave_date'])){ ?>
<input type="checkbox" name="mb_intercept_date[<?php echo $i ?>]" <?php echo $row['mb_intercept_date']?'checked':''; ?> value="<?php echo $intercept_date ?>" id="mb_intercept_date_<?php echo $i ?>" title="<?php echo $intercept_title ?>">
<?php } ?>
</td>
<td class="td_chk td_tdiv"><?php echo $group ?></td>
<td><?php echo substr($row['mb_datetime'],2,8); ?></td>
<td class="td_chk"><?php echo $group ?></td>
</tr>
<?php

5
css/admin.css
View File

@ -284,6 +284,9 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.visit_bar {position:relative}
.visit_bar span {position:absolute;top:-8px;left:0;height:15px;background:#ddd}
/* 공통 */
.tr_bg {background:#fafeef}
.tr_bg td {border-bottom:1px solid #d8e6b6 !important}
.td_chk {width:30px;text-align:center}
.td_num {width:60px;text-align:center}
.td_smallnum {width:40px;text-align:center}
@ -299,8 +302,8 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.td_boolean {width:50px;text-align:center}
.td_pt {text-align:right !important}
.td_tdiv {border-bottom:1px solid #c9c9c9 !important}
.txt_true {color:#e8180c}
.txt_false {color:#ccc}

3
head.sub.php
View File

@ -78,7 +78,8 @@ if ($is_admin) {
if(G4_IS_MOBILE) {
echo '<script> set_cookie("device_width", screen.width, 6, g4_cookie_domain); </script>'.PHP_EOL;
}
echo $config['cf_add_script'];
if(!defined('G4_IS_ADMIN'))
echo $config['cf_add_script'];
?>
</head>
<body>

7
skin/board/basic/view.skin.php
View File

@ -279,17 +279,24 @@ function view_image_resize()
$img.each(function() {
var img_width = $(this).width();
var img_height = $(this).height();
var this_width = $(this).data("width");
var this_height = $(this).data("height");
if(this_width == undefined) {
$(this).data("width", img_width); // 원래 이미지 사이즈
$(this).data("height", img_height);
this_width = img_width;
this_height = img_height;
}
if(this_width > res_width) {
$(this).width(res_width);
var res_height = Math.round(res_width * $(this).data("height") / $(this).data("width"));
$(this).height(res_height);
} else {
$(this).width(this_width);
$(this).height(this_height);
}
});
}

7
skin/board/gallery/view.skin.php
View File

@ -277,17 +277,24 @@ function view_image_resize()
$img.each(function() {
var img_width = $(this).width();
var img_height = $(this).height();
var this_width = $(this).data("width");
var this_height = $(this).data("height");
if(this_width == undefined) {
$(this).data("width", img_width); // 원래 이미지 사이즈
$(this).data("height", img_height);
this_width = img_width;
this_height = img_height;
}
if(this_width > res_width) {
$(this).width(res_width);
var res_height = Math.round(res_width * $(this).data("height") / $(this).data("width"));
$(this).height(res_height);
} else {
$(this).width(this_width);
$(this).height(this_height);
}
});
}