Index: /branches/version-2_13-dev/html/user_data/packages/admin/css/admin_contents.css
===================================================================
--- /branches/version-2_13-dev/html/user_data/packages/admin/css/admin_contents.css	(revision 22789)
+++ /branches/version-2_13-dev/html/user_data/packages/admin/css/admin_contents.css	(revision 23138)
@@ -1079,4 +1079,16 @@
 /* 基本情報管理
 ----------------------------------------------- */
+/* SHOPマスター */
+#maparea {
+    padding: 30px;
+    background: #FFFFFF;
+}
+#maparea .btn-area {
+    text-align: center;
+}
+#maps {
+    margin: 0 auto 1em;
+}
+
 /* 郵便番号DB登録 */
 .basis-zip-item {
Index: /branches/version-2_13-dev/html/js/eccube.js
===================================================================
--- /branches/version-2_13-dev/html/js/eccube.js	(revision 23136)
+++ /branches/version-2_13-dev/html/js/eccube.js	(revision 23138)
@@ -564,4 +564,7 @@
             );
         });
+
+        // モーダルウィンドウ
+        $("a.expansion").colorbox();
     });
 })(window);
Index: /branches/version-2_13-dev/html/js/jquery.colorbox/jquery.colorbox-min.js
===================================================================
--- /branches/version-2_13-dev/html/js/jquery.colorbox/jquery.colorbox-min.js	(revision 23138)
+++ /branches/version-2_13-dev/html/js/jquery.colorbox/jquery.colorbox-min.js	(revision 23138)
@@ -0,0 +1,7 @@
+/*!
+	Colorbox v1.4.27 - 2013-07-16
+	jQuery lightbox and modal window plugin
+	(c) 2013 Jack Moore - http://www.jacklmoore.com/colorbox
+	license: http://www.opensource.org/licenses/mit-license.php
+*/
+(function(t,e,i){function o(i,o,n){var r=e.createElement(i);return o&&(r.id=te+o),n&&(r.style.cssText=n),t(r)}function n(){return i.innerHeight?i.innerHeight:t(i).height()}function r(t){var e=E.length,i=(j+t)%e;return 0>i?e+i:i}function l(t,e){return Math.round((/%/.test(t)?("x"===e?H.width():n())/100:1)*parseInt(t,10))}function h(t,e){return t.photo||t.photoRegex.test(e)}function s(t,e){return t.retinaUrl&&i.devicePixelRatio>1?e.replace(t.photoRegex,t.retinaSuffix):e}function a(t){"contains"in v[0]&&!v[0].contains(t.target)&&(t.stopPropagation(),v.focus())}function d(){var e,i=t.data(A,Z);null==i?(O=t.extend({},Y),console&&console.log&&console.log("Error: cboxElement missing settings object")):O=t.extend({},i);for(e in O)t.isFunction(O[e])&&"on"!==e.slice(0,2)&&(O[e]=O[e].call(A));O.rel=O.rel||A.rel||t(A).data("rel")||"nofollow",O.href=O.href||t(A).attr("href"),O.title=O.title||A.title,"string"==typeof O.href&&(O.href=t.trim(O.href))}function c(i,o){t(e).trigger(i),se.trigger(i),t.isFunction(o)&&o.call(A)}function u(){var t,e,i,o,n,r=te+"Slideshow_",l="click."+te;O.slideshow&&E[1]?(e=function(){clearTimeout(t)},i=function(){(O.loop||E[j+1])&&(t=setTimeout(J.next,O.slideshowSpeed))},o=function(){R.html(O.slideshowStop).unbind(l).one(l,n),se.bind(ne,i).bind(oe,e).bind(re,n),v.removeClass(r+"off").addClass(r+"on")},n=function(){e(),se.unbind(ne,i).unbind(oe,e).unbind(re,n),R.html(O.slideshowStart).unbind(l).one(l,function(){J.next(),o()}),v.removeClass(r+"on").addClass(r+"off")},O.slideshowAuto?o():n()):v.removeClass(r+"off "+r+"on")}function p(i){G||(A=i,d(),E=t(A),j=0,"nofollow"!==O.rel&&(E=t("."+ee).filter(function(){var e,i=t.data(this,Z);return i&&(e=t(this).data("rel")||i.rel||this.rel),e===O.rel}),j=E.index(A),-1===j&&(E=E.add(A),j=E.length-1)),g.css({opacity:parseFloat(O.opacity),cursor:O.overlayClose?"pointer":"auto",visibility:"visible"}).show(),V&&v.add(g).removeClass(V),O.className&&v.add(g).addClass(O.className),V=O.className,O.closeButton?P.html(O.close).appendTo(x):P.appendTo("<div/>"),$||($=q=!0,v.css({visibility:"hidden",display:"block"}),W=o(ae,"LoadedContent","width:0; height:0; overflow:hidden"),x.css({width:"",height:""}).append(W),_=b.height()+k.height()+x.outerHeight(!0)-x.height(),D=T.width()+C.width()+x.outerWidth(!0)-x.width(),N=W.outerHeight(!0),z=W.outerWidth(!0),O.w=l(O.initialWidth,"x"),O.h=l(O.initialHeight,"y"),J.position(),u(),c(ie,O.onOpen),B.add(S).hide(),v.focus(),O.trapFocus&&e.addEventListener&&(e.addEventListener("focus",a,!0),se.one(le,function(){e.removeEventListener("focus",a,!0)})),O.returnFocus&&se.one(le,function(){t(A).focus()})),w())}function f(){!v&&e.body&&(X=!1,H=t(i),v=o(ae).attr({id:Z,"class":t.support.opacity===!1?te+"IE":"",role:"dialog",tabindex:"-1"}).hide(),g=o(ae,"Overlay").hide(),L=t([o(ae,"LoadingOverlay")[0],o(ae,"LoadingGraphic")[0]]),y=o(ae,"Wrapper"),x=o(ae,"Content").append(S=o(ae,"Title"),M=o(ae,"Current"),K=t('<button type="button"/>').attr({id:te+"Previous"}),I=t('<button type="button"/>').attr({id:te+"Next"}),R=o("button","Slideshow"),L),P=t('<button type="button"/>').attr({id:te+"Close"}),y.append(o(ae).append(o(ae,"TopLeft"),b=o(ae,"TopCenter"),o(ae,"TopRight")),o(ae,!1,"clear:left").append(T=o(ae,"MiddleLeft"),x,C=o(ae,"MiddleRight")),o(ae,!1,"clear:left").append(o(ae,"BottomLeft"),k=o(ae,"BottomCenter"),o(ae,"BottomRight"))).find("div div").css({"float":"left"}),F=o(ae,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),B=I.add(K).add(M).add(R),t(e.body).append(g,v.append(y,F)))}function m(){function i(t){t.which>1||t.shiftKey||t.altKey||t.metaKey||t.ctrlKey||(t.preventDefault(),p(this))}return v?(X||(X=!0,I.click(function(){J.next()}),K.click(function(){J.prev()}),P.click(function(){J.close()}),g.click(function(){O.overlayClose&&J.close()}),t(e).bind("keydown."+te,function(t){var e=t.keyCode;$&&O.escKey&&27===e&&(t.preventDefault(),J.close()),$&&O.arrowKey&&E[1]&&!t.altKey&&(37===e?(t.preventDefault(),K.click()):39===e&&(t.preventDefault(),I.click()))}),t.isFunction(t.fn.on)?t(e).on("click."+te,"."+ee,i):t("."+ee).live("click."+te,i)),!0):!1}function w(){var n,r,a,u=J.prep,p=++de;q=!0,U=!1,A=E[j],d(),c(he),c(oe,O.onLoad),O.h=O.height?l(O.height,"y")-N-_:O.innerHeight&&l(O.innerHeight,"y"),O.w=O.width?l(O.width,"x")-z-D:O.innerWidth&&l(O.innerWidth,"x"),O.mw=O.w,O.mh=O.h,O.maxWidth&&(O.mw=l(O.maxWidth,"x")-z-D,O.mw=O.w&&O.w<O.mw?O.w:O.mw),O.maxHeight&&(O.mh=l(O.maxHeight,"y")-N-_,O.mh=O.h&&O.h<O.mh?O.h:O.mh),n=O.href,Q=setTimeout(function(){L.show()},100),O.inline?(a=o(ae).hide().insertBefore(t(n)[0]),se.one(he,function(){a.replaceWith(W.children())}),u(t(n))):O.iframe?u(" "):O.html?u(O.html):h(O,n)?(n=s(O,n),U=e.createElement("img"),t(U).addClass(te+"Photo").bind("error",function(){O.title=!1,u(o(ae,"Error").html(O.imgError))}).one("load",function(){var e;p===de&&(U.alt=t(A).attr("alt")||t(A).attr("data-alt")||"",O.retinaImage&&i.devicePixelRatio>1&&(U.height=U.height/i.devicePixelRatio,U.width=U.width/i.devicePixelRatio),O.scalePhotos&&(r=function(){U.height-=U.height*e,U.width-=U.width*e},O.mw&&U.width>O.mw&&(e=(U.width-O.mw)/U.width,r()),O.mh&&U.height>O.mh&&(e=(U.height-O.mh)/U.height,r())),O.h&&(U.style.marginTop=Math.max(O.mh-U.height,0)/2+"px"),E[1]&&(O.loop||E[j+1])&&(U.style.cursor="pointer",U.onclick=function(){J.next()}),U.style.width=U.width+"px",U.style.height=U.height+"px",setTimeout(function(){u(U)},1))}),setTimeout(function(){U.src=n},1)):n&&F.load(n,O.data,function(e,i){p===de&&u("error"===i?o(ae,"Error").html(O.xhrError):t(this).contents())})}var g,v,y,x,b,T,C,k,E,H,W,F,L,S,M,R,I,K,P,B,O,_,D,N,z,A,j,U,$,q,G,Q,J,V,X,Y={transition:"elastic",speed:300,fadeOut:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,className:!1,retinaImage:!1,retinaUrl:!1,retinaSuffix:"@2x.$1",current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",open:!1,returnFocus:!0,trapFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",photoRegex:/\.(gif|png|jp(e|g|eg)|bmp|ico|webp)((#|\?).*)?$/i,onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:void 0,closeButton:!0},Z="colorbox",te="cbox",ee=te+"Element",ie=te+"_open",oe=te+"_load",ne=te+"_complete",re=te+"_cleanup",le=te+"_closed",he=te+"_purge",se=t("<a/>"),ae="div",de=0,ce={};t.colorbox||(t(f),J=t.fn[Z]=t[Z]=function(e,i){var o=this;if(e=e||{},f(),m()){if(t.isFunction(o))o=t("<a/>"),e.open=!0;else if(!o[0])return o;i&&(e.onComplete=i),o.each(function(){t.data(this,Z,t.extend({},t.data(this,Z)||Y,e))}).addClass(ee),(t.isFunction(e.open)&&e.open.call(o)||e.open)&&p(o[0])}return o},J.position=function(e,i){function o(){b[0].style.width=k[0].style.width=x[0].style.width=parseInt(v[0].style.width,10)-D+"px",x[0].style.height=T[0].style.height=C[0].style.height=parseInt(v[0].style.height,10)-_+"px"}var r,h,s,a=0,d=0,c=v.offset();if(H.unbind("resize."+te),v.css({top:-9e4,left:-9e4}),h=H.scrollTop(),s=H.scrollLeft(),O.fixed?(c.top-=h,c.left-=s,v.css({position:"fixed"})):(a=h,d=s,v.css({position:"absolute"})),d+=O.right!==!1?Math.max(H.width()-O.w-z-D-l(O.right,"x"),0):O.left!==!1?l(O.left,"x"):Math.round(Math.max(H.width()-O.w-z-D,0)/2),a+=O.bottom!==!1?Math.max(n()-O.h-N-_-l(O.bottom,"y"),0):O.top!==!1?l(O.top,"y"):Math.round(Math.max(n()-O.h-N-_,0)/2),v.css({top:c.top,left:c.left,visibility:"visible"}),y[0].style.width=y[0].style.height="9999px",r={width:O.w+z+D,height:O.h+N+_,top:a,left:d},e){var u=0;t.each(r,function(t){return r[t]!==ce[t]?(u=e,void 0):void 0}),e=u}ce=r,e||v.css(r),v.dequeue().animate(r,{duration:e||0,complete:function(){o(),q=!1,y[0].style.width=O.w+z+D+"px",y[0].style.height=O.h+N+_+"px",O.reposition&&setTimeout(function(){H.bind("resize."+te,J.position)},1),i&&i()},step:o})},J.resize=function(t){var e;$&&(t=t||{},t.width&&(O.w=l(t.width,"x")-z-D),t.innerWidth&&(O.w=l(t.innerWidth,"x")),W.css({width:O.w}),t.height&&(O.h=l(t.height,"y")-N-_),t.innerHeight&&(O.h=l(t.innerHeight,"y")),t.innerHeight||t.height||(e=W.scrollTop(),W.css({height:"auto"}),O.h=W.height()),W.css({height:O.h}),e&&W.scrollTop(e),J.position("none"===O.transition?0:O.speed))},J.prep=function(i){function n(){return O.w=O.w||W.width(),O.w=O.mw&&O.mw<O.w?O.mw:O.w,O.w}function l(){return O.h=O.h||W.height(),O.h=O.mh&&O.mh<O.h?O.mh:O.h,O.h}if($){var a,d="none"===O.transition?0:O.speed;W.empty().remove(),W=o(ae,"LoadedContent").append(i),W.hide().appendTo(F.show()).css({width:n(),overflow:O.scrolling?"auto":"hidden"}).css({height:l()}).prependTo(x),F.hide(),t(U).css({"float":"none"}),a=function(){function i(){t.support.opacity===!1&&v[0].style.removeAttribute("filter")}var n,l,a=E.length,u="frameBorder",p="allowTransparency";$&&(l=function(){clearTimeout(Q),L.hide(),c(ne,O.onComplete)},S.html(O.title).add(W).show(),a>1?("string"==typeof O.current&&M.html(O.current.replace("{current}",j+1).replace("{total}",a)).show(),I[O.loop||a-1>j?"show":"hide"]().html(O.next),K[O.loop||j?"show":"hide"]().html(O.previous),O.slideshow&&R.show(),O.preloading&&t.each([r(-1),r(1)],function(){var i,o,n=E[this],r=t.data(n,Z);r&&r.href?(i=r.href,t.isFunction(i)&&(i=i.call(n))):i=t(n).attr("href"),i&&h(r,i)&&(i=s(r,i),o=e.createElement("img"),o.src=i)})):B.hide(),O.iframe?(n=o("iframe")[0],u in n&&(n[u]=0),p in n&&(n[p]="true"),O.scrolling||(n.scrolling="no"),t(n).attr({src:O.href,name:(new Date).getTime(),"class":te+"Iframe",allowFullScreen:!0,webkitAllowFullScreen:!0,mozallowfullscreen:!0}).one("load",l).appendTo(W),se.one(he,function(){n.src="//about:blank"}),O.fastIframe&&t(n).trigger("load")):l(),"fade"===O.transition?v.fadeTo(d,1,i):i())},"fade"===O.transition?v.fadeTo(d,0,function(){J.position(0,a)}):J.position(d,a)}},J.next=function(){!q&&E[1]&&(O.loop||E[j+1])&&(j=r(1),p(E[j]))},J.prev=function(){!q&&E[1]&&(O.loop||j)&&(j=r(-1),p(E[j]))},J.close=function(){$&&!G&&(G=!0,$=!1,c(re,O.onCleanup),H.unbind("."+te),g.fadeTo(O.fadeOut||0,0),v.stop().fadeTo(O.fadeOut||0,0,function(){v.add(g).css({opacity:1,cursor:"auto"}).hide(),c(he),W.empty().remove(),setTimeout(function(){G=!1,c(le,O.onClosed)},1)}))},J.remove=function(){v&&(v.stop(),t.colorbox.close(),v.stop().remove(),g.remove(),G=!1,v=null,t("."+ee).removeData(Z).removeClass(ee),t(e).unbind("click."+te))},J.element=function(){return t(A)},J.settings=Y)})(jQuery,document,window);
Index: /branches/version-2_13-dev/html/js/jquery.colorbox/colorbox.css
===================================================================
--- /branches/version-2_13-dev/html/js/jquery.colorbox/colorbox.css	(revision 23138)
+++ /branches/version-2_13-dev/html/js/jquery.colorbox/colorbox.css	(revision 23138)
@@ -0,0 +1,49 @@
+/*
+    Colorbox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto; -webkit-overflow-scrolling: touch;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none; -ms-interpolation-mode:bicubic;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box; -moz-box-sizing:content-box; -webkit-box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of Colorbox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#fff;}
+#colorbox{outline:0;}
+    #cboxContent{margin-top:32px; overflow:visible; background:#000;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{background:#000; padding:1px;}
+        #cboxLoadingGraphic{background:url(./loading.gif) no-repeat center center;}
+        #cboxLoadingOverlay{background:#000;}
+        #cboxTitle{position:absolute; top:-22px; left:0; color:#000;}
+        #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;}
+
+        /* these elements are buttons, and may need to have additional styles reset to avoid unwanted base styles */
+        #cboxPrevious, #cboxNext, #cboxSlideshow, #cboxClose {border:0; padding:0; margin:0; overflow:visible; text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(./controls.png) no-repeat 0 0;}
+        
+        /* avoid outlines on :active (mouseclick), but preserve outlines on :focus (tabbed navigating) */
+        #cboxPrevious:active, #cboxNext:active, #cboxSlideshow:active, #cboxClose:active {outline:0;}
+
+        #cboxPrevious{background-position:0px 0px; right:44px;}
+        #cboxPrevious:hover{background-position:0px -25px;}
+        #cboxNext{background-position:-25px 0px; right:22px;}
+        #cboxNext:hover{background-position:-25px -25px;}
+        #cboxClose{background-position:-50px 0px; right:0;}
+        #cboxClose:hover{background-position:-50px -25px;}
+        .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}
+        .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
+        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-100px -25px;}
+        .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
+        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-75px -25px;}
Index: /branches/version-2_13-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/products/detail.tpl	(revision 23122)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/products/detail.tpl	(revision 23138)
@@ -21,6 +21,4 @@
  *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     // 規格2に選択肢を割り当てる。
@@ -32,10 +30,4 @@
         eccube.setClassCategories($form, product_id, $sele1, $sele2, classcat_id2_selected);
     }
-    $(document).ready(function() {
-        $('a.expansion').facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/closelabel.png'
-        });
-    });
 //]]></script>
 
