diff --git a/adm/admin.menu100.php b/adm/admin.menu100.php index d65cb8fbf..0c8edbb8c 100644 --- a/adm/admin.menu100.php +++ b/adm/admin.menu100.php @@ -9,6 +9,7 @@ $menu['menu100'] = array ( array('100900', '캐쉬파일 일괄삭제',G4_ADMIN_URL.'/cache_file_delete.php', 'cf_cache', 1), array('100910', '캡챠파일 일괄삭제',G4_ADMIN_URL.'/gcaptcha_file_delete.php', 'cf_captcha', 1), array('100920', '썸네일파일 일괄삭제',G4_ADMIN_URL.'/thumbnail_file_delete.php', 'cf_thumbnail', 1), + array('100930', '네이버 신디케이션 핑',G4_SYNDI_URL.'/ping.php', 'cf_syndi_ping', 1), array('100500', 'phpinfo()', G4_ADMIN_URL.'/phpinfo.php', 'cf_phpinfo'), //array('100600', '업그레이드', G4_ADMIN_URL.'/upgrade.php', 'cf_upgrade'), //array('100700', '복구/최적화', G4_ADMIN_URL.'/repair.php', 'cf_repair'), diff --git a/css/admin.css b/css/admin.css index a678a4d8e..d2458c1d9 100644 --- a/css/admin.css +++ b/css/admin.css @@ -419,7 +419,7 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f .sort_odr {float:left;margin:0 0 10px;padding-left:1px;list-style:none;zoom:1} .sort_odr:after {display:block;visibility:hidden;clear:both;content:""} .sort_odr li {float:left;margin-bottom:-1px} -.sort_odr a {display:block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} +.sort_odr a {display:inline-block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} .sort_odr a:focus, .sort_odr a:hover, .sort_odr a:active {text-decoration:none} .sort_with {float:right} @@ -435,6 +435,7 @@ table {clear:both;margin-bottom:10px;width:100%;border-collapse:collapse;border- caption {padding:10px 0 15px;font-weight:bold;text-align:left} thead th {padding:12px 0 8px;border-bottom:1px solid #666;background:#565e60;color:#fff} thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ +thead a {color:#fff} tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all} diff --git a/css/default_shop.css b/css/default_shop.css index 4ab2ba3c0..e668e2d11 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -665,6 +665,9 @@ td.empty_table {padding:85px 0;text-align:center} #sod_frm {} #sod_frm h2 {margin:0 0 10px} +#display_setup_message {padding:15px;border:1px solid #fccdff;background:#ffeef9} +#display_setup_message strong {display:block;margin:0 0 10px} + #sod_list {position:relative} #sod_list #it_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll;overflow-x:none} diff --git a/js/shop.js b/js/shop.js index caaf177a3..b16ebf6da 100644 --- a/js/shop.js +++ b/js/shop.js @@ -3,6 +3,23 @@ var supply_add = false; $(function() { // 선택옵션 + /* 가상서커 ctrl keyup 이베트 대응 */ + $("select[name='it_option[]']").live("keyup", function(e) { + var sel_count = $("select[name='it_option[]']").size(); + var idx = $("select[name='it_option[]']").index($(this)); + var code = e.keyCode; + var val = $(this).val(); + + option_add = false; + if(code == 17 && sel_count == idx + 1) { + if(val == "") + return; + + sel_option_process(true); + } + }); + + /* 키보드 접근 후 옵션 선택 Enter keydown 이벤트 대응 */ $("select[name='it_option[]']").live("keydown", function(e) { var sel_count = $("select[name='it_option[]']").size(); var idx = $("select[name='it_option[]']").index($(this)); @@ -82,6 +99,22 @@ $(function() { }); // 추가옵션 + /* 가상서커 ctrl keyup 이베트 대응 */ + $("select[name='it_supply[]']").live("keyup", function(e) { + var $el = $(this); + var code = e.keyCode; + var val = $(this).val(); + + supply_add = false; + if(code == 17) { + if(val == "") + return; + + sel_supply_process($el, true); + } + }); + + /* 키보드 접근 후 옵션 선택 Enter keydown 이벤트 대응 */ $("select[name='it_supply[]']").live("keydown", function(e) { var $el = $(this); var code = e.keyCode; diff --git a/plugin/syndi/ping.php b/plugin/syndi/ping.php new file mode 100644 index 000000000..5c2169d9a --- /dev/null +++ b/plugin/syndi/ping.php @@ -0,0 +1,61 @@ += 0) +{ + date_default_timezone_set(@date_default_timezone_get()); +} + +error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT); + +$syndi_path = dirname(__FILE__); + +include $syndi_path . '/config/site.config.php'; + +$sql = " select bo_table from " . $g4['board_table'] . " b, ". $g4['group_table'] . " g where b.bo_read_level=1 and b.bo_list_level=1 and g.gr_use_access=0 and g.gr_id = b.gr_id order by b.gr_id, b.bo_table limit 1 "; +$channel = sql_fetch($sql); + +$sql = " select wr_id from {$g4['write_prefix']}{$channel['bo_table']} where wr_is_comment = 0 order by wr_num, wr_reply desc limit 1 "; +$article = sql_fetch($sql); +?> + + + + + +네이버 신디케이션 핑 + + + + +

네이버 신디케이션 핑 (Naver Syndication PING)

+ + + + + diff --git a/shop/orderform.php b/shop/orderform.php index 745b2bed0..0f99e7900 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -157,6 +157,13 @@ function get_intall_file() } + +

+ 결제안내 + 결제를 하시려면 상단의 노란색 표시줄을 클릭하시거나, [수동설치]를 눌러 Payplus Plug-in을 설치하시기 바랍니다.
+ [수동설치]를 눌러 설치하신 경우 새로고침(F5)키를 눌러 진행하시기 바랍니다. +

+

주문하실 상품을 확인하세요.

@@ -938,6 +945,7 @@ function get_intall_file() ?> +<<<<<<< HEAD

결제를 계속 하시려면 상단의 노란색 표시줄을 클릭하시거나 [수동설치]를 눌러 다운로드 된 Payplus Plug-in을 설치하시기 바랍니다.
@@ -946,6 +954,8 @@ function get_intall_file() 브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.

+======= +>>>>>>> 225fa4a75dd51016367658455d6c416890c90b64