Merge branch 'master' of github.com:gnuboard/yc5 into orderlist

css/default.css

@@ -138,7 +138,7 @@ fieldset .btn_submit {height:22px;font-size:1em}
 .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 .btn_cancel:focus, .btn_cancel:hover {text-decoration:none !important}
-.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 button.btn_frmline {font-size:1em}
 .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
 .btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer}

js/iteminfoimageresize.js

@@ -0,0 +1,44 @@
+(function($) {
+    $.fn.iteminfoimageresize = function(selector)
+    {
+        var cfg = {
+                selector: "img"
+            };
+
+        if(typeof selector == "object") {
+            cfg = $.extend(cfg, selector);
+        } else {
+            if(selector) {
+                cfg = $.extend({ selector: selector });
+            }
+        }
+
+        var $img = this.find(cfg.selector);
+        var $this = this;
+
+        function image_resize()
+        {
+            var width = $this.width();
+
+            $img.each(function() {
+                $(this).removeAttr("width")
+                       .removeAttr("height")
+                       .css("width","")
+                       .css("height", "");
+
+                if($(this).data("width") == undefined)
+                    $(this).data("width", $(this).width());
+
+                if($(this).data("width") > width) {
+                    $(this).css("width", "100%");
+                }
+            });
+        }
+
+        $(window).on("resize", function() {
+            image_resize();
+        });
+
+        image_resize();
+    }
+}(jQuery));

js/jquery.floatmenu.js

