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

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

Browse Source
This commit is contained in:
gnuboard
2013-06-28 11:47:43 +09:00
parent 3c34ac40c7 2c1a2c9a50
commit bb102864fd
6 changed files with 26 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shop/boxcategory.inc.php
View File

@ -15,7 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
{
$gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여
?>
<li class="gnb_1dli">
<li class="gnb_1dli" style="z-index:<?php echo $gnb_zindex; ?>">
<a href="<?php echo G4_SHOP_URL.'/list.php?ca_id='.$row['ca_id']; ?>" class="gnb_1da"><?php echo $row['ca_name']; ?></a>
<?php
// 2단계 분류 판매 가능한 것만

4
shop/item.php
View File

@ -226,7 +226,7 @@ else
<?php //echo it_name_icon($it, false, 0); ?>
<section id="sit_ov">
<h2 id="sit_title"><?php echo stripslashes($it['it_name']); ?></h2>
<h2 id="sit_title"><?php echo stripslashes($it['it_name']); ?> 요약정보 및 구매</h2>
<p id="sit_desc"><?php echo $it['it_basic']; ?></p>
<p id="sit_opt_info">
<?php
@ -510,12 +510,14 @@ else
<h2>상품 정보</h2>
<?php echo pg_anchor('inf'); ?>
<h3>상품 기본설명</h3>
<?php if ($it['it_basic']) { // 상품 기본설명 ?>
<div id="sit_inf_basic">
<?php echo $it['it_basic']; ?>
</div>
<?php } ?>
<h3>상품 상세설명</h3>
<?php if ($it['it_explan']) { // 상품 상세설명 ?>
<div id="sit_inf_explan">
<?php echo conv_content($it['it_explan'], 1); ?>

56
shop/orderform.php
View File

@ -48,45 +48,20 @@ if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
<script>
function CheckPayplusInstall()
{
if(!ChkBrowser())
StartSmartUpdate();
if(ChkBrowser())
{
var inst = 0;
for (var i = 0; i < navigator.plugins.length; i++)
{
if (navigator.plugins[i].name == "KCP")
{
if (navigator.mimeTypes && navigator.mimeTypes[GetPluginVersion()])
{
inst = 1;
}
else
{
inst = 2;
}
break;
}
}
if (inst != 1)
{
if (inst == 0)
{
alert("Microsoft Internet Exploer 외의 환경에서 이용하시려면 KCP 플러그인을 설치하셔야 합니다. 확인을 누르시면 플러그인 다운로드창이 호출됩니다. 설치후에는 반드시 브라우저를 재시작 하십시오.");
document.getElementById("display_setup_message").scrollIntoView();
}
else if (inst == 2)
{
alert("플러그인이 업데이트 되었습니다. 재설치 하시고 진행해 주시기 바랍니다. 재설치 후에는 반드시 브라우저를 재시작 하십시오.");
}
document.location.href = GetInstallFile();
return false;
if(document.Payplus.object != null) {
document.getElementById("display_setup_message_top").style.display = "none" ;
document.getElementById("display_setup_message").style.display = "none" ;
document.getElementById("display_pay_button").style.display = "block" ;
}
}
StartSmartUpdate();
setTimeout("init_pay_button();",300);
else
{
setTimeout("init_pay_button();",300);
}
}
/* Payplus Plug-in 실행 */
@ -118,17 +93,11 @@ function jsf__pay( form )
// Payplus Plug-in 설치 안내
function init_pay_button()
{
/*
if( document.Payplus.object == null )
document.getElementById("display_setup_message").style.display = "block" ;
else
document.getElementById("display_pay_button").style.display = "block" ;
*/
// 체크 방법이 변경
if( GetPluginObject() == null ){
document.getElementById("display_setup_message_top").style.display = "block" ;
document.getElementById("display_setup_message").style.display = "block" ;
document.getElementById("display_pay_button").style.display = "none" ;
document.getElementById("display_setup_message").scrollIntoView();
}
else{
document.getElementById("display_setup_message_top").style.display = "none" ;
@ -137,7 +106,6 @@ function init_pay_button()
}
}
function get_intall_file()
{
document.location.href = GetInstallFile();

8
shop/shop.head.php
View File

@ -9,8 +9,8 @@ include_once(G4_LIB_PATH.'/connect.lib.php');
include_once(G4_LIB_PATH.'/popular.lib.php');
?>
<header id="hd">
<h1><?php echo $config['cf_title'] ?></h1>
<div id="hd">
<h1 id="hd_h1"><?php echo $g4['title'] ?></h1>
<div id="skip_to_container"><a href="#container">본문 바로가기</a></div>
@ -86,7 +86,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
</div>
</aside>
</header>
</div>
<div id="wrapper">
@ -120,7 +120,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
</div>
<div id="container">
<?php if ((!$bo_table || $w == 's' ) && !defined('_INDEX_')) { ?><h1 id="wrapper_title"><?php echo $g4['title'] ?></h1><?php } ?>
<?php if ((!$bo_table || $w == 's' ) && !defined('_INDEX_')) { ?><div id="wrapper_title"><?php echo $g4['title'] ?></div><?php } ?>
<div id="text_size">
<button class="no_text_resize" onclick="font_resize('container', 'decrease');">작게</button>
<button class="no_text_resize" onclick="font_default('container');">기본</button>

5
shop/shop.tail.php
View File

@ -10,8 +10,7 @@ $admin = get_admin("super");
</div><!-- Container End -->
</div><!-- Wrapper End -->
<footer id="ft">
<h1><?php echo $config['cf_title']; ?> 정보</h1>
<div id="ft">
<div>
<a href="<?php echo G4_SHOP_URL; ?>/" id="ft_logo"><img src="<?php echo G4_DATA_URL; ?>/common/logo_img" alt="처음으로"></a>
<ul>
@ -33,7 +32,7 @@ $admin = get_admin("super");
</p>
<a href="#" id="ft_totop">상단으로</a>
</div>
</footer>
</div>
<?php
$sec = get_microtime() - $begin_time;