Index: branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 19713)
@@ -0,0 +1,174 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.mousewheel-3.0.2.pack.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.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 />
+                <!--{/if}-->
+                
+                <!--{* カゴの中に商品がある場合にのみ表示 *}-->
+                <!--{if count($arrProductsClass) > 0 }-->
+                    <!--{* FIXME $key は未定義 *}-->
+                    お買い上げ商品の合計金額は「<em><!--{$tpl_total_inctax[$key]|number_format}-->円</em>」です。
+                    <!--{if $arrInfo.free_rule > 0}-->
+                        <!--{if $arrData.deliv_fee > 0}-->
+                            <!--{* FIXME $key は未定義 *}-->
+                            あと「<em><!--{$tpl_deliv_free[$key]|number_format}-->円</em>」で送料無料です！！
+                        <!--{else}-->
+                            現在、「<em>送料無料</em>」です！！
+                        <!--{/if}-->
+                    <!--{/if}-->
+                <!--{/if}-->
+            </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($cartItems) > 0}-->
+
+    <!--{foreach from=$cartKeys item=key}-->
+        <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="" />
+            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+            <table summary="商品情報">
+                <tr>
+                    <th>削除</th>
+                    <th>商品写真</th>
+                    <th>商品名</th>
+                    <th>単価</th>
+                    <th>数量</th>
+                    <th>小計</th>
+                </tr>
+                <!--{foreach from=$cartItems[$key] item=item}-->
+                    <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                        <td><a href="?" onclick="fnModeSubmit('delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">削除</a>
+                        </td>
+                        <td class="phototd">
+                        <a
+                            <!--{if $item.productsClass.main_image|strlen >= 1}-->
+                                href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$item.productsClass.main_image|sfNoImageMainList|escape}-->"
+                                class="expansion"
+                                target="_blank"
+                            <!--{/if}-->
+                        >
+                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|escape}-->" /></a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|escape}--></strong><br />
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                                <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
+                            <!--{/if}-->
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                                <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}-->
+                            <!--{/if}-->
+                        </td>
+                        <td class="pricetd">
+                        <!--{if $item.productsClass.price02 != ""}-->
+                            <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                        <!--{else}-->
+                            <!--{$item.productsClass.price01|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                        <!--{/if}-->
+                        </td>
+                        <td id="quantity"><!--{$item.quantity}-->
+                            <ul id="quantity_level">
+                                <li><a href="?" onclick="fnModeSubmit('up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/button/btn_plus.gif" width="16" height="16" alt="＋" /></a></li>
+                                <li><a href="?" onclick="fnModeSubmit('down','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_DIR}-->img/button/btn_minus.gif" width="16" height="16" alt="-" /></a></li>
+                            </ul>
+                        </td>
+                        <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td>
+                     </tr>
+                 <!--{/foreach}-->
+                 <tr>
+                     <th colspan="5" class="resulttd">小計</th>
+                     <td class="pricetd"><!--{$tpl_total_inctax[$key]|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>
+            <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/button/btn_back_on.gif','back');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','back');">
+                            <img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="買い物を続ける" name="back" id="back" /></a>&nbsp;&nbsp;
+                    <!--{/if}-->
+                    <!--{if strlen($tpl_error) == 0}-->
+                        <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_buystep.gif" width="130" height="30" alt="購入手続きへ" name="confirm" />
+                    <!--{/if}-->
+                 </p>
+            </div>
+        </form>
+    <!--{/foreach}-->
+    <!--{else}-->
+        <p class="empty"><em>※ 現在カート内に商品はございません。</em></p>
+    <!--{/if}-->
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/contact/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/contact/index.tpl	(revision 19713)
@@ -0,0 +1,201 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="undercolumn">
+  <div id="undercolumn_contact">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    
+    <p>お問い合わせはメールにて承っています。<br />
+    内容によっては回答をさしあげるのにお時間をいただくこともございます。また、土日、祝祭日、年末年始、夏期休暇期間は翌営業日以降の対応となりますのでご了承ください。</p>
+    
+    <p class="mini"><em>※ご注文に関するお問い合わせには、必ず「ご注文番号」と「お名前」をご記入の上、メールくださいますようお願いいたします。</em></p>
+    
+    <form name="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="confirm" />
+    
+    <table summary="お問い合わせ">
+      <tr>
+        <th>お名前<span class="attention">※</span></th>
+        <td>
+          <span class="attention"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></span>
+          姓&nbsp;<input type="text"
+                         class="box120"
+                         name="name01"
+                         value="<!--{$arrForm.name01|default:$arrData.name01|escape}-->"
+                         maxlength="<!--{$smarty.const.STEXT_LEN}-->"
+                         style="<!--{$arrErr.name01|sfGetErrorColor}-->" />　
+          名&nbsp;<input type="text" class="box120" name="name02"
+                         value="<!--{$arrForm.name02|default:$arrData.name02|escape}-->"
+                         maxlength="<!--{$smarty.const.STEXT_LEN}-->"
+                         style="<!--{$arrErr.name02|sfGetErrorColor}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th>お名前(フリガナ)<span class="attention">※</span></th>
+        <td>
+          <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
+          セイ&nbsp;<input type="text"
+                           class="box120"
+                           name="kana01"
+                           value="<!--{$arrForm.kana01|default:$arrData.kana01|escape}-->"
+                           maxlength="<!--{$smarty.const.STEXT_LEN}-->"
+                           style="<!--{$arrErr.kana01|sfGetErrorColor}-->" />　
+          メイ&nbsp;<input type="text"
+                           class="box120"
+                           name="kana02"
+                           value="<!--{$arrForm.kana02|default:$arrData.kana02|escape}-->"
+                           maxlength="<!--{$smarty.const.STEXT_LEN}-->"
+                           style="<!--{$arrErr.kana02|sfGetErrorColor}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th>郵便番号</th>
+        <td>
+          <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
+          <p>
+            〒&nbsp;
+            <input type="text"
+                   name="zip01"
+                   class="box60"
+                   value="<!--{$arrForm.zip01|default:$arrData.zip01|escape}-->"
+                   maxlength="<!--{$smarty.const.ZIP01_LEN}-->"
+                   style="<!--{$arrErr.zip01|sfGetErrorColor}-->" />&nbsp;-&nbsp;
+            <input type="text"
+                   name="zip02"
+                   class="box60"
+                   value="<!--{$arrForm.zip02|default:$arrData.zip02|escape}-->"
+                   maxlength="<!--{$smarty.const.ZIP02_LEN}-->"
+                   style="<!--{$arrErr.zip02|sfGetErrorColor}-->" />　
+            <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a>
+          </p>
+          <p class="zipimg">
+            <a href="javascript:fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01');">
+              <img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+            <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <th>住所</th>
+        <td>
+          <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
+          
+          <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->">
+          <option value="">都道府県を選択</option>
+          <!--{html_options options=$arrPref selected=$arrForm.pref|default:$arrData.pref|escape}-->
+          </select>
+          
+          <p class="mini">
+            <input type="text"
+                   class="box380"
+                   name="addr01"
+                   value="<!--{$arrForm.addr01|default:$arrData.addr01|escape}-->"
+                   style="<!--{$arrErr.addr01|sfGetErrorColor}-->" /><br />
+            <!--{$smarty.const.SAMPLE_ADDRESS1}-->
+          </p>
+          
+          <p class="mini">
+            <input type="text"
+                   class="box380"
+                   name="addr02"
+                   value="<!--{$arrForm.addr02|default:$arrData.addr02|escape}-->"
+                   style="<!--{$arrErr.addr02|sfGetErrorColor}-->" /><br />
+            <!--{$smarty.const.SAMPLE_ADDRESS2}-->
+          </p>
+          
+          <p class="mini"><em>住所は2つに分けてご記入ください。マンション名は必ず記入してください。</em></p>
+        </td>
+      </tr>
+      <tr>
+        <th>電話番号</th>
+        <td>
+          <span class="attention"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
+          <input type="text" 
+                 class="box60"
+                 name="tel01"
+                 value="<!--{$arrForm.tel01|default:$arrData.tel01|escape}-->"
+                 maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
+                 style="<!--{$arrErr.tel01|sfGetErrorColor}-->" />&nbsp;-&nbsp;
+          <input type="text" 
+                 class="box60"
+                 name="tel02"
+                 value="<!--{$arrForm.tel02|default:$arrData.tel02|escape}-->"
+                 maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
+                 style="<!--{$arrErr.tel02|sfGetErrorColor}-->" />&nbsp;-&nbsp;
+          <input type="text" 
+                 class="box60"
+                 name="tel03"
+                 value="<!--{$arrForm.tel03|default:$arrData.tel03|escape}-->"
+                 maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->"
+                 style="<!--{$arrErr.tel03|sfGetErrorColor}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th>メールアドレス<span class="attention">※</span></th>
+        <td>
+          <span class="attention"><!--{$arrErr.email}--><!--{$arrErr.email02}--></span>
+          <input type="text"
+                 class="box380"
+                 name="email"
+                 value="<!--{$arrForm.email|default:$arrData.email|escape}-->"
+                 maxlength="<!--{$smarty.const.MTEXT_LEN}-->"
+                 style="<!--{$arrErr.email|sfGetErrorColor}-->" /><br />
+          <!--{* ログインしていれば入力済みにする *}-->
+          <!--{if $smarty.server.REQUEST_METHOD != 'POST' && $smarty.session.customer}-->
+          <!--{assign var=email02 value=$arrData.email}-->
+          <!--{/if}-->
+          <input type="text"
+                 class="box380"
+                 name="email02"
+                 value="<!--{$arrForm.email02|escape}-->"
+                 maxlength="<!--{$smarty.const.MTEXT_LEN}-->"
+                 style="<!--{$arrErr.email02|sfGetErrorColor}-->" /><br />
+          <p class="mini"><em>確認のため2度入力してください。</em></p>
+        </td>
+      </tr>        
+      <tr>
+        <th>お問い合わせ内容<span class="attention">※</span><br />
+        <span class="mini">（全角<!--{$smarty.const.MLTEXT_LEN}-->字以下）</span></th>
+        <td>
+          <span class="attention"><!--{$arrErr.contents}--></span>
+          <textarea name="contents"
+                    class="area380"
+                    cols="60"
+                    rows="20"
+                    style="<!--{$arrErr.contents|sfGetErrorColor}-->"><!--{$arrForm.contents|escape}--></textarea>
+        </td>
+      </tr>
+    </table>
+    
+    <div class="tblareabtn">
+      <input type="image"
+             onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm_on.gif', this)"
+             onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm.gif', this)"
+             src="<!--{$TPL_DIR}-->img/button/btn_confirm.gif"
+             style="width:150px; height=30px;"
+             alt="確認ページへ"
+             name="confirm" />
+    </div>
+    </form>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/contact/complete.tpl	(revision 19713)
@@ -0,0 +1,47 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="undercolumn">
+  <div id="undercolumn_contact">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <div id="completetext">
+      お問い合わせ内容の送信が完了いたしました。<br />
+      万一、ご回答メールが届かない場合は、トラブルの可能性もありますので大変お手数ではございますがもう一度お問い合わせいただくか、お電話にてお問い合わせください。<br />
+      今後ともご愛顧賜りますようよろしくお願い申し上げます。
+    <p><!--{$arrSiteInfo.company_name|escape}--><br />
+      TEL：<!--{$arrSiteInfo.tel01}-->-<!--{$arrSiteInfo.tel02}-->-<!--{$arrSiteInfo.tel03}-->
+       <!--{if $arrSiteInfo.business_hour != ""}-->
+      (受付時間/<!--{$arrSiteInfo.business_hour}-->)
+       <!--{/if}--><br />
+      E-mail：<a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a></p>
+    </div>
+    <div class="tblareabtn">
+    <!--{if $is_campaign}-->
+      <a href="<!--{$smarty.const.CAMPAIGN_URL}--><!--{$campaign_dir}-->/<!--{$smarty.const.DIR_INDEX_URL}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" id="b_toppage" /></a>
+
+    <!--{else}-->
+
+      <a href="<!--{$smarty.const.URL_SITE_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" id="b_toppage" /></a>
+    <!--{/if}-->
+    </div>
+  </div>
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/contact/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/contact/confirm.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/contact/confirm.tpl	(revision 19713)
@@ -0,0 +1,89 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+
+<div id="undercolumn">
+  <div id="undercolumn_contact">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <p>下記入力内容で送信してもよろしいでしょうか？<br />
+      よろしければ、一番下の「送信」ボタンをクリックしてください。</p>
+    <form name="form1" id="form1" method="post" action="?">
+      <input type="hidden" name="mode" value="complete" />
+      <!--{foreach key=key item=item from=$arrForm}-->
+        <!--{if $key ne 'mode'}-->
+      <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+        <!--{/if}-->
+      <!--{/foreach}-->
+      <table summary="お問い合わせ内容確認">
+        <tr>
+          <th>お名前<span class="attention">※</span></th>
+          <td><!--{$arrForm.name01|escape}-->　<!--{$arrForm.name02|escape}--></td>
+        </tr>
+        <tr>
+          <th>お名前(フリガナ)<span class="attention">※</span></th>
+          <td><!--{$arrForm.kana01|escape}-->　<!--{$arrForm.kana02|escape}--></td>
+        </tr>
+        <tr>
+          <th>郵便番号</th>
+          <td>
+             <!--{if strlen($arrForm.zip01) > 0 && strlen($arrForm.zip02) > 0}-->
+               〒<!--{$arrForm.zip01|escape}-->-<!--{$arrForm.zip02|escape}-->
+             <!--{/if}-->
+          </td>
+        </tr>
+        <tr>
+          <th>住所</th>
+          <td><!--{$arrPref[$arrForm.pref]}--><!--{$arrForm.addr01|escape}--><!--{$arrForm.addr02|escape}--></td>
+        </tr>
+        <tr>
+          <th>電話番号</th>
+          <td>
+            <!--{if strlen($arrForm.tel01) > 0 && strlen($arrForm.tel02) > 0 && strlen($arrForm.tel03) > 0}-->
+              <!--{$arrForm.tel01|escape}-->-<!--{$arrForm.tel02|escape}-->-<!--{$arrForm.tel03|escape}-->
+            <!--{/if}-->
+          </td>
+        </tr>
+        <tr>
+          <th>メールアドレス<span class="attention">※</span></th>
+          <td><a href="mailto:<!--{$arrForm.email|escape:'hex'}-->"><!--{$arrForm.email|escape:'hexentity'}--></a></td>
+        </tr>
+        <tr>
+          <th>お問い合わせ内容<span class="attention">※</span><br />
+             <span class="mini">（全角1000字以下）</span></th>
+          <td><!--{$arrForm.contents|escape|nl2br}--></td>
+        </tr>
+      </table>
+      <div class="tblareabtn">
+      <a href="?"
+         onclick="fnModeSubmit('return', '', ''); return false;"
+         onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_back_on.gif','back02');"
+         onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','back02');">
+        <img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30"
+             alt="戻る" name="back02" id="back02" /></a>
+      <input type="image"
+             onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_send_on.gif',this)"
+             onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_send.gif',this)"
+             src="<!--{$TPL_DIR}-->img/button/btn_send.gif" alt="送信" name="send" id="send" class="box150" />
+       </div>
+     </form>
+   </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl	(revision 19670)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/footer.tpl	(revision 19713)
@@ -32,11 +32,11 @@
 <ul id="footer-menu">
 <li>
-<a href="<!--{$smarty.const.SPHONE_SSL_URL|sfTrimURL}-->/cart/index.php">かごを見る</a>
+<a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/cart/index.php">かごを見る</a>
 </li>
 <li>
-<a href="<!--{$smarty.const.SPHONE_SSL_URL|sfTrimURL}-->/mypage/login.php">マイページ</a>
+<a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/mypage/login.php">マイページ</a>
 </li>
 <li>
-<a href="<!--{$smarty.const.SPHONE_SSL_URL|sfTrimURL}-->/entry/kiyaku.php">会員登録</a>
+<a href="<!--{$smarty.const.SMARTPHONE_SSL_URL|sfTrimURL}-->/entry/kiyaku.php">会員登録</a>
 </li>
 
@@ -48,5 +48,5 @@
 <!--{if $isTop ne 1}-->
 <li>
-<a href="<!--{$smarty.const.SPHONE_SITE_URL|sfTrimURL}-->">TOPページへ</a>
+<a href="<!--{$smarty.const.SMARTPHONE_SITE_URL|sfTrimURL}-->">TOPページへ</a>
 </li>
 <!--{/if}-->
@@ -54,8 +54,8 @@
 </ul>
 <ul id="footer-navi">
-<li><a href="<!--{$smarty.const.SPHONE_SITE_URL}-->contact/index.php">お問合せ</a></li>
-<li><a href="<!--{$smarty.const.SPHONE_SITE_URL}-->guide/privacy.php">プライバシーポリシー</a></li>
-<li class="end"><a href="<!--{$smarty.const.SPHONE_SITE_URL}-->abouts/index.php">店舗情報</a></li>
-<li class="end"><a href="<!--{$smarty.const.SPHONE_SITE_URL}-->order/index.php">特定商取引法に基づく表記</a></li>
+<li><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->contact/index.php">お問合せ</a></li>
+<li><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->guide/privacy.php">プライバシーポリシー</a></li>
+<li class="end"><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->abouts/index.php">店舗情報</a></li>
+<li class="end"><a href="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->order/index.php">特定商取引法に基づく表記</a></li>
 </ul>
 
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/abouts/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/abouts/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/abouts/index.tpl	(revision 19713)
@@ -0,0 +1,126 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<!--{assign var=_site value=$arrSiteInfo}-->
+<script type="text/javascript">//<![CDATA[
+$(function() {
+    $("#maps").css({
+        'margin-top': '15px',
+        'margin-left': 'auto',
+        'margin-right': 'auto',
+        'width': '98%',
+        'height': '300px'
+    });
+    var lat = <!--{$_site.latitude}-->
+    var lng = <!--{$_site.longitude}-->
+    if (lat && lng) {
+        var latlng = new google.maps.LatLng(lat, lng);
+        var mapOptions = {zoom: 15,
+                          center: latlng,
+                          mapTypeId: google.maps.MapTypeId.ROADMAP};
+        var map = new google.maps.Map($("#maps").get(0), mapOptions);
+        var marker = new google.maps.Marker({map: map, position: latlng});
+    } else {
+        $("#maps").remove();
+    }
+});
+//]]>
+</script>
+<div id="undercolumn">
+
+  <div id="undercolumn_aboutus">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+
+    <table summary="当サイトについて">
+
+      <!--{if strlen($objSiteInfo->data.shop_name)}-->
+        <tr>
+          <th>店名</th>
+          <td><!--{$objSiteInfo->data.shop_name|escape}--></td>
+        </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.company_name)}-->
+      <tr>
+        <th>会社名</th>
+        <td><!--{$objSiteInfo->data.company_name|escape}--></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.zip01)}-->
+      <tr>
+        <th>住所</th>
+        <td>〒<!--{$objSiteInfo->data.zip01|escape}-->-<!--{$objSiteInfo->data.zip02|escape}--><br /><!--{$objSiteInfo->data.pref|escape}--><!--{$objSiteInfo->data.addr01|escape}--><!--{$objSiteInfo->data.addr02|escape}--></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.tel01)}-->
+      <tr>
+        <th>電話番号</th>
+        <td><!--{$objSiteInfo->data.tel01|escape}-->-<!--{$objSiteInfo->data.tel02|escape}-->-<!--{$objSiteInfo->data.tel03|escape}--></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.fax01)}-->
+      <tr>
+        <th>FAX番号</th>
+        <td><!--{$objSiteInfo->data.fax01|escape}-->-<!--{$objSiteInfo->data.fax02|escape}-->-<!--{$objSiteInfo->data.fax03|escape}--></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.email02)}-->
+      <tr>
+        <th>メールアドレス</th>
+        <td><a href="mailto:<!--{$objSiteInfo->data.email02|escape:'hex'}-->"><!--{$objSiteInfo->data.email02|escape:'hexentity'}--></a></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.business_hour)}-->
+      <tr>
+        <th>営業時間</th>
+        <td><!--{$objSiteInfo->data.business_hour|escape}--></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.good_traded)}-->
+      <tr>
+        <th>取扱商品</th>
+        <td><!--{$objSiteInfo->data.good_traded|escape|nl2br}--></td>
+      </tr>
+      <!--{/if}-->
+
+      <!--{if strlen($objSiteInfo->data.message)}-->
+      <tr>
+        <th>メッセージ</th>
+        <td><!--{$objSiteInfo->data.message|escape|nl2br}--></td>
+      </tr>
+      <!--{/if}-->
+
+    </table>
+
+    <div id="maps"></div>
+  </div>
+</div>
+<!--▲CONTENTS-->
+
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/regist/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/regist/complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/regist/complete.tpl	(revision 19713)
@@ -0,0 +1,42 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="undercolumn">
+  <div id="undercolumn_entry">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <div id="completetext">
+      <em>本登録が完了いたしました。<br />
+        それではショッピングをお楽しみください。</em>
+
+      <p>今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
+
+      <p><!--{$arrSiteInfo.company_name|escape}--><br />
+        TEL：<!--{$arrSiteInfo.tel01}-->-<!--{$arrSiteInfo.tel02}-->-<!--{$arrSiteInfo.tel03}--> <!--{if $arrSiteInfo.business_hour != ""}-->（受付時間/<!--{$arrSiteInfo.business_hour}-->）<!--{/if}--><br />
+        E-mall：<a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a></p>
+
+      <div class="tblareabtn">
+	<a href="<!--{$smarty.const.URL_SITE_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
+      </div>
+    </div>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/top.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/top.tpl	(revision 19670)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/top.tpl	(revision 19713)
@@ -36,5 +36,5 @@
 <!--{* 検索 *}-->
 <div id="searchbar">
