diff --git a/.gitignore b/.gitignore
index 4bc4f406c..c99264668 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,9 @@
-<<<<<<< HEAD
dbconfig.php
log
.htaccess
data
-=======
/.htaccess
data/
->>>>>>> g5
test
config.php
sirgle
@@ -16,16 +13,9 @@ skin/latest/basic2
rankiss*
thumb.lib.php
test.php
-<<<<<<< HEAD
-g4s_tree
-=======
->>>>>>> g5
itzimara*
nemoluv*
cheditor*
*.key
-<<<<<<< HEAD
g5_tree
-=======
*.sh
->>>>>>> g5
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index 9519d301e..a68b3f3a9 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -629,4 +629,8 @@ td.empty_table {padding:5em 0;text-align:center}
.pg_page, .qa_page {background:#f9f9f9;text-decoration:none}
.pg_start, .pg_prev, .qa_start, .qa_prev {border-right:1px solid #cfded8}
.pg_end, .pg_next, .qa_end, .qa_next {border-left:1px solid #cfded8}
-.pg_current {background:#333;color:#fff;font-weight:bold}
\ No newline at end of file
+.pg_current {background:#333;color:#fff;font-weight:bold}
+
+/* 상품상세 메뉴 floating */
+#info_top_layer {display:none;position:absolute; top:0; left:0; width:100%; background-color: #eee;}
+#form_btn_layer { display:none;position:absolute; top:0; left: 0; width: 100%; height: 60px; background-color: #eee;}
\ No newline at end of file
diff --git a/js/shop.mobile.list.js b/js/jquery.fancylist.js
similarity index 94%
rename from js/shop.mobile.list.js
rename to js/jquery.fancylist.js
index 5d7bd7050..19149bc6f 100644
--- a/js/shop.mobile.list.js
+++ b/js/jquery.fancylist.js
@@ -1,9 +1,9 @@
(function($) {
- $.fn.itemList = function(element, clear)
+ $.fn.fancyList = function(element, clear)
{
var cfg = {
- element: "li.sct_li",
- clear: "sct_clear"
+ element: "li",
+ clear: "clear"
};
if(typeof element == "object")
diff --git a/js/jquery.floatmenu.js b/js/jquery.floatmenu.js
new file mode 100644
index 000000000..b176ebe69
--- /dev/null
+++ b/js/jquery.floatmenu.js
@@ -0,0 +1,172 @@
+(function($) {
+ $.fn.topFloatMenu = function(timeout, duration)
+ {
+ var cfg = {
+ timeout: 300,
+ duration: 300
+ };
+
+ if(typeof timeout == "object") {
+ cfg = $.extend( cfg, timeout);
+ } else {
+ if(timeout) {
+ cfg = $.extend({ timeout: timeout });
+ }
+
+ if(duration) {
+ cfg = $.extend({ duration: duration });
+ }
+ }
+
+ var $menu = this;
+ var scroll_y = 0;
+ var timeout = null;
+ var height = parseInt($menu.height());
+ var move_timeout = null;
+
+ function init_menu()
+ {
+ hide_menu();
+
+ timeout = setTimeout(function() {
+ $menu.css("top", (scroll_y - height)+"px").css("display", "block");
+ $menu.animate({ top: scroll_y }, cfg.duration);
+
+ return;
+ }, cfg.timeout);
+ }
+
+ function float_menu()
+ {
+ hide_menu();
+
+ timeout = setTimeout(function() {
+ scroll_y = parseInt(document.body.scrollTop);
+ $menu.css("top", (scroll_y - height)+"px").css("display", "block");
+ $menu.animate({ top: scroll_y }, cfg.duration);
+
+ return;
+ }, cfg.timeout);
+ }
+
+ function hide_menu()
+ {
+ clearTimeout(timeout);
+ $menu.clearQueue().stop().hide().css("top", "-"+height+"px");
+ }
+
+ $(window).on("scroll",function(event) {
+ float_menu();
+ });
+
+ $(window).on("resize", function(event) {
+ $(window).trigger("scroll");
+ });
+
+ $(window).on("load", function(event) {
+ init_menu();
+ });
+
+ $(window).on("touchstart", function(event) {
+ hide_menu();
+ });
+
+ if(navigator.userAgent.toLowerCase().indexOf("android") > -1) {
+ $(window).on("touchend", function(event) {
+ $(window).trigger("scroll");
+ });
+ }
+ }
+
+ $.fn.bottomFloatMenu = function(timeout, duration)
+ {
+ var cfg = {
+ timeout: 300,
+ duration: 300
+ };
+
+ if(typeof timeout == "object") {
+ cfg = $.extend( cfg, timeout);
+ } else {
+ if(timeout) {
+ cfg = $.extend({ timeout: timeout });
+ }
+
+ if(duration) {
+ cfg = $.extend({ duration: duration });
+ }
+ }
+
+ var $menu = this;
+ var scroll_y = 0;
+ var move_y = 0;
+ var element_y = 0;
+ var top_pos = 0;
+ var timeout = null;
+ var height = parseInt($menu.height());
+ var w_height = 0;
+
+ function init_menu()
+ {
+ hide_menu();
+
+ timeout = setTimeout(function() {
+ scroll_y = parseInt(document.body.scrollTop);
+ w_height = $(window).height();
+ element_y = scroll_y + w_height;
+ $menu.css("top", element_y+"px").css("display", "block");
+ $menu.clearQueue().stop().animate({ top: "-="+height }, cfg.duration);
+ }, cfg.timeout);
+ }
+
+ function float_menu()
+ {
+ hide_menu();
+
+ w_height = $(window).height();
+ scroll_y = parseInt(document.body.scrollTop);
+ element_y = scroll_y + w_height;
+
+ if (/iP(hone|od|ad)/.test(navigator.platform)) {
+ if(window.innerHeight - $(window).outerHeight(true) > 0)
+ element_y += (window.innerHeight - $(window).outerHeight(true));
+ }
+
+ timeout = setTimeout(function() {
+ $menu.height(0).css("top", element_y+"px").css("display", "block");
+ $menu.animate({
+ top: "-="+height,
+ height: "+="+height
+ }, cfg.duration);
+ }, cfg.timeout);
+ }
+
+ function hide_menu()
+ {
+ clearTimeout(timeout);
+ $menu.css("top", (w_height + height)+"px").clearQueue().stop().css("display", "none");
+ }
+
+ $(window).on("scroll",function(event) {
+ float_menu();
+ });
+
+ $(window).on("load", function(event) {
+ init_menu();
+ });
+
+ $(window).on("resize", function(event) {
+ $(window).trigger("scroll");
+ });
+
+ $(window).on("touchstart", function(event) {
+ hide_menu();
+ });
+
+ if(navigator.userAgent.toLowerCase().indexOf("android") > -1) {
+ $(window).on("touchend", function(event) {
+ $(window).trigger("scroll");
+ });
+ }
+ }
+}(jQuery));
\ No newline at end of file
diff --git a/mobile/shop/iteminfo.php b/mobile/shop/iteminfo.php
index 9d9a5792a..e6d4f65c1 100644
--- a/mobile/shop/iteminfo.php
+++ b/mobile/shop/iteminfo.php
@@ -64,7 +64,17 @@ function pg_anchor($info) {
+
+
+
+
상품 정보
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php
index b18032b30..2843b7dc5 100644
--- a/mobile/skin/shop/basic/item.form.skin.php
+++ b/mobile/skin/shop/basic/item.form.skin.php
@@ -39,6 +39,7 @@ if ($row['it_id']) {
?>