Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 21073)
@@ -49,5 +49,4 @@
     $(function(){
         $('.recomendblock, .list_area, .newslist li, .bubbleBox, .arrowBox, .category_body, .navBox li').biggerlink();
-        //$('.recomendblock, .newslist li,.bubbleBox,.arrowBox,.navBox li').biggerlink();
     });
 </script>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/refusal_confirm.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/refusal_confirm.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/refusal_confirm.tpl	(revision 21073)
@@ -26,5 +26,5 @@
      <h2 class="title"><!--{$tpl_title|h}--></h2>
      <!--{include file=$tpl_navi}-->
-        <form name="form1" method="post" action="?">
+        <form name="form1" method="post" action="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/refusal.php">
             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
             <input type="hidden" name="mode" value="complete" />
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/refusal.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/refusal.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/refusal.tpl	(revision 21073)
@@ -28,5 +28,5 @@
 
       <h3 class="title_mypage"><!--{$tpl_subtitle|h}--></h3>
-          <form name="form1" method="post" action="?">
+          <form name="form1" method="post" action="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/refusal.php">
               <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
               <input type="hidden" name="mode" value="confirm" />
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 21073)
@@ -35,5 +35,5 @@
        </div>
 
-       <form name="form1" id="form1" method="post" action="?">
+       <form name="form1" id="form1" method="post" action="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/change.php">
            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
            <input type="hidden" name="mode" value="complete" />
@@ -100,5 +100,5 @@
           <ul class="btn_btm">
             <li><input type="submit" value="完了ページへ" class="btn data-role-none" alt="完了ページへ" name="complete" id="complete" /></li>
-            <li><a class="btn_back" href="?" onClick="fnModeSubmit('return', '', ''); return false;" rel="external">戻る</a></li>
+            <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">戻る</a></li>
           </ul>
        </div>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery.tpl	(revision 21073)
@@ -24,27 +24,26 @@
 <!--▼CONTENTS-->
 <section id="mypagecolumn">
-        <h2 class="title"><!--{$tpl_title|h}--></h2>
-        <!--{include file=$tpl_navi}-->
+    <h2 class="title"><!--{$tpl_title|h}--></h2>
+    <!--{include file=$tpl_navi}-->
 
-        <h3 class="title_mypage"><!--{$tpl_subtitle|h}--></h3>
-        <!--★インフォメーション★-->
-          <div class="information">
-             <p><span class="attention">※</span>は必須入力項目です。<p>
-             <p>最大<span class="attention"><!--{$smarty.const.DELIV_ADDR_MAX|h}-->件</span>まで登録できます。</p>  
-          </div>
-        <!--{if $tpl_linemax < $smarty.const.DELIV_ADDR_MAX}-->
+    <h3 class="title_mypage"><!--{$tpl_subtitle|h}--></h3>
+    <!--★インフォメーション★-->
+    <div class="information">
+        <p><span class="attention">※</span>は必須入力項目です。<p>
+        <p>最大<span class="attention"><!--{$smarty.const.DELIV_ADDR_MAX|h}-->件</span>まで登録できます。</p>  
+    </div>
+    <!--{if $tpl_linemax < $smarty.const.DELIV_ADDR_MAX}-->
         <!--{* 退会時非表示 *}-->
         <!--{if $tpl_login}-->
-
-        <!--★ボタン★-->
-          <div class="btn_area_top">
-              <a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/delivery_addr.php" class="btn_sub addbtn" rel="external">新しいお届け先を追加</a>
-          </div>
+            <!--★ボタン★-->
+            <div class="btn_area_top">
+                <a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/delivery_addr.php" class="btn_sub addbtn" rel="external" target="_blank">新しいお届け先を追加</a>
+            </div>
         <!--{/if}-->
-        <!--{/if}-->
+    <!--{/if}-->
 
     <div class="form_area">
         <!--{if $tpl_linemax > 0}-->
