Merge branch 'master' of github.com:gnuboard/g5

This commit is contained in:
chicpro
2013-10-02 11:24:34 +09:00
11 changed files with 24 additions and 24 deletions

View File

@ -175,8 +175,8 @@ li.empty_list {padding:5em 0;text-align:center}
/* 새창 기본 스타일 */
.new_win {}
.new_win h1 {margin-bottom:1.5em;padding:0 1.5em;height:3em;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;font-size:1.2em;line-height:3.5em}
.new_win table {margin:0 auto 1.5em;width:90%}
#new_win_title {margin-bottom:1.5em;padding:0 1.5em;height:3em;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;font-size:1.2em;line-height:3.5em}
.new_win .basic_tbl {margin:0 auto 1.5em;width:90%}
.new_win caption {padding:1em}
.new_win_ul {margin:-1.8em 0 1.5em 0;padding:0 0 0 1.5em;border-bottom:1px solid #455255;background:#484848;list-style:none}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="memo_list" class="new_win mbskin">
<h1><?php echo $g5['title'] ?></h1>
<h1 id="new_win_title"><?php echo $g5['title'] ?></h1>
<ul class="new_win_ul">
<li><a href="./memo.php?kind=recv">받은쪽지</a></li>

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="memo_write" class="new_win mbskin">
<h1>쪽지보내기</h1>
<h1 id="new_win_title">쪽지보내기</h1>
<ul class="new_win_ul">
<li><a href="./memo.php?kind=recv">받은쪽지</a></li>

View File

@ -14,7 +14,8 @@ else {
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="memo_view" class="new_win mbskin">
<h1><?php echo $g5['title'] ?></h1>
<h1 id="new_win_title"><?php echo $g5['title'] ?></h1>
<ul class="new_win_ul">
<li><a href="./memo.php?kind=recv">받은쪽지</a></li>
<li><a href="./memo.php?kind=send">보낸쪽지</a></li>

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="find_info" class="new_win mbskin">
<h1>아이디/패스워드 찾기</h1>
<h1 id="new_win_title">아이디/패스워드 찾기</h1>
<form name="fpasswordlost" action="<?php echo $action_url ?>" onsubmit="return fpasswordlost_submit(this);" method="post" autocomplete="off">
<fieldset id="find_info_fs">

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="profile" class="new_win mbskin">
<h1><?php echo $mb_nick ?>님의 프로필</h1>
<h1 id="new_win_title"><?php echo $mb_nick ?>님의 프로필</h1>
<table class="frm_tbl">
<tbody>

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="scrap" class="new_win mbskin">
<h1><?php echo $g5['title'] ?></h1>
<h1 id="new_win_title"><?php echo $g5['title'] ?></h1>
<table class="basic_tbl">
<caption>스크랩 목록</caption>

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="scrap_do" class="new_win mbskin">
<h1>스크랩하기</h1>
<h1 id="new_win_title">스크랩하기</h1>
<form name="f_scrap_popin" action="./scrap_popin_update.php" method="post">
<input type="hidden" name="bo_table" value="<?php echo $bo_table ?>">

View File

@ -5,7 +5,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<link rel="stylesheet" href="<?php echo $member_skin_url ?>/style.css">
<div id="post_code" class="new_win mbskin">
<h1><?php echo $g5['title'] ?></h1>
<h1 id="new_win_title"><?php echo $g5['title'] ?></h1>
<form name="fzip" method="get" autocomplete="off">
<input type="hidden" name="frm_name" value="<?php echo $frm_name ?>">
@ -25,7 +25,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
document.fzip.addr1.focus();
</script>
<?php if ($search_count > 0) { ?>
<dl>
<dt>총 <?php echo $search_count ?>건 가나다순 정렬</dt>

View File

@ -13,19 +13,19 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</header>
<ul id="ol_after_private">
<li id="ol_after_memo">
<a href="<?php echo G5_BBS_URL ?>/memo.php" target="_blank" class="win_memo">
<a href="<?php echo G5_BBS_URL ?>/memo.php" target="_blank">
<span class="sound_only">안 읽은 </span>쪽지
<strong><?php echo $memo_not_read ?></strong>
</a>
</li>
<li id="ol_after_pt">
<a href="<?php echo G5_BBS_URL ?>/point.php" target="_blank" class="win_point">
<a href="<?php echo G5_BBS_URL ?>/point.php" target="_blank">
포인트
<strong><?php echo $point ?></strong>
</a>
</li>
<li id="ol_after_scrap">
<a href="<?php echo G5_BBS_URL ?>/scrap.php" target="_blank" class="win_scrap">스크랩</a>
<a href="<?php echo G5_BBS_URL ?>/scrap.php" target="_blank">스크랩</a>
</li>
</ul>
<footer id="ol_after_ft">

View File

@ -44,7 +44,7 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
<input type="hidden" name="page" value="<?php echo $page ?>">
<input type="hidden" name="sw" value="">
<ul id="bo_gall_list">
<ul id="gall_ul">
<?php for ($i=0; $i<count($list); $i++) {
if($i>0 && ($i % $bo_gallery_cols == 0))
$style = 'clear:both;';
@ -54,7 +54,7 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
$k += 1;
if ($k % $bo_gallery_cols == 0) $style .= "margin:0 !important;";
?>
<li class="bo_gall_list_li <?php if ($wr_id == $list[$i]['wr_id']) { ?>bo_gall_now<?php } ?>" style="<?php echo $style ?>width:<?php echo $board['bo_gallery_width'] ?>px">
<li class="gall_li <?php if ($wr_id == $list[$i]['wr_id']) { ?>gall_now<?php } ?>" style="<?php echo $style ?>width:<?php echo $board['bo_gallery_width'] ?>px">
<?php if ($is_checkbox) { ?>
<label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
<input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
@ -67,8 +67,8 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
echo $list[$i]['num'];
?>
</span>
<ul class="bo_gall_con">
<li class="bo_gall_href">
<ul class="gall_con">
<li class="gall_href">
<a href="<?php echo $list[$i]['href'] ?>">
<?php
if ($list[$i]['is_notice']) { // 공지사항 ?>
@ -87,7 +87,7 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
?>
</a>
</li>
<li class="bo_gall_text_href" style="width:<?php echo $board['bo_gallery_width'] ?>px">
<li class="gall_text_href" style="width:<?php echo $board['bo_gallery_width'] ?>px">
<?php
// echo $list[$i]['icon_reply']; 갤러리는 reply 를 사용 안 할 것 같습니다. - 지운아빠 2013-03-04
if ($is_category && $list[$i]['ca_name']) {
@ -109,11 +109,11 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
//if (isset($list[$i]['icon_secret'])) echo $list[$i]['icon_secret'];
?>
</li>
<li><span class="bo_gall_subject">작성자 </span><?php echo $list[$i]['name'] ?></li>
<li><span class="bo_gall_subject">작성일 </span><?php echo $list[$i]['datetime2'] ?></li>
<li><span class="bo_gall_subject">조회 </span><?php echo $list[$i]['wr_hit'] ?></li>
<?php if ($is_good) { ?><li><span class="bo_gall_subject">추천</span><strong><?php echo $list[$i]['wr_good'] ?></strong></li><?php } ?>
<?php if ($is_nogood) { ?><li><span class="bo_gall_subject">비추천</span><strong><?php echo $list[$i]['wr_nogood'] ?></strong></li><?php } ?>
<li><span class="gall_subject">작성자 </span><?php echo $list[$i]['name'] ?></li>
<li><span class="gall_subject">작성일 </span><?php echo $list[$i]['datetime2'] ?></li>
<li><span class="gall_subject">조회 </span><?php echo $list[$i]['wr_hit'] ?></li>
<?php if ($is_good) { ?><li><span class="gall_subject">추천</span><strong><?php echo $list[$i]['wr_good'] ?></strong></li><?php } ?>
<?php if ($is_nogood) { ?><li><span class="gall_subject">비추천</span><strong><?php echo $list[$i]['wr_nogood'] ?></strong></li><?php } ?>
</ul>
</li>
<?php } ?>