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

This commit is contained in:
gnuboard
2013-07-01 15:34:04 +09:00
69 changed files with 816 additions and 1214 deletions

View File

@ -398,8 +398,9 @@ else
<?php } // 전화문의가 아닐 경우 끝 ?>
<div id="sit_sel_option">
<?php if(!$option_1 && !$option_2) { ?>
<section id="sit_sel_option">
<h3>선택된 옵션</h3>
<?php if(!$option_1 && !$option_2) { ?>
<ul id="sit_opt_added">
<li class="sit_opt_list">
<input type="hidden" name="io_type[]" value="0">
@ -421,8 +422,8 @@ else
price_calculate();
});
</script>
<?php } ?>
</div>
<?php } ?>
</section>
<div id="sit_tot_price"></div>

View File

@ -53,9 +53,9 @@ if ($is_admin)
include G4_SHOP_PATH.'/navigation1.inc.php';
// 상단 이미지
$himg = G4_DATA_URL.'/category/'.$ca_id.'_h';
$himg = G4_DATA_PATH.'/category/'.$ca_id.'_h';
if (file_exists($himg)) {
echo '<div id="sct_himg" class="sct_img"><img src="'.$himg.'" alt=""></div>';
echo '<div id="sct_himg" class="sct_img"><img src="'.G4_DATA_URL.'/category/'.$ca_id.'_h" alt=""></div>';
}
// 상단 HTML

View File

@ -71,7 +71,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
<h3>회원메뉴 및 FAQ</h3>
<ul>
<?php if ($is_member) { ?>
<li><a href="<?php echo G4_BBS_URL; ?>/logout.php">로그아웃</a></li>
<li><a href="<?php echo G4_BBS_URL; ?>/logout.php?url=shop">로그아웃</a></li>
<li><a href="<?php echo G4_BBS_URL; ?>/member_confirm.php?url=register_form.php">정보수정</a></li>
<?php } else { ?>
<li><a href="<?php echo G4_BBS_URL; ?>/login.php?url=<?php echo $urlencode; ?>">로그인</a></li>