-           <form name="form1" method="post" action="?" >
+           <form name="form1" id="form1" method="post" action="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/delivery.php" >
                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                <input type="hidden" name="mode" value="" />
@@ -52,31 +51,33 @@
                <input type="hidden" name="pageno" value="<!--{$tpl_pageno}-->" />
 
-       <!--▼フォームボックスここから -->
-       <div class="formBox">
+               <!--▼フォームボックスここから -->
+               <div class="formBox">
+               
+                  <!--{section name=cnt loop=$arrOtherDeliv max=$dispNumber}-->
+                      <!--▼お届け先 -->
+                      <div class="delivBox">
+                          <!--{assign var=OtherPref value="`$arrOtherDeliv[cnt].pref`"}-->
+                          <p><em><span class="zip_title">お届け先住所<!--{$smarty.section.cnt.iteration}--></span></em>：<br />
+                              〒<span class="zip01"><!--{$arrOtherDeliv[cnt].zip01}--></span>-<span class="zip02"><!--{$arrOtherDeliv[cnt].zip02}--></span><br />
+                              <span class="address"><!--{$arrPref[$OtherPref]|h}--><!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--></span><br />
+                              <span class="name01"><!--{$arrOtherDeliv[cnt].name01|h}--></span>&nbsp;<span class="name02"><!--{$arrOtherDeliv[cnt].name02|h}--></span></p>
 
-             <!--▼お届け先 -->
-       <div class="delivBox">
-                   <!--{section name=cnt loop=$arrOtherDeliv}-->
-          <!--{assign var=OtherPref value="`$arrOtherDeliv[cnt].pref`"}-->
-             <p><em>お届け先住所<!--{$smarty.section.cnt.iteration}--></em>：<br />
-                                〒<!--{$arrOtherDeliv[cnt].zip01}-->-<!--{$arrOtherDeliv[cnt].zip02}--><br />
-                      <!--{$arrPref[$OtherPref]|h}--><!--{$arrOtherDeliv[cnt].addr01|h}--><!--{$arrOtherDeliv[cnt].addr02|h}--><br />
-                      <!--{$arrOtherDeliv[cnt].name01|h}-->&nbsp;<!--{$arrOtherDeliv[cnt].name02|h}--></p>
-
-            <ul class="edit">
-              <li><a href="./delivery_addr.php" onclick="win02('./delivery_addr.php?other_deliv_id=<!--{$arrOtherDeliv[cnt].other_deliv_id}-->','deliv_disp','600','640'); return false;" class="b_edit" rel="external">編集</a></li>
-              <li><a href="#" onclick="fnModeSubmit('delete','other_deliv_id','<!--{$arrOtherDeliv[cnt].other_deliv_id}-->'); return false;" rel="external">削除</a></li>
-            </ul>
-          </div>
-       <!--▲お届け先-->
-         <!--{/section}-->
-
-      </div><!--▲formBox -->
-          </form>
+                          <ul class="edit">
+                              <li><a href="#" onClick="win02('./delivery_addr.php?other_deliv_id=<!--{$arrOtherDeliv[cnt].other_deliv_id}-->','deliv_disp','600','640'); return false;" class="b_edit deliv_edit" rel="external">編集</a></li>
+                              <li><a href="#" onClick="fnModeSubmit('delete','other_deliv_id','<!--{$arrOtherDeliv[cnt].other_deliv_id}-->'); return false;" class="deliv_delete" rel="external">削除</a></li>
+                          </ul>
+                       </div>
+                       <!--▲お届け先-->
+                   <!--{/section}-->
+                
+               </div><!--▲formBox -->
+           </form>
       <!--{else}-->
           <p class="delivempty"><strong>新しいお届け先はありません。</strong></p>
       <!--{/if}-->
 