Index: /branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl	(revision 23111)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl	(revision 23138)
@@ -42,4 +42,5 @@
 <link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
 <link rel="icon" type="image/vnd.microsoft.icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
+<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/colorbox.css" type="text/css" media="all" />
 <link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/import.css" type="text/css" media="all" />
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.HTTP_URL}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" />
@@ -49,4 +50,5 @@
     <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
 *}-->
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
 <!--{if $tpl_page_class_name === "LC_Page_Abouts"}-->
     <!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}-->
Index: /branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl	(revision 23122)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl	(revision 23138)
@@ -21,14 +21,4 @@
  *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.css" media="screen" />
-<script type="text/javascript">//<![CDATA[
-    $(document).ready(function() {
-        $("a.expansion").facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/loading.jpg',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/closelabel.png'
-        });
-    });
-//]]></script>
 <div id="undercolumn">
     <div id="undercolumn_shopping">
Index: /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 23122)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 23138)
@@ -21,6 +21,4 @@
  *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     var sent = false;
@@ -34,11 +32,4 @@
         return true;
     }
-
-    $(document).ready(function() {
-        $('a.expansion').facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/closelabel.png'
-        });
-    });
 //]]></script>
 
Index: /branches/version-2_13-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/default/cart/index.tpl	(revision 23122)
+++ /branches/version-2_13-dev/data/Smarty/templates/default/cart/index.tpl	(revision 23138)
@@ -20,15 +20,4 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.css" media="screen" />
-<script type="text/javascript">//<![CDATA[
-    $(document).ready(function() {
-        $('a.expansion').facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/closelabel.png'
-        });
-    });
-//]]></script>
 
 <div id="undercolumn">
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 23130)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 23138)
@@ -33,4 +33,5 @@
 <link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
 <link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_file_manager.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/colorbox.css" type="text/css" media="all" />
 <!--{if $tpl_mainno eq "basis" && $tpl_subno eq "index"}-->
 <!--{if ($smarty.server.HTTPS != "") && ($smarty.server.HTTPS != "off")}-->