@@ -52,10 +52,10 @@
         {
             hide_menu();
 
-            origin_y = $("body").scrollTop();
+            origin_y = $(window).scrollTop();
 
             timeout = setTimeout(function() {
-                scroll_y = $("body").scrollTop();
+                scroll_y = $(window).scrollTop();
 
                 if(origin_y == scroll_y) {
                     $menu.css("top", (scroll_y - height)+"px").css("display", "block");
@@ -87,10 +87,10 @@
                 interval_count++;
             }
 
-            origin_y = $("body").scrollTop();
+            origin_y = $(window).scrollTop();
 
             timeout = setTimeout(function() {
-                scroll_y = $("body").scrollTop();
+                scroll_y = $(window).scrollTop();
 
                 if(origin_y == scroll_y) {
                     element_y = parseInt($menu.css("top"));
@@ -164,7 +164,7 @@
             hide_menu();
 
             timeout = setTimeout(function() {
-                scroll_y = $("body").scrollTop();
+                scroll_y = $(window).scrollTop();
                 w_height = $(window).height();
                 element_y = scroll_y + w_height;
                 $menu.css("top", element_y+"px").css("display", "block");
@@ -176,10 +176,10 @@
         {
             hide_menu();
 
-            origin_y = $("body").scrollTop();
+            origin_y = $(window).scrollTop();
 
             timeout = setTimeout(function() {
-                scroll_y = $("body").scrollTop();
+                scroll_y = $(window).scrollTop();
 
                 if(origin_y == scroll_y) {
                     w_height = $(window).height();
@@ -222,10 +222,10 @@
                 interval_count++;
             }
 
-            origin_y = $("body").scrollTop();
+            origin_y = $(window).scrollTop();
 
             timeout = setTimeout(function() {
-                scroll_y = $("body").scrollTop();
+                scroll_y = $(window).scrollTop();
 
                 if(origin_y == scroll_y) {
                     w_height = $(window).height();

js/viewimageresize.js

@@ -14,10 +14,12 @@
         }
 
         var $img = this.find(cfg.selector);
-        var width = this.width();
+        var $this = this;
 
         function image_resize()
         {
+            var width = $this.width();
+
             $img.each(function() {
                 $(this).removeAttr("width")
                        .removeAttr("height")

lib/common.lib.php

@@ -1879,7 +1879,12 @@ function convert_charset($from_charset, $to_charset, $str)
 function escape_trim($field)
 {
     if ($field) {
-        return mysql_real_escape_string(@trim($field));
+        $str = mysql_real_escape_string(@trim($field));
+
+        if(PHP_VERSION < '5.3.0')
+            $str = stripslashes($str);
+
+        return $str;
     }
 }
 

mobile/skin/shop/basic/itemqa.skin.php

@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_MSHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 상품문의 목록 시작 { -->
 <section id="sit_qa_list">
@@ -110,7 +111,12 @@ $(function(){
             $con.slideUp();
         } else {
             $(".sit_qa_con:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
         }
     });
 

mobile/skin/shop/basic/itemqalist.skin.php

@@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_MSHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 전체 상품 문의 목록 시작 { -->
 <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
@@ -111,7 +112,12 @@ $(function(){
         } else {
             $(".sqa_con_btn button").text("보기");
             $("div[id^=sqa_con]:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
             $(this).text("닫기");
         }
     });

mobile/skin/shop/basic/itemuse.skin.php

@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_MSHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 상품 사용후기 시작 { -->
 <section id="sit_use_list">
@@ -28,7 +29,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     ?>
 
         <li class="sit_use_li">
-            <button type="button" class="sit_use_li_title" onclick="javascript:qa_menu('sit_use_con_<?php echo $i; ?>')"><b><?php echo $is_num; ?>.</b> <?php echo $is_subject; ?></button>
+            <button type="button" class="sit_use_li_title"><b><?php echo $is_num; ?>.</b> <?php echo $is_subject; ?></button>
             <dl class="sit_use_dl">
                 <dt>작성자</dt>
                 <dd><?php echo $is_name; ?></dd>
@@ -90,7 +91,12 @@ $(function(){
             $con.slideUp();
         } else {
             $(".sit_use_con:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
         }
     });
 

mobile/skin/shop/basic/itemuselist.skin.php

@@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_MSHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 전체 상품 사용후기 목록 시작 { -->
 <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
@@ -91,7 +92,12 @@ $(function(){
         } else {
             $(".sps_con_btn button").text("보기");
             $("div[id^=sps_con]:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
             $(this).text("닫기");
         }
     });

skin/board/basic/style.css

@@ -26,7 +26,7 @@
 #bo_w .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 #bo_w button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 #bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {text-decoration:none !important}
-#bo_w .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+#bo_w a.btn_frmline, #bo_w button.btn_frmline,  {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 #bo_w button.btn_frmline {font-size:1em}
 
 /* 기본 테이블 */

skin/board/gallery/style.css

@@ -26,7 +26,7 @@
 #bo_w .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 #bo_w button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 #bo_w .btn_cancel:focus, #bo_w .btn_cancel:hover {text-decoration:none !important}
-#bo_w .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+#bo_w a.btn_frmline, #bo_w button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 #bo_w button.btn_frmline {font-size:1em}
 
 /* 기본 테이블 */

skin/member/basic/style.css

@@ -13,7 +13,7 @@
 .mbskin .btn_cancel {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 .mbskin button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px solid #ccc;background:#fafafa;line-height:2em}
 .mbskin .btn_cancel:focus, .mbskin .btn_cancel:hover {text-decoration:none !important}
-.mbskin .btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
+.mbskin a.btn_frmline, .mbskin button.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
 .mbskin button.btn_frmline {font-size:1em}
 .mbskin .btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
 .mbskin .btn_win button {display:inline-block;padding:0 10px;height:30px;border:0;background:#666;color:#fff;vertical-align:top;line-height:2em;cursor:pointer}

skin/shop/basic/itemqa.skin.php

@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 상품문의 목록 시작 { -->
 <section id="sit_qa_list">
@@ -110,7 +111,12 @@ $(function(){
             $con.slideUp();
         } else {
             $(".sit_qa_con:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
         }
     });
 

skin/shop/basic/itemqalist.skin.php

@@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 전체 상품 문의 목록 시작 { -->
 
@@ -112,7 +113,12 @@ $(function(){
         } else {
             $(".sqa_con_btn button").text("보기");
             $("div[id^=sqa_con]:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
             $(this).text("닫기");
         }
     });

skin/shop/basic/itemuse.skin.php

@@ -3,6 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 상품 사용후기 시작 { -->
 <section id="sit_use_list">
@@ -89,7 +90,12 @@ $(function(){
             $con.slideUp();
         } else {
             $(".sit_use_con:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
         }
     });
 

skin/shop/basic/itemuselist.skin.php

@@ -3,6 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 ?>
 
 <link rel="stylesheet" href="<?php echo G5_SHOP_SKIN_URL; ?>/style.css">
+<script src="<?php echo G5_JS_URL; ?>/iteminfoimageresize.js"></script>
 
 <!-- 전체 상품 사용후기 목록 시작 { -->
 <form method="get" action="<?php echo $_SERVER['PHP_SELF']; ?>">
@@ -90,7 +91,12 @@ $(function(){
         } else {
             $(".sps_con_btn button").text("보기");
             $("div[id^=sps_con]:visible").hide();
-            $con.slideDown();
+            $con.slideDown(
+                function() {
+                    // 이미지 리사이즈
+                    $con.iteminfoimageresize();
+                }
+            );
             $(this).text("닫기");
         }
     });