-          <p><a href="#" class="btn_more" rel="external">もっとみる</a></p>
+      <!--{if count($arrOtherDeliv) > $dispNumber}-->
+      <p><a rel="external" href="javascript: void(0);" class="btn_more" id="btn_more_delivery" onClick="getDelivery(<!--{$dispNumber}-->); return false;" rel="external">もっとみる(＋<!--{$dispNumber}-->件)</a></p>
+      <!--{/if}-->
 
    </div><!--▲form_area -->
@@ -84,2 +85,69 @@
 </section>
 <!--▲CONTENTS -->
+
+<script>
+var pageNo = 2;
+
+function getDelivery(limit) {
+    $.mobile.pageLoading();
+    var i = limit;
+    //送信データを準備
+    var postData = {};
+    $('#form1').find(':input').each(function(){
+        postData[$(this).attr('name')] = $(this).val();
+    });
+    postData["mode"] = "getList";
+    postData["pageno"] = pageNo;
+    postData["disp_number"] = i;
+
+    $.ajax({
+           type: "POST",
+           url: "<!--{$smarty.const.ROOT_URLPATH}-->mypage/delivery.php",
+           data: postData,
+           cache: false,
+           dataType: "json",
+           error: function(XMLHttpRequest, textStatus, errorThrown){
+               alert(textStatus);
+               $.mobile.pageLoading(true);
+           },
+           success: function(result){
+             var count = ((pageNo - 1) * i + 1); //お届け先住所の番号
+             for (var j = 0; j < i; j++) {
+                 if (result[j] != null) {
+                    var delivery = result[j];
+                    var deliveryHtml = "";
+                    var maxCnt = $(".delivBox").length - 1;
+                    var deliveryEl = $(".delivBox").get(maxCnt);
+                    deliveryEl = $(deliveryEl).clone(true).insertAfter(deliveryEl);
+                    maxCnt++;
+                    
+                    //住所タイトルをセット
+                    $($(".delivBox span.zip_title").get(maxCnt)).text('お届け先住所' + count);
+                    //郵便番号1をセット
+                    $($(".delivBox span.zip01").get(maxCnt)).text(delivery.zip01);
+                    //郵便番号2をセット
+                    $($(".delivBox span.zip02").get(maxCnt)).text(delivery.zip02);
+                    //住所をセット
+                    $($(".delivBox span.address").get(maxCnt)).text(delivery.pref + delivery.addr01 + delivery.addr02);
+                    //姓をセット
+                    $($(".delivBox span.name01").get(maxCnt)).text(delivery.name01);
+                    //名前をセット
+                    $($(".delivBox span.name02").get(maxCnt)).text(delivery.name02);
+                    //編集ボタンをセット
+                    $($(".delivBox a.deliv_edit").get(maxCnt)).attr("onClick", "win02('./delivery_addr.php?other_deliv_id=" + delivery.other_deliv_id + "','deliv_disp','600','640'); return false;");
+                    //削除ボタンをセット
+                    $($(".delivBox a.deliv_delete").get(maxCnt)).attr("onClick", "fnModeSubmit('delete','other_deliv_id','" + delivery.other_deliv_id + "'); return false;");
+                    count++;
+                 }
+             }
+             pageNo++;
+
+             //すべてのお届け先を表示したか判定
+             if (parseInt(result.delivCount) <= $(".delivBox").length) {
+                 $("#btn_more_delivery").hide();
+             }
+             $.mobile.pageLoading(true);
+           }
+});
+}
+</script>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/change.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/change.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/change.tpl	(revision 21073)
@@ -24,31 +24,30 @@
 <!--▼CONTENTS-->
 <section id="mypagecolumn">
-       <h2 class="title"><!--{$tpl_title|h}--></h2>
-       <!--{include file=$tpl_navi}-->
+    <h2 class="title"><!--{$tpl_title|h}--></h2>
+    <!--{include file=$tpl_navi}-->
+    <h3 class="title_mypage"><!--{$tpl_subtitle|h}--></h3>
 