-<form method="get" action="<!--{$smarty.const.SPHONE_SITE_URL}-->products/list.php">
+<form method="get" action="<!--{$smarty.const.SMARTPHONE_SITE_URL}-->products/list.php">
 <input type="text" name="name" maxlength="50" value="<!--{$smarty.get.name|escape}-->" placeholder="商品検索" ><input type="submit" name="search" value="検索">
 </form>
@@ -44,12 +44,12 @@
 
 <!--{* 新着情報 *}-->
-<!--{include_php file=`$smarty.const.SPHONE_HTML_PATH`/frontparts/bloc/news.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/news.php}-->
 
 <!--{* ログイン *}-->
-<!--{include_php file=`$smarty.const.SPHONE_HTML_PATH`/frontparts/bloc/login.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/login.php}-->
 
 <!--{* おすすめ商品 *}-->
-<!--{include_php file=`$smarty.const.SPHONE_HTML_PATH`/frontparts/bloc/best5.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/best5.php}-->
 
 <!-- ▼メニュー ここから -->
-<!--{include_php file=`$smarty.const.SPHONE_HTML_PATH`/frontparts/bloc/category.php}-->
+<!--{include_php file=`$smarty.const.SMARTPHONE_HTML_PATH`/frontparts/bloc/category.php}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/detail.tpl	(revision 19680)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/detail.tpl	(revision 19713)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.mousewheel-3.0.2.pack.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.pack.js"></script>
-<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.mousewheel-3.0.2.pack.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->js/jquery.fancybox/jquery.fancybox-1.3.1.css" type="text/css" media="screen" />
 <script type="text/javascript">//<![CDATA[
 // 規格2に選択肢を割り当てる。
@@ -304,5 +304,5 @@
                         <p>
                             <!--{section name=s loop=$arrRelativeCat[r]}-->
-                            <a href="<!--{$smarty.const.SPHONE_URL_DIR}-->products/list.php?category_id=<!--{$arrRelativeCat[r][s].category_id}-->"><!--{$arrRelativeCat[r][s].category_name}--></a>
+                            <a href="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->products/list.php?category_id=<!--{$arrRelativeCat[r][s].category_id}-->"><!--{$arrRelativeCat[r][s].category_name}--></a>
                             <!--{if !$smarty.section.s.last}--><!--{$smarty.const.SEPA_CATNAVI}--><!--{/if}-->
                             <!--{/section}-->
@@ -467,5 +467,5 @@
 
                     <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrRecommend[cnt].product_id|escape:url}-->">
-                        <img src="<!--{$smarty.const.SPHONE_URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|escape}-->" /></a>
+                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|escape}-->" /></a>
 
                     <div class="whoboughtrightblock">
@@ -494,5 +494,5 @@
 
                     <a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$arrRecommend[cnt].product_id|escape:url}-->">
