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

충돌 수정

Browse Source
This commit is contained in:
thisgun
2018-03-19 14:25:32 +09:00
parent 91a3ca9f8a af6d060fa0
commit bb176f0a46
52 changed files with 332 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
theme/basic/mobile/skin/board/basic/view.skin.php
View File

@ -141,7 +141,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
?>
<div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
<?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

2
theme/basic/mobile/skin/board/gallery/view.skin.php
View File

@ -141,7 +141,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
?>
<div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
<?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

3
theme/basic/mobile/skin/member/basic/memo.skin.php
View File

@ -30,6 +30,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
</ul>
<!-- 페이지 -->
<?php echo $write_pages; ?>
<p class="win_desc">
쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
</p>

2
theme/basic/mobile/skin/member/basic/memo_view.skin.php
View File

@ -50,7 +50,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<a href="<?php echo $next_link ?>">다음쪽지</a>
<?php } ?>
<?php if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>" class="btn01">답장</a><?php } ?>
<a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
<a href="<?php echo $list_link ?>">목록보기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>

2
theme/basic/skin/board/basic/view.skin.php
View File

@ -149,7 +149,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<!-- 본문 내용 시작 { -->
<div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
<?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<!-- } 본문 내용 끝 -->
<?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

2
theme/basic/skin/board/gallery/view.skin.php
View File

@ -149,7 +149,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
<!-- 본문 내용 시작 { -->
<div id="bo_v_con"><?php echo get_view_thumbnail($view['content']); ?></div>
<?php//echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<?php //echo $view['rich_content']; // {이미지:0} 과 같은 코드를 사용할 경우 ?>
<!-- } 본문 내용 끝 -->
<?php if ($is_signature) { ?><p><?php echo $signature ?></p><?php } ?>

3
theme/basic/skin/member/basic/memo.skin.php
View File

@ -42,6 +42,9 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
</table>
</div>
<!-- 페이지 -->
<?php echo $write_pages; ?>
<p class="win_desc">
쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
</p>

2
theme/basic/skin/member/basic/memo_view.skin.php
View File

@ -53,7 +53,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
<a href="<?php echo $next_link ?>">다음쪽지</a>
<?php } ?>
<?php if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?php echo $mb['mb_id'] ?>&amp;me_id=<?php echo $memo['me_id'] ?>">답장</a><?php } ?>
<a href="./memo.php?kind=<?php echo $kind ?>">목록보기</a>
<a href="<?php echo $list_link ?>">목록보기</a>
<button type="button" onclick="window.close();">창닫기</button>
</div>
</div>