-       <h3 class="title_mypage"><!--{$tpl_subtitle|h}--></h3>
+    <!--★インフォメーション★-->
+    <div class="intro">
+       <p><span class="attention">※</span>は必須入力項目です。</p>
+    </div>
 
-       <!--★インフォメーション★-->
-       <div class="intro">
-           <p><span class="attention">※</span>は必須入力項目です。</p>
+    <form name="form1" id="form1" method="post" action="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/change.php">
+       <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+       <input type="hidden" name="mode" value="confirm" />
+       <input type="hidden" name="customer_id" value="<!--{$arrForm.customer_id|h}-->" />
+
+       <dl class="form_entry">
+           <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/form_personal_input.tpl" flgFields=3 emailMobile=true prefix=""}-->
+       </dl>
+          
+       <!--{if 'sfGMOMypageDisplay'|function_exists}-->
+           <!--{'sfGMOMypageDisplay'|call_user_func}-->
+       <!--{/if}-->
+       <div class="btn_area">
+           <p><input type="submit" class="btn data-role-none" value="確認ページへ" name="refusal" id="refusal" /></p>
        </div>
 
-         <form name="form1" id="form1" method="post" action="?">
-             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-             <input type="hidden" name="mode" value="confirm" />
-             <input type="hidden" name="customer_id" value="<!--{$arrForm.customer_id|h}-->" />
-
-       <dl class="form_entry">
-          <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/form_personal_input.tpl" flgFields=3 emailMobile=true prefix=""}-->
-       </dl>
-          
-                                        <!--{if 'sfGMOMypageDisplay'|function_exists}-->
-          <!--{'sfGMOMypageDisplay'|call_user_func}-->
-          <!--{/if}-->
-       <div class="btn_area">
-           <p><input type="submit" class="btn data-role-none" value="確認ページへ" name="refusal" id="refusal" /></p>
-          </div>
-
-         </form>
+    </form>
 </section>
 <!--▲CONTENTS-->
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/login.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/login.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/login.tpl	(revision 21073)
@@ -43,5 +43,5 @@
 </div><!--▲loginBox -->
 
-<p class="arrowRtxt"><a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->','forget','600','460'); return false;" target="_blank">パスワードを忘れた方</a></p>
+<p class="arrowRtxt"><a rel="external" href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->">パスワードを忘れた方</a></p>
 
         <div class="btn_area">
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/mail_view.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/mail_view.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/mail_view.tpl	(revision 21073)
@@ -1,5 +1,5 @@
 <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`popup_header.tpl" subtitle="MYページ/メール履歴詳細"}-->
 
-<div data-role="page" data-theme="d" id="index frame_outer">
+<div data-theme="d" id="index frame_outer">
 <!--▼CONTENTS-->
    <dl class="view_detail">
@@ -10,4 +10,3 @@
 <!--▲CONTENTS -->
 
-
 <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`popup_footer.tpl"}-->
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 21073)
@@ -38,5 +38,5 @@
        </div>
 
-       <form name="form1" id="form1" method="post" action="?">
+       <form name="form1" id="form1" method="post" action="<!--{$smarty.const.HTTP_URL}-->mypage/delivery_addr.php">
            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
            <input type="hidden" name="mode" value="edit" />
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	(revision 21073)
@@ -27,8 +27,5 @@
 <!--★インフォメーション★-->
 <div class="information">
- <p>一覧よりお届け先住所を選択してください。</p>
-<!--{if $tpl_addrmax < $smarty.const.DELIV_ADDR_MAX}-->
-※最大<!--{$smarty.const.DELIV_ADDR_MAX|h}-->件まで登録できます。</p>
-<!--{/if}-->
+<p>一覧よりお届け先住所を選択してください。</p>
 </div>
 
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/index.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/index.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/shopping/index.tpl	(revision 21073)
@@ -41,5 +41,5 @@
     </div>
 