-                        <img src="<!--{$smarty.const.SPHONE_URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|escape}-->" /></a>
+                        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[cnt].name|escape}-->" /></a>
 
                     <div class="whoboughtrightblock">
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/secret.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/secret.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/secret.tpl	(revision 19713)
@@ -0,0 +1,41 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="パスワードを忘れた方(確認ページ)"}-->
+
+  <div id="windowarea">
+    <h2>パスワードを忘れた方</h2>
+    <p>ご登録時に入力した下記質問の答えを入力して「次へ」ボタンをクリックしてください。<br />
+      ※下記質問の答えをお忘れになられた場合は、<a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentitiy'}--></a>までご連絡ください。</p>
+    <p><span class="attention">※新しくパスワードを発行いたしますので、お忘れになったパスワードはご利用できなくなります。</span></p>
+    <form action="?" method="post" name="form1">
+      <input type="hidden" name="mode" value="secret_check" />
+      <div id="completebox">
+        <p><!--{$Reminder}-->：&nbsp;<!--★答え入力★--><input type="text" name="input_reminder" value="" size="40" class="box300" style="<!--{$errmsg|sfGetErrorColor}-->" /></p>
+        <span class="attention"><!--{$errmsg}--></span>
+      </div>
+      <div class="btn">
+        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_next.gif" alt="次へ" class="box150" name="next" id="next" />
+      </div>
+    </form>
+  </div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/index.tpl	(revision 19713)
@@ -0,0 +1,40 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="パスワードを忘れた方(入力ページ)"}-->
+
+  <div id="windowarea">
+    <h2>パスワードを忘れた方</h2>
+    <p>ご登録時のメールアドレスを入力して「次へ」ボタンをクリックしてください。<br />
+      <span class="attention">※新しくパスワードを発行いたしますので、お忘れになったパスワードはご利用できなくなります。</span></p>
+    <form action="?" method="post" name="form1">
+      <input type="hidden" name="mode" value="mail_check" />
+      <div id="completebox">
+        <p>メールアドレス：&nbsp;<!--★メールアドレス入力★--><input type="text" name="email" value="<!--{$tpl_login_email|escape}-->" size="40" class="box300" style="<!--{$errmsg|sfGetErrorColor}-->; ime-mode: disabled;" /></p>
+        <span class="attention"><!--{$errmsg}--></span>
+      </div>
+      <div class="btn">
+        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_next.gif" alt="次へ" class="box150" name="next" id="next" />
+      </div>
+    </form>
+  </div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/forgot/complete.tpl	(revision 19713)
@@ -0,0 +1,38 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="パスワードを忘れた方(完了ページ)"}-->
+
+  <div id="windowarea">
+    <h2 class="title">パスワードを忘れた方</h2>
+    <p>パスワードの発行が完了いたしました。ログインには下記のパスワードをご利用ください。<br />
+    ※下記パスワードは、MYページの「会員登録内容変更」よりご変更いただけます。</p>
+    <form action="?" method="post" name="form1">
+      <div id="completebox">
+        <p><em><!--{$temp_password}--></em></p>
+      </div>
+      <div class="btn">
+        <a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_close_on.gif','close');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_close.gif','close');"><img src="<!--{$TPL_DIR}-->img/button/btn_close.gif" width="150" height="30" alt="閉じる" name="close" id="close" /></a>
+      </div>
+    </form>
+  </div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/entry/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/entry/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/entry/index.tpl	(revision 19713)
@@ -0,0 +1,44 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+ <!--▼CONTENTS-->
+<div id="undercolumn">
+    <div id="undercolumn_entry">
+        <h2 class="title"><!--{$tpl_title|escape}--></h2>
+        <!--{if $smarty.const.CUSTOMER_CONFIRM_MAIL}-->
+            <p>ご登録されますと、まずは仮会員となります。<br />
+                入力されたメールアドレスに、ご連絡が届きますので、本会員になった上でお買い物をお楽しみください。</p>
+        <!--{/if}-->
+        <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" />
+
+            <table summary="会員登録フォーム">
+            <!--{include file="`$smarty.const.TEMPLATE_DIR`frontparts/form_personal_input.tpl" flgFields=3 emailMobile=false prefix=""}-->
+            </table>
+
+            <div class="tblareabtn">
+                <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_confirm.gif" class="box150" alt="確認ページへ" name="confirm" id="confirm" />
+            </div>
+        </form>
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/entry/complete.tpl	(revision 19713)
@@ -0,0 +1,47 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="undercolumn">
+  <div id="undercolumn_entry">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <div id="completetext">
+      <em>会員登録の受付が完了いたしました。</em>
+      <p>現在<em>仮会員</em>の状態です。<br />
+        ご入力いただいたメールアドレス宛てに、ご連絡が届いておりますので、本会員登録になった上でお買い物をお楽しみください。<br />
+        今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
+
+      <p><!--{$arrSiteInfo.company_name|escape}--><br />
+        TEL：<!--{$arrSiteInfo.tel01}-->-<!--{$arrSiteInfo.tel02}-->-<!--{$arrSiteInfo.tel03}--> <!--{if $arrSiteInfo.business_hour != ""}-->（受付時間/<!--{$arrSiteInfo.business_hour}-->）<!--{/if}--><br />
+        E-mail：<a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a>
+      </p>
+
+      <div class="tblareabtn">
+        <!--{if $is_campaign}-->
+        <a href="<!--{$smarty.const.URL_SHOP_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
+        <!--{else}-->
+        <a href="<!--{$smarty.const.URL_SITE_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
+        <!--{/if}-->
+      </div>
+    </div>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/entry/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/entry/confirm.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/entry/confirm.tpl	(revision 19713)
@@ -0,0 +1,141 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="undercolumn">
+  <div id="undercolumn_entry">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <p>下記の内容で送信してもよろしいでしょうか？<br />
+      よろしければ、一番下の「会員登録完了へ」ボタンをクリックしてください。</p>
+    <form name="form1" id="form1" method="post" action="?">
+      <input type="hidden" name="mode" value="complete">
+      <!--{foreach from=$list_data key=key item=item}-->
+        <input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->" />
+      <!--{/foreach}-->
+        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+
+      <table summary="入力内容確認">
+        <tr>
+          <th>お名前<span class="attention">※</span></th>
+          <td>
+            <!--{$list_data.name01|escape}-->&nbsp;
+            <!--{$list_data.name02|escape}-->
+          </td>
+        </tr>
+        <tr>
+          <th>お名前(フリガナ)<span class="attention">※</span></th>
+          <td>
+            <!--{$list_data.kana01|escape}-->&nbsp;
+            <!--{$list_data.kana02|escape}-->
+          </td>
+        </tr>
+        <tr>
+          <th>郵便番号<span class="attention">※</span></th>
+          <td>
+            〒<!--{$list_data.zip01|escape}--> - <!--{$list_data.zip02|escape}-->
+          </td>
+        </tr>
+        <tr>
+          <th>住所<span class="attention">※</span></th>
+          <td>
+            <!--{$arrPref[$list_data.pref]|escape}--><!--{$list_data.addr01|escape}--><!--{$list_data.addr02|escape}-->
+          </td>
+        </tr>
+        <tr>
+          <th>電話番号<span class="attention">※</span></th>
+          <td>
+            <!--{$list_data.tel01|escape}--> - <!--{$list_data.tel02|escape}--> - <!--{$list_data.tel03|escape}-->
+          </td>
+        </tr>
+        <tr>
+          <th>FAX</th>
+          <td>
+            <!--{if strlen($list_data.fax01) > 0 && strlen($list_data.fax02) > 0 && strlen($list_data.fax03) > 0}-->
+              <!--{$list_data.fax01|escape}--> - <!--{$list_data.fax02|escape}--> - <!--{$list_data.fax03|escape}-->
+            <!--{else}-->
+              未登録
+            <!--{/if}-->
+          </td>
+        </tr>
+        <tr>
+          <th>メールアドレス<span class="attention">※</span></th>
+          <td>
+            <a href="mailto:<!--{$list_data.email|escape:'hex'}-->"><!--{$list_data.email|escape:'hexentity'}--></a>
+          </td>
+        </tr>
+        <tr>
+          <th>性別<span class="attention">※</span></th>
+          <td>
+            <!--{if $list_data.sex eq 1}-->
+            男性
+            <!--{else}-->
+            女性
+            <!--{/if}-->
+          </td>
+        </tr>
+        <tr>
+          <th>職業</th>
+          <td><!--{$arrJob[$list_data.job]|escape|default:"未登録"}--></td>
+        </tr>
+        <tr>
+          <th>生年月日</th>
+          <td>
+            <!--{if strlen($list_data.year) > 0 && strlen($list_data.month) > 0 && strlen($list_data.day) > 0}-->
+              <!--{$list_data.year|escape}-->年<!--{$list_data.month|escape}-->月<!--{$list_data.day|escape}-->日
+            <!--{else}-->
+            未登録
+            <!--{/if}-->
+          </td>
+        </tr>
+        <tr>
+          <th>希望するパスワード<span class="attention">※</span><br />
+          </th>
+          <td><!--{$passlen}--></td>
+        </tr>
+        <tr>
+          <th>パスワードを忘れた時のヒント<span class="attention">※</span></th>
+          <td>
+              質問：<!--{$arrReminder[$list_data.reminder]|escape}--><br />
+              答え：<!--{$list_data.reminder_answer|escape}-->
+          </td>
+        </tr>
+        <tr>
+          <th>メールマガジン送付について<span class="attention">※</span></th>
+          <td>
+            <!--{if $list_data.mailmaga_flg eq 1}-->
+            HTMLメール＋テキストメールを受け取る
+            <!--{elseif $list_data.mailmaga_flg eq 2}-->
+            テキストメールを受け取る
+            <!--{else}-->
+            受け取らない
+            <!--{/if}-->
+          </td>
+        </tr>
+      </table>
+
+      <div class="tblareabtn">
+        <a href="?" onclick="fnModeSubmit('return', '', ''); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_back_on.gif','back')" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','back')"><img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="戻る" border="0" name="back" id="back" /></a>&nbsp;
+        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_entry_complete_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_entry_complete.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_entry_complete.gif" class="box150" alt="送信" border="0" name="send" id="send" />
+      </div>
+    </form>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/entry/kiyaku.tpl	(revision 19713)
@@ -0,0 +1,44 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<div id="undercolumn">
+  <div id="undercolumn_entry">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <p><em>【重要】 会員登録をされる前に、下記ご利用規約をよくお読みください。</em><br />
+      規約には、本サービスを使用するに当たってのあなたの権利と義務が規定されております。<br />
+     「規約に同意して会員登録」ボタン をクリックすると、あなたが本規約の全ての条件に同意したことになります。</p>
+    <form name="form1" id="form1" method="post" action="?">
+       <textarea name="textfield" class="area470"  cols="80" rows="30"
+                 readonly="readonly"><!--{$tpl_kiyaku_text}--></textarea>
+       <div class="tblareabtn">
+       <!--{if $is_campaign}-->
+         <a href="javascript:history.back();" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_cannot_on.gif','b_noagree');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_cannot.gif','b_noagree');">
+           <img src="<!--{$TPL_DIR}-->img/button/btn_entry_cannot.gif" width="180" height="30" alt="同意しない" border="0" name="b_noagree" /></a>&nbsp;
+       <!--{else}-->
+         <a href="<!--{$smarty.const.URL_SITE_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_cannot_on.gif','b_noagree');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_cannot.gif','b_noagree');">
+           <img src="<!--{$TPL_DIR}-->img/button/btn_entry_cannot.gif" width="180" height="30" alt="同意しない" border="0" name="b_noagree" /></a>&nbsp;
+       <!--{/if}-->
+         <a href="<!--{$smarty.const.URL_ENTRY_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_agree_on.gif','b_agree');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_agree.gif','b_agree');">
+           <img src="<!--{$TPL_DIR}-->img/button/btn_entry_agree.gif" width="180" height="30" alt="規約に同意して会員登録" border="0" name="b_agree" /></a>
+       </div>
+     </form>
+   </div>
+ </div>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_complete.tpl	(revision 19713)
@@ -0,0 +1,36 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="お客様の声書き込み（完了ページ）"}-->
+
+  <div id="windowarea">
+    <h2 class="title">お客様の声書き込み</h2>
+    <div id="completebox">
+      <p>登録が完了しました。ご利用ありがとうございました。<br />
+       弊社にて登録内容を確認後、ホームページに反映させていただきます。<br />
+       今しばらくお待ちくださいませ。</p>
+    </div>
+    <div class="btn">
+      <a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_close_on.gif','b_close');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_close.gif','b_close');"><img src="<!--{$TPL_DIR}-->img/button/btn_close.gif" width="150" height="30" alt="閉じる" border="0" name="b_close" /></a>
+    </div>
+  </div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 19713)
@@ -0,0 +1,71 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="お客様の声書き込み（確認ページ）"}-->
+
+  <div id="windowarea">
+    <h2 class="title">お客様の声書き込み</h2>
+    <form name="form1" method="post" action="?">
+      <input type="hidden" name="mode" value="complete" />
+        <!--{foreach from=$arrForm key=key item=item}-->
+        <!--{if $key ne "mode"}-->
+        <input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->" /><!--{/if}-->
+        <!--{/foreach}-->
+        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+
+        <table summary="お客様の声書き込み">
+          <tr>
+            <th>商品名</th>
+            <td><!--{$arrForm.name|escape}--></td>
+          </tr>
+          <tr>
+            <th>投稿者名<span class="attention">※</span></th>
+            <td><!--{$arrForm.reviewer_name|escape}--></td>
+          </tr>
+          <tr>
+            <th>投稿者URL</th>
+            <td><!--{$arrForm.reviewer_url|escape}--></td>
+          </tr>
+          <tr>
+            <th>性別</th>
+            <td><!--{if $arrForm.sex eq 1 }-->男性<!--{elseif $arrForm.sex eq 2 }-->女性<!--{/if}--></td>
+          </tr>
+          <tr>
+            <th>おすすめレベル<span class="attention">※</span></th>
+            <td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
+          </tr>
+          <tr>
+            <th>タイトル<span class="attention">※</span></th>
+            <td><!--{$arrForm.title|escape}--></td>
+          </tr>
+          <tr>
+            <th>コメント<span class="attention">※</span></th>
+            <td><!--{$arrForm.comment|escape|nl2br}--></td>
+          </tr>
+        </table>
+        <div class="btn">
+          <input type="image" onclick=" mode.value='return';" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_back.gif" class="box150" alt="戻る"  name="back" id="back" />
+          <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_send_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_send.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_send.gif" class="box150" alt="送信"  name="send" id="send" />
+        </div>
+      </form>
+    </div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/products/review.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/products/review.tpl	(revision 19713)
@@ -0,0 +1,86 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="お客様の声書き込み（入力ページ）"}-->
+
+  <div id="windowarea">
+    <h2 class="title">お客様の声書き込み</h2>
+    <p class="windowtext">以下の商品について、お客様のご意見、ご感想をどしどしお寄せください。<br />
+      「<span class="attention">※</span>」印は入力必須項目です。<br />
+       ご入力後、一番下の「確認ページへ」ボタンをクリックしてください。</p>
+        <form name="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+        <input type="hidden" name="mode" value="confirm" />
+        <input type="hidden" name="product_id" value="<!--{$arrForm.product_id}-->" />
+        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+        <table summary="お客様の声書き込み">
+          <tr>
+            <th>商品名</th>
+            <td><!--{$arrForm.name|escape}--></td>
+          </tr>
+          <tr>
+            <th>投稿者名<span class="attention">※</span></th>
+            <td><span class="attention"><!--{$arrErr.reviewer_name}--></span><input type="text" name="reviewer_name" value="<!--{$arrForm.reviewer_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size="40" class="box350" /></td>
+          </tr>
+          <tr>
+            <th>投稿者URL</th>
+            <td><span class="attention"><!--{$arrErr.reviewer_url}--></span><input type="text" name="reviewer_url" value="<!--{$arrForm.reviewer_url|escape}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="40" class="box350" /></td>
+          </tr>
+          <tr>
+            <th>性別</th>
+            <td>
+              <input type="radio" name="sex" id="man" value="1" <!--{if $arrForm.sex eq 1}--> checked="checked"<!--{/if}--> /><label for="man">男性</label>&nbsp;
+              <input type="radio" name="sex" id="woman" value="2" <!--{if $arrForm.sex eq 2}--> checked="checked"<!--{/if}--> /><label for="woman">女性</label>
+            </td>
+          </tr>
+          <tr>
+            <th>おすすめレベル<span class="attention">※</span></th>
+            <td>
+              <span class="attention"><!--{$arrErr.recommend_level}--></span>
+              <select name="recommend_level" style="<!--{$arrErr.recommend_level|sfGetErrorColor}-->">
+                <option value="" selected="selected">選択してください</option>
+                  <!--{html_options options=$arrRECOMMEND selected=$arrForm.recommend_level}-->
+              </select>
+            </td>
+          </tr>
+          <tr>
+            <th>タイトル<span class="attention">※</span></th>
+            <td>
+              <span class="attention"><!--{$arrErr.title}--></span>
+              <input type="text" name="title" value="<!--{$arrForm.title|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size="40" class="box350" />
+            </td>
+          </tr>
+          <tr>
+            <th>コメント<span class="attention">※</span></th>
+            <td>
+              <span class="attention"><!--{$arrErr.comment}--></span>
+              <textarea name="comment" cols="50" rows="10" style="<!--{$arrErr.comment|sfGetErrorColor}-->" class="area350"><!--{$arrForm.comment|escape}--></textarea>
+            </td>
+          </tr>
+        </table>
+        <div class="btn">
+          <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_confirm.gif" class="box150" alt="確認ページへ" name="conf" id="conf" />
+        </div>
+      </form>
+    </div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl	(revision 19670)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/site_main.tpl	(revision 19713)
@@ -45,5 +45,5 @@
 <script type="text/javascript" language="JavaScript">
 //<![CDATA[
-setTopButton("<!--{$smarty.const.SPHONE_SSL_URL}-->");
+//setTopButton("<!--{$smarty.const.SPHONE_SSL_URL}-->");
 //]]>
 <!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/order/index.tpl	(revision 19713)
@@ -0,0 +1,82 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="undercolumn">
+  <div id="undercolumn_order">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <table summary="特定商取引に関する法律に基づく表記">
+      <tr>
+        <th>販売業者</th>
+        <td><!--{$arrRet.law_company|escape}--></td>
+      </tr>
+      <tr>
+        <th>運営責任者</th>
+        <td><!--{$arrRet.law_manager|escape}--></td>
+      </tr>
+      <tr>
+        <th>住所</th>
+        <td>〒<!--{$arrRet.law_zip01|escape}-->-<!--{$arrRet.law_zip02|escape}--><br /><!--{$arrPref[$arrRet.law_pref]|escape}--><!--{$arrRet.law_addr01|escape}--><!--{$arrRet.law_addr02|escape}--></td>
+      </tr>
+      <tr>
+        <th>電話番号</th>
+        <td><!--{$arrRet.law_tel01|escape}-->-<!--{$arrRet.law_tel02|escape}-->-<!--{$arrRet.law_tel03|escape}--></td>
+      </tr>
+      <tr>
+        <th>FAX番号</th>
+        <td><!--{$arrRet.law_fax01|escape}-->-<!--{$arrRet.law_fax02|escape}-->-<!--{$arrRet.law_fax03|escape}--></td>
+      </tr>
+      <tr>
+        <th>メールアドレス</th>
+        <td><a href="mailto:<!--{$arrRet.law_email|escape:'hex'}-->"><!--{$arrRet.law_email|escape:'hexentity'}--></a></td>
+      </tr>
+      <tr>
+        <th>URL</th>
+        <td><a href="<!--{$arrRet.law_url|escape}-->"><!--{$arrRet.law_url|escape}--></a></td>
+      </tr>
+      <tr>
+        <th>商品以外の必要代金</th>
+        <td><!--{$arrRet.law_term01|escape|nl2br}--></td>
+      </tr>
+      <tr>
+        <th>注文方法</th>
+        <td><!--{$arrRet.law_term02|escape|nl2br}--></td>
+      </tr>
+      <tr>
+        <th>支払方法</th>
+        <td><!--{$arrRet.law_term03|escape|nl2br}--></td>
+      </tr>
+      <tr>
+        <th>支払期限</th>
+        <td><!--{$arrRet.law_term04|escape|nl2br}--></td>
+      </tr>
+      <tr>
+        <th>引渡し時期</th>
+        <td><!--{$arrRet.law_term05|escape|nl2br}--></td>
+      </tr>
+      <tr>
+        <th>返品・交換について</th>
+        <td><!--{$arrRet.law_term06|escape|nl2br}--></td>
+      </tr>
+    </table>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 19670)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 19713)
@@ -31,12 +31,14 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <!--{* 共通CSS *}-->
-<link rel="stylesheet" media="only screen" href="<!--{$smarty.const.SPHONE_URL_DIR}-->sphone/user_data/packages/default/css/import.css" type="text/css" /> 
+<link rel="stylesheet" media="only screen" href="<!--{$TPL_DIR}-->css/import.css" type="text/css" /> 
 
-<script type="text/javascript" src="<!--{$smarty.const.SPHONE_URL_DIR}-->sphone/user_data/packages/default/js/barbutton.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.SPHONE_URL_DIR}-->sphone/user_data/packages/default/js/category.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.SPHONE_URL_DIR}-->sphone/user_data/packages/default/js/news.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$smarty.const.URL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/barbutton.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/category.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/news.js"></script>
+
 <title><!--{$arrSiteInfo.shop_name|escape}--><!--{if $tpl_subtitle|strlen >= 1}--> / <!--{$tpl_subtitle|escape}--><!--{elseif $tpl_title|strlen >= 1}--> / <!--{$tpl_title|escape}--><!--{/if}--></title>
 <!--{if $arrPageLayout.author|strlen >= 1}-->
@@ -50,5 +52,5 @@
 <!--{/if}-->
 <!--{* iPhone用アイコン画像 *}-->
-<link rel="apple-touch-icon" href="<!--{$smarty.const.SPHONE_URL_DIR}-->sphone/apple-touch-icon.png" />
+<link rel="apple-touch-icon" href="<!--{$smarty.const.SMARTPHONE_URL_DIR}-->sphone/apple-touch-icon.png" />
 
 </head>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change.tpl	(revision 19713)