@@ -41,5 +42,5 @@
 <!--{/if}-->
 <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script>
-    <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
 <script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script>
 <!--{* 従来のJavaScript関数が必要な場合は、コメントアウトを外してスクリプトファイルを読み込んでください。
@@ -47,4 +48,5 @@
     <script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script>
 *}-->
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
 <title><!--{$smarty.const.ADMIN_TITLE}--></title>
 <link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl	(revision 23066)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl	(revision 23138)
@@ -1,6 +1,2 @@
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
-
 <form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
Index: /branches/version-2_13-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 23129)
+++ /branches/version-2_13-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 23138)
@@ -23,7 +23,4 @@
 *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.fancybox/jquery.mousewheel-3.0.4.pack.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
 var map;
@@ -51,60 +48,58 @@
     });
 
-    $("a#mapAddress").fancybox({onStart: function() {
-        var lat = $("#latitude").val();
-        var lng = $("#longitude").val();
-
-        var latlng;
-        if (lat && lng) {
-            latlng = new google.maps.LatLng(lat, lng);
-        } else {
-            var address = $("#addr01").val() + $("#addr02").val();
-            if (geocoder) {
-                geocoder.geocode({'address': address}, function(results, status) {
-                    if (status == google.maps.GeocoderStatus.OK) {
-                        latlng = results[0].geometry.location;
-                    }
-                });
+    $("a#mapAddress").colorbox({
+        inline: true,
+        width: 360,
+        onComplete: function() {
+            var lat = $("#latitude").val();
+            var lng = $("#longitude").val();
+
+            var latlng;
+            if (lat && lng) {
+                latlng = new google.maps.LatLng(lat, lng);
+            } else {
+                var address = $("#addr01").val() + $("#addr02").val();
+                if (geocoder) {
+                    geocoder.geocode({address: address}, function(results, status) {
+                        if (status == google.maps.GeocoderStatus.OK) {
+                            latlng = results[0].geometry.location;
+                        }
+                    });
+                }
             }
-        }
-
-        if (!latlng) {
-            // 座標が取得できない場合は北緯35度東経135度から取得
-            latlng = new google.maps.LatLng(35, 135);
-        }
-
-        var mapOptions = {
-            zoom: 15,
-            center: latlng,
-            mapTypeId: google.maps.MapTypeId.ROADMAP
-        };
-
-        if (!map)
-        {
-            map = new google.maps.Map($("#maps").get(0), mapOptions);
-        }
-        else
-        {
-            map.panTo(latlng);
-        }
-
-        if (!marker)
-        {
-            marker = new google.maps.Marker({map: map, position: latlng});
-            marker.setDraggable(true);
-        }
-        else
-        {
-            marker.setPosition(latlng);
-        }
-
-        // TODO Maker のダブルクリックにも対応したい
-        $("#inputPoint").click(function() {
-            latlng = marker.getPosition();
-            $("#latitude").val(latlng.lat());
-            $("#longitude").val(latlng.lng());
-            $.fancybox.close();
-        });
-    }});
+
+            if (!latlng) {
+                // 座標が取得できない場合は北緯35度東経135度から取得
+                latlng = new google.maps.LatLng(35, 135);
+            }
+
+            var mapOptions = {
+                zoom: 15,
+                center: latlng,
+                mapTypeId: google.maps.MapTypeId.ROADMAP
+            };
+
+            if (!map) {
+                map = new google.maps.Map(document.getElementById("maps"), mapOptions);
+            } else {
+                map.panTo(latlng);
+            }
+
+            if (!marker) {
+                marker = new google.maps.Marker({map: map, position: latlng});
+                marker.setDraggable(true);
+            } else {
+                marker.setPosition(latlng);
+            }
+
+            // TODO Maker のダブルクリックにも対応したい
+            $("#inputPoint").click(function() {
+                latlng = marker.getPosition();
+                $("#latitude").val(latlng.lat());
+                $("#longitude").val(latlng.lng());
+                $.colorbox.close();
+            });
+        },
+    });
 });
 //]]></script>