-    <p class="arrowRtxt"><a rel="external" href="javascript:void(0);" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->','forget','600','460'); return false;">パスワードを忘れた方</a></p>
+    <p class="arrowRtxt"><a rel="external" href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->">パスワードを忘れた方</a></p>
     <div class="btn_area">
     <p><input type="submit" value="ログイン" class="btn data-role-none" alt="ログイン" name="log" id="log" /></p>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 21063)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 21073)
@@ -90,5 +90,5 @@
         <!--{/if}-->
 
-        <form name="form1" id="form1" method="post" action="<!--{$smarty.const.CART_URLPATH|h}-->">
+        <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="<!--{$smarty.const.CART_URLPATH|h}-->">
             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
             <!--{if 'sfGMOCartDisplay'|function_exists}-->
@@ -108,8 +108,4 @@
                   <div class="totalmoney_area">
                   <!--{$arrProductType[$key]}-->の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。
-                  </div>
-                <!--{else}-->
-                  <div class="totalmoney_area">
-                  お買い上げ商品の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。
                   </div>
                 <!--{/if}-->
@@ -135,10 +131,11 @@
                           <span class="mini"><!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--></span><br />
                       <!--{/if}-->
+                                                   価格:<!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
                       </p>
                     <p class="btn_delete">
-                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_delete.png" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$item.cart_no}-->');" class="pointer" width="21" height="20" alt="削除" /></p>
+                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_delete.png" onClick="fnFormModeSubmit('form<!--{$key}-->', 'delete', 'cart_no', '<!--{$item.cart_no}-->');" class="pointer" width="21" height="20" alt="削除" /></p>
 
                     <ul>
-                     <li><input type="number" name="quantity" class="cartin_quantity text data-role-none" value="<!--{$item.quantity}-->" maxlength="9" style="" onchange="fnModeSubmit('setQuantity','cart_no','<!--{$item.cart_no}-->');" /></li>
+                     <li><input type="number" name="quantity" class="cartin_quantity text data-role-none" value="<!--{$item.quantity}-->" maxlength="9" style="" onchange="fnFormModeSubmit('form<!--{$key}-->', 'setQuantity','cart_no','<!--{$item.cart_no}-->');" /></li>
                       <li class="result"><span class="mini">小計：</span><!--{$item.total_inctax|number_format}-->円</li>
                     </ul>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/forgot/complete.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/forgot/complete.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/forgot/complete.tpl	(revision 21073)
@@ -45,5 +45,5 @@
 
      <div class="btn_area">
-      <p><a href="javascript:window.close()" class="btn_sub btn_close">閉じる</a></p>
+      <p><a rel="external" href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/login.php" class="btn_sub btn_close">ログイン画面へ</a></p>
        </div>
      </form>    
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/entry/complete.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/entry/complete.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/entry/complete.tpl	(revision 21073)
@@ -29,5 +29,5 @@
          <div id="completetext">
             <p>今後ともご愛顧賜りますよう、よろしくお願い申し上げます。</p>
-            <a class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URLPATH}-->">トップページへ</a>
+            <a rel="external" class="btn_s btn_sub" href="<!--{$smarty.const.TOP_URLPATH}-->">トップページへ</a>
          </div>
 </section>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 21073)
@@ -75,2 +75,64 @@
 </section>
 <!-- ▲カテゴリ -->