@@ -0,0 +1,49 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+<!--{include file=$tpl_navi}-->
+<div id="mycontentsarea">
+  <h3><!--{$tpl_subtitle|escape}--></h3>
+  <p>下記項目にご入力ください。「<span class="attention">※</span>」印は入力必須項目です。<br />
+    入力後、一番下の「確認ページへ」ボタンをクリックしてください。</p>
+
+  <form name="form1" id="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="confirm" />
+  <input type="hidden" name="customer_id" value="<!--{$arrForm.customer_id|escape}-->" />
+    <table summary="会員登録内容変更 " class="delivname">
+      <!--{include file="`$smarty.const.TEMPLATE_DIR`frontparts/form_personal_input.tpl" flgFields=3 emailMobile=true prefix=""}-->
+    </table>
+    <!--{if 'sfGMOMypageDisplay'|function_exists}-->
+      <!--{'sfGMOMypageDisplay'|call_user_func}-->
+    <!--{/if}-->
+    <div class="tblareabtn">
+      <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_confirm.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_confirm.gif" class="box150" alt="確認ページへ" name="refusal" id="refusal" />
+    </div>
+  </form>
+</div>
+
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/index.tpl	(revision 19713)
@@ -0,0 +1,72 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+  <!--{if $tpl_navi != ""}-->
+    <!--{include file=$tpl_navi}-->
+  <!--{else}-->
+    <!--{include file=`$smarty.const.TEMPLATE_DIR`mypage/navi.tpl}-->
+  <!--{/if}-->
+  <div id="mycontentsarea">
+    <form name="form1" method="post" action="?">
+    <input type="hidden" name="order_id" value="" />
+    <input type="hidden" name="pageno" value="<!--{$tpl_pageno}-->" />
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+
+<!--{if $tpl_linemax > 0}-->
+
+    <p><!--{$tpl_linemax}-->件の購入履歴があります。</p>
+    <div>
+      <!--▼ページナビ-->
+      <!--{$tpl_strnavi}-->
+      <!--▲ページナビ-->
+    </div>
+
+    <table summary="購入履歴">
+      <tr>
+        <th>購入日時</th>
+        <th>注文番号</th>
+        <th>お支払い方法</th>
+        <th>合計金額</th>
+        <th>詳細</th>
+      </tr>
+      <!--{section name=cnt loop=$arrOrder}-->
+      <tr>
+       <td><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></td>
+       <td><!--{$arrOrder[cnt].order_id}--></td>
+       <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
+       <td><!--{$arrPayment[$payment_id]|escape}--></td>
+       <td class="pricetd"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
+       <td class="centertd"><a href="<!--{$smarty.const.URL_DIR}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
+     </tr>
+     <!--{/section}-->
+    </table>
+
+    <!--{else}-->
+    <p>購入履歴はありません。</p>
+    <!--{/if}-->
+    </form>
+  </div>
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/login.tpl	(revision 19713)
@@ -0,0 +1,78 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="under02column">
+  <div id="under02column_login">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <form name="login_mypage" id="login_mypage" method="post" action="./login_check.php" onsubmit="return fnCheckLogin('login_mypage')">
+    <input type="hidden" name="mode" value="login" />
+   <div class="loginarea">
+     <p><img src="<!--{$TPL_DIR}-->img/title/tit_sub_member.gif" width="202" height="16" alt="会員登録がお済みのお客様" /></p>
+     <p class="inputtext">会員の方は、登録時に入力されたメールアドレスとパスワードでログインしてください。</p>
+       <div class="inputbox">
+       <!--{assign var=key value="mypage_login_email"}-->
+       <span class="attention"><!--{$arrErr[$key]}--></span>
+       <p>メールアドレス:&nbsp;
+         <input type="text" name="<!--{$key}-->"
+                value="<!--{$tpl_login_email|escape}-->"
+                maxlength="<!--{$arrForm[$key].length}-->"
+                style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;"
+                size="40" class="box300" />
+       </p>
+       <p class="mini">
+         <!--{assign var=key value="mypage_login_memory"}-->
+         <input type="checkbox" name="<!--{$key}-->" value="1" <!--{$tpl_login_memory|sfGetChecked:1}--> id="login_memory" />
+         <label for="login_memory">会員メールアドレスをコンピューターに記憶させる</label>
+       </p>
+       <p class="passwd">
+         <!--{assign var=key value="mypage_login_pass"}-->
+         <span class="attention"><!--{$arrErr[$key]}--></span>
+         パスワード:&nbsp;
+         <input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box300" />
+       </p>
+     </div>
+     <div class="tblareabtn">
+      <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_login.gif" alt="ログイン" name="log" id="log" class="box140" />
+     </div>
+     <p class="inputtext02">
+       パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_DIR}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
+     </p>
+  </div>
+  <div class="loginarea">
+    <p>
+      <img src="<!--{$TPL_DIR}-->img/title/tit_sub_guest.gif" width="247" height="16" alt="まだ会員登録されていないお客様" />
+    </p>
+    <p class="inputtext">会員登録をすると便利なMyページをご利用いただけます。<br />
+      また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。
+    </p>
+    <div class="inputbox02">
+      <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
+        <img src="<!--{$TPL_DIR}-->img/button/btn_entry.gif" width="130" height="30" alt="会員登録をする" border="0" name="b_gotoentry" /></a>
+    </div>
+  </div>
+</form>
+</div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/error.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/error.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/error.tpl	(revision 19713)
@@ -0,0 +1,34 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="エラー"}-->
+
+<div id="compbox">
+<span class="red"><!--{$tpl_error}--></span><br />
+</div>
+
+<div class="button">
+<a href="javascript:window.close()" onmouseOver="chgImg('<!--{$TPL_DIR}-->img/button/btn_close_on.gif','close');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_close.gif','close');"><img src="<!--{$TPL_DIR}-->img/button/btn_close.gif" width="129" height="32" alt="閉じる" name="close" id="close" /></a>
+</div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal_complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal_complete.tpl	(revision 19713)
@@ -0,0 +1,40 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+  <!--{include file = $tpl_navi}-->
+  <div id="mycontentsarea">
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+    <div id="completetext">
+      <p class="changetext">退会手続きが完了いたしました。<br />
+        MYページをご利用いただき誠にありがとうございました。<br />
+        またのご利用を心よりお待ち申し上げます。<br />
+      <!--{$arrSiteInfo.company_name|escape}--><br />
+      TEL：<!--{$arrSiteInfo.tel01}-->-<!--{$arrSiteInfo.tel02}-->-<!--{$arrSiteInfo.tel03}--> <!--{if $arrSiteInfo.business_hour != ""}-->（受付時間/<!--{$arrSiteInfo.business_hour}-->）<!--{/if}--><br />
+      E-mail：<a href="mailto:<!--{$arrSiteInfo.email02|escape:'hex'}-->"><!--{$arrSiteInfo.email02|escape:'hexentity'}--></a></p>
+    </div>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/mail_view.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/mail_view.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/mail_view.tpl	(revision 19713)
@@ -0,0 +1,14 @@
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="MYページ/メール履歴詳細"}-->
+
+<table class="form">
+  <tr>
+    <th>件名</th>
+    <td><!--{$tpl_subject|escape}--></td>
+  </tr>
+  <tr>
+    <th>本文</th>
+    <td><!--{$tpl_body|escape|nl2br}--></td>
+  </tr>
+</table>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change_complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change_complete.tpl	(revision 19713)
@@ -0,0 +1,41 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+  <!--{include file=$tpl_navi}-->
+  <div id="mycontentsarea">
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+
+    <div id="completetext">
+      <p class="changetext">会員登録内容の変更が完了いたしました。<br />
+        今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
+    </div>
+
+    <div class="tblareabtn">
+      <a href="<!--{$smarty.const.URL_SITE_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','fortop');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','fortop');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" name="fortop" id="fortop" /></a>
+    </div>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 19713)
@@ -0,0 +1,46 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="新しいお届け先の追加・変更"}-->
+
+<div id="windowarea">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <p>下記項目にご入力ください。「<span class="attention">※</span>」印は入力必須項目です。</p>
+    <p>入力後、一番下の「登録する」ボタンをクリックしてください。</p>
+
+    <form name="form1" id="form1" method="post" action="?">
+        <input type="hidden" name="mode" value="edit" />
+        <input type="hidden" name="other_deliv_id" value="<!--{$smarty.session.other_deliv_id}-->" />
+        <input type="hidden" name="ParentPage" value="<!--{$ParentPage}-->" />
+
+        <table summary="お届け先登録">
+            <!--{include file="`$smarty.const.TEMPLATE_DIR`frontparts/form_personal_input.tpl" flgFields=1 emailMobile=false prefix=""}-->
+        </table>
+
+        <div class="btn">
+            <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_add_address_complete_on.gif',this);" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_add_address_complete.gif',this);" src="<!--{$TPL_DIR}-->img/button/btn_add_address_complete.gif" class="box150" alt="登録する" name="register" id="register" />
+        </div>
+    </form>
+</div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/navi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/navi.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/navi.tpl	(revision 19713)
@@ -0,0 +1,75 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<div id="mynavarea">
+    <!--{strip}-->
+        <ul class="button_like">
+        
+          <!--{if $tpl_login}-->
+            <!--{* 会員状態 *}-->
+            <li><a href="./<!--{$smarty.const.DIR_INDEX_URL}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
+                購入履歴一覧</a></li>
+            <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
+                <li><a href="favorite.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+                    お気に入り一覧</a></li>
+            <!--{/if}-->
+            <li><a href="change.php" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
+                会員登録内容変更</a></li>
+            <li><a href="delivery.php" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
+                お届け先追加・変更</a></li>
+            <li><a href="refusal.php" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
+                退会手続き</a></li>
+          <!--{else}-->
+
+          <!--{* 退会状態 *}-->
+            <li><a href="<!--{$smarty.const.URL_SITE_TOP}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
+                購入履歴一覧</a></li>
+            <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
+                <li><a href="<!--{$smarty.const.URL_SITE_TOP}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+                    お気に入り一覧</a></li>
+            <!--{/if}-->
+            <li><a href="<!--{$smarty.const.URL_SITE_TOP}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
+                会員登録内容変更</a></li>
+            <li><a href="<!--{$smarty.const.URL_SITE_TOP}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
+                お届け先追加・変更</a></li>
+            <li><a href="<!--{$smarty.const.URL_SITE_TOP}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
+                退会手続き</a></li>
+          <!--{/if}-->
+
+        </ul>
+        
+        <!--▼現在のポイント-->
+        <!--{if $point_disp !== false}-->
+            <ul>
+                 <li>ようこそ <br />
+                     <!--{$CustomerName1|escape}--> <!--{$CustomerName2|escape}-->様
+                     <!--{if $smarty.const.USE_POINT !== false}-->
+                         <br />現在の所持ポイントは<em><!--{$CustomerPoint|number_format|escape|default:"0"}-->pt</em>です。
+                     <!--{/if}-->
+                 </li>
+            </ul>
+        <!--{/if}-->
+        <!--▲現在のポイント-->
+    <!--{/strip}-->
+</div>
+<!--▲NAVI-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal_confirm.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal_confirm.tpl	(revision 19713)
@@ -0,0 +1,45 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+  <!--{include file=$tpl_navi}-->
+  <form name="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="complete" />
+  <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+  <div id="mycontentsarea">
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+    <div id="completetext">
+      <p>退会手続きを実行してもよろしいでしょうか？</p>
+      <div class="tblareabtn">
+        <a href="./refusal.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_refuse_not_on.gif','refuse_not');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_refuse_not.gif','refuse_not');"><img src="<!--{$TPL_DIR}-->img/button/btn_refuse_not.gif" width="180" height="30" alt="いいえ、退会しません" name="refuse_not" id="refuse_not" /></a>&nbsp;
+        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_refuse_do_on.gif',this);" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_refuse_do.gif',this);" src="<!--{$TPL_DIR}-->img/button/btn_refuse_do.gif" class="box180" alt="はい、退会します" name="refuse_do" id="refuse_do" />
+      </div>
+
+      <p class="mini"><em>※退会手続きが完了した時点で、現在保存されている購入履歴や、お届け先等の情報はすべてなくなりますのでご注意ください。</em></p>
+    </div>
+  </div>
+  </form>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 19713)
@@ -0,0 +1,87 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+  <!--{if $tpl_navi != ""}-->
+    <!--{include file=$tpl_navi}-->
+  <!--{else}-->
+    <!--{include file=`$smarty.const.TEMPLATE_DIR`mypage/navi.tpl}-->
+  <!--{/if}-->
+
+  <div id="mycontentsarea">
+    <form name="form1" method="post" action="?">
+    <input type="hidden" name="order_id" value="" />
+    <input type="hidden" name="pageno" value="<!--{$tpl_pageno}-->" />
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+
+<!--{if $tpl_linemax > 0}-->
+
+    <p><!--{$tpl_linemax}-->件のお気に入りがあります。</p>
+    <div class="paging">
+      <!--▼ページナビ-->
+      <!--{$tpl_strnavi}-->
+      <!--▲ページナビ-->
+    </div>
+
+    <form name="form1" id="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="cart" />
+    <input type="hidden" name="product_id" value="" />
+    <table summary="お気に入り" id="mypage-history-list" class="list">
+      <tr>
+        <th width="40">削除</th>
+        <th width="60">商品画像</th>
+        <th width="200">商品名</th>
+        <th width="200" class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}--><span class="mini">(税込)</span></th>
+      </tr>
+      <!--{section name=cnt loop=$arrFavorite}-->
+      <!--{assign var=product_id value="`$arrFavorite[cnt].product_id`"}-->
+      <tr>
+       <td><a href="javascript:fnModeSubmit('delete_favorite','product_id','<!--{$product_id|escape}-->');">削除</a></td>
+       <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|escape:url}-->"><img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrFavorite[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65"></a></td>
+       <td><a href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$product_id|escape:url}-->"><!--{$arrFavorite[cnt].name}--></a></td>
+       <td class="right sale_price">
+        <span class="price">
+          <!--{if $arrFavorite[cnt].price02_min == $arrFavorite[cnt].price02_max}-->
+            <!--{$arrFavorite[cnt].price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
+          <!--{else}-->
+            <!--{$arrFavorite[cnt].price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$arrFavorite[cnt].price02_max|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
+          <!--{/if}-->円</span>
+       </td>
+     </tr>
+     <!--{/section}-->
+    </table>
+    <br />
+    <!--{if $stock_find_count > 0 && $customer_rank < 51}-->
+    <div class="product-btn">
+      <a href="javascript:void(document.form1.submit())" class="btn-cart">カートに入れる</a>
+    </div>
+    <!--{/if}-->
+    </form>
+
+    <!--{else}-->
+    <p>お気に入りが登録されておりません。</p>
+    <!--{/if}-->
+    </form>
+  </div>
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 19713)
@@ -0,0 +1,196 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <!--{include file=$tpl_navi}-->
+    <div id="mycontentsarea">
+        <h3><!--{$tpl_subtitle|escape}--></h3>
+        <p class="myconditionarea">
+        <strong>購入日時：&nbsp;</strong><!--{$arrDisp.create_date|sfDispDBDate}--><br />
+        <strong>注文番号：&nbsp;</strong><!--{$arrDisp.order_id}--><br />
+        <strong>お支払い方法：&nbsp;</strong><!--{$arrPayment[$arrDisp.payment_id]|escape}-->
+        <!--{if $arrDisp.deliv_time_id != ""}--><br />
+        <strong>お届け時間：&nbsp;</strong><!--{$arrDelivTime[$arrDisp.deliv_time_id]|escape}-->
+        <!--{/if}-->
+        <!--{if $arrDisp.deliv_date != ""}--><br />
+        <strong>お届け日：&nbsp;</strong><!--{$arrDisp.deliv_date|escape}-->
+        <!--{/if}-->
+        </p>
+
+        <!--{* (開発者向けレビュー)
+        <form action="order.php" method="post">
+            <input type="hidden" name="order_id" value="<!--{$arrDisp.order_id}-->">
+            <input type="submit" name="submit" value="再注文">
+        </form>
+        *}-->
+
+        <table summary="購入商品詳細">
+            <tr>
+                <th>商品コード</th>
+                <th>商品名</th>
+                <th>商品種別</th>
+                <th>単価</th>
+                <th>数量</th>
+                <th>小計</th>
+            </tr>
+            <!--{foreach from=$tpl_arrOrderDetail item=orderDetail}-->
+                <tr>
+                    <td><!--{$orderDetail.product_code|escape}--></td>
+                    <td><a<!--{if $orderDetail.enable}--> href="<!--{$smarty.const.DETAIL_P_HTML}--><!--{$orderDetail.product_id|escape:url}-->"<!--{/if}-->><!--{$orderDetail.product_name|escape}--></a></td>
+                    <td>
+                    <!--{ if $orderDetail.product_type_id == PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{ if $orderDetail.price == "0" || ( $orderDetail.status >= "4" && $orderDetail.effective == "1" )}-->
+                            <a target="_self" href="<!--{$smarty.const.URL_DIR}-->mypage/download.php?order_id=<!--{$arrDisp.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a>
+                        <!--{ elseif $orderDetail.payment_date == "" || $orderDetail.status < "4"}-->
+                            ダウンロード商品<BR />（入金確認中）
+                        <!--{ elseif $orderDetail.effective != "1"}-->
+                            ダウンロード商品<BR />（期限切れ）
+                        <!--{ /if }-->
+                    <!--{ else if $orderDetail.product_type_id == PRODUCT_TYPE_NORMAL}-->
+                            通常商品
+                    <!--{ /if }-->
+                    </td>
+                    <!--{assign var=price value=`$orderDetail.price`}-->
+                    <!--{assign var=quantity value=`$orderDetail.quantity`}-->
+                    <td class="pricetd"><!--{$price|escape|number_format}-->円</td>
+                    <td><!--{$quantity|escape}--></td>
+                    <td class="pricetd"><!--{$price|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+                </tr>
+            <!--{/foreach}-->
+            <tr>
+                <th colspan="5" class="resulttd">小計</th>
+                <td class="pricetd"><!--{$arrDisp.subtotal|number_format}-->円</td>
+            </tr>
+            <!--{assign var=point_discount value="`$arrDisp.use_point*$smarty.const.POINT_VALUE`"}-->
+            <!--{if $point_discount > 0}-->
+            <tr>
+                <th colspan="5" class="resulttd">ポイント値引き</th>
+                <td class="pricetd"><!--{$point_discount|number_format}-->円</td>
+            </tr>
+            <!--{/if}-->
+            <!--{assign var=key value="discount"}-->
+            <!--{if $arrDisp[$key] != "" && $arrDisp[$key] > 0}-->
+            <tr>
+                <th colspan="5" class="resulttd">値引き</th>
+                <td class="pricetd"><!--{$arrDisp[$key]|number_format}-->円</td>
+            </tr>
+            <!--{/if}-->
+            <tr>
+                <th colspan="5" class="resulttd">送料</th>
+                <td class="pricetd"><!--{assign var=key value="deliv_fee"}--><!--{$arrDisp[$key]|escape|number_format}-->円</td>
+            </tr>
+            <tr>
+                <th colspan="5" class="resulttd">手数料</th>
+                <!--{assign var=key value="charge"}-->
+                <td class="pricetd"><!--{$arrDisp[$key]|escape|number_format}-->円</td>
+            </tr>
+            <tr>
+                <th colspan="5" class="resulttd">合計</th>
+                <td class="pricetd"><em><!--{$arrDisp.payment_total|number_format}-->円</em></td>
+            </tr>
+        </table>
+
+        <!-- 使用ポイントここから -->
+        <!--{if $smarty.const.USE_POINT !== false}-->
+            <table summary="使用ポイント">
+                <tr>
+                    <th>ご使用ポイント</th>
+                    <td class="pricetd"><!--{assign var=key value="use_point"}--><!--{$arrDisp[$key]|number_format|default:0}--> pt</td>
+                </tr>
+                <tr>
+                    <th>今回加算されるポイント</th>
+                    <td class="pricetd"><!--{$arrDisp.add_point|number_format|default:0}--> pt</td>
+                </tr>
+            </table>
+        <!--{/if}-->
+        <!-- 使用ポイントここまで -->
+
+        <table summary="お届け先" class="delivname">
+            <thead>
+                <tr>
+                    <th colspan="5">▼お届け先</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr>
+                    <th>お名前</th>
+                    <!--{assign var=key1 value="deliv_name01"}-->
+                    <!--{assign var=key2 value="deliv_name02"}-->
+                    <td><!--{$arrDisp[$key1]|escape}-->&nbsp;<!--{$arrDisp[$key2]|escape}--></td>
+                </tr>
+                <tr>
+                    <th>お名前(フリガナ)</th>
+                    <!--{assign var=key1 value="deliv_kana01"}-->
+                    <!--{assign var=key2 value="deliv_kana02"}-->
+                    <td><!--{$arrDisp[$key1]|escape}-->&nbsp;<!--{$arrDisp[$key2]|escape}--></td>
+                </tr>
+                <tr>
+                    <th>郵便番号</th>
+                    <!--{assign var=key1 value="deliv_zip01"}-->
+                    <!--{assign var=key2 value="deliv_zip02"}-->
+                    <td>〒<!--{$arrDisp[$key1]}-->-<!--{$arrDisp[$key2]}--></td>
+                </tr>
+                <tr>
+                    <th>住所</th>
+                    <!--{assign var=pref value=`$arrDisp.deliv_pref`}-->
+                    <!--{assign var=key value="deliv_addr01"}-->
+                    <td><!--{$arrPref[$pref]}--><!--{$arrDisp[$key]|escape}--><!--{assign var=key value="deliv_addr02"}--><!--{$arrDisp[$key]|escape}--></td>
+                </tr>
+                <tr>
+                    <th>電話番号</th>
+                    <!--{assign var=key1 value="deliv_tel01"}-->
+                    <!--{assign var=key2 value="deliv_tel02"}-->
+                    <!--{assign var=key3 value="deliv_tel03"}-->
+                    <td><!--{$arrDisp[$key1]}-->-<!--{$arrDisp[$key2]}-->-<!--{$arrDisp[$key3]}--></td>
+                </tr>
+            </tbody>
+        </table>
+
+        <br />
+
+        <h3>メール配信履歴一覧</h3>
+        <table>
+            <tr>
+                <th>処理日</th>
+                <th>通知メール</th>
+                <th>件名</th>
+            </tr>
+            <!--{section name=cnt loop=$arrMailHistory}-->
+            <tr class="center">
+                <td><!--{$arrMailHistory[cnt].send_date|sfDispDBDate|escape}--></td>
+                <!--{assign var=key value="`$arrMailHistory[cnt].template_id`"}-->
+                <td><!--{$arrMAILTEMPLATE[$key]|escape}--></td>
+                <td><a href="<!--{$smarty.server.PHP_SELF|escape}-->" onclick="win02('./mail_view.php?send_id=<!--{$arrMailHistory[cnt].send_id}-->','mail_view','650','800'); return false;"><!--{$arrMailHistory[cnt].subject|escape}--></a></td>
+            </tr>
+            <!--{/section}-->
+        </table>
+
+        <div class="tblareabtn">
+            <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_back_on.gif','change');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','change');"><img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="戻る" name="change" id="change" /></a>
+        </div>
+
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/refusal.tpl	(revision 19713)
@@ -0,0 +1,44 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+  <!--{include file=$tpl_navi}-->
+  <div id="mycontentsarea">
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+    <form name="form1" method="post" action="?">
+      <input type="hidden" name="mode" value="confirm" />
+      <div id="completetext">
+        会員を退会された場合には、現在保存されている購入履歴や、お届け先などの情報は、すべて削除されますがよろしいでしょうか？
+
+        <div class="tblareabtn">
+          <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_refuse_on.gif',this);" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_refuse.gif',this);" src="<!--{$TPL_DIR}-->img/button/btn_refuse.gif" class="box180" alt="会員退会を行う" name="refusal" id="refusal" />
+        </div>
+
+        <p class="mini"><em>※退会手続きが完了した時点で、現在保存されている購入履歴や、お届け先等の情報はすべてなくなりますのでご注意ください。</em></p>
+      </div>
+    </form>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 19713)
@@ -0,0 +1,117 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+  <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <!--{include file=$tpl_navi}-->
+    <div id="mycontentsarea">
+    <h3><!--{$tpl_subtitle|escape}--></h3>
+    <p>下記の内容で送信してもよろしいでしょうか？<br />
+      よろしければ、一番下の「会員登録完了へ」ボタンをクリックしてください。</p>
+
+
+    <form name="form1" id="form1" method="post" action="?">
+      <input type="hidden" name="mode" value="complete" />
+      <input type="hidden" name="customer_id" value="<!--{$arrForm.customer_id|escape}-->" />
+      <!--{foreach from=$arrForm key=key item=item}-->
+        <!--{if $key ne "mode" && $key ne "subm"}-->
+        <input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->" />
+        <!--{/if}-->
+      <!--{/foreach}-->
+      <table summary=" " class="delivname">
+        <tr>
+          <th>お名前<span class="attention">※</span></th>
+          <td><!--{$arrForm.name01|escape}-->　<!--{$arrForm.name02|escape}--></td>
+        </tr>
+        <tr>
+          <th>お名前(フリガナ)<span class="attention">※</span></th>
+          <td><!--{$arrForm.kana01|escape}-->　<!--{$arrForm.kana02|escape}--></td>
+        </tr>
+        <tr>
+          <th>郵便番号<span class="attention">※</span></th>
+          <td><!--{$arrForm.zip01}-->-<!--{$arrForm.zip02}--></td>
+        </tr>
+        <tr>
+          <th>住所<span class="attention">※</span></th>
+          <td><!--{$arrPref[$arrForm.pref]}--><!--{$arrForm.addr01|escape}--><!--{$arrForm.addr02|escape}--></td>
+        </tr>
+        <tr>
+          <th>電話番号<span class="attention">※</span></th>
+          <td><!--{$arrForm.tel01|escape}-->-<!--{$arrForm.tel02}-->-<!--{$arrForm.tel03}--></td>
+        </tr>
+        <tr>
+          <th>FAX</th>
+          <td><!--{if strlen($arrForm.fax01) > 0}--><!--{$arrForm.fax01}-->-<!--{$arrForm.fax02}-->-<!--{$arrForm.fax03}--><!--{else}-->未登録<!--{/if}--></td>
+        </tr>
+        <tr>
+          <th>メールアドレス<span class="attention">※</span></th>
+          <td><a href="<!--{$arrForm.email|escape:'hex'}-->"><!--{$arrForm.email|escape:'hexentity'}--></a></td>
+        </tr>
+        <tr>
+          <th>携帯メールアドレス</th>
+          <td>
+            <!--{if strlen($arrForm.email_mobile) > 0}-->
+            <a href="<!--{$arrForm.email_mobile|escape:'hex'}-->"><!--{$arrForm.email_mobile|escape:'hexentity'}--></a>
+            <!--{else}-->
+            未登録
+            <!--{/if}-->
+          </td>
+        </tr>
+        <tr>
+          <th>性別<span class="attention">※</span></th>
+          <td><!--{$arrSex[$arrForm.sex]}--></td>
+        </tr>
+        <tr>
+          <th>職業</th>
+          <td><!--{$arrJob[$arrForm.job]|escape|default:"未登録"}--></td>
+        </tr>
+        <tr>
+          <th>生年月日</th>
+          <td><!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|escape}-->年<!--{$arrForm.month|escape}-->月<!--{$arrForm.day|escape}-->日<!--{else}-->未登録<!--{/if}--></td>
+        </tr>
+        <tr>
+          <th>希望するパスワード<br />
+          </th>
+          <td><!--{$passlen}--></td>
+        </tr>
+        <tr>
+          <th>パスワードを忘れた時のヒント<span class="attention">※</span></th>
+          <td>質問：&nbsp;<!--{$arrReminder[$arrForm.reminder]|escape}--><br />
+              答え：&nbsp;<!--{$arrForm.reminder_answer|escape}--></td>
+        </tr>
+        <tr>
+          <th>メールマガジン送付について<span class="attention">※</span></th>
+          <td><!--{$arrMAILMAGATYPE[$arrForm.mailmaga_flg]}--></td>
+        </tr>
+      </table>
+
+      <div class="tblareabtn">
+        <a href="?" onclick="fnModeSubmit('return', '', ''); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_back_on.gif','back');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','back');"><img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="戻る" name="back" id="back" /></a>
+        &nbsp;
+       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_send_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_send.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_send.gif" class="box150" alt="送信" name="complete" id="complete" />
+      </div>
+    </form>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/mypage/delivery.tpl	(revision 19713)
@@ -0,0 +1,77 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<div id="mypagecolumn">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+<!--{include file=$tpl_navi}-->
+    <div id="mycontentsarea">
+        <h3><!--{$tpl_subtitle|escape}--></h3>
+        <p>登録住所以外への住所へ送付される場合等にご利用いただくことができます。</p>
+        <p>※最大<!--{$smarty.const.DELIV_ADDR_MAX|escape}-->件まで登録できます。</p>
+
+        <!--{if $tpl_linemax < $smarty.const.DELIV_ADDR_MAX}-->
+          <!--{* 退会時非表示 *}-->
+          <!--{if $tpl_login}-->
+            <p class="addbtn">
+                <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','newadress');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','newadress');" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
+            </p>
+          <!--{/if}-->
+        <!--{/if}-->
+
+        <!--{if $tpl_linemax > 0}-->
+        <form name="form1" method="post" action="?" >
+            <input type="hidden" name="mode" value="" />
+            <input type="hidden" name="other_deliv_id" value="" />
+            <input type="hidden" name="pageno" value="<!--{$tpl_pageno}-->" />
+
+            <table summary="お届け先">
+                <tr>
+                    <th colspan="5">▼お届け先</th>
+                </tr>
+                <!--{section name=cnt loop=$arrOtherDeliv}-->
+                    <!--{assign var=OtherPref value="`$arrOtherDeliv[cnt].pref`"}-->
+                    <tr>
+                        <td class="centertd"><!--{$smarty.section.cnt.iteration}--></td>
+                        <td><label for="add<!--{$smarty.section.cnt.iteration}-->">お届け先住所</label></td>
+                        <td>
+                            〒<!--{$arrOtherDeliv[cnt].zip01}-->-<!--{$arrOtherDeliv[cnt].zip02}--><br />
+                            <!--{$arrPref[$OtherPref]|escape}--><!--{$arrOtherDeliv[cnt].addr01|escape}--><!--{$arrOtherDeliv[cnt].addr02|escape}--><br />
+                            <!--{$arrOtherDeliv[cnt].name01|escape}-->&nbsp;<!--{$arrOtherDeliv[cnt].name02|escape}-->
+                        </td>
+                        <td class="centertd">
+                            <a href="./delivery_addr.php" onclick="win02('./delivery_addr.php?other_deliv_id=<!--{$arrOtherDeliv[cnt].other_deliv_id}-->','deliv_disp','600','640'); return false;">変更</a>
+                        </td>
+                        <td class="centertd">
+                            <a href="<!--{$smarty.server.PHP_SELF}-->" onclick="fnModeSubmit('delete','other_deliv_id','<!--{$arrOtherDeliv[cnt].other_deliv_id}-->'); return false;">削除</a>
+                        </td>
+                    </tr>
+                <!--{/section}-->
+            </table>
+        </form>
+        <!--{else}-->
+        <p class="delivempty"><strong>新しいお届け先はありません。</strong></p>
+        <!--{/if}-->
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl	(revision 19713)
@@ -0,0 +1,250 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="under02column">
+  <div id="under02column_customer">
+    <p class="flowarea"><img src="<!--{$TPL_DIR}-->img/picture/img_flow_01.gif" width="700" height="36" alt="購入手続きの流れ" /></p>
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+
+    <p>下記項目にご入力ください。「<span class="attention">※</span>」印は入力必須項目です。<br />
+      入力後、一番下の「確認ページへ」ボタンをクリックしてください。</p>
+    <form name="form1" id="form1" method="post" action="?">
+      <input type="hidden" name="mode" value="nonmember_confirm" />
+      <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+      <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+      <table summary=" ">
+        <tr>
+          <th>お名前<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="order_name01"}-->
+            <!--{assign var=key2 value="order_name02"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box120" />&nbsp;
+            名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box120" />
+          </td>
+        </tr>
+        <tr>
+          <th>お名前(フリガナ)<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="order_kana01"}-->
+            <!--{assign var=key2 value="order_kana02"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box120" />&nbsp;
+            メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box120" />
+          </td>
+        </tr>
+        <tr>
+          <th>郵便番号<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="order_zip01"}-->
+            <!--{assign var=key2 value="order_zip02"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+            <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" />　
+              <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p>
+
+            <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+               <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
+          </td>
+        </tr>
+        <tr>
+          <th>住所<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key value="order_pref"}-->
+            <span class="attention"><!--{$arrErr.order_pref}--><!--{$arrErr.order_addr01}--><!--{$arrErr.order_addr02}--></span>
+            <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+              <option value="">都道府県を選択</option>
+              <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+            </select>
+            <p class="mini">
+              <!--{assign var=key value="order_addr01"}-->
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="40" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box380" /><br />
+              <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
+            <p class="mini">
+              <!--{assign var=key value="order_addr02"}-->
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="40"  maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box380" /><br />
+              <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
+            <p class="mini"><em>住所は2つに分けてご記入ください。マンション名は必ず記入してください。</em></p></td>
+        </tr>
+        <tr>
+          <th>電話番号<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="order_tel01"}-->
+            <!--{assign var=key2 value="order_tel02"}-->
+            <!--{assign var=key3 value="order_tel03"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--></span>
+            <span class="attention"><!--{$arrErr[$key2]}--></span>
+            <span class="attention"><!--{$arrErr[$key3]}--></span>
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box60" />
+          </td>
+        </tr>
+        <tr>
+          <th>FAX</th>
+          <td>
+            <!--{assign var=key1 value="order_fax01"}-->
+            <!--{assign var=key2 value="order_fax02"}-->
+            <!--{assign var=key3 value="order_fax03"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--></span>
+            <span class="attention"><!--{$arrErr[$key2]}--></span>
+            <span class="attention"><!--{$arrErr[$key3]}--></span>
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box60" />
+          </td>
+        </tr>
+        <tr>
+          <th>メールアドレス<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key value="order_email"}-->
+            <span class="attention"><!--{$arrErr[$key]}--></span>
+            <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box380" /><br />
+            <!--{assign var=key value="order_email02"}-->
+            <span class="attention"><!--{$arrErr[$key]}--></span>
+            <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box380" /><br />
+            <p class="mini"><em>確認のため2度入力してください。</em></p>
+          </td>
+        </tr>
+        <tr>
+          <th>性別<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key value="order_sex"}-->
+            <span class="attention"><!--{$arrErr[$key]}--></span>
+            <!--{if $arrErr[$key]}-->
+              <!--{assign var=err value="background-color: `$smarty.const.ERR_COLOR`"}-->
+            <!--{/if}-->
+            <!--{html_radios name="$key" options=$arrSex selected=$arrForm[$key].value style="$err"}-->
+          </td>
+        </tr>
+        <tr>
+          <th>職業</th>
+          <td>
+            <!--{assign var=key value="order_job"}-->
+            <!--{if $arrErr[$key]}-->
+              <!--{assign var=err value="background-color: `$smarty.const.ERR_COLOR`"}-->
+            <!--{/if}-->
+            <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+              <option value="">選択して下さい</option>
+              <!--{html_options options=$arrJob selected=$arrForm[$key].value}-->
+            </select>
+          </td>
+        </tr>
+        <tr>
+          <th>生年月日</th>
+          <td>
+            <!--{assign var=errBirth value="`$arrErr.year``$arrErr.month``$arrErr.day`"}-->
+            <span class="attention"><!--{$errBirth}--></span>
+            <select name="year" style="<!--{$errBirth|sfGetErrorColor}-->">
+              <!--{html_options options=$arrYear selected=$arrForm.year.value|default:''}-->
+            </select>年
+            <select name="month" style="<!--{$errBirth|sfGetErrorColor}-->">
+              <!--{html_options options=$arrMonth selected=$arrForm.month.value|default:''}-->
+            </select>月
+            <select name="day" style="<!--{$errBirth|sfGetErrorColor}-->">
+              <!--{html_options options=$arrDay selected=$arrForm.day.value|default:''}-->
+            </select>日
+          </td>
+        </tr>
+        <tr>
+          <th colspan="2">
+          <!--{assign var=key value="deliv_check"}-->
+          <input type="checkbox" name="<!--{$key}-->" value="1" onclick="fnCheckInputDeliv();" <!--{$arrForm[$key].value|sfGetChecked:1}--> id="deliv_label" />
+          <label for="deliv_label"><em>お届け先を指定</em>　※上記に入力された住所と同一の場合は省略可能です。</label>
+          </th>
+        </tr>
+        <tr>
+          <th>お名前<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="deliv_name01"}-->
+            <!--{assign var=key2 value="deliv_name02"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box120" />&nbsp;
+            名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box120" />
+          </td>
+        </tr>
+        <tr>
+          <th>お名前(フリガナ)<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="deliv_kana01"}-->
+            <!--{assign var=key2 value="deliv_kana02"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box120" />&nbsp;
+            メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box120" />
+          </td>
+        </tr>
+        <tr>
+          <th>郵便番号<span class="attention">※</span></th>
+          <td>
+           <!--{assign var=key1 value="deliv_zip01"}-->
+           <!--{assign var=key2 value="deliv_zip02"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+            <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box60" />&nbsp;-&nbsp;  <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" />　
+              <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="fs12">郵便番号検索</span></a></p>
+
+            <p class="zipimg"><a href="<!--{$smarty.const.URL_DIR}-->address/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01'); return false;" target="_blank"><img src="<!--{$TPL_DIR}-->img/button/btn_address_input.gif" width="86" height="20" alt="住所自動入力" /></a>
+              <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
+          </td>
+        </tr>
+        <tr>
+          <th>住所<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key value="deliv_pref"}-->
+            <span class="attention"><!--{$arrErr.deliv_pref}--><!--{$arrErr.deliv_addr01}--><!--{$arrErr.deliv_addr02}--></span>
+            <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+              <option value="">都道府県を選択</option>
+              <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+            </select>
+            <p class="mini">
+              <!--{assign var=key value="deliv_addr01"}-->
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="40" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box380" /><br />
+              <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
+            <p class="mini">
+              <!--{assign var=key value="deliv_addr02"}-->
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="40"  maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box380" /><br />
+              <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
+            <p class="mini"><em>住所は2つに分けてご記入ください。マンション名は必ず記入してください。</em></p>
+
+          </td>
+        </tr>
+        <tr>
+          <th>電話番号<span class="attention">※</span></th>
+          <td>
+            <!--{assign var=key1 value="deliv_tel01"}-->
+            <!--{assign var=key2 value="deliv_tel02"}-->
+            <!--{assign var=key3 value="deliv_tel03"}-->
+            <span class="attention"><!--{$arrErr[$key1]}--></span>
+            <span class="attention"><!--{$arrErr[$key2]}--></span>
+            <span class="attention"><!--{$arrErr[$key3]}--></span>
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box60" />
+          </td>
+        </tr>
+      </table>
+
+      <div class="tblareabtn">
+       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_next.gif" class="box150" alt="次へ" name="next" id="next" />
+      </div>
+    </form>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	(revision 19713)
@@ -0,0 +1,101 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="under02column">
+    <div id="under02column_shopping">
+        <p class="flowarea">
+            <img src="<!--{$TPL_DIR}-->img/picture/img_flow_01.gif" width="700" height="36" alt="購入手続きの流れ" />
+        </p>
+        <h2 class="title"><!--{$tpl_title|escape}--></h2>
+
+        <p>下記一覧よりお届け先住所を選択して、「選択したお届け先に送る」ボタンをクリックしてください。</p>
+        <!--{if $tpl_addrmax < $smarty.const.DELIV_ADDR_MAX}-->
+            <p>一覧にご希望の住所が無い場合は、「新しいお届け先を追加する」より追加登録してください。</p>
+        <!--{/if}-->
+        <p>※最大<!--{$smarty.const.DELIV_ADDR_MAX|escape}-->件まで登録できます。</p>
+
+        <!--{if $tpl_addrmax < $smarty.const.DELIV_ADDR_MAX}-->
+            <p class="addbtn">
+                <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|escape}-->','new_deiv','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address_on.gif','addition');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_add_address.gif','addition');"><img src="<!--{$TPL_DIR}-->img/button/btn_add_address.gif" width="160" height="22" alt="新しいお届け先を追加する" name="addition" id="addition" /></a>
+            </p>
+        <!--{/if}-->
+        <form name="form1" id="form1" method="post" action="?">
+            <input type="hidden" name="mode" value="customer_addr" />
+            <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+            <input type="hidden" name="other_deliv_id" value="" />
+            <!--{if $arrErr.deli != ""}-->
+                <p class="attention"><!--{$arrErr.deli}--></p>
+            <!--{/if}-->
+            <table summary="お届け先の指定">
+                <tr>
+                    <th>選択</th>
+                    <th>住所種類</th>
+                    <th>お届け先</th>
+                    <th>変更</th>
+                    <th>削除</th>
+                </tr>
+                <!--{section name=cnt loop=$arrAddr}-->
+                <tr>
+                     <td class="centertd">
+                         <!--{if $smarty.section.cnt.first}-->
+                            <input type="radio" name="deliv_check" id="chk_id_<!--{$smarty.section.cnt.iteration}-->" value="-1" <!--{if $arrForm.deliv_check.value == "" || $arrForm.deliv_check.value == -1}--> checked="checked"<!--{/if}--> />
+                         <!--{else}-->
+                            <input type="radio" name="deliv_check" id="chk_id_<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrAddr[cnt].other_deliv_id}-->"<!--{if $arrForm.deliv_check.value == $arrAddr[cnt].other_deliv_id}--> checked="checked"<!--{/if}--> />
+                         <!--{/if}-->
+                    </td>
+                    <td>
+                        <label for="chk_id_<!--{$smarty.section.cnt.iteration}-->">
+                            <!--{if $smarty.section.cnt.first}-->
+                                会員登録住所
+                            <!--{else}-->
+                                追加登録住所
+                            <!--{/if}-->
+                        </label>
+                    </td>
+                    <td>
+                        <!--{assign var=key value=$arrAddr[cnt].pref}-->
+                        <!--{$arrPref[$key]}--><!--{$arrAddr[cnt].addr01|escape}--><!--{$arrAddr[cnt].addr02|escape}--><br />
+                        <!--{$arrAddr[cnt].name01|escape}--> <!--{$arrAddr[cnt].name02|escape}-->
+                    </td>
+                    <td class="centertd">
+                        <!--{if !$smarty.section.cnt.first}-->
+                            <a href="<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php" onclick="win02('<!--{$smarty.const.URL_DIR}-->mypage/delivery_addr.php?page=<!--{$smarty.server.PHP_SELF|escape}-->&amp;other_deliv_id=<!--{$arrAddr[cnt].other_deliv_id}-->','new_deiv','600','640'); return false;">変更</a>
+                        <!--{/if}-->
+                    </td>
+                    <td class="centertd">
+                        <!--{if !$smarty.section.cnt.first}-->
+                            <a href="?" onclick="fnModeSubmit('delete', 'other_deliv_id', '<!--{$arrAddr[cnt].other_deliv_id}-->'); return false">削除</a>
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            <!--{/section}-->
+        </table>
+
+            <div class="tblareabtn">
+                <a href="<!--{$smarty.const.URL_CART_TOP}-->" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back.gif',back03)">
+                    <img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="戻る" border="0" name="back03" id="back03" /></a>
+                <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_address_select_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_address_select.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_address_select.gif" alt="選択したお届け先に送る" class="box190" name="send_button" id="send_button" />
+            </div>
+        </form>
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/index.tpl	(revision 19713)
@@ -0,0 +1,79 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="under02column">
+  <div id="under02column_login">
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+    <form name="member_form" id="member_form" method="post" action="./deliv.php" onsubmit="return fnCheckLogin('member_form')">
+   <div class="loginarea">
+     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+     <p><img src="<!--{$TPL_DIR}-->img/title/tit_sub_member.gif" width="202" height="16" alt="会員登録がお済みのお客様" /></p>
+     <p class="inputtext">会員の方は、登録時に入力されたメールアドレスとパスワードでログインしてください。</p>
+       <input type="hidden" name="mode" value="login" />
+       <div class="inputbox">
+       <!--{assign var=key value="login_email"}--><span class="attention"><!--{$arrErr[$key]}--></span>
+       <p>メールアドレス:&nbsp;
+         <input type="text" name="<!--{$key}-->"
+                value="<!--{$tpl_login_email|escape}-->"
+                maxlength="<!--{$arrForm[$key].length}-->"
+                style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;"
+                size="40" class="box300" />
+       </p>
+       <p class="mini">
+         <input type="checkbox" name="login_memory" value="1" <!--{$tpl_login_memory|sfGetChecked:1}--> id="login_memory" />
+         <label for="login_memory">会員メールアドレスをコンピューターに記憶させる</label>
+       </p>
+       <p class="passwd">
+         <!--{assign var=key value="login_pass"}--><span class="attention"><!--{$arrErr[$key]}--></span>
+         パスワード:&nbsp;
+         <input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box300" />
+       </p>
+     </div>
+     <div class="tblareabtn">
+      <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_login.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_login.gif" alt="ログイン" name="log" id="log" class="box140" />
+     </div>
+     <p class="inputtext02">
+       パスワードを忘れた方は<a href="<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->" onclick="win01('<!--{$smarty.const.SSL_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_URL}-->','forget','600','460'); return false;" target="_blank">こちら</a>からパスワードの再発行を行ってください。<br />
+      メールアドレスを忘れた方は、お手数ですが、<a href="<!--{$smarty.const.URL_DIR}-->contact/<!--{$smarty.const.DIR_INDEX_URL}-->">お問い合わせページ</a>からお問い合わせください。
+     </p>
+   </div>
+    </form>
+    <form name="member_form2" id="member_form2" method="post" action="?">
+      <input type="hidden" name="mode" value="nonmember" />
+      <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <div class="loginarea">
+    <p>
+      <img src="<!--{$TPL_DIR}-->img/title/tit_sub_guest.gif" width="247" height="16" alt="まだ会員登録されていないお客様" />
+    </p>
+    <p class="inputtext">会員登録をすると便利なMyページをご利用いただけます。<br />
+      また、ログインするだけで、毎回お名前や住所などを入力することなくスムーズにお買い物をお楽しみいただけます。
+    </p>
+    <div class="inputbox02">
+      <a href="<!--{$smarty.const.URL_DIR}-->entry/kiyaku.php" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry_on.gif','b_gotoentry');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_entry.gif','b_gotoentry');">
+        <img src="<!--{$TPL_DIR}-->img/button/btn_entry.gif" width="130" height="30" alt="会員登録をする" border="0" name="b_gotoentry" /></a>
+      <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_buystep.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_buystep.gif" class="box130"  alt="購入手続きへ" name="buystep" id="buystep" />
+    </div>
+  </div>
+</form>
+</div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/complete.tpl	(revision 19713)
@@ -0,0 +1,66 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="under02column">
+  <div id="under02column_shopping">
+    <p class="flowarea">
+      <img src="<!--{$TPL_DIR}-->img/picture/img_flow_04.gif" width="700" height="36" alt="購入手続きの流れ" />
+    </p>
+    <h2 class="title"><!--{$tpl_title|escape}--></h2>
+
+    <!-- ▼その他決済情報を表示する場合は表示 -->
+    <!--{if $arrOther.title.value }-->
+    <p><em>■<!--{$arrOther.title.name}-->情報</em><br />
+        <!--{foreach key=key item=item from=$arrOther}-->
+        <!--{if $key != "title"}-->
+          <!--{if $item.name != ""}-->
+            <!--{$item.name}-->：
+          <!--{/if}-->
+            <!--{$item.value|nl2br}--><br />
+        <!--{/if}-->
+        <!--{/foreach}-->
+    </p>
+     <!--{/if}-->
+     <!-- ▲コンビに決済の場合には表示 -->
+
+    <div id="completetext">
+      <em><!--{$arrInfo.shop_name|escape}-->の商品をご購入いただき、ありがとうございました。</em>
+
+      <p>ただいま、ご注文の確認メールをお送りさせていただきました。<br />
+        万一、ご確認メールが届かない場合は、トラブルの可能性もありますので大変お手数ではございますがもう一度お問い合わせいただくか、お電話にてお問い合わせくださいませ。<br />
+        今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
+
+      <p><!--{$arrInfo.shop_name|escape}--><br />
+        TEL：<!--{$arrInfo.tel01}-->-<!--{$arrInfo.tel02}-->-<!--{$arrInfo.tel03}--> <!--{if $arrInfo.business_hour != ""}-->（受付時間/<!--{$arrInfo.business_hour}-->）<!--{/if}--><br />
+        E-mail：<a href="mailto:<!--{$arrInfo.email02|escape:'hex'}-->"><!--{$arrInfo.email02|escape:'hexentity'}--></a></p>
+    </div>
+
+    <div class="tblareabtn">
+      <!--{if $is_campaign}-->
+        <a href="<!--{$smarty.const.CAMPAIGN_URL}--><!--{$campaign_dir}-->/<!--{$smarty.const.DIR_INDEX_URL}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
+      <!--{else}-->
+        <a href="<!--{$smarty.const.URL_SITE_TOP}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage_on.gif','b_toppage');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_toppage.gif','b_toppage');"><img src="<!--{$TPL_DIR}-->img/button/btn_toppage.gif" width="150" height="30" alt="トップページへ" border="0" name="b_toppage" /></a>
+      <!--{/if}-->
+    </div>
+  </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/card.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/card.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/card.tpl	(revision 19713)
@@ -0,0 +1,199 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<table width="780" cellspacing="0" cellpadding="0" summary=" ">
+	<tr>
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="18" alt="" /></td>
+		<td bgcolor="#ffffff" colspan="3"><img src="../img/_.gif" width="778" height="1" alt="" /></td>
+
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="18" alt="" /></td>		
+	</tr>
+	<tr>
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="10" alt="" /></td>
+		<td bgcolor="#ffffff"><img src="../img/_.gif" width="10" height="1" alt="" /></td>
+		<td><img src="../img/shopping/flow04.gif" width="758" height="78" alt="お買い物の流れ" /></td>
+		<td bgcolor="#ffffff"><img src="../img/_.gif" width="10" height="1" alt="" /></td>
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="10" alt="" /></td>		
+	</tr>
+</table>
+
+<table width="780" cellspacing="0" cellpadding="0" summary=" ">
+	<tr>
+		<td bgcolor="#cccccc" width="1"><img src="../img/_.gif" width="1" height="10" alt="" /></td>
+		<td bgcolor="#ffffff" width="9"><img src="../img/_.gif" width="39" height="1" alt="" /></td>
+		<td bgcolor="#ffffff" align="left"> 
+		<!--▼MAIN CONTENTS-->
+		<table cellspacing="0" cellpadding="0" summary=" " id="containerfull">
+			<tr><td height="20"></td></tr>
+			<tr valign="top">
+				<!--▼CONTENTS-->
+
+				<td>
+				<div id="maintitle"><img src="../img/shopping/card_title.jpg" width="700" height="40" alt="クレジットカード決済" /></div>
+				<div class="fs12n" id="comment01">下記項目にクレジットカード情報をご入力くださいませ。<br />
+				入力後、一番下の「ご注文完了ページへ」ボタンをクリックしてください。</div>
+				<form name="form1" id="form1" method="post" action="?">
+				<input type="hidden" name="mode" value="regist">
+				<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+				<span class="redst"><!--{$tpl_error}--></span>
+				<table cellspacing="1" cellpadding="8" summary=" " id="frame">
+					<tr>
+						<td class="fs12n" id="left">ご利用可能なカードの種類</td>
+
+						<td id="right"><img src="../img/shopping/card.gif" width="399" height="52" alt="ご利用可能なカードの種類" /></td>
+					</tr>
+					<tr>
+						<td class="fs12n" id="left">カード番号</td>
+						<td id="right">
+						<table cellspacing="0" cellpadding="0" summary=" ">
+							<tr>
+								<!--{assign var=key1 value="card_no01"}-->
+								<!--{assign var=key2 value="card_no02"}-->
+								<!--{assign var=key3 value="card_no03"}-->
+								<!--{assign var=key4 value="card_no04"}-->
+								<td class="fs12n">
+								<span class="red"><!--{$arrErr[$key1]}--></span>
+								<span class="red"><!--{$arrErr[$key2]}--></span>
+								<span class="red"><!--{$arrErr[$key3]}--></span>
+								<span class="red"><!--{$arrErr[$key4]}--></span>
+								<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6">&nbsp;-&nbsp;
+								<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6">&nbsp;-&nbsp;
+								<input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->"  size="6">&nbsp;-&nbsp;
+								<input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4].value|escape}-->" maxlength="<!--{$arrForm[$key4].length}-->" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->"  size="6">
+								</td>
+							</tr>
+							<tr><td height="5"></td></tr>
+							<tr>
+								<td class="fs12n">ご本人名義のカードをご使用ください。<br>
+								半角入力&nbsp;例：1234-5678-9012-3456</td>
+							</tr>
+						</table>
+
+						</td>
+					</tr>
+					<tr>
+						<td class="fs12n" id="left">有効期限</td>
+						<td id="right">
+						<table cellspacing="0" cellpadding="0" summary=" ">
+							<tr>
+								<!--{assign var=key1 value="card_month"}-->
+								<!--{assign var=key2 value="card_year"}-->
+								<td class="fs12n">
+								<span class="red"><!--{$arrErr[$key1]}--></span>
+								<span class="red"><!--{$arrErr[$key2]}--></span>
+								<select name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" >
+								<option value="">--</option>
+								<!--{html_options options=$arrMonth selected=$arrForm[$key1].value}-->
+								</select>月/
+								<select name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" >
+								<option value="">--</option>
+								<!--{html_options options=$arrYear selected=$arrForm[$key2].value}-->
+								</select>年</td>
+							</tr>
+							<tr><td height="5"></td></tr>
+
+							<tr>
+								<td class="fs12n">カード上は月/年と記述しています。</td>
+							</tr>
+						</table>
+						</td>
+					</tr>
+					<tr>
+						<td class="fs12n" id="left">ローマ字氏名</td>
+
+						<td id="right">
+						<table cellspacing="0" cellpadding="0" summary=" ">
+							<tr>
+								<!--{assign var=key2 value="card_name01"}-->
+								<!--{assign var=key1 value="card_name02"}-->								
+								<td class="fs12n">
+								<span class="red"><!--{$arrErr[$key1]}--></span>
+								<span class="red"><!--{$arrErr[$key2]}--></span>
+								名&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="20" class="bo20">&nbsp;&nbsp;姓&nbsp;
+								<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="20" class="bo20"></td>
+							</tr>
+							<tr><td height="5"></td></tr>
+							<tr>
+								<td class="fs12n">半角英字入力　例：TARO YAMADA</td>
+							</tr>
+						</table>
+						</td>
+					</tr>
+					<tr>
+						<td class="fs12n" id="left">お支払い方法</td>
+
+						<td id="right">
+						<table cellspacing="0" cellpadding="0" summary=" ">
+							<tr>
+								<!--{assign var=key value="jpo_info"}-->								
+								<td class="fs12n">
+								<select name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" >
+								<!--{html_options options=$arrJPO_INFO selected=$arrForm[$key].value}-->
+								</select></td>
+							</tr>
+						</table>
+						</td>
+					</tr>
+					
+				</table>
+				<div class="red12" id="comment02">※「ご注文完了ページへ」をクリック後、完了ページが表示されるまでお待ちください。</div>
+				<div id="button">
+				<!--「戻る」「登録」-->
+				<a href="?" onmouseover="chgImg('/img/button/back03_on.gif','back03')" onmouseout="chgImg('/img/button/back03.gif','back03')" onclick="history.back(); return false;" /><img src="/img/button/back03.gif" width="110" height="30" alt="戻る" border="0" name="back03" id="back03" ></a><img src="../img/_.gif" width="12" height="" alt="" />
+				<input type="image" onmouseover="chgImgImageSubmit('../img/shopping/complete_on.gif',this)" onmouseout="chgImgImageSubmit('../img/shopping/complete.gif',this)" src="../img/shopping/complete.gif" width="170" height="30" alt="ご注文完了ページへ" border="0" name="complete" id="complete" />
+				</div>
+				</form>
+				
+				<table cellspacing="0" cellpadding="0" summary=" " id="verisign">
+					<tr>
+						<td><script src=https://seal.verisign.com/getseal?host_name=secure.tokado.jp&size=S&use_flash=YES&use_transparent=NO&lang=ja></script></td>
+						<td><img src="../img/_.gif" width="10" height="1" alt="" /></td>
+						<td class="fs10">インターネットショッピングでは、通信の安全性を確保するセキュリティモードを設定しています。「暗号化(SSL)」を選択すると、送受信するデータが暗号化され、漏洩の危険性が低くなります。また、日本ベリサイン社によって通信サーバが認証されるため、なりすましなどによるID・パスワードの盗用の可能性も低減できます。</td>
+					</tr>
+
+				</table>
+				</td>
+				<!--▲ONTENTS-->	
+			</tr>
+		</table>
+		<!--▲MAIN CONTENTS-->
+		</td>
+		<td bgcolor="#ffffff" width="10"><img src="../img/_.gif" width="39" height="1" alt="" /></td>
+		<td bgcolor="#cccccc" width="1"><img src="../img/_.gif" width="1" height="10" alt="" />
+<!-- EBiS start -->
+<script type="text/javascript">
+if ( location.protocol == 'http:' ){ 
+	strServerName = 'http://daikoku.ebis.ne.jp'; 
+} else { 
+	strServerName = 'https://secure2.ebis.ne.jp/ver3';
+}
+cid = 'tqYg3k6U'; pid = 'shopping_card'; m1id=''; a1id=''; o1id=''; o2id=''; o3id=''; o4id=''; o5id='';
+document.write("<scr" + "ipt type=\"text\/javascript\" src=\"" + strServerName + "\/ebis_tag.php?cid=" + cid + "&pid=" + pid + "&m1id=" + m1id + "&a1id=" + a1id + "&o1id=" + o1id + "&o2id=" + o2id + "&o3id=" + o3id + "&o4id=" + o4id + "&o5id=" + o5id + "\"><\/scr" + "ipt>");
+</script>
+<!-- EBiS end -->
+		</td>
+
+	</tr>
+</table>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/convenience.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/convenience.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/convenience.tpl	(revision 19713)
@@ -0,0 +1,110 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ */
+*}-->
+<!--▼CONTENTS-->
+<table width="780" cellspacing="0" cellpadding="0" summary=" ">
+	<tr>
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="18" alt="" /></td>
+		<td bgcolor="#ffffff" colspan="3"><img src="../img/_.gif" width="778" height="1" alt="" /></td>
+
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="18" alt="" /></td>		
+	</tr>
+	<tr>
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="10" alt="" /></td>
+		<td bgcolor="#ffffff"><img src="../img/_.gif" width="10" height="1" alt="" /></td>
+		<td><img src="../img/shopping/flow06.gif" width="758" height="78" alt="お買い物の流れ" /></td>
+		<td bgcolor="#ffffff"><img src="../img/_.gif" width="10" height="1" alt="" /></td>
+		<td bgcolor="#cccccc"><img src="../img/_.gif" width="1" height="10" alt="" /></td>		
+	</tr>
+</table>
+
+<table width="780" cellspacing="0" cellpadding="0" summary=" ">
+	<tr>
+		<td bgcolor="#cccccc" width="1"><img src="../img/_.gif" width="1" height="10" alt="" /></td>
+		<td bgcolor="#ffffff" width="9"><img src="../img/_.gif" width="39" height="1" alt="" /></td>
+		<td bgcolor="#ffffff" align="left"> 
+		<!--▼MAIN CONTENTS-->
+		<table cellspacing="0" cellpadding="0" summary=" " id="containerfull">
+			<tr><td height="20"></td></tr>
+			<tr valign="top">
+				<!--▼CONTENTS-->
+
+				<td>
+				<div id="maintitle"><img src="../img/shopping/conveni_title.jpg" width="700" height="40" alt="コンビニ決済" /></div>
+				<div class="fs12n" id="comment01">下記から、お支払いするコンビニをご選択くださいませ。<br />
+				選択後、一番下の「ご注文完了ページへ」ボタンをクリックしてください。</div>
+				<form name="form1" id="form1" method="post" action="?">
+				<input type="hidden" name="mode" value="complete">
+				<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+				<span class="red12st"><!--{$arrErr.convenience}--></span>
+				<table cellspacing="1" cellpadding="8" summary=" " id="frame">
+					<tr class="fs12n">
+						<td id="select">選択</td>
+						<td id="payment">コンビニの種類</td>
+					</tr>
+					<!--{foreach key=key item=item from=$arrCONVENIENCE}-->
+					<tr>
+						<td id="select_c"><input type="radio" name="convenience" value="<!--{$key}-->" style="<!--{$arrErr.convenience|sfGetErrorColor}-->"></td>
+						<td class="fs12n" id="payment_c"><!--{$item|escape}--></td>
+					</tr>
+					<!--{/foreach}-->
+				</table>
+				<div class="red12" id="comment02">※「ご注文完了ページへ」をクリック後、完了ページが表示されるまでお待ちください。</div>
+				<div id="button">
+				<!--「戻る」「登録」-->
+				<a href="?" onmouseover="chgImg('/img/button/back03_on.gif','back03')" onmouseout="chgImg('/img/button/back03.gif','back03')" onclick="fnModeSubmit('return', '', ''); return false;" /><img src="/img/button/back03.gif" width="110" height="30" alt="戻る" border="0" name="back03" id="back03" ></a><img src="../img/_.gif" width="20" height="" alt="" /><input type="image" onmouseover="chgImgImageSubmit('../img/shopping/complete_on.gif',this)" onmouseout="chgImgImageSubmit('../img/shopping/complete.gif',this)" src="../img/shopping/complete.gif" width="170" height="30" alt="ご注文完了ページへ" border="0" name="complete" id="complete" />
+				</div>
+				</form>
+				
+				<table cellspacing="0" cellpadding="0" summary=" " id="verisign">
+					<tr>
+						<td><script src=https://seal.verisign.com/getseal?host_name=secure.tokado.jp&size=S&use_flash=YES&use_transparent=NO&lang=ja></script></td>
+						<td><img src="../img/_.gif" width="10" height="1" alt="" /></td>
+						<td class="fs10">インターネットショッピングでは、通信の安全性を確保するセキュリティモードを設定しています。「暗号化(SSL)」を選択すると、送受信するデータが暗号化され、漏洩の危険性が低くなります。また、日本ベリサイン社によって通信サーバが認証されるため、なりすましなどによるID・パスワードの盗用の可能性も低減できます。</td>
+					</tr>
+
+				</table>
+				</td>
+				<!--▲ONTENTS-->	
+			</tr>
+		</table>
+		<!--▲MAIN CONTENTS-->
+		</td>
+		<td bgcolor="#ffffff" width="10"><img src="../img/_.gif" width="39" height="1" alt="" /></td>
+		<td bgcolor="#cccccc" width="1"><img src="../img/_.gif" width="1" height="10" alt="" />
+<!-- EBiS start -->
+<script type="text/javascript">
+if ( location.protocol == 'http:' ){ 
+	strServerName = 'http://daikoku.ebis.ne.jp'; 
+} else { 
+	strServerName = 'https://secure2.ebis.ne.jp/ver3';
+}
+cid = 'tqYg3k6U'; pid = 'shopping_card'; m1id=''; a1id=''; o1id=''; o2id=''; o3id=''; o4id=''; o5id='';
+document.write("<scr" + "ipt type=\"text\/javascript\" src=\"" + strServerName + "\/ebis_tag.php?cid=" + cid + "&pid=" + pid + "&m1id=" + m1id + "&a1id=" + a1id + "&o1id=" + o1id + "&o2id=" + o2id + "&o3id=" + o3id + "&o4id=" + o4id + "&o5id=" + o5id + "\"><\/scr" + "ipt>");
+</script>
+<!-- EBiS end -->
+		</td>
+
+	</tr>
+</table>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 19713)
@@ -0,0 +1,266 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.mousewheel-3.0.2.pack.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.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;
+        }
+    }
+
+    $(document).ready(function() {
+        $("a.expansion").fancybox({
+        });
+    });
+//]]></script>
+
+<!--▼CONTENTS-->
+<div id="under02column">
+    <div id="under02column_shopping">
+        <p class="flowarea"><img src="<!--{$TPL_DIR}-->img/picture/img_flow_03.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}-->" />
+
+            <div class="tblareabtn">
+                <a href="./payment.php" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back.gif',back03)"><img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="戻る" border="0" name="back03-top" id="back03-top" /></a>&nbsp;
+                <!--{if $payment_type != ""}-->
+                <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_next.gif" alt="次へ" class="box150" name="next-top" id="next-top" />
+                <!--{else}-->
+                <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_order_complete_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_order_complete.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_order_complete.gif" alt="ご注文完了ページへ" class="box150" name="next-top" id="next-top" />                <!--{/if}-->
+            </div>
+
+            <table summary="ご注文内容確認">
+                <tr>
+                    <th>商品写真</th>
+                    <th>商品名</th>
+                    <th>単価</th>
+                    <th>数量</th>
+                    <th>小計</th>
+                </tr>
+                <!--{foreach from=$cartItems item=item}-->
+                <tr>
+                    <td class="phototd">
+                        <a
+                            <!--{if $item.productsClass.main_image|strlen >= 1}-->
+                                href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$item.productsClass.main_image|sfNoImageMainList|escape}-->"
+                                class="expansion"
+                                target="_blank"
+                            <!--{/if}-->
+                        >
+                            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|escape}-->" /></a>
+                    </td>
+                    <td>
+                        <ul>
+                            <li><strong><!--{$item.productsClass.name|escape}--></strong></li>
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                            <li><!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--></li>
+                            <!--{/if}-->
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                            <li><!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--></li>
+                            <!--{/if}-->
+                        </ul>
+                 </td>
+                 <td class="pricetd">
+                 <!--{if $item.productsClass.price02 != ""}-->
+                     <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                 <!--{else}-->
+                     <!--{$item.productsClass.price01|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                 <!--{/if}-->
+                 </td>
+                 <td><!--{$item.quantity|number_format}--></td>
+                 <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td>
+             </tr>
+             <!--{/foreach}-->
+                <tr>
+                    <th colspan="4" class="resulttd">小計</th>
+                    <td class="pricetd"><!--{$tpl_total_inctax[$cartKey]|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 && $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}-->
+            <!--{* ログイン済みの会員のみ *}-->
+
+            <!--お届け先ここから-->
+            <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+            <!--{if $cartdown != "2"}-->
+            <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>
+            <!--{/if}-->
+            <!--お届け先ここまで-->
+
+            <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
+                <thead>
+                <tr>
+                    <th colspan="2">▼お支払方法・お届け日時の指定・その他お問い合わせ</th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <th>お支払方法</th>
+                    <td><!--{$arrData.payment_method|escape}--></td>
+                </tr>
+                <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け日、時間を表示しない） *}-->
+                <!--{if $cartdown != "2"}-->
+                <tr>
+                    <th>お届け日</th>
+                    <td><!--{$arrData.deliv_date|escape|default:"指定なし"}--></td>
+                </tr>
+                <tr>
+                    <th>お届け時間</th>
+                    <td><!--{$arrData.deliv_time|escape|default:"指定なし"}--></td>
+                </tr>
+                <!--{/if}-->
+                <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/button/btn_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back.gif',back03)"><img src="<!--{$TPL_DIR}-->img/button/btn_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/button/btn_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_next.gif" alt="次へ" class="box150" name="next" id="next" />
+                <!--{else}-->
+                <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_order_complete_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_order_complete.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_order_complete.gif" alt="ご注文完了ページへ" class="box150" name="next" id="next" />
+                <!--{/if}-->
+            </div>
+        </form>
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 19713)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 19713)
@@ -0,0 +1,136 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 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.
+ *}-->
+<!--▼CONTENTS-->
+<div id="under02column">
+    <div id="under02column_shopping">
+        <p class="flowarea">
+            <img src="<!--{$TPL_DIR}-->img/picture/img_flow_02.gif" width="700" height="36" alt="購入手続きの流れ" />
+        </p>
+        <h2 class="title"><!--{$tpl_title|escape}--></h2>
+
+        <form name="form1" id="form1" method="post" action="?">
+            <input type="hidden" name="mode" value="confirm" />
+            <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+            <div class="payarea">
+                <h3>お支払方法の指定</h3>
+                <p>お支払方法をご選択ください。</p>
+
+                <!--{assign var=key value="payment_id"}-->
+                <!--{if $arrErr[$key] != ""}-->
+                <p class="attention"><!--{$arrErr[$key]}--></p>
+                <!--{/if}-->
+                <table summary="お支払方法選択">
+                    <tr>
+                        <th>選択</th>
+                        <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->">お支払方法</th>
+                    </tr>
+                    <!--{section name=cnt loop=$arrPayment}-->
+                    <tr>
+                        <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->" onclick="fnSetDelivTime('payment','<!--{$key}-->','deliv_time_id');" value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> />
+                        </td>
+                        <td>
+                            <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|escape}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label>
+                        </td>
+                        <!--{if $img_show}-->
+                            <td>
+                                <!--{if $arrPayment[cnt].payment_image != ""}-->
+                                    <img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrPayment[cnt].payment_image}-->" />
+                                <!--{/if}-->
+                            </td>
+                        <!--{/if}-->
+                    </tr>
+                    <!--{/section}-->
+                </table>
+            </div>
+
+            <!--{if $cartdown != 2}-->
+            <div class="payarea02">
+                <h3>お届け時間の指定</h3>
+                <p>ご希望の方は、お届け時間を選択してください。</p>
+                <div>
+                    <!--★お届け日★-->
+                    <!--{assign var=key value="deliv_date"}-->
+                    <span class="attention"><!--{$arrErr[$key]}--></span>
+                    <em>お届け日：</em>
+                    <!--{if !$arrDelivDate}-->
+                        ご指定頂けません。
+                    <!--{else}-->
+                        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                            <option value="" selected="">指定なし</option>
+                            <!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
+                        </select>
+                    <!--{/if}-->
+                    <!--★お届け時間★-->
+                    <!--{assign var=key value="deliv_time_id"}-->
+                    <span class="attention"><!--{$arrErr[$key]}--></span>
+                    <em>お届け時間：</em>
+                    <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                        <option value="" selected="">指定なし</option>
+                        <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
+                    </select>
+                 </div>
+            </div>
+            <!--{/if}-->
+
+            <div class="payarea02">
+                <h3>その他お問い合わせ</h3>
+                <p>その他お問い合わせ事項がございましたら、こちらにご入力ください。</p>
+                <div>
+                    <!--★その他お問い合わせ事項★-->
+                    <!--{assign var=key value="message"}-->
+                    <span class="attention"><!--{$arrErr[$key]}--></span>
+                    <textarea name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="80" rows="8" class="area660" wrap="head"><!--{$arrForm[$key].value|escape}--></textarea>
+                    <span class="attention"> (<!--{$smarty.const.LTEXT_LEN}-->文字まで)</span>
+                </div>
+            </div>
+
+            <!-- ▼ポイント使用 ここから -->
+            <!--{if $tpl_login == 1 && $smarty.const.USE_POINT !== false}-->
+                <div class="pointarea">
+                    <h3>ポイント使用の指定</h3>
+
+                        <p><span class="attention">1ポイントを1円</span>として使用する事ができます。<br />
+                            使用する場合は、「ポイントを使用する」にチェックを入れた後、使用するポイントをご記入ください。</p>
+                    <div>
+                        <p><!--{$objCustomer->getValue('name01')|escape}--> <!--{$objCustomer->getValue('name02')|escape}-->様の、現在の所持ポイントは「<em><!--{$tpl_user_point|default:0}-->Pt</em>」です。</p>
+                        <p>今回ご購入合計金額：<span class="price"><!--{$arrData.subtotal|number_format}-->円</span> <span class="attention">(送料、手数料を含みません。)</span></p>
+                        <ul>
+                            <li><input type="radio" id="point_on" name="point_check" value="1" <!--{$arrForm.point_check.value|sfGetChecked:1}--> onclick="fnCheckInputPoint();" /><label for="point_on">ポイントを使用する</label></li>
+                             <!--{assign var=key value="use_point"}-->
+
+                             <li class="underline">今回のお買い物で、<input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|default:$tpl_user_point}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="6" class="box60" />&nbsp;ポイントを使用する。<span class="attention"><!--{$arrErr[$key]}--></span></li>
+                             <li><input type="radio" id="point_off" name="point_check" value="2" <!--{$arrForm.point_check.value|sfGetChecked:2}--> onclick="fnCheckInputPoint();" /><label for="point_off">ポイントを使用しない</label></li>
+                        </ul>
+                    </div>
+                </div>
+            <!--{/if}-->
+            <!-- ▲ポイント使用 ここまで -->
+
+            <div class="tblareabtn">
+                <a href="<!--{$tpl_back_url|escape}-->" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_back_on.gif','back03')" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_back.gif','back03')">
+                    <img src="<!--{$TPL_DIR}-->img/button/btn_back.gif" width="150" height="30" alt="戻る" border="0" name="back03" id="back03" /></a>&nbsp;
+                <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next_on.gif',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_next.gif',this)" src="<!--{$TPL_DIR}-->img/button/btn_next.gif" class="box150" alt="次へ" name="next" id="next" />
+            </div>
+        </form>
+    </div>
+</div>
+<!--▲CONTENTS-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19712)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19713)
@@ -32,8 +32,8 @@
             <tr>
                 <!-- ★☆★ HEADタグ内テーブル ☆★☆ -->