@@ -315,6 +310,10 @@
     <div style="display: none">
         <div id="maparea">
-            <div id="maps" style="width: 300px; height: 300px"></div>
-            <a class="btn-normal" href="javascript:;" id="inputPoint">この位置を入力</a>
+            <div id="maps" style="width: 300px;height: 300px;"></div>
+            <div class="btn-area">
+                <ul>
+                    <li><a class="btn-normal" href="javascript:;" id="inputPoint">この位置を入力</a></li>
+                </ul>
+            </div>
         </div>
     </div>
Index: /branches/version-2_13-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 23122)
+++ /branches/version-2_13-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 23138)
@@ -21,5 +21,4 @@
  *}-->
 
-<script src="<!--{$TPL_URLPATH}-->js/jquery.facebox/facebox.js"></script>
 <script>//<![CDATA[
     // 規格2に選択肢を割り当てる。
@@ -37,9 +36,4 @@
         //お勧め商品のリンクを張り直し(フリックスライドによるエレメント生成後)
         $('#whobought_area li').biggerlink();
-        //商品画像の拡大
-        $('a.expansion').facebox({
-            loadingImage : '<!--{$TPL_URLPATH}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$TPL_URLPATH}-->js/jquery.facebox/closelabel.png'
-        });
     });
     //サブエリアの表示/非表示