+
+<!--{* デフォルト
+<!--商品カテゴリーここから-->
+<div id="topcatarea">
+<h2 id="title-category" class="title-side">商品カテゴリ</h2>
+</div>
+
+<div id="block-category" class="block-side">
+  <div class="create-box">
+
+    <ul id="categorytree">
+    <!--{assign var=preLev value=1}-->
+    <!--{assign var=firstdone value=0}-->
+    <!--{section name=cnt loop=$arrTree}-->
+      <!--{if $arrTree[cnt].view_flg != "2"}-->
+        <!--{assign var=level value=`$arrTree[cnt].level`}-->
+        <!--{if $level <= 2 || $arrTree[cnt].display == 1}-->
+        <!--{assign var=levdiff value=`$level-$preLev`}-->
+          <!--{if $levdiff > 0}-->
+              <ul>
+          <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+              </li>
+          <!--{elseif $levdiff < 0}-->
+            <!--{section name=d loop=`$levdiff*-1`}-->
+                </li>
+              </ul>
+            <!--{/section}-->
+            </li>
+          <!--{/if}-->
+
+          <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
+            <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
+            <!--{assign var=preLev value=`$level`}-->
+            <!--{/if}-->
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{if $preLev-1 > 0}-->
+                    <!--{section name=d loop=`$preLev-1`}-->
+                        </li>
+                    </ul>
+            <!--{/section}-->
+            </li>
+          <!--{else}-->
+            </li>
+          <!--{/if}-->
+        <!--{/if}-->
+      <!--{/if}-->
+    <!--{/section}-->
+    </ul>
+
+  </div>
+</div>
+
+<!--{if $arrTree|@count > 0}-->
+<script type="text/javascript" language="JavaScript">
+//<![CDATA[
+initCategoryList(); //カテゴリーリストの初期化
+//]]>
+</script>
+<!--{/if}-->
+
+<!--商品カテゴリーここまで-->
+ *}-->
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/login_header.tpl	(revision 21073)
@@ -24,5 +24,5 @@
     <!--{if $tpl_login}-->
         <p>ようこそ
-                                        <a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/login.php" data-transition="slideup"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}--></a>さん</p>
+        <a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/mypage/login.php" data-transition="slideup"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}--></a>さん</p>
         <!--{if $smarty.const.USE_POINT !== false}-->
             <p>所持ポイント<!--{$tpl_user_point|number_format|default:0}-->pt</p>
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/frontparts/bloc/navi_header.tpl	(revision 21073)
@@ -70,5 +70,5 @@
 var stateCart = 0;
 function fnShowPopupmyPage(el) {
-    $("div.popup_mypage").css("left", $(el).offset().left - $("div.popup_mypage").width() - $(el).width() + 5);
+    $("div.popup_mypage").css("left", $(el).offset().left - $("div.popup_mypage").width() + 15);
     $("div.popup_mypage").toggle();
     //表示状態の更新
@@ -87,5 +87,5 @@
 
 function fnShowPopupCart(el) {
-    $("div.popup_cart").css("left", $(el).offset().left - $("div.popup_cart").width() - $(el).width() + 5);
+    $("div.popup_cart").css("left", $(el).offset().left - $("div.popup_cart").width() + 15);
     $("div.popup_cart").toggle();
     //表示状態の更新
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 21065)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 21073)
@@ -32,9 +32,10 @@
 }
 $(function(){
-    $('#detailphotoblock ul li').flickSlide({target:'#detailphotoblock>ul', duration:5000});
-    $('#whobought_area ul li').flickSlide({target:'#whobought_area>ul', duration:5000});
+    $('#detailphotoblock ul li').flickSlide({target:'#detailphotoblock>ul', duration:5000, parentArea:'#detailphotoblock'});
+    $('#whobought_area ul li').flickSlide({target:'#whobought_area>ul', duration:5000, parentArea:'#whobought_area'});
     //サブエリアとお勧めエリアを非表示にする（初期値）
     $("#sub_area").hide();
-    $("#whobought_area").hide();
+    //お勧め商品のリンクを張り直し(フリックスライドによるエレメント生成後)
+    $('#whobought_area li').biggerlink();
 });
 //サブエリアの表示/非表示
@@ -52,5 +53,5 @@
 }
 //お勧めエリアの表示/非表示