-                <td colspan="3" id="HeadNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "HeadNavi"}-->
+                <td colspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_HEAD]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_HEAD]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -55,8 +55,8 @@
             <tr>
                 <!-- ★☆★ ヘッダより上部ナビテーブル ☆★☆ -->
-                <td colspan="3" id="HeaderTopNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "HeaderTopNavi"}-->
+                <td colspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_HEADER_TOP]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_HEAD]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -76,8 +76,8 @@
                 <!-- ★☆★ ヘッダ内部ナビテーブル ☆★☆ -->
                 <th id="layout-header">ヘッダー部</th>
-                <td colspan="2" id="HeaderInternalNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "HeaderInternalNavi"}-->
+                <td colspan="2" id="<!--{$arrTarget[$smarty.const.TARGET_ID_HEADER_INTERNAL]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_HEADER_INTERNAL]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -96,8 +96,8 @@
             <tr>
                 <!-- ★☆★ 上部ナビテーブル ☆★☆ -->
-                <td colspan="3" id="TopNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "TopNavi"}-->
+                <td colspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_TOP]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_TOP]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -116,8 +116,8 @@
             <tr>
                 <!--{* 左ナビテーブルここから *}-->
-                <td rowspan="3" id="LeftNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "LeftNavi"}-->
+                <td rowspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_LEFT]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_LEFT]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -134,8 +134,8 @@
                 <!--{* 左ナビテーブルここまで *}-->
                 <!--{* メイン上部テーブルここから *}-->
