Index: branches/comu-ver2/html/products/detail_image.php
===================================================================
--- branches/comu-ver2/html/products/detail_image.php	(revision 18234)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once("../require.php");
-require_once(CLASS_EX_PATH . "page_extends/products/LC_Page_Products_DetailImage_Ex.php");
-
-// }}}
-// {{{ generate page
-
-$objPage = new LC_Page_Products_DetailImage_Ex();
-register_shutdown_function(array($objPage, "destroy"));
-$objPage->init();
-$objPage->process();
-?>
Index: branches/comu-ver2/html/user_data/packages/default/jquery.fancybox/jquery.fancybox-1.2.1.pack.js
===================================================================
--- branches/comu-ver2/html/user_data/packages/default/jquery.fancybox/jquery.fancybox-1.2.1.pack.js	(revision 18325)
+++ branches/comu-ver2/html/user_data/packages/default/jquery.fancybox/jquery.fancybox-1.2.1.pack.js	(revision 18325)
@@ -0,0 +1,9 @@
+/*
+ * FancyBox - simple and fancy jQuery plugin
+ * Examples and documentation at: http://fancy.klade.lv/
+ * Version: 1.2.1 (13/03/2009)
+ * Copyright (c) 2009 Janis Skarnelis
+ * Licensed under the MIT License: http://en.wikipedia.org/wiki/MIT_License
+ * Requires: jQuery v1.3+
+*/
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}(';(7($){$.b.2Q=7(){u B.2t(7(){9 1J=$(B).n(\'2Z\');5(1J.1c(/^3w\\(["\']?(.*\\.2p)["\']?\\)$/i)){1J=3t.$1;$(B).n({\'2Z\':\'45\',\'2o\':"3W:3R.4m.4d(3h=F, 3T="+($(B).n(\'41\')==\'2J-3Z\'?\'4c\':\'3N\')+", Q=\'"+1J+"\')"}).2t(7(){9 1b=$(B).n(\'1b\');5(1b!=\'2e\'&&1b!=\'2n\')$(B).n(\'1b\',\'2n\')})}})};9 A,4,16=D,s=1t 1o,1w,1v=1,1y=/\\.(3A|3Y|2p|3c|3d)(.*)?$/i;9 P=($.2q.3K&&2f($.2q.3z.2k(0,1))<8);$.b.c=7(Y){Y=$.3x({},$.b.c.2R,Y);9 2s=B;7 2h(){A=B;4=Y;2r();u D};7 2r(){5(16)u;5($.1O(4.2c)){4.2c()}4.j=[];4.h=0;5(Y.j.N>0){4.j=Y.j}t{9 O={};5(!A.1H||A.1H==\'\'){9 O={d:A.d,X:A.X};5($(A).1G("1m:1D").N){O.1a=$(A).1G("1m:1D")}4.j.2j(O)}t{9 Z=$(2s).2o("a[1H="+A.1H+"]");9 O={};3C(9 i=0;i<Z.N;i++){O={d:Z[i].d,X:Z[i].X};5($(Z[i]).1G("1m:1D").N){O.1a=$(Z[i]).1G("1m:1D")}4.j.2j(O)}3F(4.j[4.h].d!=A.d){4.h++}}}5(4.23){5(P){$(\'1U, 1Q, 1P\').n(\'1S\',\'3s\')}$("#1i").n(\'25\',4.2U).J()}1d()};7 1d(){$("#1f, #1e, #V, #G").S();9 d=4.j[4.h].d;5(d.1c(/#/)){9 U=11.3r.d.3f(\'#\')[0];U=d.3g(U,\'\');U=U.2k(U.2l(\'#\'));1k(\'<6 l="3e">\'+$(U).o()+\'</6>\',4.1I,4.1x)}t 5(d.1c(1y)){s=1t 1o;s.Q=d;5(s.3a){1K()}t{$.b.c.34();$(s).x().14(\'3b\',7(){$(".I").S();1K()})}}t 5(d.1c("17")||A.3j.2l("17")>=0){1k(\'<17 l="35" 3q="$.b.c.38()" 3o="3n\'+C.T(C.3l()*3m)+\'" 2K="0" 3E="0" Q="\'+d+\'"></17>\',4.1I,4.1x)}t{$.4p(d,7(2m){1k(\'<6 l="3L">\'+2m+\'</6>\',4.1I,4.1x)})}};7 1K(){5(4.30){9 w=$.b.c.1n();9 r=C.1M(C.1M(w[0]-36,s.g)/s.g,C.1M(w[1]-4b,s.f)/s.f);9 g=C.T(r*s.g);9 f=C.T(r*s.f)}t{9 g=s.g;9 f=s.f}1k(\'<1m 48="" l="49" Q="\'+s.Q+\'" />\',g,f)};7 2F(){5((4.j.N-1)>4.h){9 d=4.j[4.h+1].d;5(d.1c(1y)){1A=1t 1o();1A.Q=d}}5(4.h>0){9 d=4.j[4.h-1].d;5(d.1c(1y)){1A=1t 1o();1A.Q=d}}};7 1k(1j,g,f){16=F;9 L=4.2Y;5(P){$("#q")[0].1E.2u("f");$("#q")[0].1E.2u("g")}5(L>0){g+=L*2;f+=L*2;$("#q").n({\'v\':L+\'z\',\'2E\':L+\'z\',\'2i\':L+\'z\',\'y\':L+\'z\',\'g\':\'2B\',\'f\':\'2B\'});5(P){$("#q")[0].1E.2C(\'f\',\'(B.2D.4j - 20)\');$("#q")[0].1E.2C(\'g\',\'(B.2D.3S - 20)\')}}t{$("#q").n({\'v\':0,\'2E\':0,\'2i\':0,\'y\':0,\'g\':\'2z%\',\'f\':\'2z%\'})}5($("#k").1u(":19")&&g==$("#k").g()&&f==$("#k").f()){$("#q").1Z("2N",7(){$("#q").1C().1F($(1j)).21("1s",7(){1g()})});u}9 w=$.b.c.1n();9 2v=(g+36)>w[0]?w[2]:(w[2]+C.T((w[0]-g-36)/2));9 2w=(f+1z)>w[1]?w[3]:(w[3]+C.T((w[1]-f-1z)/2));9 K={\'y\':2v,\'v\':2w,\'g\':g+\'z\',\'f\':f+\'z\'};5($("#k").1u(":19")){$("#q").1Z("1s",7(){$("#q").1C();$("#k").24(K,4.2X,4.2T,7(){$("#q").1F($(1j)).21("1s",7(){1g()})})})}t{5(4.1W>0&&4.j[4.h].1a!==1L){$("#q").1C().1F($(1j));9 M=4.j[4.h].1a;9 15=$.b.c.1R(M);$("#k").n({\'y\':(15.y-18)+\'z\',\'v\':(15.v-18)+\'z\',\'g\':$(M).g(),\'f\':$(M).f()});5(4.1X){K.25=\'J\'}$("#k").24(K,4.1W,4.2W,7(){1g()})}t{$("#q").S().1C().1F($(1j)).J();$("#k").n(K).21("1s",7(){1g()})}}};7 2y(){5(4.h!=0){$("#1e, #2O").x().14("R",7(e){e.2x();4.h--;1d();u D});$("#1e").J()}5(4.h!=(4.j.N-1)){$("#1f, #2M").x().14("R",7(e){e.2x();4.h++;1d();u D});$("#1f").J()}};7 1g(){2y();2F();$(W).1B(7(e){5(e.29==27){$.b.c.1l();$(W).x("1B")}t 5(e.29==37&&4.h!=0){4.h--;1d();$(W).x("1B")}t 5(e.29==39&&4.h!=(4.j.N-1)){4.h++;1d();$(W).x("1B")}});5(4.1r){$(11).14("1N 1T",$.b.c.2g)}t{$("6#k").n("1b","2e")}5(4.2b){$("#22").R($.b.c.1l)}$("#1i, #V").14("R",$.b.c.1l);$("#V").J();5(4.j[4.h].X!==1L&&4.j[4.h].X.N>0){$(\'#G 6\').o(4.j[4.h].X);$(\'#G\').J()}5(4.23&&P){$(\'1U, 1Q, 1P\',$(\'#q\')).n(\'1S\',\'19\')}5($.1O(4.2a)){4.2a()}16=D};u B.x(\'R\').R(2h)};$.b.c.2g=7(){9 m=$.b.c.1n();$("#k").n(\'y\',(($("#k").g()+36)>m[0]?m[2]:m[2]+C.T((m[0]-$("#k").g()-36)/2)));$("#k").n(\'v\',(($("#k").f()+1z)>m[1]?m[3]:m[3]+C.T((m[1]-$("#k").f()-1z)/2)))};$.b.c.1h=7(H,2A){u 2f($.3I(H.3u?H[0]:H,2A,F))||0};$.b.c.1R=7(H){9 m=H.4g();m.v+=$.b.c.1h(H,\'3k\');m.v+=$.b.c.1h(H,\'3J\');m.y+=$.b.c.1h(H,\'3H\');m.y+=$.b.c.1h(H,\'3D\');u m};$.b.c.38=7(){$(".I").S();$("#35").J()};$.b.c.1n=7(){u[$(11).g(),$(11).f(),$(W).3i(),$(W).3p()]};$.b.c.2G=7(){5(!$("#I").1u(\':19\')){33(1w);u}$("#I > 6").n(\'v\',(1v*-40)+\'z\');1v=(1v+1)%12};$.b.c.34=7(){33(1w);9 m=$.b.c.1n();$("#I").n({\'y\':((m[0]-40)/2+m[2]),\'v\':((m[1]-40)/2+m[3])}).J();$("#I").14(\'R\',$.b.c.1l);1w=3Q($.b.c.2G,3X)};$.b.c.1l=7(){16=F;$(s).x();$("#1i, #V").x();5(4.2b){$("#22").x()}$("#V, .I, #1e, #1f, #G").S();5(4.1r){$(11).x("1N 1T")}1q=7(){$("#1i, #k").S();5(4.1r){$(11).x("1N 1T")}5(P){$(\'1U, 1Q, 1P\').n(\'1S\',\'19\')}5($.1O(4.1V)){4.1V()}16=D};5($("#k").1u(":19")!==D){5(4.26>0&&4.j[4.h].1a!==1L){9 M=4.j[4.h].1a;9 15=$.b.c.1R(M);9 K={\'y\':(15.y-18)+\'z\',\'v\':(15.v-18)+\'z\',\'g\':$(M).g(),\'f\':$(M).f()};5(4.1X){K.25=\'S\'}$("#k").31(D,F).24(K,4.26,4.2S,1q)}t{$("#k").31(D,F).1Z("2N",1q)}}t{1q()}u D};$.b.c.2V=7(){9 o=\'\';o+=\'<6 l="1i"></6>\';o+=\'<6 l="22">\';o+=\'<6 p="I" l="I"><6></6></6>\';o+=\'<6 l="k">\';o+=\'<6 l="2I">\';o+=\'<6 l="V"></6>\';o+=\'<6 l="E"><6 p="E 44"></6><6 p="E 43"></6><6 p="E 42"></6><6 p="E 3V"></6><6 p="E 3U"></6><6 p="E 3O"></6><6 p="E 3M"></6><6 p="E 3P"></6></6>\';o+=\'<a d="2P:;" l="1e"><1p p="1Y" l="2O"></1p></a><a d="2P:;" l="1f"><1p p="1Y" l="2M"></1p></a>\';o+=\'<6 l="q"></6>\';o+=\'<6 l="G"></6>\';o+=\'</6>\';o+=\'</6>\';o+=\'</6>\';$(o).2H("46");$(\'<32 4i="0" 4h="0" 4k="0"><2L><13 p="G" l="4l"></13><13 p="G" l="4o"><6></6></13><13 p="G" l="4n"></13></2L></32>\').2H(\'#G\');5(P){$("#2I").47(\'<17 p="4a" 4e="2J" 2K="0"></17>\');$("#V, .E, .G, .1Y").2Q()}};$.b.c.2R={2Y:10,30:F,1X:D,1W:0,26:0,2X:3G,2W:\'28\',2S:\'28\',2T:\'28\',1I:3B,1x:3v,23:F,2U:0.3,2b:F,1r:F,j:[],2c:2d,2a:2d,1V:2d};$(W).3y(7(){$.b.c.2V()})})(4f);',62,274,'||||opts|if|div|function||var||fn|fancybox|href||height|width|itemCurrent||itemArray|fancy_outer|id|pos|css|html|class|fancy_content||imagePreloader|else|return|top||unbind|left|px|elem|this|Math|false|fancy_bg|true|fancy_title|el|fancy_loading|show|itemOpts|pad|orig_item|length|item|isIE|src|click|hide|round|target|fancy_close|document|title|settings|subGroup||window||td|bind|orig_pos|busy|iframe||visible|orig|position|match|_change_item|fancy_left|fancy_right|_finish|getNumeric|fancy_overlay|value|_set_content|close|img|getViewport|Image|span|__cleanup|centerOnScroll|normal|new|is|loadingFrame|loadingTimer|frameHeight|imageRegExp|50|objNext|keydown|empty|first|style|append|children|rel|frameWidth|image|_proceed_image|undefined|min|resize|isFunction|select|object|getPosition|visibility|scroll|embed|callbackOnClose|zoomSpeedIn|zoomOpacity|fancy_ico|fadeOut||fadeIn|fancy_wrap|overlayShow|animate|opacity|zoomSpeedOut||swing|keyCode|callbackOnShow|hideOnContentClick|callbackOnStart|null|absolute|parseInt|scrollBox|_initialize|bottom|push|substr|indexOf|data|relative|filter|png|browser|_start|matchedGroup|each|removeExpression|itemLeft|itemTop|stopPropagation|_set_navigation|100|prop|auto|setExpression|parentNode|right|_preload_neighbor_images|animateLoading|appendTo|fancy_inner|no|frameborder|tr|fancy_right_ico|fast|fancy_left_ico|javascript|fixPNG|defaults|easingOut|easingChange|overlayOpacity|build|easingIn|zoomSpeedChange|padding|backgroundImage|imageScale|stop|table|clearInterval|showLoading|fancy_frame|||showIframe||complete|load|bmp|jpeg|fancy_div|split|replace|enabled|scrollLeft|className|paddingTop|random|1000|fancy_iframe|name|scrollTop|onload|location|hidden|RegExp|jquery|355|url|extend|ready|version|jpg|425|for|borderLeftWidth|hspace|while|300|paddingLeft|curCSS|borderTopWidth|msie|fancy_ajax|fancy_bg_w|scale|fancy_bg_sw|fancy_bg_nw|setInterval|DXImageTransform|clientWidth|sizingMethod|fancy_bg_s|fancy_bg_se|progid|66|gif|repeat||backgroundRepeat|fancy_bg_e|fancy_bg_ne|fancy_bg_n|none|body|prepend|alt|fancy_img|fancy_bigIframe|60|crop|AlphaImageLoader|scrolling|jQuery|offset|cellpadding|cellspacing|clientHeight|border|fancy_title_left|Microsoft|fancy_title_right|fancy_title_main|get'.split('|'),0,{}))
Index: branches/comu-ver2/html/user_data/packages/default/jquery.fancybox/jquery.fancybox.css
===================================================================
--- branches/comu-ver2/html/user_data/packages/default/jquery.fancybox/jquery.fancybox.css	(revision 18325)
+++ branches/comu-ver2/html/user_data/packages/default/jquery.fancybox/jquery.fancybox.css	(revision 18325)
@@ -0,0 +1,315 @@
+html, body {
+	height: 100%;
+}
+
+div#fancy_overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background-color: #666;
+	display: none;
+	z-index: 30;
+}
+
+* html div#fancy_overlay {
+	position: absolute;
+	height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+div#fancy_wrap {
+	text-align: left;
+}
+
+div#fancy_loading {
+	position: absolute;
+	height: 40px;
+	width: 40px;
+	cursor: pointer;
+	display: none;
+	overflow: hidden;
+	background: transparent;
+	z-index: 100;
+}
+
+div#fancy_loading div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 40px;
+	height: 480px;
+	background: transparent url('fancy_progress.png') no-repeat;
+}
+
+div#fancy_loading_overlay {
+	position: absolute;
+	background-color: #FFF;
+	z-index: 30;
+}
+
+div#fancy_loading_icon {
+	position: absolute;
+	background: url('fancy_loading.gif') no-repeat;
+	z-index: 35;
+	width: 16px;
+	height: 16px;
+}
+
+div#fancy_outer {
+	position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 90;
+    padding: 18px 18px 33px 18px;
+    margin: 0;
+    overflow: hidden;
+    background: transparent;
+    display: none;
+}
+
+div#fancy_inner {
+	position: relative;
+	width:100%;
+	height:100%;
+	border: 1px solid #BBB;
+	background: #FFF;
+}
+
+div#fancy_content {
+	margin: 0;
+	z-index: 100;
+	position: absolute;
+}
+
+div#fancy_div {
+	background: #000;
+	color: #FFF;
+	height: 100%;
+	width: 100%;
+	z-index: 100;
+}
+
+img#fancy_img {
+	position: absolute;
+	top: 0;
+	left: 0;
+	border:0; 
+	padding: 0; 
+	margin: 0;
+	z-index: 100;
+	width: 100%;
+	height: 100%;
+}
+
+div#fancy_close {
+	position: absolute;
+	top: -12px;
+	right: -15px;
+	height: 30px;
+	width: 30px;
+	background: url('fancy_closebox.png') top left no-repeat;
+	cursor: pointer;
+	z-index: 181;
+	display: none;
+}
+
+#fancy_frame {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	display: none;
+}
+
+#fancy_ajax {
+	width: 100%;
+	height: 100%;
+	overflow: auto;
+}
+
+a#fancy_left, a#fancy_right {
+	position: absolute; 
+	bottom: 0px; 
+	height: 100%; 
+	width: 35%; 
+	cursor: pointer;
+	z-index: 111; 
+	display: none;
+	background-image: url(data:image/gif;base64,AAAA);
+	outline: none;
+}
+
+a#fancy_left {
+	left: 0px; 
+}
+
+a#fancy_right {
+	right: 0px; 
+}
+
+span.fancy_ico {
+	position: absolute; 
+	top: 50%;
+	margin-top: -15px;
+	width: 30px;
+	height: 30px;
+	z-index: 112; 
+	cursor: pointer;
+	display: block;
+}
+
+span#fancy_left_ico {
+	left: -9999px;
+	background: transparent url('fancy_left.png') no-repeat;
+}
+
+span#fancy_right_ico {
+	right: -9999px;
+	background: transparent url('fancy_right.png') no-repeat;
+}
+
+a#fancy_left:hover {
+  visibility: visible;
+}
+
+a#fancy_right:hover {
+  visibility: visible;
+}
+
+a#fancy_left:hover span {
+	left: 20px; 
+}
+
+a#fancy_right:hover span {
+	right: 20px; 
+}
+
+.fancy_bigIframe {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: transparent;
+}
+
+div#fancy_bg {
+	position: absolute;
+	top: 0; left: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 70;
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+	
+div.fancy_bg {
+	position: absolute;
+	display: block;
+	z-index: 70;
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+div.fancy_bg_n {
+	top: -18px;
+	width: 100%;
+	height: 18px;
+	background: transparent url('fancy_shadow_n.png') repeat-x;
+}
+
+div.fancy_bg_ne {
+	top: -18px;
+	right: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_ne.png') no-repeat;
+}
+
+div.fancy_bg_e {
+	right: -13px;
+	height: 100%;
+	width: 13px;
+	background: transparent url('fancy_shadow_e.png') repeat-y;
+}
+
+div.fancy_bg_se {
+	bottom: -18px;
+	right: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_se.png') no-repeat;
+}
+
+div.fancy_bg_s {
+	bottom: -18px;
+	width: 100%;
+	height: 18px;
+	background: transparent url('fancy_shadow_s.png') repeat-x;
+}
+
+div.fancy_bg_sw {
+	bottom: -18px;
+	left: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_sw.png') no-repeat;
+}
+
+div.fancy_bg_w {
+	left: -13px;
+	height: 100%;
+	width: 13px;
+	background: transparent url('fancy_shadow_w.png') repeat-y;
+}
+
+div.fancy_bg_nw {
+	top: -18px;
+	left: -13px;
+	width: 13px;
+	height: 18px;
+	background: transparent url('fancy_shadow_nw.png') no-repeat;
+}
+
+div#fancy_title {
+	position: absolute;
+	bottom: -33px;
+	left: 0;
+	width: 100%;
+	z-index: 100;
+	display: none;
+}
+
+div#fancy_title div {
+	color: #FFF;
+	font: bold 12px Arial;
+	padding-bottom: 3px;
+}
+
+div#fancy_title table {
+	margin: 0 auto;
+}
+
+div#fancy_title table td {
+	padding: 0;
+	vertical-align: middle;
+}
+
+td#fancy_title_left {
+	height: 32px;
+	width: 15px;
+	background: transparent url(fancy_title_left.png) repeat-x;
+}
+
+td#fancy_title_main {
+	height: 32px;
+	background: transparent url(fancy_title_main.png) repeat-x;
+}
+
+td#fancy_title_right {
+	height: 32px;
+	width: 15px;
+	background: transparent url(fancy_title_right.png) repeat-x;
+}
Index: branches/comu-ver2/html/user_data/packages/default/js/jquery.easing.1.3.js
===================================================================
--- branches/comu-ver2/html/user_data/packages/default/js/jquery.easing.1.3.js	(revision 18325)
+++ branches/comu-ver2/html/user_data/packages/default/js/jquery.easing.1.3.js	(revision 18325)
@@ -0,0 +1,205 @@
+/*
+ * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/
+ *
+ * Uses the built in easing capabilities added In jQuery 1.1
+ * to offer multiple easing options
+ *
+ * TERMS OF USE - jQuery Easing
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2008 George McGinley Smith
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+*/
+
+// t: current time, b: begInnIng value, c: change In value, d: duration
+jQuery.easing['jswing'] = jQuery.easing['swing'];
+
+jQuery.extend( jQuery.easing,
+{
+	def: 'easeOutQuad',
+	swing: function (x, t, b, c, d) {
+		//alert(jQuery.easing.default);
+		return jQuery.easing[jQuery.easing.def](x, t, b, c, d);
+	},
+	easeInQuad: function (x, t, b, c, d) {
+		return c*(t/=d)*t + b;
+	},
+	easeOutQuad: function (x, t, b, c, d) {
+		return -c *(t/=d)*(t-2) + b;
+	},
+	easeInOutQuad: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t + b;
+		return -c/2 * ((--t)*(t-2) - 1) + b;
+	},
+	easeInCubic: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t + b;
+	},
+	easeOutCubic: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t + 1) + b;
+	},
+	easeInOutCubic: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t + b;
+		return c/2*((t-=2)*t*t + 2) + b;
+	},
+	easeInQuart: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t + b;
+	},
+	easeOutQuart: function (x, t, b, c, d) {
+		return -c * ((t=t/d-1)*t*t*t - 1) + b;
+	},
+	easeInOutQuart: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t + b;
+		return -c/2 * ((t-=2)*t*t*t - 2) + b;
+	},
+	easeInQuint: function (x, t, b, c, d) {
+		return c*(t/=d)*t*t*t*t + b;
+	},
+	easeOutQuint: function (x, t, b, c, d) {
+		return c*((t=t/d-1)*t*t*t*t + 1) + b;
+	},
+	easeInOutQuint: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return c/2*t*t*t*t*t + b;
+		return c/2*((t-=2)*t*t*t*t + 2) + b;
+	},
+	easeInSine: function (x, t, b, c, d) {
+		return -c * Math.cos(t/d * (Math.PI/2)) + c + b;
+	},
+	easeOutSine: function (x, t, b, c, d) {
+		return c * Math.sin(t/d * (Math.PI/2)) + b;
+	},
+	easeInOutSine: function (x, t, b, c, d) {
+		return -c/2 * (Math.cos(Math.PI*t/d) - 1) + b;
+	},
+	easeInExpo: function (x, t, b, c, d) {
+		return (t==0) ? b : c * Math.pow(2, 10 * (t/d - 1)) + b;
+	},
+	easeOutExpo: function (x, t, b, c, d) {
+		return (t==d) ? b+c : c * (-Math.pow(2, -10 * t/d) + 1) + b;
+	},
+	easeInOutExpo: function (x, t, b, c, d) {
+		if (t==0) return b;
+		if (t==d) return b+c;
+		if ((t/=d/2) < 1) return c/2 * Math.pow(2, 10 * (t - 1)) + b;
+		return c/2 * (-Math.pow(2, -10 * --t) + 2) + b;
+	},
+	easeInCirc: function (x, t, b, c, d) {
+		return -c * (Math.sqrt(1 - (t/=d)*t) - 1) + b;
+	},
+	easeOutCirc: function (x, t, b, c, d) {
+		return c * Math.sqrt(1 - (t=t/d-1)*t) + b;
+	},
+	easeInOutCirc: function (x, t, b, c, d) {
+		if ((t/=d/2) < 1) return -c/2 * (Math.sqrt(1 - t*t) - 1) + b;
+		return c/2 * (Math.sqrt(1 - (t-=2)*t) + 1) + b;
+	},
+	easeInElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return -(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+	},
+	easeOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d)==1) return b+c;  if (!p) p=d*.3;
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		return a*Math.pow(2,-10*t) * Math.sin( (t*d-s)*(2*Math.PI)/p ) + c + b;
+	},
+	easeInOutElastic: function (x, t, b, c, d) {
+		var s=1.70158;var p=0;var a=c;
+		if (t==0) return b;  if ((t/=d/2)==2) return b+c;  if (!p) p=d*(.3*1.5);
+		if (a < Math.abs(c)) { a=c; var s=p/4; }
+		else var s = p/(2*Math.PI) * Math.asin (c/a);
+		if (t < 1) return -.5*(a*Math.pow(2,10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )) + b;
+		return a*Math.pow(2,-10*(t-=1)) * Math.sin( (t*d-s)*(2*Math.PI)/p )*.5 + c + b;
+	},
+	easeInBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*(t/=d)*t*((s+1)*t - s) + b;
+	},
+	easeOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158;
+		return c*((t=t/d-1)*t*((s+1)*t + s) + 1) + b;
+	},
+	easeInOutBack: function (x, t, b, c, d, s) {
+		if (s == undefined) s = 1.70158; 
+		if ((t/=d/2) < 1) return c/2*(t*t*(((s*=(1.525))+1)*t - s)) + b;
+		return c/2*((t-=2)*t*(((s*=(1.525))+1)*t + s) + 2) + b;
+	},
+	easeInBounce: function (x, t, b, c, d) {
+		return c - jQuery.easing.easeOutBounce (x, d-t, 0, c, d) + b;
+	},
+	easeOutBounce: function (x, t, b, c, d) {
+		if ((t/=d) < (1/2.75)) {
+			return c*(7.5625*t*t) + b;
+		} else if (t < (2/2.75)) {
+			return c*(7.5625*(t-=(1.5/2.75))*t + .75) + b;
+		} else if (t < (2.5/2.75)) {
+			return c*(7.5625*(t-=(2.25/2.75))*t + .9375) + b;
+		} else {
+			return c*(7.5625*(t-=(2.625/2.75))*t + .984375) + b;
+		}
+	},
+	easeInOutBounce: function (x, t, b, c, d) {
+		if (t < d/2) return jQuery.easing.easeInBounce (x, t*2, 0, c, d) * .5 + b;
+		return jQuery.easing.easeOutBounce (x, t*2-d, 0, c, d) * .5 + c*.5 + b;
+	}
+});
+
+/*
+ *
+ * TERMS OF USE - EASING EQUATIONS
+ * 
+ * Open source under the BSD License. 
+ * 
+ * Copyright © 2001 Robert Penner
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice, this list of 
+ * conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list 
+ * of conditions and the following disclaimer in the documentation and/or other materials 
+ * provided with the distribution.
+ * 
+ * Neither the name of the author nor the names of contributors may be used to endorse 
+ * or promote products derived from this software without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY 
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ *  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ *  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 
+ * OF THE POSSIBILITY OF SUCH DAMAGE. 
+ *
+ */
Index: branches/comu-ver2/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/comu-ver2/data/Smarty/templates/default/shopping/confirm.tpl	(revision 18254)
+++ branches/comu-ver2/data/Smarty/templates/default/shopping/confirm.tpl	(revision 18325)
@@ -20,218 +20,232 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery.easing.1.3.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.2.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
-var send = true;
-
-function fnCheckSubmit() {
-	if(send) {
-		send = false;
-		return true;
-	} else {
-		alert("只今、処理中です。しばらくお待ち下さい。");
-		return false;
-	}
-}
-//]]>
-</script>
+    var send = true;
+
+    function fnCheckSubmit() {
+        if(send) {
+            send = false;
+            return true;
+        } else {
+            alert("只今、処理中です。しばらくお待ち下さい。");
+            return false;
+        }
+    }
+
+    $(document).ready(function() {
+        $("a.expansion").fancybox({
+        });
+    });
+//]]></script>
+
 <!--▼CONTENTS-->
 <div id="under02column">