-var statewhobought = 1;
+var statewhobought = 0;
 function fnWhoboughtToggle(areaEl, imgEl) {
     areaEl.toggle(speed);
@@ -283,5 +284,5 @@
 
 <!--▼サブエリアここから-->
-<!--{if $arrProduct[$key] != ""}-->
+<!--{if $arrProduct.sub_title1 != ""}-->
   <div class="title_box_sub clearfix">
     <h2>商品情報</h2>
@@ -292,4 +293,5 @@
         <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
             <!--{assign var=key value="sub_title`$smarty.section.cnt.index+1`"}-->
+            <!--{if $arrProduct[$key] != ""}-->
             <!--▼サブ情報-->
            <div class="subarea clearfix">
@@ -315,4 +317,5 @@
             <p class="subtext"><!--★サブテキスト★--><!--{$arrProduct[$ckey]|nl2br_html}--></p>
             </div>
+            <!--{/if}-->
         <!--{/section}-->
     </div>
@@ -325,5 +328,5 @@
 <div class="title_box_sub clearfix">
   <h2>その他のオススメ商品</h2>
-     <span class="b_expand"><img src="<!--{$TPL_URLPATH}-->img/common/btn_plus.png" onClick="fnWhoboughtToggle($('#whobought_area'), this);"></span>
+     <span class="b_expand"><img src="<!--{$TPL_URLPATH}-->img/common/btn_minus.png" onClick="fnWhoboughtToggle($('#whobought_area'), this);"></span>
       </div>
   
@@ -332,10 +335,6 @@
     <ul>
     <!--{section name=cnt loop=$arrRecommend}-->
-        <!--{if ($smarty.section.cnt.index % 2) == 0}-->
         <!--{if $arrRecommend[cnt].product_id}-->
-        <!-- 左列 -->
-   
-          <li id="mainImage0"><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrRecommend[cnt].product_id|u}-->">
-          <a href="#">
+          <li id="mainImage1<!--{$smarty.section.cnt.index}-->">
           <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" width="80" height="80" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
              <!--{assign var=price02_min value=`$arrRecommend[cnt].price02_min`}-->
@@ -348,31 +347,7 @@
                    <!--{$price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$price02_max|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
               <!--{/if}--> 
-               円</span></p> 
-          </a></li>
-                
-         <!-- 左列 -->
-         <!--{/if}-->
-         <!--{/if}-->
-
-         <!--{if ($smarty.section.cnt.index % 2) != 0}-->
-         <!--{if $arrRecommend[cnt].product_id}-->
-         <!-- 右列 -->
-                
-         <li id="mainImage0"><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrRecommend[cnt].product_id|u}-->">
-          <a href="#">
-          <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" width="80" height="80" alt="<!--{$arrRecommend[cnt].name|h}-->" /></a>
-             <h3><a rel="external" href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrRecommend[cnt].product_id|u}-->"><!--{$arrRecommend[cnt].name|h}--></a></h3>
-              <p class="sale_price"><span class="price">
-              <!--{if $price02_min == $price02_max}-->
-                <!--{$price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
-              <!--{else}-->
-                <!--{$price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$price02_max|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
-              <!--{/if}-->
-              </span></p> 
-                </a></li>
-                
-          <!-- 右列 -->
-          <!--{/if}-->
-          <!--{/if}-->
+               円</span></p>
+          </li>
+        <!--{/if}-->
     <!--{/section}-->
                 
Index: /branches/version-2_11-dev/data/Smarty/templates/sphone/index.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/sphone/index.tpl	(revision 21050)
+++ /branches/version-2_11-dev/data/Smarty/templates/sphone/index.tpl	(revision 21073)
@@ -23,5 +23,6 @@
 <section id="search_area">
 <form method="get" action="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php">
-<input type="search" name="keyword" id="search" value="" placeholder="キーワードを入力" class="searchbox" >
+<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+<input type="search" name="name" id="search" value="" placeholder="キーワードを入力" class="searchbox" >
 </form>
 </section>