-                <td id="MainHead" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "MainHead"}-->
+                <td id="<!--{$arrTarget[$smarty.const.TARGET_ID_MAIN_HEAD]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_MAIN_HEAD]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -152,8 +152,8 @@
                 <!--{* メイン上部テーブルここまで *}-->
                 <!--{* 右ナビここから *}-->
-                <td rowspan="3" id="RightNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "RightNavi"}-->
+                <td rowspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_RIGHT]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_RIGHT]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -177,8 +177,8 @@
             <!--{* メイン下部ここから *}-->
             <tr>
-                <td id="MainFoot" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "MainFoot"}-->
+                <td id="<!--{$arrTarget[$smarty.const.TARGET_ID_MAIN_FOOT]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_MAIN_FOOT]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -197,8 +197,8 @@
             <!--{* メイン下部ここまで *}-->
                  <!-- ★☆★ 下部ナビテーブル ☆★☆ -->
-                <td colspan="3" id="BottomNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "BottomNavi"}-->
+                <td colspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_BOTTOM]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_BOTTOM]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -220,8 +220,8 @@
             <tr>
                 <!-- ★☆★ フッタより下部ナビテーブル ☆★☆ -->
-                <td colspan="3" id="FooterBottomNavi" class="ui-sortable">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "FooterBottomNavi"}-->
+                <td colspan="3" id="<!--{$arrTarget[$smarty.const.TARGET_ID_FOOTER_BOTTOM]}-->" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_FOOTER_BOTTOM]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -253,8 +253,8 @@
             </tr>
             <tr>
