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

2013-12-24 10:33:34 +09:00
parent c9b42d3b97 d4b5d9ee15
commit 634bf960e7
13 changed files with 24 additions and 5 deletions
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@ -311,9 +311,6 @@ class item_list

        }

-        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
-        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
-
        if ($this->is_mobile) {
            $file = G5_MSHOP_SKIN_PATH."/{$this->list_skin}";
        } else {
--- a/mobile/skin/shop/basic/item.form.skin.php
+++ b/mobile/skin/shop/basic/item.form.skin.php
@ -388,7 +388,7 @@ $(function(){
            return false;
        },
        threshold: 100,
-        excludedElements:"button, input, select, textarea, .noSwipe, div#sit_more",
+        excludedElements:"button, input, select, textarea, .noSwipe, div#sit_more, div#sit_star_sns",
        allowPageScroll:"vertical"
    };

--- a/mobile/skin/shop/basic/list.10.skin.php
+++ b/mobile/skin/shop/basic/list.10.skin.php
@ -71,6 +71,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
    }

    if ($this->view_sns) {
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_twt.png');
--- a/mobile/skin/shop/basic/main.10.skin.php
+++ b/mobile/skin/shop/basic/main.10.skin.php
@ -71,6 +71,8 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
    }

    if ($this->view_sns) {
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_MSHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/list.10.skin.php
+++ b/skin/shop/basic/list.10.skin.php
@ -79,6 +79,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {

    if ($this->view_sns) {
        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/list.20.skin.php
+++ b/skin/shop/basic/list.20.skin.php
@ -78,6 +78,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
    }

    if ($this->view_sns) {
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
@ -92,4 +94,4 @@ if ($i > 1) echo "</ul>\n";

 if($i == 1) echo "<p class=\"sct_noitem\">등록된 상품이 없습니다.</p>\n";
 ?>
-<!-- } 상품진열 20 끝 -->
+<!-- } 상품진열 20 끝 -->
--- a/skin/shop/basic/list.30.skin.php
+++ b/skin/shop/basic/list.30.skin.php
@ -87,6 +87,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
    }

    if ($this->view_sns) {
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/list.40.skin.php
+++ b/skin/shop/basic/list.40.skin.php
@ -89,6 +89,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {
    }

    if ($this->view_sns) {
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/main.10.skin.php
+++ b/skin/shop/basic/main.10.skin.php
@ -79,6 +79,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {

    if ($this->view_sns) {
        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/main.20.skin.php
+++ b/skin/shop/basic/main.20.skin.php
@ -93,6 +93,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {

    if ($this->view_sns) {
        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/main.30.skin.php
+++ b/skin/shop/basic/main.30.skin.php
@ -89,6 +89,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {

    if ($this->view_sns) {
        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/main.40.skin.php
+++ b/skin/shop/basic/main.40.skin.php
@ -93,6 +93,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {

    if ($this->view_sns) {
        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');
--- a/skin/shop/basic/main.50.skin.php
+++ b/skin/shop/basic/main.50.skin.php
@ -92,6 +92,8 @@ for ($i=1; $row=sql_fetch_array($result); $i++) {

    if ($this->view_sns) {
        $sns_top = $this->img_height + 10;
+        $sns_url  = G5_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+        $sns_title = get_text($row['it_name']).' | '.get_text($config['cf_title']);
        echo "<div class=\"sct_sns\" style=\"top:{$sns_top}px\">";
        echo get_sns_share_link('facebook', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_fb.png');
        echo get_sns_share_link('twitter', $sns_url, $sns_title, G5_SHOP_SKIN_URL.'/img/sns_twt.png');