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

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

Browse Source
This commit is contained in:
gnuboard
2013-01-28 13:05:02 +09:00
parent a4f794787c f6694fa28f
commit f7c9f52cf4
7 changed files with 57 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
css/default.css
View File

@ -83,13 +83,13 @@ pre {overflow-x:scroll;font-size:1.1em}
#idx_catch {margin-bottom:10px;padding: 25px 0 25px}
/* 버튼 */
.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #0c6fa7 !important;background:#0075b8 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn01 {display:inline-block;padding:0 10px;height:24px;border:1px solid #239ce2 !important;background:#109ff1 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn02 {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc !important;background:#fafafa !important;color:#000 !important;text-decoration:none;line-height:2.2em}
.btn03 {display:inline-block;padding:0 10px;height:24px;border:1px solid #494949 !important;background:#494949 !important;color:#fff !important;text-decoration:none;line-height:2.2em}
.btn_confirm {text-align:center} /* 서식단계 진행 */
.btn_submit {padding:0 10px;height:24px;border:0;background:#484848;color:#fff;letter-spacing:-0.1em;vertical-align:top}
.btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2em}
.btn_frmline {padding:0 7px 0 5px;height:22px;border:0;background:#0075b8;color:#fff;letter-spacing:-0.1em;vertical-align:top;line-height:2em}
.btn_frmline {padding:0 7px 0 5px;height:22px;border:0;background:#109ff1;color:#fff;letter-spacing:-0.1em;vertical-align:top;line-height:2em}
.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
.btn_win a {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;color:#000;text-decoration:none;line-height:2em;cursor:pointer}
@ -171,7 +171,7 @@ table a {color:#000;text-decoration:none}
#ol_after_private:after {display:block;visibility:hidden;clear:both;content:""}
#ol_after_private li {float:left}
#ol_after_private a {display:block;padding-top:8px;height:37px;background:#f7f7f2;text-align:center}
#ol_after_private a strong {display:block;padding-top:5px;color:#0075b8}
#ol_after_private a strong {display:block;padding-top:5px;color:#109ff1}
#ol_after_memo {width:50px;margin-right:1px}
#ol_after_pt {width:90px;margin-right:1px}
#ol_after_scrap {width:48px;line-height:2.6em !important}
@ -186,7 +186,7 @@ table a {color:#000;text-decoration:none}
#poll footer {padding:0 14px 14px;text-align:right}
/* 최근게시물 스킨 (latest) */
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px;border-right:1px solid #ececec;border-bottom:1px solid #ececec;background:#fff}
.lt {float:left;margin-bottom:20px;padding:20px;width:314px;height:149px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
.lt ul {margin:0;padding:0;list-style:none}
.lt li {padding:3px 0}
.lt a {color:#000;text-decoration:none}
@ -237,7 +237,7 @@ table a {color:#000;text-decoration:none}
#bo_w caption {padding:0;height:0;overflow:hidden}
/* 게시판 목록 */
.btn_bo_adm input {padding:0 10px;height:26px;border:1px solid #494949;background:#494949;color:#fff;text-decoration:none}
.btn_bo_adm input {padding:0 10px;height:26px;border:1px solid #ddd;background:#eee;color:#000;text-decoration:none}
.bo_fx {margin-bottom:5px;zoom:1}
.bo_fx:after {display:block;visibility:hidden;clear:both;content:""}
.bo_fx ul {margin:0;padding:0;list-style:none}
@ -247,27 +247,27 @@ table a {color:#000;text-decoration:none}
.btn_bo_user li {float:left;margin-left:5px}
#bo_list caption {padding:0;height:0;color:transparent;overflow:hidden} /* ff에서 감추기 위해 color:transparent 사용 */
#bo_list td {line-height:1em}
#bo_list strong {color:#0075b8}
#bo_list strong {color:#109ff1}
.btn_bo_adm {float:left}
.btn_bo_adm li {float:left;margin-right:5px}
.bo_notice {}
.bo_cate_link {display:inline-block;padding:0 8px 0 0;border-right:1px solid #ddd;font-weight:bold;text-decoration:none} /* 글제목 줄 분류스타일 */
.bo_current {color:#0075b8}
.bo_cate_link {display:inline-block;padding:0 5px 0 0;font-weight:bold;text-decoration:none} /* 글제목 줄 분류스타일 */
.bo_current {color:#109ff1}
.td_subject img {margin-left:5px}
.cnt_cmt {display:inline-block;margin:0 4px;color:#0075b8}
.cnt_cmt {display:inline-block;margin:0 4px;color:#109ff1}
/* 게시판 읽기 */
#bo_v_title {}
#bo_v {position:relative;margin-bottom:20px;background:#fff}
#bo_v {position:relative;margin-bottom:30px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;background:#fff}
#bo_v a {color:#000;text-decoration:none}
#bo_v_h1 {padding:20px 0 10px;font-size:1.2em}
#bo_v_info {padding:0 0 15px;}
#bo_v_h1 {padding:20px 20px 10px;font-size:1.2em}
#bo_v_info {padding:0 20px 15px}
#bo_v_info h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_info strong {display:inline-block;margin:0 10px 0 5px;font-weight:normal}
#bo_v_top {padding-top:10px;zoom:1}
#bo_v_top {zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_top ul {margin-bottom:10px;padding:0;list-style:none}
#bo_v_top ul {margin-bottom:10px;padding:0 20px;list-style:none}
#bo_v_file {background:#fff}
#bo_v_file h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_file ul {margin:0;padding:0;list-style:none}
@ -286,23 +286,23 @@ table a {color:#000;text-decoration:none}
#bo_v_img {margin:0 20px;width:688px;overflow:hidden}
/*#bo_v_img img {max-width:100%;height:auto}*/
#bo_v_con {padding:20px 0;width:688px;overflow:hidden;line-height:1.8em;word-break:break-all}
#bo_v_con a {color:#0075b8;text-decoration:underline}
#bo_v_con {padding:20px;width:688px;overflow:hidden;line-height:1.8em;word-break:break-all}
#bo_v_con a {color:#109ff1;text-decoration:underline}
#bo_v_act {padding:20px 0;text-align:center}
#bo_v_act a {margin-right:5px;vertical-align:top}
#bo_v_act strong {color:#0075b8}
#bo_v_act strong {color:#109ff1}
#bo_v form {padding-top:20px}
#bo_v_bot {zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_bot h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_v_bot ul {margin:0;padding:0 0 15px;list-style:none}
#bo_v_bot ul {margin:0;padding:0 20px 15px;list-style:none}
#bo_v_nb {float:left}
#bo_v_nb li {float:left;margin-right:5px}
.bo_v_com {float:right}
.bo_v_com li {float:left;margin-left:5px}
/* 게시판 댓글 */
#bo_vc {margin-bottom:10px;padding:10px 20px 20px 20px;background:#f9f9f9}
#bo_vc {margin:0 20px 10px;padding:10px 20px 20px 20px;background:#f9f9f9}
#bo_vc h2 {margin:0;padding:0;height:0;overflow:hidden}
#bo_vc article {margin-bottom:5px;padding:0 0 10px;border-bottom:1px solid #eee}
#bo_vc header {position:relative;zoom:1}

2
js/wrest.js
View File

@ -358,7 +358,7 @@ function wrestInitialized()
//if (regexp.test(document.forms[i].elements[j].className)) {
//document.forms[i].elements[j].style.backgroundColor = wrestFldDefaultColor;
//document.forms[i].elements[j].className = "wrest_required";
document.forms[i].elements[j].style.backgroundImage = "url('"+g4_path+"/js/wrest.gif')";
document.forms[i].elements[j].style.backgroundImage = "url('"+g4_url+"/js/wrest.gif')";
document.forms[i].elements[j].style.backgroundPosition = "top right";
document.forms[i].elements[j].style.backgroundRepeat = "no-repeat";
}

14
lib/common.lib.php
View File

@ -45,14 +45,14 @@ function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
$str .= '<a href="'.$url.$total_page.$add.'" class="pg_page pg_end">맨끝</a>'.PHP_EOL;
}
if ($str)
if ($str)
return "<div class=\"pg\"><span class=\"pg_wrap\">{$str}</span></div>";
else
else
return "";
}
// 페이징 코드의 <div><span> 태그 다음에 코드를 삽입
function page_insertbefore($paging_html, $insert_html)
function page_insertbefore($paging_html, $insert_html)
{
if ($paging_html) {
return preg_replace("/^(<div[^>]+><span[^>]+>)/", '$1'.$insert_html, $paging_html);
@ -60,7 +60,7 @@ function page_insertbefore($paging_html, $insert_html)
}
// 페이징 코드의 </span></div> 태그 이전에 코드를 삽입
function page_insertafter($paging_html, $insert_html)
function page_insertafter($paging_html, $insert_html)
{
if ($paging_html) {
return preg_replace("/(<\/span><\/div>)$/", $insert_html.'$1', $paging_html);
@ -152,7 +152,7 @@ function alert($msg='', $url='', $error=true)
if (isset($g4['title'])) {
$header = $g4['title'];
}
include_once("{$g4['bbs_path']}/alert.php");
include_once(G4_BBS_PATH.'/alert.php');
exit;
}
@ -171,7 +171,7 @@ function alert_close($msg, $error=true)
if (isset($g4['title'])) {
$header = $g4['title'];
}
include_once("{$g4['bbs_path']}/alert_close.php");
include_once(G4_BBS_PATH.'/alert_close.php');
exit;
}
@ -198,7 +198,7 @@ function confirm($msg, $url1='', $url2='', $url3='')
if (isset($g4['title'])) {
$header = $g4['title'];
}
include_once("{$g4['bbs_path']}/confirm.php");
include_once(G4_BBS_PATH.'/confirm.php');
exit;
}

4
shop/cart.php
View File

@ -5,13 +5,13 @@ $g4['title'] = "장바구니";
include_once('./_head.php');
?>
<img src="<?=$g4['shop_img_path']?>/top_cart.gif" border="0"><p>
<img src="<?=G4_SHOP_IMG_URL?>/top_cart.gif" border="0"><p>
<?
$s_page = 'cart.php';
$s_uq_id = get_session('ss_uniqid');
include $g4['shop_path'].'/cartsub.inc.php';
include G4_SHOP_PATH.'/cartsub.inc.php';
?>
<br><br>

34
shop/cartsub.inc.php
View File

@ -416,7 +416,7 @@ if ($i == 0) {
if ($s_page == "cart.php" || $s_page == "orderinquiryview.php")
echo "<td> &nbsp;</td>\n";
echo "</tr>\n";
echo "<input type=\"hidden\" name=\"w\" value=\"\">\n";
echo "<input type=\"hidden\" name=\"act\" value=\"\">\n";
echo "<input type=\"hidden\" name=\"records\" value=\"$i\">\n";
}
?>
@ -426,16 +426,16 @@ if ($i == 0) {
<?
if ($s_page == "cart.php") {
if ($i == 0) {
echo "<br><a href=\"{$g4['path']}\"><img src=\"{$g4['shop_img_path']}/btn_shopping.gif\" border=\"0\"></a>";
echo "<br><a href=\"{$g4['path']}\"><img src=\"".G4_SHOP_IMG_URL."/btn_shopping.gif\" border=\"0\"></a>";
} else {
echo "
<br><input type=\"hidden\" name=\"url\" value=\"./orderform.php\">
<a href=\"javascript:form_check('buy')\"><img src=\"{$g4['shop_img_path']}/btn_buy.gif\" border=\"0\" alt=\"구매하기\"></a>&nbsp;
<a href=\"javascript:form_check('selectedbuy')\"><img src=\"{$g4['shop_img_path']}/btn_buy1.gif\" border=\"0\" alt=\"선택주문\"></a>&nbsp;
<a href=\"javascript:form_check('allupdate')\"><img src=\"{$g4['shop_img_path']}/btn_cart_quan.gif\" border=\"0\" alt=\"장바구니 수량 변경\"></a>&nbsp;
<a href=\"javascript:form_check('alldelete');\"><img src=\"{$g4['shop_img_path']}/btn_cart_out.gif\" border=\"0\" alt=\"장바구니 비우기\"></a>&nbsp;
<a href=\"javascript:form_check('seldelete');\"><img src=\"{$g4['shop_img_path']}/btn_cart_out1.gif\" border=\"0\" alt=\"선택삭제\"></a>&nbsp;
<a href=\"./list.php?ca_id=$continue_ca_id\"><img src=\"{$g4['shop_img_path']}/btn_shopping.gif\" border=\"0\" alt=\"계속쇼핑하기\"></a>";
<a href=\"javascript:form_check('buy')\"><img src=\"".G4_SHOP_IMG_URL."/btn_buy.gif\" border=\"0\" alt=\"구매하기\"></a>&nbsp;
<a href=\"javascript:form_check('selectedbuy')\"><img src=\"".G4_SHOP_IMG_URL."/btn_buy1.gif\" border=\"0\" alt=\"선택주문\"></a>&nbsp;
<a href=\"javascript:form_check('allupdate')\"><img src=\"".G4_SHOP_IMG_URL."/btn_cart_quan.gif\" border=\"0\" alt=\"장바구니 수량 변경\"></a>&nbsp;
<a href=\"javascript:form_check('alldelete');\"><img src=\"".G4_SHOP_IMG_URL."/btn_cart_out.gif\" border=\"0\" alt=\"장바구니 비우기\"></a>&nbsp;
<a href=\"javascript:form_check('seldelete');\"><img src=\"".G4_SHOP_IMG_URL."/btn_cart_out1.gif\" border=\"0\" alt=\"선택삭제\"></a>&nbsp;
<a href=\"./list.php?ca_id=$continue_ca_id\"><img src=\"".G4_SHOP_IMG_URL."/btn_shopping.gif\" border=\"0\" alt=\"계속쇼핑하기\"></a>";
}
}
?>
@ -488,7 +488,7 @@ $(function() {
if (act == "buy")
{
f.w.value = act;
f.act.value = act;
<?
if (get_session('ss_mb_id')) // 회원인 겨우
@ -497,7 +497,7 @@ $(function() {
echo "f.submit();";
}
else
echo "document.location.href = \"".$g4['bbs_path']."/login.php?url=".urlencode($g4['shop_path'].'/orderform.php')."\";";
echo "document.location.href = \"".G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL.'/orderform.php')."\";";
?>
} else if (act == "selectedbuy")
{
@ -514,19 +514,19 @@ $(function() {
return false;
}
f.w.value = act;
f.act.value = act;
f.action = "./cartupdate.php";
f.submit();
}
else if (act == "alldelete")
{
f.w.value = act;
f.act.value = act;
f.action = "./cartupdate.php";
f.submit();
}
else if(act == "seldelete")
{
f.w.value = act;
f.act.value = act;
f.action = "./cartupdate.php";
f.submit();
}
@ -559,7 +559,7 @@ $(function() {
return;
}
}
f.w.value = act;
f.act.value = act;
f.action = "./cartupdate.php";
f.submit();
}
@ -573,13 +573,13 @@ $(function() {
<? if ($s_page == "cart.php") { ?>
<br><br>
<table align="center" cellpadding="0" cellspacing="0">
<tr><td><img src="<? echo $g4['shop_img_path']; ?>/info_box01.gif"></td></tr>
<tr><td background="<? echo $g4['shop_img_path']; ?>/info_box03.gif" style="line-height:180%; padding-left:20px">
<tr><td><img src="<? echo G4_SHOP_IMG_URL; ?>/info_box01.gif"></td></tr>
<tr><td background="<? echo G4_SHOP_IMG_URL; ?>/info_box03.gif" style="line-height:180%; padding-left:20px">
· <FONT COLOR="#FF8200">상품 주문하기</FONT> : 주문서를 작성하시려면 '주문하기' 버튼을 누르세요.<BR>
· <FONT COLOR="#FF8200">상품 수량변경</FONT> : 주문수량을 변경하시려면 원하시는 수량을 입력하신 후 '수량변경' 버튼을 누르세요.<BR>
· <FONT COLOR="#FF8200">상품 삭제하기</FONT> : 모든 주문내용을 삭제하시려면 '삭제하기' 버튼을 누르세요.<BR>
· <FONT COLOR="#FF8200">쇼핑 계속하기</FONT> : 쇼핑하시던 페이지로 돌아가시려면 '쇼핑 계속하기' 버튼을 누르세요.
</td></tr>
<tr><td><img src="<? echo $g4['shop_img_path']?>/info_box02.gif"></td></tr>
<tr><td><img src="<? echo G4_SHOP_IMG_URL; ?>/info_box02.gif"></td></tr>
</table><br><br>
<? } ?>

18
shop/cartupdate.php
View File

@ -38,13 +38,13 @@ if($default['de_guest_cart_use']) {
}
}
if ($w == 'alldelete') // 모두 삭제이면
if ($act == 'alldelete') // 모두 삭제이면
{
$sql = " delete from {$g4['yc4_cart_table']}
where uq_id = '$uq_id' ";
sql_query($sql);
}
else if ($w == 'seldelete') // 선택 삭제이면
else if ($act == 'seldelete') // 선택 삭제이면
{
$sel_count = count($_POST['ct_chk']);
if(!$sel_count) {
@ -57,7 +57,7 @@ else if ($w == 'seldelete') // 선택 삭제이면
sql_query($sql);
}
}
else if($w == 'selectedbuy') // 선택주문이면
else if($act == 'selectedbuy') // 선택주문이면
{
$chk_count = count($_POST['ct_chk']);
if(!$chk_count)
@ -84,14 +84,14 @@ else if($w == 'selectedbuy') // 선택주문이면
if ($is_member)
{
goto_url("{$g4['shop_url']}/orderform.php?w=selectedbuy");
goto_url(G4_SHOP_URL."/orderform.php?act=$act");
}
else
{
goto_url("{$g4['url']}/{$g4['bbs']}/login.php?url=".urlencode("{$g4['shop_path']}/orderform.php?w=selectedbuy"));
goto_url(G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL."/orderform.php?act=$act"));
}
}
else if ($w == 'allupdate') // 수량 변경이면 : 모두 수정이면
else if ($act == 'allupdate') // 수량 변경이면 : 모두 수정이면
{
$fldcnt = count($_POST['ct_id']);
@ -316,15 +316,15 @@ if ($sw_direct)
{
if ($is_member)
{
goto_url("{$g4['shop_url']}/orderform.php?sw_direct=$sw_direct");
goto_url(G4_SHOP_URL."/orderform.php?sw_direct=$sw_direct");
}
else
{
goto_url("{$g4['url']}/{$g4['bbs']}/login.php?url=".urlencode("{$g4['shop_path']}/orderform.php?sw_direct=$sw_direct"));
goto_url(G4_BBS_URL."/login.php?url=".urlencode(G4_SHOP_URL."/orderform.php?sw_direct=$sw_direct"));
}
}
else
{
goto_url("{$g4['shop_url']}/cart.php");
goto_url(G4_SHOP_URL."/cart.php");
}
?>

10
skin/board/neo/view.skin.php
View File

@ -5,20 +5,14 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p id="bo_v_title"><strong><?=$board['bo_subject']?></strong></p>
<div id="bo_v">
<h1 id="bo_v_h1"><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
<h1 id="bo_v_h1"><? if ($is_category) { ?> <?=($category_name ? "{$view['ca_name']} " : "");?><? } ?><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
<section id="bo_v_info">
<h2>게시물 정보</h2>
<? if ($is_category) { ?>
<span class="sound_only">분류</span>
<?=($category_name ? "{$view['ca_name']} " : "");?>
<? } ?>
<span class="sound_only">작성자</span>
작성자
<?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?>
<span class="sound_only">작성일</span>
<?=date("y-m-d H:i", strtotime($view['wr_datetime']))?>
<span class="sound_only">아이피</span>
<?=$view['wr_ip']?>
조회
<?=number_format($view['wr_hit'])?>회
댓글