Merge branch 'g5'

This commit is contained in:
chicpro
2014-03-12 18:19:41 +09:00
21 changed files with 359 additions and 158 deletions

View File

@ -14,33 +14,22 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<li><a href="./memo_form.php">쪽지쓰기</a></li>
</ul>
<div class="tbl_head01 tbl_wrap">
<table>
<caption>
전체 <?php echo $kind_title ?>쪽지 <?php echo $total_count ?>통<br>
</caption>
<thead>
<tr>
<th scope="col"><?php echo ($kind == "recv") ? "보낸사람" : "받는사람"; ?></th>
<th scope="col">보낸시간</th>
<th scope="col">읽은시간</th>
<th scope="col">관리</th>
</tr>
</thead>
<tbody>
<?php for ($i=0; $i<count($list); $i++) { ?>
<tr>
<td><?php echo $list[$i]['name'] ?></td>
<td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></font></td>
<td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></font></td>
<td class="td_mng"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;">삭제</a></td>
</tr>
<?php } ?>
<?php if ($i==0) { echo "<tr><td colspan=\"4\" class=\"empty_table\">자료가 없습니다.</td></tr>"; } ?>
</tbody>
</table>
<div class="win_desc">
전체 <?php echo $kind_title ?>쪽지 <?php echo $total_count ?>통<br>
</div>
<ul id="memo_list_ul">
<?php for ($i=0; $i<count($list); $i++) { ?>
<li>
<a href="<?php echo $list[$i]['view_href'] ?>" class="memo_link"><?php echo $list[$i]['send_datetime'] ?> 에 받은 쪽지</a>
<span class="memo_read"><?php echo $list[$i]['read_datetime'] ?></span>
<span class="memo_send"><?php echo $list[$i]['name'] ?></span>
<a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del">삭제</a>
</li>
<?php } ?>
<?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
</ul>
<p class="win_desc">
쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
</p>

View File