Index: /branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- /branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 23111)
+++ /branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 23138)
@@ -69,9 +69,10 @@
 
         <!--{* スマートフォンカスタマイズ用CSS *}-->
-        <link rel="stylesheet" media="screen" href="<!--{$TPL_URLPATH}-->js/jquery.facebox/facebox.css" />
+        <link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/colorbox.css" type="text/css" media="all" />
 
         <!--{* スマートフォンカスタマイズ用JS *}-->
         <script src="<!--{$TPL_URLPATH}-->js/jquery.autoResizeTextAreaQ-0.1.js"></script>
         <script src="<!--{$TPL_URLPATH}-->js/jquery.flickslide.js"></script>
+        <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
 
         <!--{* iPhone用アイコン画像 *}-->
Index: /branches/version-2_13-dev/test/selenium/backend/basis/shopmaster/TestCase_Admin_BasisShopMaster_regist
===================================================================
--- /branches/version-2_13-dev/test/selenium/backend/basis/shopmaster/TestCase_Admin_BasisShopMaster_regist	(revision 20902)
+++ /branches/version-2_13-dev/test/selenium/backend/basis/shopmaster/TestCase_Admin_BasisShopMaster_regist	(revision 23138)
@@ -143,5 +143,5 @@
 <tr>
 	<td>click</td>
-	<td>fancybox-close</td>
+	<td>colorbox-close</td>
 	<td></td>
 </tr>
Index: /branches/version-2_13-dev/test/selenium/front/products/TestCase_Front_ProductsDetail_disp_image
===================================================================
--- /branches/version-2_13-dev/test/selenium/front/products/TestCase_Front_ProductsDetail_disp_image	(revision 20902)
+++ /branches/version-2_13-dev/test/selenium/front/products/TestCase_Front_ProductsDetail_disp_image	(revision 23138)
@@ -28,5 +28,5 @@
 <tr>
 	<td>click</td>
-	<td>facebox_overlay</td>
+	<td>colorbox_overlay</td>
 	<td></td>
 </tr>