-                <td id="Unused" class="ui-sortable" style="width: 145px;">
-                    <!--{assign var="firstflg" value=false}-->
-                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
-                        <!--{if $item.target_id == "Unused"}-->
+                <td id="<!--{$arrTarget[$smarty.const.TARGET_ID_UNUSED]}-->" class="ui-sortable" style="width: 145px;">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == $arrTarget[$smarty.const.TARGET_ID_UNUSED]}-->
                             <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
                                 <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
@@ -291,9 +291,9 @@
             </td>
             <td>
-                <a href="?page_id=<!--{$item.page_id}-->" ><strong>編集</strong></a>
+                <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->" ><strong>編集</strong></a>
             </td>
             <td>
                 <!--{if $item.filename|strlen >= 1}-->
-                    <a href="main_edit.php?page_id=<!--{$item.page_id}-->">編集</a>
+                    <a href="main_edit.php?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->">編集</a>
                 <!--{/if}-->
             </td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	(revision 19711)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	(revision 19713)
@@ -47,11 +47,11 @@
   <li><a><span>スマートフォン</span></a>
     <ul class="level2">
-      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
-      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
-      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック編集</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ﾍｯﾀﾞｰ/ﾌｯﾀｰ設定</span></a></li>
-      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS編集</span></a></li>
-      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
-      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート追加</span></a></li>
+      <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
+      <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ページ詳細設定</span></a></li>
+      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック編集</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ﾍｯﾀﾞｰ/ﾌｯﾀｰ設定</span></a></li>
+      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS編集</span></a></li>
+      <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート設定</span></a></li>
+      <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート追加</span></a></li>
     </ul>
   </li>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 19713)
@@ -107,9 +107,9 @@
       </td>
       <td>
-        <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->?page_id=<!--{$item.page_id}-->" >編集</a>
+        <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->" >編集</a>
       </td>
       <td>
         <!--{if $item.filename|strlen >= 1}-->
-          <a href="?page_id=<!--{$item.page_id}-->"><strong>編集</strong></a>
+          <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->"><strong>編集</strong></a>
         <!--{/if}-->
       </td>