@ -22,8 +22,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<li><a href="./memo.php?kind=send">보낸쪽지</a></li>
<li><a href="./memo_form.php">쪽지쓰기</a></li>
</ul>
<section>
<h2>쪽지 내용</h2>
<article id="memo_view_contents">
<header>
<h1>쪽지 내용</h1>
</header>
<ul id="memo_view_ul">
<li class="memo_view_li">
<span class="memo_view_subj"><?php echo $kind_str ?>사람</span>
@ -37,7 +40,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<p>
<?php echo conv_content($memo['me_memo'], 0) ?>
</p>
</section>
</article>
<div class="win_btn">
<?php if($prev_link) { ?>
<a href="<?php echo $prev_link ?>">이전쪽지</a>

View File

@ -0,0 +1,81 @@
<?php
if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">', 0);
?>
<div id="point" class="new_win">
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
<ul id="point_ul">
<?php
$sum_point1 = $sum_point2 = $sum_point3 = 0;
$sql = " select *
{$sql_common}
{$sql_order}
limit {$from_record}, {$rows} ";
$result = sql_query($sql);
for ($i=0; $row=sql_fetch_array($result); $i++) {
$point1 = $point2 = 0;
if ($row['po_point'] > 0) {
$point1 = '+' .number_format($row['po_point']);
$sum_point1 += $row['po_point'];
} else {
$point2 = number_format($row['po_point']);
$sum_point2 += $row['po_point'];
}
$po_content = $row['po_content'];
$expr = '';
// if($row['po_expired'] == 1)
$expr = ' txt_expired';
?>
<li>
<div class="point_wrap01">
<span class="point_date"><?php echo conv_date_format('y-m-d H시', $row['po_datetime']); ?></span>
<span class="point_log"><?php echo $po_content; ?></span>
</div>
<div class="point_wrap02">
<span class="point_expdate<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</span>
<span class="point_inout"><?php if ($point1) echo $point1; else echo $point2; ?></span>
</div>
</li>
<?php
}
if ($i == 0)
echo '<li class="empty_list">자료가 없습니다.</li>';
else {
if ($sum_point1 > 0)
$sum_point1 = "+" . number_format($sum_point1);
$sum_point2 = number_format($sum_point2);
}
?>
</ul>
<div id="point_sum">
<div class="sum_row">
<span class="sum_tit">지급</span>
<b class="sum_val"><?php echo $sum_point1; ?></b>
</div>
<div class="sum_row">
<span class="sum_tit">사용</span>
<b class="sum_val"><?php echo $sum_point2; ?></b>
</div>
<div class="sum_row">
<span class="sum_tit">보유</span>
<b class="sum_val"><?php echo number_format($member['mb_point']); ?></b>
</div>
</div>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
<div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
</div>

View File

@ -8,29 +8,16 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<div id="scrap" class="new_win mbskin">
<h1 id="win_title"><?php echo $g5['title'] ?></h1>
<div class="tbl_head01 tbl_wrap">
<table>
<caption>스크랩 목록</caption>
<thead>
<tr>
<th scope="col">게시판</th>
<th scope="col">제목</th>
<th scope="col">삭제</th>
</tr>
</thead>
<tbody>
<ul id="scrap_ul">
<?php for ($i=0; $i<count($list); $i++) { ?>
<tr>
<td class="td_board"><a href="<?php echo $list[$i]['opener_href'] ?>" target="_blank" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href'] ?>'; return false;"><?php echo $list[$i]['bo_subject'] ?></a></td>
<td><a href="<?php echo $list[$i]['opener_href_wr_id'] ?>" target="_blank" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href_wr_id'] ?>'; return false;"><?php echo $list[$i]['subject'] ?></a></td>
<td class="td_mng"><a href="<?php echo $list[$i]['del_href']; ?>" onclick="del(this.href); return false;">삭제</a></td>
</tr>
<li>
<a href="<?php echo $list[$i]['opener_href'] ?>" target="_blank" class="scrap_board" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href'] ?>'; return false;"><?php echo $list[$i]['bo_subject'] ?></a>
<a href="<?php echo $list[$i]['opener_href_wr_id'] ?>" target="_blank" class="scrap_link" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href_wr_id'] ?>'; return false;"><?php echo $list[$i]['subject'] ?></a>
<a href="<?php echo $list[$i]['del_href']; ?>" class="scrap_del" onclick="del(this.href); return false;">삭제</a>
</li>
<?php } ?>
<?php if ($i == 0) echo "<tr><td colspan=\"5\" class=\"empty_table\">자료가 없습니다.</td></tr>"; ?>
</tbody>
</table>
</div>
<?php if ($i == 0) echo "<li class=\"empty_list\">자료가 없습니다.</li>"; ?>
</ul>
<?php echo get_paging($config['cf_mobile_pages'], $page, $total_page, "?$qstr&amp;page="); ?>

View File

@ -136,24 +136,47 @@
#mb_login_odinfo div {text-align:right}
/* 쪽지 */
#memo_view section {padding:10px}
#memo_view section h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#memo_view_contents {margin:0 auto 20px;width:90%}
#memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
.memo_view_li {position:relative;padding:5px 0}
.memo_view_subj {display:inline-block;width:65px}
#memo_view_ul a {}
#memo_view section p {min-height:150px;height:auto !important;height:150px}
#memo_view p {padding:10px 0;min-height:150px;height:auto !important;height:150px;line-height:1.8em}
#memo_list_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#memo_list_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
#memo_list_ul .memo_link {}
#memo_list_ul .memo_send {position:absolute;top:10px;right:30px}
#memo_list_ul .memo_read {font-size:0.95em;color:#666}
#memo_list_ul .memo_del {position:absolute;top:10px;right:0}
#memo_write #me_recv_mb_id {width:98%}
#memo_write textarea {width:99%;height:100px}
/* 스크랩 */
#scrap td:nth-of-type(1) {width:150px}
#scrap td:nth-last-of-type(1) {width:50px;text-align:center}
#scrap_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#scrap_ul li {position:relative;padding:10px 35px 10px 0;border-bottom:1px solid #e9e9e9}
#scrap_ul .scrap_board {display:inline-block;margin:0 10px 0 0;font-weight:bold}
#scrap_ul .scrap_del {position:absolute;top:10px;right:0}
#scrap_do table {margin:0 0 10px;width:100%}
#scrap_do textarea {width:99%;height:100px}
/* 포인트 */
#point_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
#point_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
#point_ul .point_wrap01 {position:relative;padding:0 0 0 90px}
#point_ul .point_wrap02 {margin:7px 0 0;text-align:right}
#point_ul .point_date {position:absolute;top:0;left:0}
#point_sum {margin:0 20px}
#point_sum .sum_row {margin:0 0 1px;background:#f2f5f9}
#point_sum .sum_row:after {display:block;visibility:hidden;clear:both;content:''}
#point_sum .sum_tit, #point_sum .sum_val {display:block;margin:0 0 1px;padding:10px}
#point_sum .sum_tit {clear:both;float:left;width:100px}
#point_sum .sum_val {float:right}
/* 회원 비밀번호 확인 */
#mb_confirm {margin:30px 0}
#mb_confirm h1 {margin:0 0 15px;padding:0 10px;font-size:1.3em}