-  <div id="under02column_shopping">
-    <p class="flowarea"><img src="<!--{$TPL_DIR}-->img/shopping/flow03.gif" width="700" height="36" alt="購入手続きの流れ" /></p>
-    <h2 class="title"><!--{$tpl_title|escape}--></h2>
-
-    <p>下記ご注文内容で送信してもよろしいでしょうか？<br />
-      よろしければ、一番下の「<!--{if $payment_type != ""}-->次へ<!--{else}-->ご注文完了ページへ<!--{/if}-->」ボタンをクリックしてください。</p>
-
-    <form name="form1" id="form1" method="post" action="?">
-      <input type="hidden" name="mode" value="confirm" />
-      <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
-      <table summary="ご注文内容確認">
-        <tr>
-          <th>商品写真</th>
-          <th>商品名</th>
-          <th>単価</th>
-          <th>数量</th>
-          <th>小計</th>
-        </tr>
-        <!--{section name=cnt loop=$arrProductsClass}-->
-        <tr>
-          <td class="phototd">
-            <a href="?" onclick="win01('<!--{$smarty.const.URL_DIR}-->products/detail_image.php?product_id=<!--{$arrProductsClass[cnt].product_id}-->&amp;image=main_image','detail_image','<!--{$arrProductsClass[cnt].tpl_image_width}-->','<!--{$arrProductsClass[cnt].tpl_image_height}-->'); return false;" target="_blank">
-              <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a>
-          </td>
-          <td>
-            <ul>
-              <li><strong><!--{$arrProductsClass[cnt].name|escape}--></strong></li>
-              <!--{if $arrProductsClass[cnt].classcategory_name1 != ""}-->
-              <li><!--{$arrProductsClass[cnt].class_name1}-->：<!--{$arrProductsClass[cnt].classcategory_name1}--></li>
-              <!--{/if}-->
-              <!--{if $arrProductsClass[cnt].classcategory_name2 != ""}-->
-              <li><!--{$arrProductsClass[cnt].class_name2}-->：<!--{$arrProductsClass[cnt].classcategory_name2}--></li>
-              <!--{/if}-->
-            </ul>
-         </td>
-         <td class="pricetd">
-         <!--{if $arrProductsClass[cnt].price02 != ""}-->
-           <!--{$arrProductsClass[cnt].price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-         <!--{else}-->
-           <!--{$arrProductsClass[cnt].price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-         <!--{/if}-->
-         </td>
-         <td><!--{$arrProductsClass[cnt].quantity|number_format}--></td>
-         <td class="pricetd"><!--{$arrProductsClass[cnt].total_pretax|number_format}-->円</td>
-       </tr>
-       <!--{/section}-->
-        <tr>
-          <th colspan="4" class="resulttd">小計</th>
-          <td class="pricetd"><!--{$tpl_total_pretax|number_format}-->円</td>
-        </tr>
-        <!--{if $smarty.const.USE_POINT !== false}-->
-          <tr>
-            <th colspan="4" class="resulttd">値引き（ポイントご使用時）</th>
-            <td class="pricetd">
-            <!--{assign var=discount value=`$arrData.use_point*$smarty.const.POINT_VALUE`}-->
-             -<!--{$discount|number_format|default:0}-->円</td>
-          </tr>
-        <!--{/if}-->
-        <tr>
-          <th colspan="4" class="resulttd">送料</th>
-          <td class="pricetd"><!--{$arrData.deliv_fee|number_format}-->円</td>
-        </tr>
-        <tr>
-          <th colspan="4" class="resulttd">手数料</th>
-          <td class="pricetd"><!--{$arrData.charge|number_format}-->円</td>
-        </tr>
-        <tr>
-          <th colspan="4" class="resulttd">合計</th>
-          <td class="pricetd"><em><!--{$arrData.payment_total|number_format}-->円</em></td>
-        </tr>
-      </table>
-
-    <!--{* ログイン済みの会員のみ *}-->
-    <!--{if ($tpl_login == 1 || $arrData.member_check == 1) && $smarty.const.USE_POINT !== false}-->
-      <table summary="ポイント確認" class="delivname">
-        <tr>
-          <th>ご注文前のポイント</th>
-          <td><!--{$tpl_user_point|number_format|default:0}-->Pt</td>
-        </tr>
-        <tr>
-          <th>ご使用ポイント</th>
-          <td>-<!--{$arrData.use_point|number_format|default:0}-->Pt</td>
-        </tr>
-        <!--{if $arrData.birth_point > 0}-->
-        <tr>
-          <th>お誕生月ポイント</th>
-          <td>+<!--{$arrData.birth_point|number_format|default:0}-->Pt</td>
-        </tr>
-        <!--{/if}-->
-        <tr>
-          <th>今回加算予定のポイント</th>
-          <td>+<!--{$arrData.add_point|number_format|default:0}-->Pt</td>
-        </tr>
-        <tr>
-        <!--{assign var=total_point value=`$tpl_user_point-$arrData.use_point+$arrData.add_point`}-->
-          <th>加算後のポイント</th>
-          <td><!--{$total_point|number_format}-->Pt</td>
-        </tr>
-      </table>
-    <!--{/if}-->
-    <!--{* ログイン済みの会員のみ *}-->
-
-      <table summary="お届け先確認" class="delivname">
-        <thead>
-          <tr>
-            <th colspan="2">▼お届け先</th>
-          </tr>
-        </thead>
-        <tbody>
-        <!--{* 別のお届け先が選択されている場合 *}-->
-        <!--{if $arrData.deliv_check >= 1}-->
-        <tr>
-          <th>お名前</th>
-          <td><!--{$arrData.deliv_name01|escape}--> <!--{$arrData.deliv_name02|escape}--></td>
-        </tr>
-        <tr>
-          <th>お名前（フリガナ）</th>
-          <td><!--{$arrData.deliv_kana01|escape}--> <!--{$arrData.deliv_kana02|escape}--></td>
-        </tr>
-        <tr>
-          <th>郵便番号</th>
-          <td>〒<!--{$arrData.deliv_zip01|escape}-->-<!--{$arrData.deliv_zip02|escape}--></td>
-        </tr>
-        <tr>
-          <th>住所</th>
-          <td><!--{$arrPref[$arrData.deliv_pref]}--><!--{$arrData.deliv_addr01|escape}--><!--{$arrData.deliv_addr02|escape}--></td>
-        </tr>
-        <tr>
-          <th>電話番号</th>
-          <td><!--{$arrData.deliv_tel01}-->-<!--{$arrData.deliv_tel02}-->-<!--{$arrData.deliv_tel03}--></td>
-        </tr>
-      </table>
-      <!--{else}-->
-      <tr>
-          <th>お名前</th>
-          <td><!--{$arrData.order_name01|escape}--> <!--{$arrData.order_name02|escape}--></td>
-        </tr>
-        <tr>
-          <th>お名前（フリガナ）</th>
-          <td><!--{$arrData.order_kana01|escape}--> <!--{$arrData.order_kana02|escape}--></td>
-        </tr>
-        <tr>
-          <th>郵便番号</th>
-          <td>〒<!--{$arrData.order_zip01|escape}-->-<!--{$arrData.order_zip02|escape}--></td>
-        </tr>
-        <tr>
-          <th>住所</th>
-          <td><!--{$arrPref[$arrData.order_pref]}--><!--{$arrData.order_addr01|escape}--><!--{$arrData.order_addr02|escape}--></td>
-        </tr>
-        <tr>
-          <th>電話番号</th>
-          <td><!--{$arrData.order_tel01}-->-<!--{$arrData.order_tel02}-->-<!--{$arrData.order_tel03}--></td>
-        </tr>
-        <!--{/if}-->
-        </tbody>
-      </table>
-      <!--お届け先ここまで-->
-
-      <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
-        <thead>
-        <tr>
-          <th colspan="2">▼お支払方法・お届け日時の指定・その他お問い合わせ</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr>
-          <th>お支払方法</th>
-          <td><!--{$arrData.payment_method|escape}--></td>
-        </tr>
-        <tr>
-          <th>お届け日</th>
-          <td><!--{$arrData.deliv_date|escape|default:"指定なし"}--></td>
-        </tr>
-        <tr>
-          <th>お届け時間</th>
-          <td><!--{$arrData.deliv_time|escape|default:"指定なし"}--></td>
-        </tr>
-        <tr>
-          <th>その他お問い合わせ</th>
-          <td><!--{$arrData.message|escape|nl2br}--></td>
-        </tr>
-        </tbody>
-      </table>
-
-      <!--{if 'sfTSPrintOrderBox'|function_exists}-->
-        <!--{'sfTSPrintOrderBox'|call_user_func}-->
-      <!--{/if}-->
-      
-      <div class="tblareabtn">
-        <a href="./payment.php" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_back.gif',back03)"><img src="<!--{$TPL_DIR}-->img/common/b_back.gif" width="150" height="30" alt="戻る" border="0" name="back03" id="back03" /></a>&nbsp;
-        <!--{if $payment_type != ""}-->
-        <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_next.gif',this)" src="<!--{$TPL_DIR}-->img/common/b_next.gif" alt="次へ" class="box150" name="next" id="next" />
-        <!--{else}-->
-        <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/shopping/b_ordercomp_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/shopping/b_ordercomp.gif',this)" src="<!--{$TPL_DIR}-->img/shopping/b_ordercomp.gif" alt="ご注文完了ページへ" class="box150" name="next" id="next" />
-        <!--{/if}-->
-      </div>
-    </form>
-  </div>
+    <div id="under02column_shopping">
+        <p class="flowarea"><img src="<!--{$TPL_DIR}-->img/shopping/flow03.gif" width="700" height="36" alt="購入手続きの流れ" /></p>
+        <h2 class="title"><!--{$tpl_title|escape}--></h2>
+
+        <p>下記ご注文内容で送信してもよろしいでしょうか？<br />
+            よろしければ、一番下の「<!--{if $payment_type != ""}-->次へ<!--{else}-->ご注文完了ページへ<!--{/if}-->」ボタンをクリックしてください。</p>
+
+        <form name="form1" id="form1" method="post" action="?">
+            <input type="hidden" name="mode" value="confirm" />
+            <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+            <table summary="ご注文内容確認">
+                <tr>
+                    <th>商品写真</th>
+                    <th>商品名</th>
+                    <th>単価</th>
+                    <th>数量</th>
+                    <th>小計</th>
+                </tr>
+                <!--{section name=cnt loop=$arrProductsClass}-->
+                <tr>
+                    <td class="phototd">
+                        <a
+                            <!--{if $arrProductsClass[cnt].main_image|strlen >= 1}-->
+                                href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProductsClass[cnt].main_image|sfNoImageMainList|escape}-->"
+                                class="expansion"
+                                target="_blank"
+                            <!--{/if}-->
+                        >
+                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a>
+                    </td>
+                    <td>
+                        <ul>
+                            <li><strong><!--{$arrProductsClass[cnt].name|escape}--></strong></li>
+                            <!--{if $arrProductsClass[cnt].classcategory_name1 != ""}-->
+                            <li><!--{$arrProductsClass[cnt].class_name1}-->：<!--{$arrProductsClass[cnt].classcategory_name1}--></li>
+                            <!--{/if}-->
+                            <!--{if $arrProductsClass[cnt].classcategory_name2 != ""}-->
+                            <li><!--{$arrProductsClass[cnt].class_name2}-->：<!--{$arrProductsClass[cnt].classcategory_name2}--></li>
+                            <!--{/if}-->
+                        </ul>
+                 </td>
+                 <td class="pricetd">
+                 <!--{if $arrProductsClass[cnt].price02 != ""}-->
+                     <!--{$arrProductsClass[cnt].price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                 <!--{else}-->
+                     <!--{$arrProductsClass[cnt].price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                 <!--{/if}-->
+                 </td>
+                 <td><!--{$arrProductsClass[cnt].quantity|number_format}--></td>
+                 <td class="pricetd"><!--{$arrProductsClass[cnt].total_pretax|number_format}-->円</td>
+             </tr>
+             <!--{/section}-->
+                <tr>
+                    <th colspan="4" class="resulttd">小計</th>
+                    <td class="pricetd"><!--{$tpl_total_pretax|number_format}-->円</td>
+                </tr>
+                <!--{if $smarty.const.USE_POINT !== false}-->
+                    <tr>
+                        <th colspan="4" class="resulttd">値引き（ポイントご使用時）</th>
+                        <td class="pricetd">
+                        <!--{assign var=discount value=`$arrData.use_point*$smarty.const.POINT_VALUE`}-->
+                         -<!--{$discount|number_format|default:0}-->円</td>
+                    </tr>
+                <!--{/if}-->
+                <tr>
+                    <th colspan="4" class="resulttd">送料</th>
+                    <td class="pricetd"><!--{$arrData.deliv_fee|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th colspan="4" class="resulttd">手数料</th>
+                    <td class="pricetd"><!--{$arrData.charge|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th colspan="4" class="resulttd">合計</th>
+                    <td class="pricetd"><em><!--{$arrData.payment_total|number_format}-->円</em></td>
+                </tr>
+            </table>
+
+            <!--{* ログイン済みの会員のみ *}-->
+            <!--{if ($tpl_login == 1 || $arrData.member_check == 1) && $smarty.const.USE_POINT !== false}-->
+                <table summary="ポイント確認" class="delivname">
+                    <tr>
+                        <th>ご注文前のポイント</th>
+                        <td><!--{$tpl_user_point|number_format|default:0}-->Pt</td>
+                    </tr>
+                    <tr>
+                        <th>ご使用ポイント</th>
+                        <td>-<!--{$arrData.use_point|number_format|default:0}-->Pt</td>
+                    </tr>
+                    <!--{if $arrData.birth_point > 0}-->
+                    <tr>
+                        <th>お誕生月ポイント</th>
+                        <td>+<!--{$arrData.birth_point|number_format|default:0}-->Pt</td>
+                    </tr>
+                    <!--{/if}-->
+                    <tr>
+                        <th>今回加算予定のポイント</th>
+                        <td>+<!--{$arrData.add_point|number_format|default:0}-->Pt</td>
+                    </tr>
+                    <tr>
+                    <!--{assign var=total_point value=`$tpl_user_point-$arrData.use_point+$arrData.add_point`}-->
+                        <th>加算後のポイント</th>
+                        <td><!--{$total_point|number_format}-->Pt</td>
+                    </tr>
+                </table>
+            <!--{/if}-->
+            <!--{* ログイン済みの会員のみ *}-->
+
+            <table summary="お届け先確認" class="delivname">
+                <thead>
+                    <tr>
+                        <th colspan="2">▼お届け先</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <!--{* 別のお届け先が選択されている場合 *}-->
+                    <!--{if $arrData.deliv_check >= 1}-->
+                        <tr>
+                            <th>お名前</th>
+                            <td><!--{$arrData.deliv_name01|escape}--> <!--{$arrData.deliv_name02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>お名前（フリガナ）</th>
+                            <td><!--{$arrData.deliv_kana01|escape}--> <!--{$arrData.deliv_kana02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>郵便番号</th>
+                            <td>〒<!--{$arrData.deliv_zip01|escape}-->-<!--{$arrData.deliv_zip02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>住所</th>
+                            <td><!--{$arrPref[$arrData.deliv_pref]}--><!--{$arrData.deliv_addr01|escape}--><!--{$arrData.deliv_addr02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>電話番号</th>
+                            <td><!--{$arrData.deliv_tel01}-->-<!--{$arrData.deliv_tel02}-->-<!--{$arrData.deliv_tel03}--></td>
+                        </tr>
+                    <!--{else}-->
+                        <tr>
+                            <th>お名前</th>
+                            <td><!--{$arrData.order_name01|escape}--> <!--{$arrData.order_name02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>お名前（フリガナ）</th>
+                            <td><!--{$arrData.order_kana01|escape}--> <!--{$arrData.order_kana02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>郵便番号</th>
+                            <td>〒<!--{$arrData.order_zip01|escape}-->-<!--{$arrData.order_zip02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>住所</th>
+                            <td><!--{$arrPref[$arrData.order_pref]}--><!--{$arrData.order_addr01|escape}--><!--{$arrData.order_addr02|escape}--></td>
+                        </tr>
+                        <tr>
+                            <th>電話番号</th>
+                            <td><!--{$arrData.order_tel01}-->-<!--{$arrData.order_tel02}-->-<!--{$arrData.order_tel03}--></td>
+                        </tr>
+                    <!--{/if}-->
+                </tbody>
+            </table>
+            <!--お届け先ここまで-->
+
+            <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
+                <thead>
+                <tr>
+                    <th colspan="2">▼お支払方法・お届け日時の指定・その他お問い合わせ</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <th>お支払方法</th>
+                    <td><!--{$arrData.payment_method|escape}--></td>
+                </tr>
+                <tr>
+                    <th>お届け日</th>
+                    <td><!--{$arrData.deliv_date|escape|default:"指定なし"}--></td>
+                </tr>
+                <tr>
+                    <th>お届け時間</th>
+                    <td><!--{$arrData.deliv_time|escape|default:"指定なし"}--></td>
+                </tr>
+                <tr>
+                    <th>その他お問い合わせ</th>
+                    <td><!--{$arrData.message|escape|nl2br}--></td>
+                </tr>
+                </tbody>
+            </table>
+
+            <!--{if 'sfTSPrintOrderBox'|function_exists}-->
+                <!--{'sfTSPrintOrderBox'|call_user_func}-->
+            <!--{/if}-->
+            
+            <div class="tblareabtn">
+                <a href="./payment.php" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_back.gif',back03)"><img src="<!--{$TPL_DIR}-->img/common/b_back.gif" width="150" height="30" alt="戻る" border="0" name="back03" id="back03" /></a>&nbsp;
+                <!--{if $payment_type != ""}-->
+                <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/common/b_next.gif',this)" src="<!--{$TPL_DIR}-->img/common/b_next.gif" alt="次へ" class="box150" name="next" id="next" />
+                <!--{else}-->
+                <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/shopping/b_ordercomp_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/shopping/b_ordercomp.gif',this)" src="<!--{$TPL_DIR}-->img/shopping/b_ordercomp.gif" alt="ご注文完了ページへ" class="box150" name="next" id="next" />
+                <!--{/if}-->
+            </div>
+        </form>
+    </div>
 </div>
 <!--▲CONTENTS-->
Index: branches/comu-ver2/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- branches/comu-ver2/data/Smarty/templates/default/cart/index.tpl	(revision 18254)
+++ branches/comu-ver2/data/Smarty/templates/default/cart/index.tpl	(revision 18325)
@@ -20,134 +20,151 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery.easing.1.3.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.2.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox.css" type="text/css" media="screen" />
+<script type="text/javascript">//<![CDATA[
+    $(document).ready(function() {
+        $("a.expansion").fancybox({
+        });
+    });
+//]]></script>
+
 <!--▼CONTENTS-->
 <div id="under02column">
-  <div id="under02column_cart">
-    <h2 class="title"><!--{$tpl_title|escape}--></h2>
-    <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
-      <p class="totalmoneyarea">
-        <!--★ポイント案内★-->
-        <!--{if $smarty.const.USE_POINT !== false}-->
-          <!--{if $tpl_login}-->
-            <!--{$tpl_name|escape}--> 様の、現在の所持ポイントは「<em><!--{$tpl_user_point|number_format|default:0}--> pt</em>」です。<br />
-          <!--{else}-->
-            ポイント制度をご利用になられる場合は、会員登録後ログインしていだだきますようお願い致します。<br />
-          <!--{/if}-->
-          ポイントは商品購入時に1pt＝<!--{$smarty.const.POINT_VALUE}-->円として使用することができます。<br />
+    <div id="under02column_cart">
+        <h2 class="title"><!--{$tpl_title|escape}--></h2>
+        <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
+            <p class="totalmoneyarea">
+                <!--★ポイント案内★-->
+                <!--{if $smarty.const.USE_POINT !== false}-->
+                    <!--{if $tpl_login}-->
+                        <!--{$tpl_name|escape}--> 様の、現在の所持ポイントは「<em><!--{$tpl_user_point|number_format|default:0}--> pt</em>」です。<br />
+                    <!--{else}-->
+                        ポイント制度をご利用になられる場合は、会員登録後ログインしていだだきますようお願い致します。<br />
+                    <!--{/if}-->
+                    ポイントは商品購入時に1pt＝<!--{$smarty.const.POINT_VALUE}-->円として使用することができます。<br />
+                <!--{/if}-->
+                
+                <!--{* カゴの中に商品がある場合にのみ表示 *}-->
+                <!--{if count($arrProductsClass) > 0 }-->
+                    お買い上げ商品の合計金額は「<em><!--{$tpl_total_pretax|number_format}-->円</em>」です。
+                    <!--{if $arrInfo.free_rule > 0}-->
+                        <!--{if $arrData.deliv_fee|number_format > 0}-->
+                            あと「<em><!--{$tpl_deliv_free|number_format}-->円</em>」で送料無料です！！
+                        <!--{else}-->
+                            現在、「<em>送料無料</em>」です！！
+                        <!--{/if}-->
+                    <!--{/if}-->
+                <!--{/if}-->
+            </p>
         <!--{/if}-->
-        
-        <!--{* カゴの中に商品がある場合にのみ表示 *}-->
-        <!--{if count($arrProductsClass) > 0 }-->
-          お買い上げ商品の合計金額は「<em><!--{$tpl_total_pretax|number_format}-->円</em>」です。
-          <!--{if $arrInfo.free_rule > 0}-->
-            <!--{if $arrData.deliv_fee|number_format > 0}-->
-              あと「<em><!--{$tpl_deliv_free|number_format}-->円</em>」で送料無料です！！
-            <!--{else}-->
-              現在、「<em>送料無料</em>」です！！
-            <!--{/if}-->
-          <!--{/if}-->
-        <!--{/if}-->
-      </p>
+
+    <!--{if strlen($tpl_error) != 0}-->
+        <p class="attention"><!--{$tpl_error|escape}--></p>
     <!--{/if}-->
 
-   <!--{if strlen($tpl_error) != 0}-->
-    <p class="attention"><!--{$tpl_error|escape}--></p>
-   <!--{/if}-->
-   
-   <!--{if strlen($tpl_message) != 0}-->
-    <p class="attention"><!--{$tpl_message|escape|nl2br}--></p>
-   <!--{/if}-->
-
-   <!--{if count($arrProductsClass) > 0}-->
-   
-   <form name="form1" id="form1" method="post" action="?">
-   <!--{if 'sfGMOCartDisplay'|function_exists}-->
-     <!--{'sfGMOCartDisplay'|call_user_func}-->
-   <!--{/if}-->
-   
-     <input type="hidden" name="mode" value="confirm" />
-     <input type="hidden" name="cart_no" value="" />
-     <table summary="商品情報">
-       <tr>
-         <th>削除</th>
-         <th>商品写真</th>
-         <th>商品名</th>
-         <th>単価</th>
-         <th>数量</th>
-         <th>小計</th>
-       </tr>
-      <!--{section name=cnt loop=$arrProductsClass}-->
-       <tr style="<!--{if $arrProductsClass[cnt].error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
-         <td><a href="?" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$arrProductsClass[cnt].cart_no}-->'); return false;">削除</a>
-         </td>
-         <td class="phototd">
-           <a href="?" onclick="win01('../products/detail_image.php?product_id=<!--{$arrProductsClass[cnt].product_id}-->&image=main_image','detail_image','<!--{$arrProductsClass[cnt].tpl_image_width}-->','<!--{$arrProductsClass[cnt].tpl_image_height}-->'); return false;" target="_blank">
-             <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a>
-         </td>
-         <td><!--{* 商品名 *}--><strong><!--{$arrProductsClass[cnt].name|escape}--></strong><br />
-           <!--{if $arrProductsClass[cnt].classcategory_name1 != ""}-->
-             <!--{$arrProductsClass[cnt].class_name1}-->：<!--{$arrProductsClass[cnt].classcategory_name1}--><br />
-           <!--{/if}-->
-           <!--{if $arrProductsClass[cnt].classcategory_name2 != ""}-->
-             <!--{$arrProductsClass[cnt].class_name2}-->：<!--{$arrProductsClass[cnt].classcategory_name2}-->
-           <!--{/if}-->
-         </td>
-         <td class="pricetd">
-         <!--{if $arrProductsClass[cnt].price02 != ""}-->
-           <!--{$arrProductsClass[cnt].price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-         <!--{else}-->
-           <!--{$arrProductsClass[cnt].price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-         <!--{/if}-->
-         </td>
-         <td id="quantity"><!--{$arrProductsClass[cnt].quantity}-->
-           <ul id="quantity_level">
-            <li><a href="?" onclick="fnModeSubmit('up','cart_no','<!--{$arrProductsClass[cnt].cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/plus.gif" width="16" height="16" alt="＋" /></a></li>
-            <li><a href="?" onclick="fnModeSubmit('down','cart_no','<!--{$arrProductsClass[cnt].cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/minus.gif" width="16" height="16" alt="-" /></a></li>
-           </ul>
-         </td>
-         <td class="pricetd"><!--{$arrProductsClass[cnt].total_pretax|number_format}-->円</td>
-     </tr>
-     <!--{/section}-->
-     <tr>
-       <th colspan="5" class="resulttd">小計</th>
-       <td class="pricetd"><!--{$tpl_total_pretax|number_format}-->円</td>
-    </tr>
-    <tr>
-      <th colspan="5" class="resulttd">合計</th>
-      <td class="pricetd"><em><!--{$arrData.total-$arrData.deliv_fee|number_format}-->円</em></td>
-    </tr>
-    <!--{if $smarty.const.USE_POINT !== false}-->
-      <!--{if $arrData.birth_point > 0}-->
-      <tr>
-        <th colspan="5" class="resulttd">お誕生月ポイント</th>
-        <td class="pricetd"><!--{$arrData.birth_point|number_format}-->pt</td>
-      </tr>
-      <!--{/if}-->
-      <tr>
-        <th colspan="5" class="resulttd">今回加算ポイント</th>
-        <td class="pricetd"><!--{$arrData.add_point|number_format}-->pt</td>
-      </tr>
-    <!--{/if}-->
-  </table>
-  <p class="mini">※商品写真は参考用写真です。ご注文のカラーと異なる写真が表示されている場合でも、商品番号に記載されているカラー表示で間違いございませんのでご安心ください。</p>
-  <div class="tblareabtn">
-    <!--{if strlen($tpl_error) == 0}-->
-      <p>上記内容でよろしければ「購入手続きへ」ボタンをクリックしてください。</p>
+    <!--{if strlen($tpl_message) != 0}-->
+        <p class="attention"><!--{$tpl_message|escape|nl2br}--></p>
     <!--{/if}-->
 
-    <p>
-      <!--{if $tpl_prev_url != ""}-->
-        <a href="<!--{$tpl_prev_url}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/cart/b_pageback_on.gif','back');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/cart/b_pageback.gif','back');">
-          <img src="<!--{$TPL_DIR}-->img/cart/b_pageback.gif" width="150" height="30" alt="買い物を続ける" name="back" id="back" /></a>&nbsp;&nbsp;
-      <!--{/if}-->
-      <!--{if strlen($tpl_error) == 0}-->
-        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/cart/b_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/cart/b_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/cart/b_buystep.gif" class="box150"  alt="購入手続きへ" name="confirm" />
-      <!--{/if}-->
-     </p>
-  </div>
-</form>
-<!--{else}-->
-<p class="empty"><em>※ 現在カート内に商品はございません。</em></p>
-<!--{/if}-->
-</div>
+    <!--{if count($arrProductsClass) > 0}-->
+
+        <form name="form1" id="form1" method="post" action="?">
+            <!--{if 'sfGMOCartDisplay'|function_exists}-->
+                <!--{'sfGMOCartDisplay'|call_user_func}-->
+            <!--{/if}-->
+
+            <input type="hidden" name="mode" value="confirm" />
+            <input type="hidden" name="cart_no" value="" />
+            <table summary="商品情報">
+                <tr>
+                    <th>削除</th>
+                    <th>商品写真</th>
+                    <th>商品名</th>
+                    <th>単価</th>
+                    <th>数量</th>
+                    <th>小計</th>
+                </tr>
+                <!--{section name=cnt loop=$arrProductsClass}-->
+                    <tr style="<!--{if $arrProductsClass[cnt].error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                        <td><a href="?" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$arrProductsClass[cnt].cart_no}-->'); return false;">削除</a>
+                        </td>
+                        <td class="phototd">
+                        <a
+                            <!--{if $arrProductsClass[cnt].main_image|strlen >= 1}-->
+                                href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProductsClass[cnt].main_image|sfNoImageMainList|escape}-->"
+                                class="expansion"
+                                target="_blank"
+                            <!--{/if}-->
+                        >
+                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsClass[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProductsClass[cnt].name|escape}-->" /></a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$arrProductsClass[cnt].name|escape}--></strong><br />
+                            <!--{if $arrProductsClass[cnt].classcategory_name1 != ""}-->
+                                <!--{$arrProductsClass[cnt].class_name1}-->：<!--{$arrProductsClass[cnt].classcategory_name1}--><br />
+                            <!--{/if}-->
+                            <!--{if $arrProductsClass[cnt].classcategory_name2 != ""}-->
+                                <!--{$arrProductsClass[cnt].class_name2}-->：<!--{$arrProductsClass[cnt].classcategory_name2}-->
+                            <!--{/if}-->
+                        </td>
+                        <td class="pricetd">
+                        <!--{if $arrProductsClass[cnt].price02 != ""}-->
+                            <!--{$arrProductsClass[cnt].price02|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                        <!--{else}-->
+                            <!--{$arrProductsClass[cnt].price01|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                        <!--{/if}-->
+                        </td>
+                        <td id="quantity"><!--{$arrProductsClass[cnt].quantity}-->
+                            <ul id="quantity_level">
+                                <li><a href="?" onclick="fnModeSubmit('up','cart_no','<!--{$arrProductsClass[cnt].cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/plus.gif" width="16" height="16" alt="＋" /></a></li>
+                                <li><a href="?" onclick="fnModeSubmit('down','cart_no','<!--{$arrProductsClass[cnt].cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/cart/minus.gif" width="16" height="16" alt="-" /></a></li>
+                            </ul>
+                        </td>
+                        <td class="pricetd"><!--{$arrProductsClass[cnt].total_pretax|number_format}-->円</td>
+                     </tr>
+                 <!--{/section}-->
+                 <tr>
+                     <th colspan="5" class="resulttd">小計</th>
+                     <td class="pricetd"><!--{$tpl_total_pretax|number_format}-->円</td>
+                 </tr>
+                 <tr>
+                     <th colspan="5" class="resulttd">合計</th>
+                     <td class="pricetd"><em><!--{$arrData.total-$arrData.deliv_fee|number_format}-->円</em></td>
+                 </tr>
+                 <!--{if $smarty.const.USE_POINT !== false}-->
+                     <!--{if $arrData.birth_point > 0}-->
+                         <tr>
+                             <th colspan="5" class="resulttd">お誕生月ポイント</th>
+                             <td class="pricetd"><!--{$arrData.birth_point|number_format}-->pt</td>
+                         </tr>
+                     <!--{/if}-->
+                     <tr>
+                         <th colspan="5" class="resulttd">今回加算ポイント</th>
+                         <td class="pricetd"><!--{$arrData.add_point|number_format}-->pt</td>
+                    </tr>
+                <!--{/if}-->
+            </table>
+            <p class="mini">※商品写真は参考用写真です。ご注文のカラーと異なる写真が表示されている場合でも、商品番号に記載されているカラー表示で間違いございませんのでご安心ください。</p>
+            <div class="tblareabtn">
+                <!--{if strlen($tpl_error) == 0}-->
+                    <p>上記内容でよろしければ「購入手続きへ」ボタンをクリックしてください。</p>
+                <!--{/if}-->
+
+                <p>
+                    <!--{if $tpl_prev_url != ""}-->
+                        <a href="<!--{$tpl_prev_url}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/cart/b_pageback_on.gif','back');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/cart/b_pageback.gif','back');">
+                            <img src="<!--{$TPL_DIR}-->img/cart/b_pageback.gif" width="150" height="30" alt="買い物を続ける" name="back" id="back" /></a>&nbsp;&nbsp;
+                    <!--{/if}-->
+                    <!--{if strlen($tpl_error) == 0}-->
+                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/cart/b_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/cart/b_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/cart/b_buystep.gif" class="box150" alt="購入手続きへ" name="confirm" />
+                    <!--{/if}-->
+                 </p>
+            </div>
+        </form>
+    <!--{else}-->
+        <p class="empty"><em>※ 現在カート内に商品はございません。</em></p>
+    <!--{/if}-->
+    </div>
 </div>
 <!--▲CONTENTS-->
Index: branches/comu-ver2/data/Smarty/templates/default/detail.tpl
===================================================================
--- branches/comu-ver2/data/Smarty/templates/default/detail.tpl	(revision 18297)
+++ branches/comu-ver2/data/Smarty/templates/default/detail.tpl	(revision 18325)
@@ -20,4 +20,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery.easing.1.3.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.2.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
 // 規格2に選択肢を割り当てる。
@@ -126,4 +130,8 @@
     }
 }
+$(document).ready(function() {
+    $("a.expansion").fancybox({
+    });
+});
 //]]>
 </script>
@@ -142,16 +150,21 @@
 
             <!--{assign var=key value="main_image"}-->
-            <!--{if $arrProduct.main_large_image != ""}-->
-                <!--★画像★-->
-                <a href="javascript:void(win01('./detail_image.php?product_id=<!--{$arrProduct.product_id}-->&amp;image=main_large_image<!--{if $smarty.get.admin == 'on'}-->&amp;admin=on<!--{/if}-->','detail_image','<!--{$arrFile.main_large_image.width+60}-->', '<!--{$arrFile.main_large_image.height+80}-->'))">
-                    <img src="<!--{$arrFile[$key].filepath|escape}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" alt="<!--{$arrProduct.name|escape}-->" class="picture" /></a>
-                <p>
+            
+            <!--★画像★-->
+            <a
+                <!--{if $arrProduct.main_large_image|strlen >= 1}-->
+                    href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProduct.main_large_image|escape}-->"
+                    class="expansion"
+                    onmouseover="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion_on.gif','expansion01');"
+                    onmouseout="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion.gif','expansion01');"
+                    target="_blank"
+                <!--{/if}-->
+            >
+                <img src="<!--{$arrFile[$key].filepath|escape}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" alt="<!--{$arrProduct.name|escape}-->" class="picture" /><br />
                 <!--★拡大する★-->
-                    <a href="javascript:void(win01('./detail_image.php?product_id=<!--{$arrProduct.product_id}-->&amp;image=main_large_image<!--{if $smarty.get.admin == 'on'}-->&amp;admin=on<!--{/if}-->','detail_image','<!--{$arrFile.main_large_image.width+60}-->', '<!--{$arrFile.main_large_image.height+80}-->'))" onmouseover="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion_on.gif','expansion01');" onMouseOut="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion.gif','expansion01');">
-                        <img src="<!--{$TPL_DIR}-->img/products/b_expansion.gif" width="85" height="13" alt="画像を拡大する" name="expansion01" id="expansion01" /></a>
-                </p>
-            <!--{else}-->
-                <img src="<!--{$arrFile[$key].filepath}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" alt="<!--{$arrProduct.name|escape}-->" class="picture" />
-            <!--{/if}-->
+                <!--{if $arrProduct.main_large_image|strlen >= 1}-->
+                    <img src="<!--{$TPL_DIR}-->img/products/b_expansion.gif" width="85" height="13" alt="画像を拡大する" name="expansion01" id="expansion01" />
+                <!--{/if}-->
+            </a>
         </div>
 
@@ -353,30 +366,26 @@
                 <div class="subtext"><!--★サブテキスト★--><!--{$arrProduct[$ckey]|nl2br_html}--></div>
                 
-                <!--▼拡大写真-->
+                <!--▼サブ画像-->
                 <!--{assign var=key value="sub_image`$smarty.section.cnt.index+1`"}-->
                 <!--{assign var=lkey value="sub_large_image`$smarty.section.cnt.index+1`"}-->
-                <!--{if $arrFile[$key].filepath != ""}-->
+                <!--{if $arrProduct[$lkey]|strlen >= 1}-->
                     <div class="subphotoimg">
                         <a
-                        <!--{if $arrFile[$lkey].filepath != ""}-->
-                                href="?"
-                                onclick="win01('./detail_image.php?product_id=<!--{$arrProduct.product_id}-->&amp;image=<!--{$lkey}--><!--{if $smarty.get.admin == 'on'}-->&amp;admin=on<!--{/if}-->','detail_image','<!--{$arrFile[$lkey].width+60}-->','<!--{$arrFile[$lkey].height+80}-->'); return false;"
+                            <!--{if $arrProduct[$lkey]|strlen >= 1}-->
+                                href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrProduct[$lkey]|escape}-->"
+                                class="expansion"
+                                onmouseover="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion_on.gif', 'expansion_<!--{$lkey|escape}-->');"
+                                onmouseout="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion.gif', 'expansion_<!--{$lkey|escape}-->');"
                                 target="_blank"
-                        <!--{/if}-->
+                            <!--{/if}-->
                         >
-                        <!--サブ画像-->
-                            <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrProduct.name|escape}-->" width="<!--{$smarty.const.NORMAL_SUBIMAGE_WIDTH}-->" height="<!--{$smarty.const.NORMAL_SUBIMAGE_HEIGHT}-->" /></a>
-                        <!--{if $arrFile[$lkey].filepath != ""}-->
-                            <p>
-                                <a href="?"
-                                     onclick="win01('./detail_image.php?product_id=<!--{$arrProduct.product_id}-->&amp;image=<!--{$lkey}--><!--{if $smarty.get.admin == 'on'}-->&amp;admin=on<!--{/if}-->','detail_image','<!--{$arrFile[$lkey].width+60}-->','<!--{$arrFile[$lkey].height+80}-->'); return false;"
-                                     onmouseover="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion_on.gif','expansion02');"
-                                     onmouseout="chgImg('<!--{$TPL_DIR}-->img/products/b_expansion.gif','expansion02');" target="_blank">
-                                    <img src="<!--{$TPL_DIR}-->img/products/b_expansion.gif" width="85" height="13" alt="画像を拡大する" /></a>
-                            </p>
-                        <!--{/if}-->
+                            <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrProduct.name|escape}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" /><br />
+                            <!--{if $arrProduct[$lkey]|strlen >= 1}-->
+                                <img src="<!--{$TPL_DIR}-->img/products/b_expansion.gif" width="85" height="13" alt="画像を拡大する" id="expansion_<!--{$lkey|escape}-->" />
+                            <!--{/if}-->
+                        </a>
                     </div>
-                    <!--▲拡大写真-->
                 <!--{/if}-->
+                <!--▲サブ画像-->
             </div>
         <!--{/if}-->
Index: branches/comu-ver2/data/class_extends/page_extends/products/LC_Page_Products_DetailImage_Ex.php
===================================================================
--- branches/comu-ver2/data/class_extends/page_extends/products/LC_Page_Products_DetailImage_Ex.php	(revision 16741)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once(CLASS_PATH . "pages/products/LC_Page_Products_DetailImage.php");
-
-/**
- * LC_Page_Products_DetailImage のページクラス(拡張).
- *
- * LC_Page_Products_DetailImage をカスタマイズする場合はこのクラスを編集する.
- *
- * @package Page
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class LC_Page_Products_DetailImage_Ex extends LC_Page_Products_DetailImage {
-
-    // }}}
-    // {{{ functions
-
-    /**
-     * Page を初期化する.
-     *
-     * @return void
-     */
-    function init() {
-        parent::init();
-    }
-
-    /**
-     * Page のプロセス.
-     *
-     * @return void
-     */
-    function process() {
-        parent::process();
-    }
-
-    /**
-     * デストラクタ.
-     *
-     * @return void
-     */
-    function destroy() {
-        parent::destroy();
-    }
-}
-?>
Index: branches/comu-ver2/data/class/SC_CartSession.php
===================================================================
--- branches/comu-ver2/data/class/SC_CartSession.php	(revision 18275)
+++ branches/comu-ver2/data/class/SC_CartSession.php	(revision 18325)
@@ -249,5 +249,4 @@
         // 前頁として記録しないページを指定する。
         $arrExclude = array(
-            "detail_image.php",
             "/shopping/"
         );
Index: branches/comu-ver2/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/comu-ver2/data/class/helper/SC_Helper_DB.php	(revision 18320)
+++ branches/comu-ver2/data/class/helper/SC_Helper_DB.php	(revision 18325)
@@ -362,15 +362,4 @@
                     $arrClassCatName[$arrData['classcategory_id2']];
 
-                // 画像サイズ
-                $main_image_path = IMAGE_SAVE_DIR . basename($objPage->arrProductsClass[$cnt]["main_image"]);
-                if(file_exists($main_image_path)) {
-                    list($image_width, $image_height) = getimagesize($main_image_path);
-                } else {
-                    $image_width = 0;
-                    $image_height = 0;
-                }
-
-                $objPage->arrProductsClass[$cnt]["tpl_image_width"] = $image_width + 60;
-                $objPage->arrProductsClass[$cnt]["tpl_image_height"] = $image_height + 80;
                 // 価格の登録
                 if ($arrData['price02'] != "") {
Index: branches/comu-ver2/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/comu-ver2/data/class/pages/products/LC_Page_Products_Detail.php	(revision 18290)
+++ branches/comu-ver2/data/class/pages/products/LC_Page_Products_Detail.php	(revision 18325)
@@ -245,6 +245,4 @@
         
         // 画像ファイル指定がない場合の置換処理
-        $this->arrProduct['main_list_image']
-            = SC_Utils_Ex::sfNoImageMainList($this->arrProduct['main_list_image']);
         $this->arrProduct['main_image']
             = SC_Utils_Ex::sfNoImageMain($this->arrProduct['main_image']);
@@ -448,6 +446,4 @@
         
         // 画像ファイル指定がない場合の置換処理
-        $this->arrProduct['main_list_image']
-            = SC_Utils_Ex::sfNoImageMainList($this->arrProduct['main_list_image']);
         $this->arrProduct['main_image']
             = SC_Utils_Ex::sfNoImageMain($this->arrProduct['main_image']);
@@ -509,10 +505,7 @@
     /* ファイル情報の初期化 */
     function lfInitFile() {
-        $this->objUpFile->addFile("一覧-メイン画像", 'main_list_image', array('jpg','gif'),IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
         $this->objUpFile->addFile("詳細-メイン画像", 'main_image', array('jpg'), IMAGE_SIZE, true, NORMAL_IMAGE_WIDTH, NORMAL_IMAGE_HEIGHT);
-        $this->objUpFile->addFile("詳細-メイン拡大画像", 'main_large_image', array('jpg'), IMAGE_SIZE, false, LARGE_IMAGE_HEIGHT, LARGE_IMAGE_HEIGHT);
         for ($cnt = 1; $cnt <= PRODUCTSUB_MAX; $cnt++) {
             $this->objUpFile->addFile("詳細-サブ画像$cnt", "sub_image$cnt", array('jpg'), IMAGE_SIZE, false, NORMAL_SUBIMAGE_HEIGHT, NORMAL_SUBIMAGE_HEIGHT);
-            $this->objUpFile->addFile("詳細-サブ拡大画像$cnt", "sub_large_image$cnt", array('jpg'), IMAGE_SIZE, false, LARGE_SUBIMAGE_HEIGHT, LARGE_SUBIMAGE_HEIGHT);
         }
         $this->objUpFile->addFile("商品比較画像", 'file1', array('jpg'), IMAGE_SIZE, false, NORMAL_IMAGE_HEIGHT, NORMAL_IMAGE_HEIGHT);
Index: branches/comu-ver2/data/class/pages/products/LC_Page_Products_DetailImage.php
===================================================================
--- branches/comu-ver2/data/class/pages/products/LC_Page_Products_DetailImage.php	(revision 18236)
+++ 	(revision )
@@ -1,114 +1,0 @@
-<?php
-/*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
- *
- * http://www.lockon.co.jp/
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-// {{{ requires
-require_once(CLASS_PATH . "pages/LC_Page.php");
-
-/**
- * 画像詳細 のページクラス.
- *
- * @package Page
- * @author LOCKON CO.,LTD.
- * @version $Id$
- */
-class LC_Page_Products_DetailImage extends LC_Page {
-
-    // }}}
-    // {{{ functions
-
-    /**
-     * Page を初期化する.
-     *
-     * @return void
-     */
-    function init() {
-        parent::init();
-        $this->tpl_mainpage = 'products/detail_image.tpl';
-    }
-
-    /**
-     * Page のプロセス.
-     *
-     * @return void
-     */
-    function process() {
-        $objView = new SC_SiteView();
-        $objCartSess = new SC_CartSession();
-        $objDb = new SC_Helper_DB_Ex();
-
-        // 管理ページからの確認の場合は、非公開の商品も表示する。
-        // XXX 若干脆弱な気がする。ログイン状態か確認するのが望ましいかと。
-        if (isset($_GET['admim']) && $_GET['admin'] == 'on') {
-            $where = "del_flg = 0";
-        } else {
-            $where = "del_flg = 0 AND status = 1";
-        }
-
-        // 値の正当性チェック
-        if (!SC_Utils_Ex::sfIsInt($_GET['product_id']) || !$objDb->sfIsRecord("dtb_products", "product_id", $_GET['product_id'], $where)) {
-            SC_Utils_Ex::sfDispSiteError(PRODUCT_NOT_FOUND);
-        }
-
-
-        $image_key = $_GET['image'];
-
-        $objQuery = new SC_Query();
-         // カラムが存在していなければエラー画面を表示
-        if(!$objDb->sfColumnExists("dtb_products",$image_key)){
-            SC_Utils_Ex::sfDispSiteError(PRODUCT_NOT_FOUND);
-        }
-        $col = "name, $image_key";
-        
-        $arrRet = $objQuery->select($col, "dtb_products", "product_id = ?", array($_GET['product_id']));
-        $image_path = IMAGE_SAVE_DIR . $arrRet[0][$image_key];
-        
-        if (file_exists($image_path)) {
-            list($width, $height) = getimagesize($image_path);
-        } else {
-            $width = 0;
-            $height = 0;
-        }
-        
-        $this->tpl_width = $width;
-        $this->tpl_height = $height;
-        $this->tpl_table_width = $this->tpl_width + 20;
-        $this->tpl_table_height = $this->tpl_height + 20;
-
-        $this->tpl_image = $arrRet[0][$image_key];
-        $this->tpl_name = $arrRet[0]['name'];
-        $this->tpl_image_key = $image_key;
-
-        $objView->assignobj($this);
-        $objView->display($this->tpl_mainpage);
-    }
-
-    /**
-     * デストラクタ.
-     *
-     * @return void
-     */
-    function destroy() {
-        parent::destroy();
-    }
-}
-?>
