Index: branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 22458)
+++ branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 22796)
@@ -173,97 +173,100 @@
         <!--{* ログイン済みの会員のみ *}-->
 
-        <!--{* ▼お届け先 *}-->
+        <!--お届け先ここから-->
+        <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
         <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
-            <h3>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-            <!--{if $is_multiple}-->
-                <table summary="ご注文内容確認">
-                    <col width="10%" />
-                    <col width="60%" />
-                    <col width="20%" />
-                    <col width="10%" />
+        <h3>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
+        <!--{if $is_multiple}-->
+            <table summary="ご注文内容確認">
+                <col width="10%" />
+                <col width="60%" />
+                <col width="20%" />
+                <col width="10%" />
+                <tr>
+                    <th scope="col">商品写真</th>
+                    <th scope="col">商品名</th>
+                    <th scope="col">単価</th>
+                    <th scope="col">数量</th>
+                    <!--{* XXX 購入小計と誤差が出るためコメントアウト
+                    <th scope="col">小計</th>
+                    *}-->
+                </tr>
+                <!--{foreach item=item from=$shippingItem.shipment_item}-->
                     <tr>
-                        <th scope="col">商品写真</th>
-                        <th scope="col">商品名</th>
-                        <th scope="col">単価</th>
-                        <th scope="col">数量</th>
+                        <td class="alignC">
+                            <a
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
+                                <!--{/if}-->
+                            >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></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="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->円
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}--></td>
                         <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                        <th scope="col">小計</th>
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
                         *}-->
                     </tr>
-                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                        <tr>
-                            <td class="alignC">
-                                <a
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
-                                    <!--{/if}-->
-                                >
-                                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
-                            </td>
-                            <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></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="alignR">
-                                <!--{$item.price|sfCalcIncTax|number_format}-->円
-                            </td>
-                            <td class="alignC"><!--{$item.quantity}--></td>
-                            <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                            <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
-                            *}-->
-                        </tr>
-                    <!--{/foreach}-->
-                </table>
+                <!--{/foreach}-->
+            </table>
+        <!--{/if}-->
+
+        <table summary="お届け先確認" class="delivname">
+            <col width="30%" />
+            <col width="70%" />
+            <tbody>
+                <tr>
+                    <th scope="row">お名前</th>
+                    <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">お名前(フリガナ)</th>
+                    <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">郵便番号</th>
+                    <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">住所</th>
+                    <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">電話番号</th>
+                    <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">FAX番号</th>
+                    <td>
+                        <!--{if $shippingItem.shipping_fax01 > 0}-->
+                            <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                <tr>
+                    <th scope="row">お届け日</th>
+                    <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">お届け時間</th>
+                    <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
+                </tr>
             <!--{/if}-->
-
-            <table summary="お届け先確認" class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tbody>
-                    <tr>
-                        <th scope="row">お名前</th>
-                        <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">お名前(フリガナ)</th>
-                        <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">郵便番号</th>
-                        <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">住所</th>
-                        <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">電話番号</th>
-                        <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
-                    </tr>
-                    <tr>
-                        <th scope="row">FAX番号</th>
-                        <td>
-                            <!--{if $shippingItem.shipping_fax01 > 0}-->
-                                <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
-                            <!--{/if}-->
-                        </td>
-                    </tr>
-                    <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                        <tr>
-                            <th scope="row">お届け日</th>
-                            <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">お届け時間</th>
-                            <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
-                        </tr>
-                    <!--{/if}-->
-                </tbody>
-            </table>
+            </tbody>
+        </table>
         <!--{/foreach}-->
-        <!--{* ▲お届け先 *}-->
+        <!--{/if}-->
+        <!--お届け先ここまで-->
 
         <h3>配送方法・お支払方法・その他お問い合わせ</h3>
Index: branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl	(revision 22608)
+++ branches/version-2_12-dev/data/Smarty/templates/default/cart/index.tpl	(revision 22796)
@@ -21,11 +21,11 @@
  *}-->
 
-<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.js"></script>
-<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/facebox.css" media="screen" />
+<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.js"></script>
+<link rel="stylesheet" type="text/css" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/facebox.css" media="screen" />
 <script type="text/javascript">//<![CDATA[
     $(document).ready(function() {
         $('a.expansion').facebox({
-            loadingImage : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/loading.gif',
-            closeImage   : '<!--{$smarty.const.ROOT_URLPATH|h}-->js/jquery.facebox/closelabel.png'
+            loadingImage : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/loading.gif',
+            closeImage   : '<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.facebox/closelabel.png'
         });
     });
@@ -36,158 +36,167 @@
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
-        <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
-            <!--★ポイント案内★-->
-            <!--{if $smarty.const.USE_POINT !== false}-->
-                <div class="point_announce">
-                    <!--{if $tpl_login}-->
-                        <span class="user_name"><!--{$tpl_name|h}--> 様</span>の、現在の所持ポイントは「<span class="point"><!--{$tpl_user_point|number_format|default:0|h}--> pt</span>」です。<br />
-                    <!--{else}-->
-                        ポイント制度をご利用になられる場合は、会員登録後ログインしてくださいますようお願い致します。<br />
+    <!--{if $smarty.const.USE_POINT !== false || count($arrProductsClass) > 0}-->
+        <!--★ポイント案内★-->
+        <!--{if $smarty.const.USE_POINT !== false}-->
+            <div class="point_announce">
+                <!--{if $tpl_login}-->
+                    <span class="user_name"><!--{$tpl_name|h}--> 様</span>の、現在の所持ポイントは「<span class="point"><!--{$tpl_user_point|number_format|default:0}--> pt</span>」です。<br />
+                <!--{else}-->
+                    ポイント制度をご利用になられる場合は、会員登録後ログインしてくださいますようお願い致します。<br />
+                <!--{/if}-->
+                ポイントは商品購入時に<span class="price">1pt＝<!--{$smarty.const.POINT_VALUE}-->円</span>として使用することができます。<br />
+            </div>
+        <!--{/if}-->
+    <!--{/if}-->
+
+    <p class="totalmoney_area">
+        <!--{* カゴの中に商品がある場合にのみ表示 *}-->
+        <!--{if count($cartKeys) > 1}-->
+            <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。<br />
+                        お手数ですが、個別に購入手続きをお願い致します。
+            </span>
+        <!--{/if}-->
+
+        <!--{if strlen($tpl_error) != 0}-->
+            <p class="attention"><!--{$tpl_error|h}--></p>
+        <!--{/if}-->
+
+        <!--{if strlen($tpl_message) != 0}-->
+            <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
+        <!--{/if}-->
+    </p>
+
+    <!--{if count($cartItems) > 0}-->
+    <!--{foreach from=$cartKeys item=key}-->
+    <div class="form_area">
+        <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="?">
+            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+            <input type="hidden" name="mode" value="confirm" />
+            <input type="hidden" name="cart_no" value="" />
+            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+            <input type="hidden" name="category_id" value="<!--{$tpl_category_id|h}-->" />
+            <!--{if count($cartKeys) > 1}-->
+            <h3><!--{$arrProductType[$key]}--></h3>
+                <p>
+                    <!--{$arrProductType[$key]}-->の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。
+                    <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $arrInfo.free_rule > 0}-->
+                            <!--{if !$arrData[$key].is_deliv_free}-->
+                                あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です！！
+                            <!--{else}-->
+
+                                現在、「<span class="attention">送料無料</span>」です！！
+                            <!--{/if}-->
+                        <!--{/if}-->
                     <!--{/if}-->
-                    ポイントは商品購入時に<span class="price">1pt＝<!--{$smarty.const.POINT_VALUE|h}-->円</span>として使用することができます。<br />
-                </div>
+                </p>
+            <!--{else}-->
+                <p>
+                    お買い上げ商品の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format}-->円</span>」です。
+                    <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                        <!--{if $arrInfo.free_rule > 0}-->
+                            <!--{if !$arrData[$key].is_deliv_free}-->
+                                あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format}-->円</span>」で送料無料です！！
+                            <!--{else}-->
+                                現在、「<span class="attention">送料無料</span>」です！！
+                            <!--{/if}-->
+                        <!--{/if}-->
+                    <!--{/if}-->
+                </p>
             <!--{/if}-->
-        <!--{/if}-->
-
-        <p class="totalmoney_area">
-            <!--{* カゴの中に商品がある場合にのみ表示 *}-->
-            <!--{if count($cartKeys) > 1}-->
-                <span class="attentionSt"><!--{foreach from=$cartKeys item=key name=cartKey}--><!--{$arrProductType[$key]|h}--><!--{if !$smarty.foreach.cartKey.last}-->、<!--{/if}--><!--{/foreach}-->は同時購入できません。<br />
-                    お手数ですが、個別に購入手続きをお願い致します。
-                </span>
-            <!--{/if}-->
-
-            <!--{if strlen($tpl_error) != 0}-->
-                <p class="attention"><!--{$tpl_error|h}--></p>
-            <!--{/if}-->
-
-            <!--{if strlen($tpl_message) != 0}-->
-                <p class="attention"><!--{$tpl_message|h|nl2br}--></p>
-            <!--{/if}-->
-        </p>
-
-        <!--{if count($cartItems) > 0}-->
-            <!--{foreach from=$cartKeys item=key}-->
-                <div class="form_area">
-                    <form name="form<!--{$key|h}-->" id="form<!--{$key|h}-->" method="post" action="?">
-                        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME|h}-->" value="<!--{$transactionid|h}-->" />
-                        <input type="hidden" name="mode" value="confirm" />
-                        <input type="hidden" name="cart_no" value="" />
-                        <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />
-                        <input type="hidden" name="category_id" value="<!--{$tpl_category_id|h}-->" />
-                        <input type="hidden" name="product_id" value="<!--{$tpl_product_id|h}-->" />
-                        <!--{if count($cartKeys) > 1}-->
-                            <h3><!--{$arrProductType[$key]|h}--></h3>
-                            <!--{assign var=purchasing_goods_name value=$arrProductType[$key]}-->
-                        <!--{else}-->
-                            <!--{assign var=purchasing_goods_name value="カゴの中の商品"}-->
-                        <!--{/if}-->
-                        <p>
-                            <!--{$purchasing_goods_name|h}-->の合計金額は「<span class="price"><!--{$tpl_total_inctax[$key]|number_format|h}-->円</span>」です。
-                            <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                                <!--{if $arrInfo.free_rule > 0}-->
-                                    <!--{if !$arrData[$key].is_deliv_free}-->
-                                        あと「<span class="price"><!--{$tpl_deliv_free[$key]|number_format|h}-->円</span>」で送料無料です！！
-                                    <!--{else}-->
-                                        現在、「<span class="attention">送料無料</span>」です！！
-                                    <!--{/if}-->
+
+            <table summary="商品情報">
+                <col width="10%" />
+                <col width="15%" />
+                <col width="30%" />
+                <col width="15%" />
+                <col width="15%" />
+                <col width="15%" />
+                <tr>
+                    <th class="alignC">削除</th>
+                    <th class="alignC">商品写真</th>
+                    <th class="alignC">商品名</th>
+                    <th class="alignC">単価</th>
+                    <th class="alignC">数量</th>
+                    <th class="alignC">小計</th>
+                </tr>
+                <!--{foreach from=$cartItems[$key] item=item}-->
+                    <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                        <td class="alignC"><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->', 'delete', 'cart_no', '<!--{$item.cart_no}-->'); return false;">削除</a>
+                        </td>
+                        <td class="alignC">
+                        <a class="expansion" target="_blank"
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->"
                                 <!--{/if}-->
-                            <!--{/if}-->
-                        </p>
-
-                        <table summary="商品情報">
-                            <col width="10%" />
-                            <col width="15%" />
-                            <col width="30%" />
-                            <col width="15%" />
-                            <col width="15%" />
-                            <col width="15%" />
-                            <tr>
-                                <th class="alignC">削除</th>
-                                <th class="alignC">商品写真</th>
-                                <th class="alignC">商品名</th>
-                                <th class="alignC">単価</th>
-                                <th class="alignC">数量</th>
-                                <th class="alignC">小計</th>
-                            </tr>
-                            <!--{foreach from=$cartItems[$key] item=item}-->
-                                <tr style="<!--{if $item.error}-->background-color: <!--{$smarty.const.ERR_COLOR|h}-->;<!--{/if}-->">
-                                    <td class="alignC"><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->', 'delete', 'cart_no', '<!--{$item.cart_no|h}-->'); return false;">削除</a>
-                                    </td>
-                                    <td class="alignC">
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}-->
-                                        <a class="expansion" target="_blank" href="<!--{$smarty.const.IMAGE_SAVE_URLPATH|h}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->">
-                                    <!--{/if}-->
-                                    <img src="<!--{$smarty.const.ROOT_URLPATH|h}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" />
-                                    <!--{if $item.productsClass.main_image|strlen >= 1}-->
-                                        </a>
-                                    <!--{/if}-->
-                                    </td>
-                                    <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong>
-                                        <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                            <div><!--{$item.productsClass.class_name1|h}-->：<!--{$item.productsClass.classcategory_name1|h}--></div>
-                                        <!--{/if}-->
-                                        <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                            <div><!--{$item.productsClass.class_name2|h}-->：<!--{$item.productsClass.classcategory_name2|h}--></div>
-                                        <!--{/if}-->
-                                    </td>
-                                    <td class="alignR">
-                                        <!--{$item.price|sfCalcIncTax|number_format|h}-->円
-                                    </td>
-                                    <td class="alignC"><!--{$item.quantity|h}-->
-                                        <ul id="quantity_level">
-                                            <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->','up','cart_no','<!--{$item.cart_no|h}-->'); return false"><img src="<!--{$TPL_URLPATH|h}-->img/button/btn_plus.jpg" width="16" height="16" alt="＋" /></a></li>
-                                            <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key|h}-->','down','cart_no','<!--{$item.cart_no|h}-->'); return false"><img src="<!--{$TPL_URLPATH|h}-->img/button/btn_minus.jpg" width="16" height="16" alt="-" /></a></li>
-                                        </ul>
-                                    </td>
-                                    <td class="alignR"><!--{$item.total_inctax|number_format|h}-->円</td>
-                                </tr>
-                            <!--{/foreach}-->
-                            <tr>
-                                <th colspan="5" class="alignR">小計</th>
-                                <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format|h}-->円</td>
-                            </tr>
-                            <tr>
-                                <th colspan="5" class="alignR">合計</th>
-                                <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format|h}-->円</span></td>
-                            </tr>
-                            <!--{if $smarty.const.USE_POINT !== false}-->
-                                <!--{if $arrData[$key].birth_point > 0}-->
-                                    <tr>
-                                        <th colspan="5" class="alignR">お誕生月ポイント</th>
-                                        <td class="alignR"><!--{$arrData[$key].birth_point|number_format|h}-->pt</td>
-                                    </tr>
-                                <!--{/if}-->
-                                <tr>
-                                    <th colspan="5" class="alignR">今回加算ポイント</th>
-                                    <td class="alignR"><!--{$arrData[$key].add_point|number_format|h}-->pt</td>
-                                </tr>
-                            <!--{/if}-->
-                        </table>
+                                >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" />
+                            </a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></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="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->円
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}-->
+                            <ul id="quantity_level">
+                                <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.jpg" width="16" height="16" alt="＋" /></a></li>
+                                <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','down','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.jpg" width="16" height="16" alt="-" /></a></li>
+                            </ul>
+                        </td>
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
+                    </tr>
+                <!--{/foreach}-->
+                <tr>
+                    <th colspan="5" class="alignR">小計</th>
+                    <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th colspan="5" class="alignR">合計</th>
+                    <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->円</span></td>
+                </tr>
+                <!--{if $smarty.const.USE_POINT !== false}-->
+                    <!--{if $arrData[$key].birth_point > 0}-->
+                        <tr>
+                            <th colspan="5" class="alignR">お誕生月ポイント</th>
+                            <td class="alignR"><!--{$arrData[$key].birth_point|number_format}-->pt</td>
+                        </tr>
+                    <!--{/if}-->
+                    <tr>
+                        <th colspan="5" class="alignR">今回加算ポイント</th>
+                        <td class="alignR"><!--{$arrData[$key].add_point|number_format}-->pt</td>
+                    </tr>
+                <!--{/if}-->
+            </table>
+                <!--{if strlen($tpl_error) == 0}-->
+                    <p class="alignC">上記内容でよろしければ「購入手続きへ」ボタンをクリックしてください。</p>
+                <!--{/if}-->
+            <div class="btn_area">
+                <ul>
+                    <li>
+                        <!--{if $tpl_prev_url != ""}-->
+                            <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg','back<!--{$key}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg','back<!--{$key}-->');">
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" name="back<!--{$key}-->" /></a>
+                        <!--{/if}-->
+                    </li>
+                    <li>
                         <!--{if strlen($tpl_error) == 0}-->
-                            <p class="alignC">上記内容でよろしければ「購入手続きへ」ボタンをクリックしてください。</p>
-                        <!--{/if}-->
-                        <div class="btn_area">
-                            <ul>
-                                <li>
-                                    <!--{if $tpl_prev_url != ""}-->
-                                        <a href="<!--{$tpl_prev_url|h}-->" onmouseover="chgImg('<!--{$TPL_URLPATH|h}-->img/button/btn_back_on.jpg','back<!--{$key|h}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH|h}-->img/button/btn_back.jpg','back<!--{$key|h}-->');">
-                                            <img src="<!--{$TPL_URLPATH|h}-->img/button/btn_back.jpg" alt="戻る" name="back<!--{$key|h}-->" /></a>
-                                    <!--{/if}-->
-                                </li>
-                                <li>
-                                    <!--{if strlen($tpl_error) == 0}-->
-                                        <input type="hidden" name="cartKey" value="<!--{$key|h}-->" />
-                                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH|h}-->img/button/btn_buystep_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH|h}-->img/button/btn_buystep.jpg',this)" src="<!--{$TPL_URLPATH|h}-->img/button/btn_buystep.jpg" alt="購入手続きへ" name="confirm" />
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                        </div>
-                    </form>
-                </div>
-            <!--{/foreach}-->
-        <!--{else}-->
-            <p class="empty"><span class="attention">※ 現在カート内に商品はございません。</span></p>
-        <!--{/if}-->
+                            <input type="hidden" name="cartKey" value="<!--{$key}-->" />
+                            <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_buystep_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_buystep.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_buystep.jpg" alt="購入手続きへ" name="confirm" />
+                        <!--{/if}-->
+                    </li>
+                </ul>
+            </div>
+        </form>
+        </div>
+    <!--{/foreach}-->
+    <!--{else}-->
+        <p class="empty"><span class="attention">※ 現在カート内に商品はございません。</span></p>
+    <!--{/if}-->
     </div>
 </div>
Index: branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl	(revision 22376)
+++ branches/version-2_12-dev/data/Smarty/templates/default/contact/confirm.tpl	(revision 22796)
@@ -38,9 +38,9 @@
             <col width="70%" />
             <tr>
-                <th>お名前</th>
+                <th>お名前<span class="attention">※</span></th>
                 <td><!--{$arrForm.name01.value|h}-->　<!--{$arrForm.name02.value|h}--></td>
             </tr>
             <tr>
-                <th>お名前(フリガナ)</th>
+                <th>お名前(フリガナ)<span class="attention">※</span></th>
                 <td><!--{$arrForm.kana01.value|h}-->　<!--{$arrForm.kana02.value|h}--></td>
             </tr>
@@ -66,9 +66,9 @@
             </tr>
             <tr>
-                <th>メールアドレス</th>
+                <th>メールアドレス<span class="attention">※</span></th>
                 <td><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></td>
             </tr>
             <tr>
-                <th>お問い合わせ内容</th>
+                <th>お問い合わせ内容<span class="attention">※</span></th>
                 <td><!--{$arrForm.contents.value|h|nl2br}--></td>
             </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 22218)
+++ branches/version-2_12-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 22796)
@@ -52,11 +52,10 @@
 商品コード: <!--{$arrOrderDetail[cnt].product_code}-->
 商品名: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
-単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrOrderDetail[cnt].tax_rate:$arrOrderDetail[cnt].tax_rule|number_format}-->
+単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax|number_format}-->
 数量：<!--{$arrOrderDetail[cnt].quantity}-->
 
 <!--{/section}-->
 -------------------------------------------------
-小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）<!--{/if}-->
-
+小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）
 値引き ￥ <!--{$arrOrder.use_point*$smarty.const.POINT_VALUE+$arrOrder.discount|number_format|default:0}-->
 送　料 ￥ <!--{$arrOrder.deliv_fee|number_format|default:0}-->
@@ -85,5 +84,5 @@
 商品コード: <!--{$item.product_code}-->
 商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥ <!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+単価：￥ <!--{$item.price|sfCalcIncTax|number_format}-->
 数量：<!--{$item.quantity}-->
 
Index: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	(revision 22548)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	(revision 22796)
@@ -24,5 +24,5 @@
     <div class="block_outer clearfix">
         <div id="recommend_area">
-            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.png" alt="*" class="title_icon" /></h2>
+            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.jpg" alt="*" class="title_icon" /></h2>
             <div class="block_body clearfix">
                 <!--{foreach from=$arrBestProducts item=arrProduct name="recommend_products"}-->
Index: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 22583)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 22796)
@@ -23,9 +23,9 @@
 <div class="block_outer">
     <div id="news_area">
-    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.png" alt="新着情報" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg" alt="RSS" /></a></span></h2>
+    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.jpg" alt="新着情報" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg" alt="RSS" /></a></span></h2>
         <div class="block_body">
             <div class="news_contents">
             <!--{section name=data loop=$arrNews}-->
-            <!--{assign var="date_array" value="-"|explode:$arrNews[data].cast_news_date}-->
+            <!--{assign var="date_array" value="-"|explode:$arrNews[data].news_date_disp}-->
             <dl class="newslist">
                 <dt><!--{$date_array[0]}-->年<!--{$date_array[1]}-->月<!--{$date_array[2]}-->日</dt>
Index: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 22602)
+++ branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 22796)
@@ -26,10 +26,50 @@
     });
 //]]></script>
-
 <div class="block_outer">
     <div id="category_area">
         <div class="block_body">
             <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_category.gif" alt="商品カテゴリ" /></h2>
-            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$arrTree treeID="categorytreelist" display=1}-->
+            <!--{strip}-->
+                <ul id="categorytree">
+                    <!--{assign var=preLev value=1}-->
+                    <!--{assign var=firstdone value=0}-->
+                    <!--{section name=cnt loop=$arrTree}-->
+                        <!--{* 表示フラグがTRUEなら表示 *}-->
+                        <!--{if $arrTree[cnt].display == 1}-->
+                            <!--{assign var=level value=`$arrTree[cnt].level`}-->
+                            <!--{assign var=levdiff value=`$level-$preLev`}-->
+                                <!--{if $levdiff > 0}-->
+                                    <ul>
+                                <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+                                    </li>
+                                <!--{elseif $levdiff < 0}-->
+                                    <!--{section name=d loop=`$levdiff*-1`}-->
+                                            </li>
+                                        </ul>
+                                    <!--{/section}-->
+                                    </li>
+                                <!--{/if}-->
+                            <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
+                                <p>
+                                    <a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+                                </p>
+                            <!--{if $firstdone == 0}--><!--{assign var=firstdone value=1}--><!--{/if}-->
+                            <!--{assign var=preLev value=`$level`}-->
+                        <!--{/if}-->
+                        <!--{* セクションの最後に閉じタグを追加 *}-->
+                        <!--{if $smarty.section.cnt.last}-->
+                            <!--{if $preLev-1 > 0}-->
+                                <!--{section name=d loop=`$preLev-1`}-->
+                                    </li>
+                                </ul>
+                                <!--{/section}-->
+                                </li>
+                            <!--{else}-->
+                                </li>
+                            <!--{/if}-->
+                        <!--{/if}-->
+                    <!--{/section}-->
+                </ul>
+            <!--{/strip}-->
         </div>
     </div>
Index: branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/category_tree_fork.tpl	(revision 22602)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 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.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
-        <p><a href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></p>
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	(revision 22607)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	(revision 22796)
@@ -197,5 +197,4 @@
                 <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
                 <input type="hidden" name="product_class_id" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                <input type="hidden" name="category_id" value="<!--{$arrSearchData.category_id|h}-->" />
 
                 <div class="cart_area clearfix">
Index: branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 22376)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 22796)
@@ -42,5 +42,5 @@
         </tr>
         <tr>
-            <th>投稿者名</th>
+            <th>投稿者名<span class="attention">※</span></th>
             <td><!--{$arrForm.reviewer_name|h}--></td>
         </tr>
@@ -54,13 +54,13 @@
         </tr>
         <tr>
-            <th>おすすめレベル</th>
+            <th>おすすめレベル<span class="attention">※</span></th>
             <td><span class="recommend_level"><!--{$arrRECOMMEND[$arrForm.recommend_level]}--></span></td>
         </tr>
         <tr>
-            <th>タイトル</th>
+            <th>タイトル<span class="attention">※</span></th>
             <td><!--{$arrForm.title|h}--></td>
         </tr>
         <tr>
-            <th>コメント</th>
+            <th>コメント<span class="attention">※</span></th>
             <td><!--{$arrForm.comment|h|nl2br}--></td>
         </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	(revision 22548)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	(revision 22796)
@@ -116,5 +116,5 @@
                                 <!--{$arrProduct.price01_min_inctax|number_format}-->～<!--{$arrProduct.price01_max_inctax|number_format}-->
                             <!--{/if}-->
-                        <!--{/strip}--></span><span id="price01_dynamic"></span>
+                        </span><span id="price01_dynamic"></span><!--{/strip}-->
                         円
                     </dd>
@@ -132,5 +132,5 @@
                             <!--{$arrProduct.price02_min_inctax|number_format}-->～<!--{$arrProduct.price02_max_inctax|number_format}-->
                         <!--{/if}-->
-                    <!--{/strip}--></span><span id="price02_dynamic"></span>
+                    </span><span id="price02_dynamic"></span><!--{/strip}-->
                     円
                 </dd>
@@ -150,5 +150,5 @@
                             <!--{/if}-->
                         <!--{/if}-->
-                    <!--{/strip}--></span><span id="point_dynamic"></span>
+                    </span><span id="point_dynamic"></span><!--{/strip}-->
                     Pt
                 </div>
@@ -192,97 +192,97 @@
 
             <div class="cart_area clearfix">
-                <input type="hidden" name="mode" value="cart" />
-                <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
-                <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
-                <input type="hidden" name="favorite_product_id" value="" />
-
-                <!--{if $tpl_stock_find}-->
-                    <!--{if $tpl_classcat_find1}-->
-                        <div class="classlist">
-                            <!--▼規格1-->
-                            <ul class="clearfix">
-                                <li><!--{$tpl_class_name1|h}-->：</li>
-                                <li>
-                                    <select name="classcategory_id1" style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->">
-                                    <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
-                                    </select>
-                                    <!--{if $arrErr.classcategory_id1 != ""}-->
-                                    <br /><span class="attention">※ <!--{$tpl_class_name1}-->を入力して下さい。</span>
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                            <!--▲規格1-->
-                            <!--{if $tpl_classcat_find2}-->
-                            <!--▼規格2-->
-                            <ul class="clearfix">
-                                <li><!--{$tpl_class_name2|h}-->：</li>
-                                <li>
-                                    <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
-                                    </select>
-                                    <!--{if $arrErr.classcategory_id2 != ""}-->
-                                    <br /><span class="attention">※ <!--{$tpl_class_name2}-->を入力して下さい。</span>
-                                    <!--{/if}-->
-                                </li>
-                            </ul>
-                            <!--▲規格2-->
+            <input type="hidden" name="mode" value="cart" />
+            <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
+            <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
+            <input type="hidden" name="favorite_product_id" value="" />
+
+            <!--{if $tpl_stock_find}-->
+                <!--{if $tpl_classcat_find1}-->
+                    <div class="classlist">
+                        <!--▼規格1-->
+                        <ul class="clearfix">
+                            <li><!--{$tpl_class_name1|h}-->：</li>
+                            <li>
+                                <select name="classcategory_id1" style="<!--{$arrErr.classcategory_id1|sfGetErrorColor}-->">
+                                <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
+                                </select>
+                                <!--{if $arrErr.classcategory_id1 != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name1}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </li>
+                        </ul>
+                        <!--▲規格1-->
+                        <!--{if $tpl_classcat_find2}-->
+                        <!--▼規格2-->
+                        <ul class="clearfix">
+                            <li><!--{$tpl_class_name2|h}-->：</li>
+                            <li>
+                                <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
+                                </select>
+                                <!--{if $arrErr.classcategory_id2 != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name2}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </li>
+                        </ul>
+                        <!--▲規格2-->
+                        <!--{/if}-->
+                    </div>
+                <!--{/if}-->
+
+                <!--★数量★-->
+                <dl class="quantity">
+                    <dt>数量：</dt>
+                    <dd><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
+                        <!--{if $arrErr.quantity != ""}-->
+                            <br /><span class="attention"><!--{$arrErr.quantity}--></span>
+                        <!--{/if}-->
+                    </dd>
+                </dl>
+
+                <div class="cartin">
+                    <div class="cartin_btn">
+                        <div id="cartbtn_default">
+                            <!--★カゴに入れる★-->
+                            <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="カゴに入れる" name="cart" id="cart" /></a>
+                        </div>
+                    </div>
+                </div>
+                <div class="attention" id="cartbtn_dynamic"></div>
+            <!--{else}-->
+                <div class="attention">申し訳ございませんが、只今品切れ中です。</div>
+            <!--{/if}-->
+
+            <!--★お気に入り登録★-->
+            <!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1 && $tpl_login === true}-->
+                <div class="favorite_btn">
+                    <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
+                    <!--{if $arrErr[$add_favorite]}-->
+                        <div class="attention"><!--{$arrErr[$add_favorite]}--></div>
+                    <!--{/if}-->
+                    <!--{if !$is_favorite}-->
+                        <a href="javascript:fnChangeAction('?product_id=<!--{$arrProduct.product_id|h}-->'); fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favorite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favorite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="お気に入りに追加" name="add_favorite_product" id="add_favorite_product" /></a>
+                    <!--{else}-->
+                        <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="お気に入り登録済" name="add_favorite_product" id="add_favorite_product" />
+                        <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.tipsy.js"></script>
+                        <script type="text/javascript">
+                            var favoriteButton = $("#add_favorite_product");
+                            favoriteButton.tipsy({gravity: $.fn.tipsy.autoNS, fallback: "お気に入りに登録済み", fade: true });
+
+                            <!--{if $just_added_favorite == true}-->
+                            favoriteButton.load(function(){$(this).tipsy("show")});
+                            $(function(){
+                                var tid = setTimeout('favoriteButton.tipsy("hide")',5000);
+                            });
                             <!--{/if}-->
-                        </div>
+                        </script>
                     <!--{/if}-->
-
-                    <!--★数量★-->
-                    <dl class="quantity">
-                        <dt>数量：</dt>
-                        <dd><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
-                            <!--{if $arrErr.quantity != ""}-->
-                                <br /><span class="attention"><!--{$arrErr.quantity}--></span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-
-                    <div class="cartin">
-                        <div class="cartin_btn">
-                            <div id="cartbtn_default">
-                                <!--★カゴに入れる★-->
-                                <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
-                                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="カゴに入れる" name="cart" id="cart" /></a>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="attention" id="cartbtn_dynamic"></div>
-                <!--{else}-->
-                    <div class="attention">申し訳ございませんが、只今品切れ中です。</div>
-                <!--{/if}-->
-
-                <!--★お気に入り登録★-->
-                <!--{if $smarty.const.OPTION_FAVORITE_PRODUCT == 1 && $tpl_login === true}-->
-                    <div class="favorite_btn">
-                        <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
-                        <!--{if $arrErr[$add_favorite]}-->
-                            <div class="attention"><!--{$arrErr[$add_favorite]}--></div>
-                        <!--{/if}-->
-                        <!--{if !$is_favorite}-->
-                            <a href="javascript:fnChangeAction('?product_id=<!--{$arrProduct.product_id|h}-->'); fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favorite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favorite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="お気に入りに追加" name="add_favorite_product" id="add_favorite_product" /></a>
-                        <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="お気に入り登録済" name="add_favorite_product" id="add_favorite_product" />
-                            <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.tipsy.js"></script>
-                            <script type="text/javascript">
-                                var favoriteButton = $("#add_favorite_product");
-                                favoriteButton.tipsy({gravity: $.fn.tipsy.autoNS, fallback: "お気に入りに登録済み", fade: true });
-
-                                <!--{if $just_added_favorite == true}-->
-                                favoriteButton.load(function(){$(this).tipsy("show")});
-                                $(function(){
-                                    var tid = setTimeout('favoriteButton.tipsy("hide")',5000);
-                                });
-                                <!--{/if}-->
-                            </script>
-                        <!--{/if}-->
-                    </div>
-                <!--{/if}-->
-            </div>
+                </div>
+            <!--{/if}-->
         </div>
-        <!--▲買い物かご-->
     </div>
-    </form>
+    <!--▲買い物かご-->
+</div>
+</form>
 
     <!--詳細ここまで-->
@@ -305,6 +305,5 @@
                         <!--{/if}-->
                         <img src="<!--{$arrFile[$ikey].filepath}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile[$ikey].width}-->" height="<!--{$arrFile[$ikey].height}-->" />
-                        <!--{if $arrProduct[$lkey]|strlen >= 1}-->
-                            </a>
+                        <!--{if $arrProduct[$lkey]|strlen >= 1}--></a>
                             <span class="mini">
                                 <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
@@ -324,5 +323,5 @@
     <!--この商品に対するお客様の声-->
     <div id="customervoice_area">
-        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_voice.png" alt="この商品に対するお客様の声" /></h2>
+        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_voice.jpg" alt="この商品に対するお客様の声" /></h2>
 
         <div class="review_bloc clearfix">
@@ -357,5 +356,5 @@
     <!--{if $arrRecommend}-->
         <div id="whobought_area">
-            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_recommend.png" alt="その他のオススメ商品" /></h2>
+            <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_product_recommend.jpg" alt="その他のオススメ商品" /></h2>
             <!--{foreach from=$arrRecommend item=arrItem name="arrRecommend"}-->
                 <div class="product_item">
Index: branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	(revision 22363)
+++ branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	(revision 22796)
@@ -21,5 +21,5 @@
  *}-->
 
-<body class="<!--{$tpl_page_class_name|h}-->">
+<body>
 <!--{$GLOBAL_ERR}-->
 <noscript>
Index: branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl	(revision 22363)
+++ branches/version-2_12-dev/data/Smarty/templates/default/site_frame.tpl	(revision 22796)
@@ -22,5 +22,5 @@
  *}-->
 
-<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja" class="<!--{$tpl_page_class_name|h}-->">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
Index: branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl	(revision 22796)
+++ branches/version-2_12-dev/data/Smarty/templates/default/input_zip.tpl	(revision 22796)
@@ -0,0 +1,41 @@
+<!--{*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2013 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_REALDIR`popup_header.tpl" subtitle="住所検索" disable_wincol=1}-->
+
+<div id="zipsearchcolumn">
+    <h2>住所検索</h2>
+    <div id="zipsearch_area">
+        <form name="form1" id="form1" method="post" action="?">
+            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+            <input type="hidden" name="state" value="<!--{$tpl_state}-->" />
+            <input type="hidden" name="city" value="<!--{$tpl_city}-->" />
+            <input type="hidden" name="town" value="<!--{$tpl_town}-->" />
+            <div id="completebox">
+                <p><!--{$tpl_message}--></p>
+            </div>
+        </form>
+    </div>
+    <div class="btn"><a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close_on.gif','b_close');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close.gif','b_close');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_close.gif" alt="閉じる" border="0" name="b_close" /></a></div>
+</div>
+
+<!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_footer.tpl"}-->
Index: branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 22573)
+++ branches/version-2_12-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 22796)
@@ -33,12 +33,9 @@
                 <span class="st">注文番号：&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
                 <span class="st">お支払い方法：&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
-                <!--{if $is_price_change == true}-->    
-                    <div class="attention" Align="right">※金額が変更されている商品があるため、再注文時はご注意ください。</div>
-                <!--{/if}-->
             </p>
             <form action="order.php" method="post">
                 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                 <p class="btn">
-                    <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->" />
+                    <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id|h}-->">
                     <input type="image" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re_on.jpg', this);" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg', this);" src="<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg" alt="この購入内容で再注文する" name="submit" value="この購入内容で再注文する" />
                 </p>
@@ -87,16 +84,9 @@
                     <!--{/if}-->
                     </td>
-                    <!--{assign var=order_price   value=`$orderDetail.price`}-->
-                    <!--{assign var=product_price value=`$orderDetail.product_price`}-->
+                    <!--{assign var=price value=`$orderDetail.price`}-->
                     <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-                    <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                    <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円
-                    <!--{if $order_price != $product_price}-->
-                        <div class="attention">【現在価格】</div><span class="attention"><!--{$product_price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円</span>
-                    <!--{/if}-->
-                    </td>
+                    <td class="alignR"><!--{$price|sfCalcIncTax|number_format|h}-->円</td>
                     <td class="alignR"><!--{$quantity|h}--></td>
-                    <td class="alignR"><!--{$order_price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+                    <td class="alignR"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</td>
                 </tr>
             <!--{/foreach}-->
@@ -180,5 +170,5 @@
                             </td>
                             <td class="alignR">
-                                <!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円
+                                <!--{$item.price|sfCalcIncTax|number_format}-->円
                             </td>
                             <td class="alignC"><!--{$item.quantity}--></td>
@@ -191,7 +181,6 @@
             <!--{/if}-->
             <table summary="お届け先" class="delivname">
-                <col width="30%" />
-                <col width="70%" />
-                <tbody>
+                    <col width="30%" />
+                    <col width="70%" />
                     <tr>
                         <th class="alignL">お名前</th>
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 22601)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/history.tpl	(revision 22796)
@@ -27,4 +27,10 @@
     注文番号：<!--{$tpl_arrOrderData.order_id}--><br>
     お支払い方法：<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+    <!--{if $tpl_arrOrderData.deliv_time_id != ""}--><br>
+        お届け時間：<!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+    <!--{/if}-->
+    <!--{if $tpl_arrOrderData.deliv_date != ""}--><br>
+        お届け日：<!--{$tpl_arrOrderData.deliv_date|h}-->
+    <!--{/if}-->
 
     <form action="order.php" method="post">
@@ -62,9 +68,7 @@
         <!--{assign var=price value=`$orderDetail.price`}-->
         <!--{assign var=quantity value=`$orderDetail.quantity`}-->
-        <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-        <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
-        <!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format|h}-->円<br>
+        <!--{$price|sfCalcIncTax|number_format|h}-->円<br>
         数量：<!--{$quantity|h}--><br>
-        小計：<!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円<br>
+        小計：<!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円<br>
     <!--{/foreach}-->
     <hr>
@@ -105,5 +109,5 @@
                     <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--><br>
                 <!--{/if}-->
-                単価：<!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円<br>
+                単価：<!--{$item.price|sfCalcIncTax|number_format}-->円<br>
                 数量：<!--{$item.quantity}--><br>
                 <br>
@@ -123,8 +127,4 @@
             <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br>
         <!--{/if}-->
-        ●お届け日<br>
-        <!--{$shippingItem.shipping_date|default:'指定なし'|h}-->&nbsp;<br>
-        ●お届け時間<br>
-        <!--{$shippingItem.shipping_time|default:'指定なし'|h}-->&nbsp;<br>
         <br>
     <!--{/foreach}-->
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 22458)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 22796)
@@ -69,5 +69,6 @@
         <!--{/if}-->
 
-        <!--{if $arrShipping}-->
+        <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
             【お届け先】<br>
             <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	(revision 22606)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl	(revision 22796)
@@ -43,13 +43,12 @@
 ■ご注文商品明細
 <!--{section name=cnt loop=$arrOrderDetail}-->
-商品コード：<!--{$arrOrderDetail[cnt].product_code}-->
-商品名：<!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
-単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax:$arrOrderDetail[cnt].tax_rate:$arrOrderDetail[cnt].tax_rule|number_format}-->
+商品コード: <!--{$arrOrderDetail[cnt].product_code}-->
+商品名: <!--{$arrOrderDetail[cnt].product_name}--> <!--{$arrOrderDetail[cnt].classcategory_name1}--> <!--{$arrOrderDetail[cnt].classcategory_name2}-->
+単価：￥ <!--{$arrOrderDetail[cnt].price|sfCalcIncTax|number_format}-->
 数量：<!--{$arrOrderDetail[cnt].quantity}-->
 
 <!--{/section}-->
 
-小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> <!--{if 0 < $arrOrder.tax}-->(うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）<!--{/if}-->
-
+小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）
 値引き ￥ <!--{$arrOrder.use_point+$arrOrder.discount|number_format|default:0}-->
 送　料 ￥ <!--{$arrOrder.deliv_fee|number_format|default:0}-->
@@ -69,10 +68,10 @@
 　電話番号：<!--{$shipping.shipping_tel01}-->-<!--{$shipping.shipping_tel02}-->-<!--{$shipping.shipping_tel03}-->
 　お届け日：<!--{$shipping.shipping_date|date_format:"%Y/%m/%d"|default:"指定なし"}-->
-　お届け時間：<!--{$shipping.shipping_time|default:"指定なし"}-->
+お届け時間：<!--{$shipping.shipping_time|default:"指定なし"}-->
 
 <!--{foreach item=item name=item from=$shipping.shipment_item}-->
-商品コード：<!--{$item.product_code}-->
-商品名：<!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥ <!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
+商品コード: <!--{$item.product_code}-->
+商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
+単価：￥ <!--{$item.price|sfCalcIncTax|number_format}-->
 数量：<!--{$item.quantity}-->
 
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 22369)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 22796)
@@ -103,15 +103,4 @@
         <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
 
-        ●FAX<br>
-        <!--{assign var=key1 value="`$prefix`fax01"}-->
-        <!--{assign var=key2 value="`$prefix`fax02"}-->
-        <!--{assign var=key3 value="`$prefix`fax03"}-->
-        <!--{if $arrErr[fax01] || $arrErr[fax02] || $arrErr[fax03]}-->
-            <font color="#FF0000"><!--{$arrErr[fax01]}--><!--{$arrErr[fax02]}--><!--{$arrErr[fax03]}--></font><br>
-        <!--{/if}-->
-        <input type="text" size="<!--{$size}-->" name="fax01" value="<!--{$arrForm.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
-        <input type="text" size="<!--{$size}-->" name="fax02" value="<!--{$arrForm.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" />&nbsp;-&nbsp;
-        <input type="text" size="<!--{$size}-->" name="fax03" value="<!--{$arrForm.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4" /><br>
-        
         ●メールアドレス<font color="#FF0000"> *</font><br>
         <font color="#FF0000"><!--{$arrErr.email}--></font>
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	(revision 22545)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	(revision 22796)
@@ -34,6 +34,6 @@
         <input type="text" name="quantity" size="3" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength=<!--{$smarty.const.INT_LEN}--> istyle="4"><br>
         <input type="hidden" name="mode" value="cart">
-        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
-        <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value|h}-->">
+        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
+        <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value}-->">
         <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
         <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->">
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	(revision 22545)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	(revision 22796)
@@ -37,5 +37,5 @@
         </select><br>
         <input type="hidden" name="mode" value="selectItem">
-        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value|h}-->">
+        <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
         <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
         <center><input type="submit" name="submit" value="次へ"></center>
Index: branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	(revision 22549)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	(revision 22796)
@@ -115,14 +115,4 @@
     <br>
 
-    <!--★メーカー★-->
-    <!--{if $arrProduct.maker_name|strlen >= 1}-->
-        メーカー：<!--{$arrProduct.maker_name|h}--><br>
-    <!--{/if}-->
-
-    <!--★メーカーURL★-->
-    <!--{if $arrProduct.comment1|strlen >= 1}-->
-        メーカーURL：<a href="<!--{$arrProduct.comment1|h}-->"><!--{$arrProduct.comment1|h}--></a><br>
-    <!--{/if}-->
-
     <!--★関連カテゴリ★-->
     関連カテゴリ：<br>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 22796)
@@ -57,5 +57,5 @@
         <!--{if $arrForm.mail_method.value ne 2}-->
             <tr>
-                <td colspan="2"><a href="javascript:;" onclick="winSubmitMail('','form2','preview',650,700); return false;">HTMLで確認</a>
+                <td colspan="2"><a href="javascript:;" onClick="winSubmitMail('','form2','preview',650,700); return false;">HTMLで確認</a>
             </tr>
         <!--{/if}-->
@@ -69,5 +69,5 @@
         <ul>
             <li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' ); return false;"><span class="btn-prev">テンプレート設定画面へ戻る</span></a></li>
-            <li><a class="btn-action" href="javascript:;" name="subm03" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">配信する</span></a></li>
+            <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' ); return false;"><span class="btn-next">配信する</span></a></li>
         </ul>
     </div>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/system.tpl	(revision 22796)
@@ -29,5 +29,5 @@
             <th>
             <!--{$info.title|h}-->
-            </th>
+            </td>
             <td>
             <!--{$info.value|h|nl2br}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/index.tpl	(revision 22796)
@@ -32,7 +32,4 @@
     </div>
 
-    <div class="btn">
-        <a class="btn-action" href="javascript:;" onclick="win02('./input.php','input','620','450'); return false;"><span class="btn-next">メンバーを新規入力</span></a>
-    </div>
     <!--▼メンバー一覧ここから-->
     <table class="list">
@@ -44,4 +41,7 @@
         <col width="7.5%" />
         <col width="20%" />
+        <div class="btn">
+            <a class="btn-action" href="javascript:;" onclick="win02('./input.php','input','620','450'); return false;"><span class="btn-next">メンバーを新規入力</span></a>
+        </div>
         <tr>
             <th>権限</th>
@@ -59,6 +59,6 @@
             <td><!--{$list_data[data].department|h}--></td>
             <!--{assign var="work" value=$list_data[data].work}--><td><!--{$arrWORK[$work]|h}--></td>
-            <td align="center"><a href="#" onclick="win02('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','620','450'); return false;">編集</a></td>
-            <td align="center"><!--{if $workmax > 1}--><a href="#" onclick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
+            <td align="center"><a href="#" onClick="win02('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','620','450'); return false;">編集</a></td>
+            <td align="center"><!--{if $workmax > 1}--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
             <td align="center">
             <!--{$tpl_nomove}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 22796)
@@ -48,15 +48,13 @@
         <!--{section name=cnt loop=$arrForm}-->
             <tr>
-                <td class="center">
-                    <input type="hidden" name="table_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].table_name}-->" />
-                    <input type="hidden" name="column_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].column_name}-->" />
-                    <input type="hidden" name="indexflag[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].indexflag}-->" />
-                    <input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="1" <!--{if $arrForm[cnt].indexflag == "1"}-->checked="checked"<!--{/if}--> />
-                </td>
-                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="" <!--{if $arrForm[cnt].indexflag != "1"}-->checked="checked"<!--{/if}--> /></td>
+                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="1" <!--{if $arrForm[cnt].indexflag == "1"}-->checked<!--{/if}--> /></td>
+                <td class="center"><input type="radio" name="indexflag_new[<!--{$smarty.section.cnt.iteration}-->]" value="" <!--{if $arrForm[cnt].indexflag != "1"}-->checked<!--{/if}--> /></td>
                 <th class="column"><!--{$arrForm[cnt].table_name}--></th>
                 <th class="column"><!--{$arrForm[cnt].column_name}--></th>
                 <td><!--{$arrForm[cnt].recommend_comment}--></td>
             </tr>
+            <input type="hidden" name="table_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].table_name}-->" />
+            <input type="hidden" name="column_name[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].column_name}-->" />
+            <input type="hidden" name="indexflag[<!--{$smarty.section.cnt.iteration}-->]" value="<!--{$arrForm[cnt].indexflag}-->" />
         <!--{/section}-->
     </table>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	(revision 22796)
@@ -31,10 +31,10 @@
 </script>
 
-<form name="form1" id="form1" method="post" action="">
+<form name="form1" id="form1" method="post" action="" onsubmit="return fnRegistMember();">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="<!--{$tpl_mode|h}-->" />
-<input type="hidden" name="member_id" value="<!--{$tpl_member_id|h}-->" />
-<input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->" />
-<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|h}-->" />
+<input type="hidden" name="mode" value="<!--{$tpl_mode|h}-->">
+<input type="hidden" name="member_id" value="<!--{$tpl_member_id|h}-->">
+<input type="hidden" name="pageno" value="<!--{$tpl_pageno|h}-->">
+<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|h}-->">
 
 <h2>メンバー登録/編集</h2>
@@ -95,6 +95,6 @@
             <!--{if $arrErr.work}--><span class="attention"><!--{$arrErr.work}--></span><!--{/if}-->
             <!--{assign var=key value="work"}-->
-            <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1"><!--{$arrWORK.1}--></label>
-            <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0"><!--{$arrWORK.0}--></label>
+            <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1">稼働</label>
+            <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0">非稼働</label>
             <span class="attention">※必須入力</span>
         </td>
@@ -104,5 +104,5 @@
 <div class="btn-area">
     <ul>
-        <li><a class="btn-action" href="javascript:;" onclick="if (!fnConfirm()) return false; fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
     </ul>
 </div>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 22796)
@@ -23,5 +23,5 @@
 *}-->
 
-<script type="text/javascript">
+<script>
     function fnRestore(list_name) {
         if (window.confirm('リストアしますか?')) {
@@ -101,5 +101,5 @@
         <div class="message">
             <!--{if $tpl_restore_err == false}-->
-                <div class="btn"><a class="btn-normal" href="javascript:;" name="restore_config" onclick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$tpl_restore_name|h}-->'; submit(); return false;"><span>エラーを無視してリストアする</span></a></div>
+                <div class="btn"><a class="btn-normal" href="javascript:;" name="restore_config" onClick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$tpl_restore_name|h}-->'; submit(); return false;"><span>エラーを無視してリストアする</span></a></div>
             <!--{/if}-->
             <!--{$tpl_restore_msg|h}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/plugin.tpl	(revision 22796)
@@ -133,5 +133,5 @@
                 <!--{assign var=key value="plugin_file"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" />
+                <input type="file" name="<!--{ $key }-->" class="box45" size="43"  style="<!--{$arrErr[$key]|sfGetErrorColor}--> <!--{if $arrErr[$key]}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->">
                 <a class="btn-action" href="javascript:;" onclick="install(); return false;"><span class="btn-next">インストール</span></a>
             </td>
@@ -157,5 +157,5 @@
                 <td class="center plugin_img">
                     <!--{if $plugin.plugin_site_url != '' }-->
-                        <a href="?" onclick="win03('<!--{$plugin.plugin_site_url|h}-->','plugin_site_url','620','760'); return false;"><img src="<!--{$plugin.logo}-->" width="65" height="65" /></a>&nbsp;
+                        <a href="?" onclick="win03('<!--{$plugin.plugin_site_url|h}-->','plugin_site_url','620','760'); return false;"><img src="<!--{$plugin.logo}-->" width="65" height="65"/></a>&nbsp;
                     <!--{else}-->
                         <img src="<!--{$plugin.logo}-->" width="65" height="65"/>
@@ -203,7 +203,7 @@
                             <!-- 有効/無効 -->
                                 <!--{if $plugin.enable == $smarty.const.PLUGIN_ENABLE_TRUE}-->
-                                    <label><input id="plugin_enable" type="checkbox" name="disable" value="<!--{$plugin.plugin_id}-->" checked="checked" />有効</label><br/>
+                                    <label><input id="plugin_enable" type="checkbox" name="disable" value="<!--{$plugin.plugin_id}-->" id="login_memory" checked="checked">有効</input></label><br/>
                                 <!--{else}-->
-                                    <label><input id="plugin_enable" type="checkbox" name="enable" value="<!--{$plugin.plugin_id}-->" />有効にする</label><br/>
+                                    <label><input id="plugin_enable" type="checkbox" name="enable" value="<!--{$plugin.plugin_id}-->" id="login_memory">有効にする</input></label><br/>
                                 <!--{/if}-->
 
@@ -218,5 +218,5 @@
                 <td class="center">
                     <span class="attention"><!--{$arrErr.priority[$plugin.plugin_id]}--></span>
-                    <input type="text" class="center" name="priority_<!--{$plugin.plugin_code}--> priority" value="<!--{$plugin.priority|h}-->" size="1" />
+                    <input type="text" class="center" name="priority_<!--{$plugin.plugin_code}-->" value="<!--{$plugin.priority|h}-->" size="1" class="priority" />
                     <a class="btn-action" href="javascript:;" onclick="update_priority(<!--{$plugin.plugin_id}-->, '<!--{$plugin.plugin_code}-->'); return false;"><span class="btn-next">変更</span></a><br/>
                     <span><!--{$plugin.priority_message}--></span>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	(revision 22796)
@@ -66,14 +66,4 @@
             <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
         </tr>
-        <tr>
-            <th>商品ステータス</th>
-            <td>
-                <input type="hidden" name="search_status" value="1" />
-                <label>
-                    <input type="checkbox" name="search_status" value="" <!--{if $arrForm.search_status === ""}-->checked<!--{/if}--> />
-                    非公開の商品を含む
-                </label>
-            </td>
-        </tr>
     </table>
     <div class="btn-area">
@@ -87,5 +77,5 @@
     <!--{$tpl_strnavi}-->
 
-    <table id="recommend-search-results" class="list">
+    <table class="list">
         <col width="15%" />
         <col width="12.5%" />
@@ -101,5 +91,5 @@
         <!--{foreach name=loop from=$arrProducts item=arr}-->
         <!--▼商品<!--{$smarty.foreach.loop.iteration}-->-->
-        <tr class="<!--{if $arr.status == "2"}-->hidden<!--{/if}-->">
+        <tr>
             <td class="center">
                 <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arr.main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="" />
@@ -116,5 +106,5 @@
             </td>
             <td><!--{$arr.name|h}--></td>
-            <td class="center"><a href="" onclick="return func_submit(<!--{$arr.product_id}-->)">決定</a></td>
+            <td class="center"><a href="" onClick="return func_submit(<!--{$arr.product_id}-->)">決定</a></td>
         </tr>
         <!--▲商品<!--{$smarty.foreach.loop.iteration}-->-->    
Index: branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 22581)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 22796)
@@ -23,9 +23,96 @@
 *}-->
 
+<script type="text/javascript">
+<!--
+
+function func_regist(url) {
+    res = confirm('この内容で<!--{if $edit_mode eq "on"}-->編集<!--{else}-->登録<!--{/if}-->しても宜しいですか？');
+    if(res == true) {
+        document.form1.mode.value = 'regist';
+        document.form1.submit();
+        return false;
+    }
+    return false;
+}
+
+function func_edit(news_id) {
+    document.form1.mode.value = "search";
+    document.form1.news_id.value = news_id;
+    document.form1.submit();
+}
+
+function func_del(news_id) {
+    res = confirm('この新着情報を削除しても宜しいですか？');
+    if(res == true) {
+        document.form1.mode.value = "delete";
+        document.form1.news_id.value = news_id;
+        document.form1.submit();
+    }
+    return false;
+}
+
+function func_rankMove(term,news_id) {
+    document.form1.mode.value = "move";
+    document.form1.news_id.value = news_id;
+    document.form1.term.value = term;
+    document.form1.submit();
+}
+
+function moving(news_id,rank, max_rank) {
+
+    var val;
+    var ml;
+    var len;
+
+    ml = document.move;
+    len = document.move.elements.length;
+    j = 0;
+    for( var i = 0 ; i < len ; i++) {
+            if ( ml.elements[i].name == 'position' && ml.elements[i].value != "" ) {
+            val = ml.elements[i].value;
+            j ++;
+            }
+    }
+
+    if ( j > 1) {
+        alert( '移動順位は１つだけ入力してください。' );
+        return false;
+    } else if( ! val ) {
+        alert( '移動順位を入力してください。' );
+        return false;
+    } else if( val.length > 4){
+        alert( '移動順位は4桁以内で入力してください。' );
+        return false;
+    } else if( val.match(/[0-9]+/g) != val){
+        alert( '移動順位は数字で入力してください。' );
+        return false;
+    } else if( val == rank ){
+        alert( '移動させる番号が重複しています。' );
+        return false;
+    } else if( val == 0 ){
+        alert( '移動順位は0以上で入力してください。' );
+        return false;
+    } else if( val > max_rank ){
+        alert( '入力された順位は、登録数の最大値を超えています。' );
+        return false;
+    } else {
+        ml.moveposition.value = val;
+        ml.rank.value = rank;
+        ml.news_id.value = news_id;
+        ml.submit();
+        return false;
+    }
+}
+
+//-->
+</script>
+
+
 <div id="admin-contents" class="contents-main">
 <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="" />
-<input type="hidden" name="news_id" value="<!--{$arrForm.news_id.value|h}-->" />
+<input type="hidden" name="news_id" value="<!--{$arrForm.news_id|h}-->" />
+<input type="hidden" name="term" value="" />
     <!--{* ▼登録テーブルここから *}-->
     <table>
@@ -36,13 +123,13 @@
                 <select name="year" <!--{if $arrErr.year || $arrErr.month || $arrErr.day }-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">----</option>
-                    <!--{html_options options=$arrYear selected=$arrForm.year.value}-->
+                    <!--{html_options options=$arrYear selected=$arrForm.year}-->
                 </select>年
                 <select name="month" <!--{if $arrErr.year || $arrErr.month || $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">--</option>
-                    <!--{html_options options=$arrMonth selected=$arrForm.month.value}-->
+                    <!--{html_options options=$arrMonth selected=$arrForm.month}-->
                 </select>月
                 <select name="day" <!--{if $arrErr.year || $arrErr.month || $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
                     <option value="" selected="selected">--</option>
-                    <!--{html_options options=$arrDay selected=$arrForm.day.value}-->
+                    <!--{html_options options=$arrDay selected=$arrForm.day}-->
                 </select>日
             </td>
@@ -52,5 +139,5 @@
             <td>
                 <!--{if $arrErr.news_title}--><span class="attention"><!--{$arrErr.news_title}--></span><!--{/if}-->
-                <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title.value|h}--></textarea><br />
+                <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title|h}--></textarea><br />
                 <span class="attention"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
             </td>
@@ -60,5 +147,5 @@
             <td>
                 <span class="attention"><!--{$arrErr.news_url}--></span>
-                <input type="text" name="news_url" size="60" class="box60"    value="<!--{$arrForm.news_url.value|h}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
+                <input type="text" name="news_url" size="60" class="box60"    value="<!--{$arrForm.news_url|h}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
                 <span class="attention"> (上限<!--{$smarty.const.URL_LEN}-->文字)</span>
             </td>
@@ -66,5 +153,5 @@
         <tr>
             <th>リンク</th>
-            <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method.value eq 2}--> checked <!--{/if}--> /> 別ウィンドウで開く</label></td>
+            <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method eq 2}--> checked <!--{/if}--> /> 別ウィンドウで開く</label></td>
         </tr>
         <tr>
@@ -72,5 +159,5 @@
             <td>
                 <!--{if $arrErr.news_comment}--><span class="attention"><!--{$arrErr.news_comment}--></span><!--{/if}-->
-                <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment.value|h}--></textarea><br />
+                <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment|h}--></textarea><br />
                 <span class="attention"> (上限3000文字)</span>
             </td>
@@ -81,5 +168,5 @@
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="return func_regist();"><span class="btn-next">この内容で登録する</span></a></li>
         </ul>
     </div>
@@ -94,4 +181,5 @@
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
     <input type="hidden" name="mode" value="moveRankSet" />
+    <input type="hidden" name="term" value="setposition" />
     <input type="hidden" name="news_id" value="" />
     <input type="hidden" name="moveposition" value="" />
@@ -126,20 +214,15 @@
             <td>
                 <!--{if $arrNews[data].news_id != $tpl_news_id}-->
-                <a href="#" onclick="fnFormModeSubmit('move','pre_edit','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">編集</a>
+                <a href="#" onclick="return func_edit('<!--{$arrNews[data].news_id|h}-->');">編集</a>
                 <!--{else}-->
                 編集中
                 <!--{/if}-->
             </td>
-            <td><a href="#" onclick="fnFormModeSubmit('move','delete','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">削除</a></td>
-            <td>
-                <!--{if count($arrNews) != 1}-->
-                <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">移動</a><br />
-                <!--{/if}-->
-                <!--{if $smarty.section.data.iteration != 1}-->
-                <a href="?" onclick="fnFormModeSubmit('move','up','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">上へ</a>
-                <!--{/if}-->
-                <!--{if !$smarty.section.data.last}-->
-                <a href="?" onclick="fnFormModeSubmit('move','down','news_id','<!--{$arrNews[data].news_id|h}-->'); return false;">下へ</a>
-                <!--{/if}-->
+            <td><a href="#" onclick="return func_del('<!--{$arrNews[data].news_id|h}-->');">削除</a></td>
+            <td>
+            <!--{if count($arrNews) != 1}-->
+            <input type="text" name="pos-<!--{$arrNews[data].news_id|h}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$arrNews[data].news_id|h}-->'); return false;">移動</a><br />
+            <!--{/if}-->
+            <!--{if $arrNews[data].rank ne $max_rank}--><a href="#" onclick="return func_rankMove('up', '<!--{$arrNews[data].news_id|h}-->', '<!--{$max_rank|h}-->');">上へ</a><!--{/if}-->　<!--{if $arrNews[data].rank ne 1}--><a href="#" onclick="return func_rankMove('down', '<!--{$arrNews[data].news_id|h}-->', '<!--{$max_rank|h}-->');">下へ</a><!--{/if}-->
             </td>
         </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/subnavi.tpl	(revision 22796)
@@ -27,5 +27,5 @@
 <li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/recommend.php"><span>おすすめ商品管理</span></a></li>
 <li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/file_manager.php"><span>ファイル管理</span></a></li>
-<li class="on_level2 <!--{if $tpl_subno == 'csv'}--> on<!--{/if}--> " id="navi-contents-csv"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
+<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> class="on_level2" id="navi-contents-csv"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php"><span>CSV出力項目設定</span></a>
     <ul id="navi-csv-sub" class="level2">
     <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 22796)
@@ -63,5 +63,5 @@
                 <td>
                     <!--{if $arrErr.upload_file}--><span class="attention"><!--{$arrErr.upload_file}--></span><!--{/if}-->
-                    <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> /><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">アップロード</a>
+                    <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">アップロード</a>
                 </td>
             </tr>
@@ -70,5 +70,5 @@
                 <td>
                     <!--{if $arrErr.create_file}--><span class="attention"><!--{$arrErr.create_file}--></span><!--{/if}-->
-                    <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->" /><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;">作成</a>
+                    <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|h}--><!--{/if}-->"><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;">作成</a>
                 </td>
             </tr>
@@ -101,7 +101,7 @@
                     <td class="file-name" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$arrFileList[cnt].file_path|h}-->', <!--{if $arrFileList[cnt].is_dir|h}-->true<!--{else}-->false<!--{/if}-->, '<!--{$tpl_now_dir|h}-->', false)">
                         <!--{if $arrFileList[cnt].is_dir}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
+                            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
                         <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/contents/file.gif" />
+                            <img src="<!--{$TPL_URLPATH}-->img/contents/file.gif">
                         <!--{/if}-->
                         <!--{$arrFileList[cnt].file_name|h}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	(revision 22582)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	(revision 22796)
@@ -21,6 +21,5 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-
- *}-->
+*}-->
 
 <script type="text/javascript">
@@ -76,5 +75,5 @@
     if ( flag ){
         document.form1["mode"].value = mode;
-        document.form1["best_id"].value = data;
+        document.form1["rank"].value = data;
         document.form1.submit();
     }
@@ -84,39 +83,36 @@
 </script>
 
+        <!--{section name=cnt loop=$tpl_disp_max}-->
+
 <div id="admin-contents" class="contents-main">
-    <!--{section name=cnt loop=$tpl_disp_max}-->
-    <div class="recommend-product <!--{if $arrItems[$smarty.section.cnt.iteration].status == "2"}-->hidden<!--{/if}-->">
-        <table class="list center recommend-table">
-            <col width="13%" />
-            <col width="73%" />
-            <col width="7%" />
-            <col width="7%" />
-            <tr>
-                <th>順位</th>
-                <th>商品/コメント</th>
-                <th>編集</th>
-                <th>削除</th>
-                <th>並び替え</th>
-            </tr>
+    <table class="list center" id="recommend-table">
+        <col width="13%" />
+        <col width="73%" />
+        <col width="7%" />
+        <col width="7%" />
+        <tr>
+            <th>順位</th>
+            <th>商品/コメント</th>
+            <th>編集</th>
+            <th>削除</th>
+            <th>並び替え</th>
+        </tr>
 
-            <tr>
-                <td>おすすめ商品(<!--{$smarty.section.cnt.iteration}-->)</td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <td>
-                            <div class="clearfix table-wrap">
-                                <div class="table-img">
-                                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                                        <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|h}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->" width="100" height="100" />
-                                    <!--{/if}-->
-                                </div>
-                                <div class="table-detail">
-                                    <div class="detail-name">
-                                        商品名： <!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->
-                                    </div>
+        <tr>
+            <td>おすすめ商品(<!--{$smarty.section.cnt.iteration}-->)</td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <td>
+                        <div id="table-wrap" class="clearfix">
+                            <div class="table-img">
+                                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                                    <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|h}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->" width="100" height="100" />
+                                <!--{/if}-->
+                            </div>
+                            <div class="table-detail">
+                                <div class="detail-name">商品名： <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
                                     <div class="detail-form">
                                         <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
                                             <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                                             <input type="hidden" name="mode" value="regist" />
-                                            <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
                                             <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
                                             <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
@@ -128,50 +124,53 @@
                                 </div>
                             </div>
-                        </td>
-                    <!--{else}-->
-                        <td class="AlignLeft">
-                            <a class="btn-action-m" href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank"><span class="btn-next">商品を選択する</span></a>
-                            <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
-                                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-                                <input type="hidden" name="mode" value="regist" />
-                                <input type="hidden" name="best_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].best_id|h}-->" />
-                                <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
-                                <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
-                                <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
-                            </form>
-                        </td>
-                    <!--{/if}-->
-                <td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
-                            編集
-                        </a>
-                    <!--{else}-->
-                        - -
-                    <!--{/if}-->
-                </td>
-                <td>
-                    <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                            <a href="javascript:;" onclick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '削除します。宜しいですか' )">削除</a>
-                    <!--{else}-->
-                        - -
-                    <!--{/if}-->
-                </td>
-                <td>
-                    <!--{* 移動 *}-->
-                    <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">上へ</a><br />&nbsp;
-                    <!--{/if}-->
-                    <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
-                        <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].best_id}-->); return false;">下へ</a>
-                    <!--{/if}-->
-                </td>
-            </tr>
-        </table>
-        <div class="btn-area">
-            <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">この内容で登録する</span></a>
-        </div>
-    </div>
+                        </div>
+                    </td>
+                <!--{else}-->
+                    <td class="AlignLeft">
+                        <a class="btn-action-m" href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank"><span class="btn-next">商品を選択する</span></a>
+                        <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
+                            <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+                            <input type="hidden" name="mode" value="regist" />
+                            <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|h}-->" />
+                            <input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
+                            <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
+                        </form>
+                    </td>
+                <!--{/if}-->
+            <td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="javascript:;" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
+                        編集</a>
+                <!--{else}-->
+                    - -
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                        <a href="javascript:;" onClick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '削除します。宜しいですか' )">削除</a>
+                <!--{else}-->
+                    - -
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{* 移動 *}-->
+                <!--{if $smarty.section.cnt.iteration != 1 && $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="?" onclick="lfnSortItem('up',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">上へ</a><br>&nbsp;
+                <!--{/if}-->
+                <!--{if $smarty.section.cnt.iteration != $tpl_disp_max && $arrItems[$smarty.section.cnt.iteration].product_id}-->
+                    <a href="?" onclick="lfnSortItem('down',<!--{$arrItems[$smarty.section.cnt.iteration].rank}-->); return false;">下へ</a>
+                <!--{/if}-->
+            </td>
+        </tr>
+
+        <tr><td colspan="4" class="no-border-w" height="20"></td></tr>
+        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+        <tr><td colspan="4" class="no-border">
+        <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">この内容で登録する</span></a>
+        </td>
+        </tr>
+        <!--{/if}-->
     <!--▲おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
     <!--{/section}-->
+    </table>
 </div>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 22796)
@@ -66,5 +66,5 @@
     <div class="ms2side__area">
         <span class="attention"><!--{$arrErr.output_list}--></span>
-        <select multiple="multiple" name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
+        <select multiple name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
             <!--{html_options options=$arrOptions selected=$arrSelected}-->
         </select>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 22575)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 22796)
@@ -34,5 +34,5 @@
             <td>
                 <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
-                <input type="text" name="title" value="<!--{$arrForm.title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+                <input type="text" name="title" value="<!--{$arrForm.title|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
                 <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
             </td>
@@ -48,9 +48,9 @@
                 <select name="month" style="<!--{$arrErr.month|sfGetErrorColor}-->">
                     <option value="">--</option>
-                    <!--{html_options options=$arrMonth selected=$arrForm.month.value}-->
+                    <!--{html_options options=$arrMonth selected=$arrForm.month}-->
                 </select>月
                 <select name="day" style="<!--{$arrErr.day|sfGetErrorColor}-->">
                     <option value="">--</option>
-                    <!--{html_options options=$arrDay selected=$arrForm.day.value}-->
+                    <!--{html_options options=$arrDay selected=$arrForm.day}-->
                 </select>日
                 <br />
@@ -100,8 +100,8 @@
             <td class="center">
                 <!--{if $smarty.section.cnt.iteration != 1}-->
-                <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">上へ</a>
+                <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />上へ</a>
                 <!--{/if}-->
                 <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
-                <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">下へ</a>
+                <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />下へ</a>
                 <!--{/if}-->
             </td>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 22294)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 22796)
@@ -34,5 +34,5 @@
                 <span class="attention"><!--{$arrErr.kiyaku_title}--></span>
                 <span class="attention"><!--{$arrErr.name}--></span>
-                <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{if $arrErr.kiyaku_title != "" || $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60"/>
+                <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{if $arrErr.kiyaku_title != "" || $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60"/>
                 <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
             </td>
@@ -42,5 +42,5 @@
             <td>
             <span class="attention"><!--{$arrErr.kiyaku_text}--></span>
-            <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text.value|h}--></textarea>
+            <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text|h}--></textarea>
             <span class="attention"> (上限<!--{$smarty.const.MLTEXT_LEN}-->文字)</span>
             </td>
@@ -70,5 +70,5 @@
                 <td align="center">
                     <!--{if $tpl_kiyaku_id != $arrKiyaku[cnt].kiyaku_id}-->
-                    <a href="?" onclick="fnModeSubmit('pre_edit', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">編集</a>
+                    <a href="?" onclick="fnSetFormSubmit('form1', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">編集</a>
                     <!--{else}-->
                     編集中
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 22796)
@@ -141,5 +141,4 @@
         <!--{/if}-->
         <!--{/section}-->
-        </tr>
     </table>
     <!--{/if}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 22796)
@@ -87,5 +87,5 @@
                 <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','header','cnt_header'); return false;"><span>文字数カウント</span></a>
                 今までに入力したのは
-                <input type="text" name="cnt_header" size="4" class="box4" readonly="readonly" style="text-align:right" />
+                <input type="text" name="cnt_header" size="4" class="box4" readonly = true style="text-align:right" />
                 文字です。
             </div>
@@ -107,5 +107,5 @@
                 <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','footer','cnt_footer'); return false;"><span>文字数カウント</span></a>
                 今までに入力したのは
-                <input type="text" name="cnt_footer" size="4" class="box4" readonly="readonly" style="text-align:right" />
+                <input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />
                 文字です。
             </div>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 22495)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 22796)
@@ -129,5 +129,5 @@
                 <!--{assign var=key value="law_email"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
+                <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
             </td>
         </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 22796)
@@ -25,5 +25,5 @@
 <form name="form1" id="form1" method="post" action="?" onSubmit="return window.confirm('登録しても宜しいですか');">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="mode" value="confirm">
 <input type="hidden" name="device_type_id" value="" />
 <input type="hidden" name="page_id" value="" />
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 22477)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 22796)
@@ -111,5 +111,5 @@
 <form name="form1" id="form1" method="post" action="?">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
 <!--{* ▼登録テーブルここから *}-->
 <div id="basis" class="contents-main">
@@ -323,5 +323,5 @@
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
         </ul>
     </div>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 22796)
@@ -29,5 +29,5 @@
     <form name="form1" id="form1" method="get" action="?" onsubmit="return false;">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-        <input type="hidden" name="mode" value="" />
+        <input type="hidden" name="mode" value="">
         <p>保存されている郵便番号CSVの更新日時: <!--{$tpl_csv_datetime|h}--></p>
         <p>郵便番号CSVには <!--{$tpl_line|h}--> 行のデータがあります。</p>
@@ -53,5 +53,5 @@
             <h2>DB手動登録</h2>
             <p>指定した行数から郵便番号を登録します。タイムアウトした場合、直前まで登録されます。</p>
-            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', ''); return false;"><span class="btn-next">手動登録</span></a>　開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8" /><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
+            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', ''); return false;"><span class="btn-next">手動登録</span></a>　開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8"><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
         </div>
 
Index: branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 22796)
@@ -103,5 +103,5 @@
                 <td>
                     <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
-                    〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                    〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
                     <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;">住所入力</a>
                 </td>
@@ -241,6 +241,6 @@
 
         <input type="hidden" name="order_id" value="" />
-        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
-        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" />
+        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->">
+        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" >
 
         <h2>購入履歴一覧</h2>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 22796)
@@ -104,5 +104,5 @@
             <td><!--{$arrCustomer[cnt].name01|h}--><!--{$arrCustomer[cnt].name02|h}-->(<!--{$arrCustomer[cnt].kana01|h}--><!--{$arrCustomer[cnt].kana02|h}-->)</td>
             <td><!--{$arrCustomer[cnt].tel01|h}-->-<!--{$arrCustomer[cnt].tel02|h}-->-<!--{$arrCustomer[cnt].tel03|h}--></td>
-            <td align="center"><a href="" onclick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)">決定</a></td>
+            <td align="center"><a href="" onClick="return func_submit(<!--{$arrCustomer[cnt].customer_id|h}-->)">決定</a></td>
         </tr>
         <!--▲会員<!--{$smarty.section.cnt.iteration}-->-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 22796)
@@ -137,5 +137,5 @@
                 <td class="center" rowspan="2"><!--{if $row.status eq 1}-->仮<!--{else}-->本<!--{/if}--></td>
                 <td><!--{$row.customer_id|h}--></td>
-                <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br />(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
+                <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br>(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
                 <td class="center" rowspan="2"><!--{$arrSex[$row.sex]|h}--></td>
                 <td><!--{$row.tel01|h}-->-<!--{$row.tel02|h}-->-<!--{$row.tel03|h}--></td>
@@ -145,5 +145,5 @@
             <tr>
                 <td><!--{assign var=pref value=$row.pref}--><!--{$arrPref[$pref]}--></td>
-                <td><!--{mailto address=$row.email encode="javascript"}--><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');">仮登録メール再送</a><!--{/if}--></td>
+                <td><!--{mailto address=$row.email encode="javascript"}--></a><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|h}-->');">仮登録メール再送</a><!--{/if}--></td>
             </tr>
         <!--{/foreach}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/adminparts/form_customer_search.tpl	(revision 22796)
@@ -126,6 +126,6 @@
         <!--{assign var=key1 value="search_buy_times_from"}-->
         <!--{assign var=key2 value="search_buy_times_to"}-->
-    <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span><br />
+    <!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}-->
+        <span class="attention"><!--{$arrErr.buy_times_from}--><!--{$arrErr.buy_times_to}--></span><br />
     <!--{/if}-->
     <input type="text" name="<!--{$key1}-->" maxlength="<!--{$arrForm[$key].length}-->" value="<!--{$arrForm[$key1].value|h}-->" size="6" class="box6" <!--{if $arrErr[$key1] || $arrErr[$key2]}--><!--{sfSetErrorStyle}--><!--{/if}--> /> 回 ～
@@ -221,5 +221,5 @@
         <!--{assign var=key value="search_buy_product_code"}-->
         <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" >
     </td>
 </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	(revision 22796)
@@ -38,5 +38,5 @@
             $('#' + disp_id).css("display", "none");
 
-            $('#' + inner_id).html('    URL <a href="#" onclick="lfnDispChange();"> &gt;&gt; カテゴリ表示<\/a>');
+            $('#' + inner_id).html('    URL <a href="#" onClick="lfnDispChange();"> &gt;&gt; カテゴリ表示<\/a>');
         }
     }else{
@@ -48,5 +48,5 @@
             $('#' + disp_id).css("display", "");
 
-            $('#' + inner_id).html('    カテゴリ <a href="#" onclick="lfnDispChange();"> &gt;&gt; URL表示<\/a>');
+            $('#' + inner_id).html('    カテゴリ <a href="#" onClick="lfnDispChange();"> &gt;&gt; URL表示<\/a>');
         }
     }
@@ -235,5 +235,5 @@
             </tr>
             <tr>
-                <th nowrap="nowrap"><a href="#" onclick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
+                <th nowrap><a href="#" onClick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
             </tr>
 
@@ -244,5 +244,5 @@
                     <td class="id" rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
                     <td class="thumbnail" rowspan="2">
-                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" />            </td>
+                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">            </td>
                     <td rowspan="2"><!--{$arrProducts[cnt].product_code_min|h}-->
                         <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl	(revision 22596)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/category.tpl	(revision 22796)
@@ -34,7 +34,7 @@
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="edit" />
-<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id|h}-->" />
-<input type="hidden" name="category_id" value="<!--{$arrForm.category_id|h}-->" />
-<input type="hidden" name="keySet" value="" />
+<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id|h}-->">
+<input type="hidden" name="category_id" value="<!--{$arrForm.category_id|h}-->">
+<input type="hidden" name="keySet" value="">
 <div id="products" class="contents-main">
     <div class="btn">
@@ -45,10 +45,44 @@
     <!--{* ▼画面左 *}-->
     <div id="products-category-left">
-        <ul>
-            <li>
-                <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />&nbsp;ホーム</a>
-                <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$arrTree treeID="f0" display=1}-->
-            </li>
-        </ul>
+        <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">&nbsp;ホーム</a><br />
+        <!--{section name=cnt loop=$arrTree}-->
+            <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+            <!--{* 上の階層表示の時にdivを閉じる *}-->
+            <!--{assign var=close_cnt value="`$before_level-$level+1`"}-->
+            <!--{if $close_cnt > 0}-->
+                <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{* スペース繰り返し *}-->
+            <!--{section name=n loop=$level}-->　　<!--{/section}-->
+
+            <!--{* カテゴリ名表示 *}-->
+            <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+            <!--{if $arrTree[cnt].level != $smarty.const.LEVEL_MAX}-->
+                <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false;">
+                <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+                    <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ">
+                <!--{else}-->
+                    <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
+                <!--{/if}-->
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
+            <!--{else}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
+                <!--{$disp_name|sfCutString:10:false|h}--></a><br />
+            <!--{/if}-->
+
+            <!--{if $arrTree[cnt].display == true}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->">
+            <!--{else}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+            <!--{/if}-->
+
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{section name=n loop=$level}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+        <!--{/section}-->
     </div>
     <!--{* ▲画面左 *}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	(revision 22796)
@@ -72,5 +72,5 @@
 <input type="hidden" name="mode" value="edit" />
 <input type="hidden" name="image_key" value="" />
-<input type="hidden" name="down_key" value="" />
+<input type="hidden" name="down_key" value="">
 <input type="hidden" name="product_id" value="<!--{$arrForm.product_id|h}-->" />
 <input type="hidden" name="product_class_id" value="<!--{$arrForm.product_class_id|h}-->" />
@@ -105,5 +105,5 @@
                     <tr>
                         <td>
-                            <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple="multiple">
+                            <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple>
                             </select>
                         </td>
@@ -113,5 +113,5 @@
                         </td>
                         <td>
-                            <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple="multiple">
+                            <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple>
                                 <!--{html_options values=$arrCatVal output=$arrCatOut selected=$arrForm.category_id}-->
                             </select>
@@ -156,5 +156,5 @@
                     <!--{if $arrForm.down_realfilename != ""}-->
                         <!--{$arrForm.down_realfilename|h}--><input type="hidden" name="down_realfilename" value="<!--{$arrForm.down_realfilename|h}-->">
-                        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br />
+                        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
                     <!--{/if}-->
                     <input type="file" name="down_file" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 22597)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 22796)
@@ -43,10 +43,37 @@
     <!--{* ▼画面左 *}-->
     <div id="products-rank-left">
-        <ul>
-            <li>
-                <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />&nbsp;ホーム</a>
-                <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$arrTree treeID="f0" display=1}-->
-            </li>
-        </ul>
+        <a href="?"><img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">&nbsp;ホーム</a><br />
+        <!--{section name=cnt loop=$arrTree}-->
+            <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+            <!--{* 上の階層表示の時にdivを閉じる *}-->
+            <!--{assign var=close_cnt value="`$before_level-$level+1`}-->
+            <!--{if $close_cnt > 0}-->
+                <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+            <!--{/if}-->
+
+            <!--{* スペース繰り返し *}-->
+            <!--{section name=n loop=$level}-->　　<!--{/section}-->
+
+            <!--{* カテゴリ名表示 *}-->
+            <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false">
+            <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ">
+            <!--{else}-->
+                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ">
+            <!--{/if}-->
+            <!--{$disp_name|sfCutString:10:false|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+            <br />
+            <!--{if $arrTree[cnt].display == true}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->">
+            <!--{else}-->
+                <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+            <!--{/if}-->
+            <!--{if $smarty.section.cnt.last}-->
+                <!--{section name=n loop=$level}--></div><!--{/section}-->
+            <!--{/if}-->
+            <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+        <!--{/section}-->
     </div>
     <!--{* ▲画面左 *}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 22796)
@@ -48,6 +48,5 @@
             <td>
                 <!--{if $arrErr.csv_file}--><span class="attention"><!--{$arrErr.csv_file}--></span><!--{/if}-->
-                <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1行目タイトル行)
-                (最大アップロードサイズ:<!--{$max_upload_csv_size}-->)</span>
+                <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1行目タイトル行)</span>
             </td>
         </tr>
@@ -56,5 +55,5 @@
             <td>
                 <!--{foreach name=title key=key item=item from=$arrTitle}-->
-                <!--{$smarty.foreach.title.iteration}-->項目：<!--{$item}--><br />
+                <!--{$smarty.foreach.title.iteration}-->項目：<!--{$item}--><br>
                 <!--{/foreach}-->
             </td>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 22796)
@@ -97,5 +97,5 @@
             </tr>
             <tr>
-                <th>ダウンロード商品用<br />ファイル</th>
+                <th>ダウンロード商品用<BR />ファイル</th>
                 <td>
                     <!--{if $arrForm.down_realfilename != ""}-->
@@ -271,5 +271,5 @@
                     <th>関連商品(<!--{$smarty.section.cnt.iteration}-->)<br />
                         <!--{if $arrRecommend[$recommend_no].product_id|strlen >= 1}-->
-                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
+                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->">
                         <!--{/if}-->
                     </th>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 22796)
@@ -23,5 +23,5 @@
 *}-->
 
-<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data"">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="csv_upload" />
@@ -48,5 +48,5 @@
                     <span class="attention"><!--{$arrErr.csv_file}--></span>
                 <!--{/if}-->
-                <input type="file" name="csv_file" size="40" /><span class="attention">(1行目タイトル行)(最大アップロードサイズ:<!--{$max_upload_csv_size}-->)</span>
+                <input type="file" name="csv_file" size="40" /><span class="attention">(1行目タイトル行)</span>
             </td>
         </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 22578)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 22796)
@@ -35,5 +35,5 @@
                     <!--{if $arrErr.maker_id}--><span class="attention"><!--{$arrErr.maker_id}--></span><br /><!--{/if}-->
                     <!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
-                    <input type="text" name="name" value="<!--{$arrForm.name.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+                    <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
                     <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
                 </td>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 22303)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 22796)
@@ -76,5 +76,5 @@
                 </td>
                 <td align="center">
-                    <a href="?" onclick="if(window.confirm('分類名を削除すると、その分類を利用している商品規格が無効になります。\n整合性の問題を把握し、バックアップを行ってから削除することを推奨致します。')){ fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); } return false;">削除</a>
+                    <a href="?" onclick="fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">削除</a>
                 </td>
                 <td align="center">
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 22796)
@@ -194,7 +194,7 @@
         <col width="8%" />
         <tr>
-            <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br />登録</label></th>
-            <th>規格1<br />(<!--{$arrClass[$class_id1]|default:"未選択"|h}-->)</th>
-            <th>規格2<br />(<!--{$arrClass[$class_id2]|default:"未選択"|h}-->)</th>
+            <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br>登録</label></th>
+            <th>規格1<br>(<!--{$arrClass[$class_id1]|default:"未選択"|h}-->)</th>
+            <th>規格2<br>(<!--{$arrClass[$class_id2]|default:"未選択"|h}-->)</th>
             <th>商品コード</th>
             <th>在庫数<span class="attention">*</span></th>
@@ -202,6 +202,6 @@
             <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
             <th>商品種別<span class="attention">*</span></th>
-            <th>ダウンロード<br />ファイル名<span class="red"><br />上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
-            <th>ダウンロード商品用<br />ファイル</th>
+            <th>ダウンロード<br>ファイル名<span class="red"><br>上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
+            <th>ダウンロード商品用<br>ファイル</th>
         </tr>
         <!--{section name=cnt loop=$arrForm.total.value}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 22796)
@@ -38,5 +38,5 @@
             <th>商品名</th>
             <td><!--{$arrForm.name|h}-->
-            <input type="hidden" name="name" value="<!--{$arrForm.name|h}-->" />
+            <input type="hidden" name="name" value="<!--{$arrForm.name|h}-->">
             </td>
         </tr>
@@ -44,5 +44,5 @@
             <th>投稿日</th>
             <td><!--{$arrForm.create_date|sfDispDBDate}-->
-            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date|h}-->" />
+            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date|h}-->">
             </td>
         </tr>
@@ -51,5 +51,5 @@
             <td>
                 <!--{if $arrErr.status}--><span class="attention"><!--{$arrErr.status}--></span><!--{/if}-->
-                <input type="radio" name="status" value="2" <!--{if $arrForm.status eq 2}-->checked="checked"<!--{/if}--> />非表示<!--{if $arrForm.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrForm.status eq 1}-->checked="checked"<!--{/if}--> />表示<!--{/if}-->
+                <input type="radio" name="status" value="2" <!--{if $arrForm.status eq 2}-->checked<!--{/if}-->>非表示<!--{if $arrForm.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrForm.status eq 1}-->checked<!--{/if}-->>表示<!--{/if}-->
             </td>
         </tr>
@@ -58,5 +58,5 @@
             <td>
                 <!--{if $arrErr.reviewer_name}--><span class="attention"><!--{$arrErr.reviewer_name}--></span><!--{/if}-->
-                <input type="text" class="box60" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size=30>
             </td>
         </tr>
@@ -65,5 +65,5 @@
             <td>
                 <!--{if $arrErr.reviewer_url}--><span class="attention"><!--{$arrErr.reviewer_url}--></span><!--{/if}-->
-                <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrForm.reviewer_url|h}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrForm.reviewer_url|h}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size=30>
             </td>
         </tr>
@@ -89,5 +89,5 @@
             <td>
                 <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
-                <input type="text" class="box60" name="title" value="<!--{$arrForm.title|h}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size="30" />
+                <input type="text" class="box60" name="title" value="<!--{$arrForm.title|h}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size=30><span class="attention">
             </td>
         </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank_tree_fork.tpl	(revision 22597)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 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.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}-->">
-        <!--{* カテゴリ名表示 *}-->
-        <!--{assign var=disp_name value="`$child.category_id`.`$child.category_name`"}-->
-        <!--{if $child.level != $smarty.const.LEVEL_MAX}-->
-            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$child.category_id}-->); return false;">
-            <!--{if $arrForm.parent_category_id == $child.category_id}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ" />
-            <!--{else}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{/if}-->
-            <!--{$disp_name|sfCutString:10:false|h}--></a>
-        <!--{else}-->
-            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{$disp_name|sfCutString:10:false|h}-->
-        <!--{/if}-->
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/product_rank_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/category_tree_fork.tpl	(revision 22596)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 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.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}-->">
-        <!--{* カテゴリ名表示 *}-->
-        <!--{assign var=disp_name value="`$child.category_id`.`$child.category_name`"}-->
-        <!--{if $child.level != $smarty.const.LEVEL_MAX}-->
-            <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$child.category_id}-->); return false;">
-            <!--{if $arrForm.parent_category_id == $child.category_id}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_open.gif" alt="フォルダ" />
-            <!--{else}-->
-                <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{/if}-->
-            <!--{$disp_name|sfCutString:10:false|h}--></a>
-        <!--{else}-->
-            <img src="<!--{$TPL_URLPATH}-->img/contents/folder_close.gif" alt="フォルダ" />
-            <!--{$disp_name|sfCutString:10:false|h}-->
-        <!--{/if}-->
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/category_tree_fork.tpl" children=$child.children treeID="f`$child.category_id`" display=$disp_child}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl	(revision 22796)
@@ -52,5 +52,5 @@
             <td>
                 <!--{assign var=key value="css_data"}-->
-                <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows="<!--{$area_row}-->" align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+                <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows=<!--{$area_row}--> align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
                 <input type="hidden" name="area_row" value="<!--{$area_row}-->" />
                 <div class="btn">
Index: branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl	(revision 22796)
@@ -60,5 +60,5 @@
     <input type="hidden" name="mode" value="" />
     <input type="hidden" name="division" value="footer" />
-    <input type="hidden" name="footer_row" value="<!--{$footer_row}-->" />
+    <input type="hidden" name="footer_row" value=<!--{$footer_row}--> />
     <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
Index: branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 22796)
@@ -82,5 +82,5 @@
                 <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" value="1" <!--{if $arrForm.footer_chk.value == "1"}-->checked="checked"<!--{/if}--> />共通のフッターを使用する</label>
                 <div>
-                    <textarea id="tpl_data" class="top" name="tpl_data" rows="<!--{$text_row}-->" style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
+                    <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
                     <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /><br />
                     <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#tpl_data', 50, 13); return false;"><span>拡大</span></a>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	(revision 22796)
@@ -72,6 +72,6 @@
             <td class="left"><!--{$tpl.template_name|h}--></td>
             <td class="left">data/Smarty/templates/<!--{$tplcode|h}-->/</td>
-            <td><span class="icon_confirm"><a href="javascript:;" onclick="fnFormModeSubmit('form2', 'download','template_code','<!--{$tplcode}-->');return false;">ダウンロード</a></span></td>
-            <td><span class="icon_delete"><a href="javascript:;" onclick="fnFormModeSubmit('form2', 'delete','template_code','<!--{$tplcode}-->');return false;">削除</a></span></td>
+            <td><span class="icon_confirm"><a href="javascript:;" onClick="fnFormModeSubmit('form2', 'download','template_code','<!--{$tplcode}-->');return false;">ダウンロード</a></span></td>
+            <td><span class="icon_delete"><a href="javascript:;" onClick="fnFormModeSubmit('form2', 'delete','template_code','<!--{$tplcode}-->');return false;">削除</a></span></td>
         </tr>
         <!--{/foreach}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 22796)
@@ -58,5 +58,5 @@
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
             </td>
         </tr>
@@ -66,5 +66,5 @@
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
             </td>
         </tr>
@@ -76,5 +76,5 @@
             <td>
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> />
+                <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->>
             </td>
         </tr>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/status.tpl	(revision 22796)
@@ -23,9 +23,9 @@
 *}-->
 
-<form name="form1" id="form1" method="post" action="?" >
+<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="" />
 <input type="hidden" name="status" value="<!--{if $arrForm.status == ""}-->1<!--{else}--><!--{$arrForm.status}--><!--{/if}-->" />
-<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
+<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" >
 <input type="hidden" name="order_id" value="" />
 <div id="order" class="contents-main">
@@ -58,5 +58,5 @@
             <a class="btn-normal" href="javascript:;" onclick="fnSelectCheckSubmit(); return false;"><span>移動</span></a>
         </div>
-        <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->に変更時には、在庫数を手動で戻してください。</span><br />
+        <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->もしくは、削除に変更時には、在庫数を手動で戻してください。</span><br />
 
         <p class="remark">
@@ -89,5 +89,5 @@
             <!--{assign var=status value="`$arrStatus[cnt].status`"}-->
             <tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
-                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" /></td>
+                <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
                 <td><!--{$arrORDERSTATUS[$status]}--></td>
                 <td><a href="#" onclick="fnOpenWindow('./disp.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrStatus[cnt].order_id}--></a></td>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 22796)
@@ -39,5 +39,5 @@
         var shipping_data = $('input[name^=shipping_name01]').attr('name'); 
         var shipping_slt  = shipping_data.split("shipping_name01");
-
+        
         var shipping_key = "[0]";
         if(shipping_slt.length > 1) {
@@ -82,10 +82,4 @@
     }
 
-    $(document).ready(function() {
-        if(<!--{$arrForm.shipping_quantity.value}--> > 1){
-            $("input[name^='quantity[']").attr("disabled","disabled");
-        }
-    });
-
 //-->
 </script>
@@ -98,5 +92,4 @@
 <input type="hidden" id="add_product_id" name="add_product_id" value="" />
 <input type="hidden" id="add_product_class_id" name="add_product_class_id" value="" />
-<input type="hidden" id="select_shipping_id" name="select_shipping_id" value="" />
 <input type="hidden" id="edit_product_id" name="edit_product_id" value="" />
 <input type="hidden" id="edit_product_class_id" name="edit_product_class_id" value="" />
@@ -120,5 +113,5 @@
         <tr>
             <th>帳票出力</th>
-            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value|h}-->','pdf_input','615','650'); return false;">帳票出力</a></td>
+            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value|h}-->','pdf','615','650'); return false;">帳票出力</a></td>
         </tr>
         <!--{/if}-->
@@ -281,7 +274,5 @@
         受注商品情報
         <a class="btn-normal" href="javascript:;" name="recalculate" onclick="fnModeSubmit('recalculate','anchor_key','order_products');">計算結果の確認</a>
-        <!--{if $arrForm.shipping_quantity.value <= 1}-->
-        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500'); return false;">商品の追加</a>
-        <!--{/if}-->
+        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->', 'search', '615', '500'); return false;">商品の追加</a>
     </h2>
 
@@ -290,5 +281,5 @@
     <!--{/if}-->
 
-    <table class="list order-edit-products">
+    <table class="list" id="order-edit-products">
         <tr>
             <th class="id">商品コード</th>
@@ -312,9 +303,7 @@
                 <input type="hidden" name="classcategory_name2[<!--{$product_index}-->]" value="<!--{$arrForm.classcategory_name2.value[$product_index]|h}-->" id="classcategory_name2_<!--{$product_index}-->" />
                 <br />
-                <!--{if $arrForm.shipping_quantity.value <= 1}-->
-                    <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500'); return false;">変更</a>
-                    <!--{if count($arrForm.quantity.value) > 1}-->
-                        <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$product_index}-->); fnSetFormVal('form1', 'select_shipping_id', '<!--{$top_shipping_id}-->'); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
-                    <!--{/if}-->
+                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->', 'search', '615', '500'); return false;">変更</a>
+                <!--{if count($arrForm.quantity.value) > 1}-->
+                    <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$product_index}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
                 <!--{/if}-->
             <input type="hidden" name="product_type_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_type_id.value[$product_index]|h}-->" id="product_type_id_<!--{$product_index}-->" />
@@ -322,6 +311,4 @@
             <input type="hidden" name="product_class_id[<!--{$product_index}-->]" value="<!--{$arrForm.product_class_id.value[$product_index]|h}-->" id="product_class_id_<!--{$product_index}-->" />
             <input type="hidden" name="point_rate[<!--{$product_index}-->]" value="<!--{$arrForm.point_rate.value[$product_index]|h}-->" id="point_rate_<!--{$product_index}-->" />
-            <input type="hidden" name="tax_rate[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rate.value[$product_index]|h}-->" id="tax_rate_<!--{$product_index}-->" />
-            <input type="hidden" name="tax_rule[<!--{$product_index}-->]" value="<!--{$arrForm.tax_rule.value[$product_index]|h}-->" id="tax_rule_<!--{$product_index}-->" />
             </td>
             <td align="center">
@@ -337,8 +324,6 @@
             <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
             <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
-            <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
-            <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-            <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円(税率<!--{$tax_rate|number_format}-->%)</td>
-            <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+            <td class="right"><!--{$price|sfCalcIncTax|number_format}--> 円</td>
+            <td class="right"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</td>
         </tr>
         <!--{/section}-->
@@ -403,6 +388,4 @@
                 <th colspan="5" class="column right">お誕生日ポイント</th>
                 <td class="right">
-                    <!--{assign var=key value="birth_point"}-->
-                    <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->"/>
                     <!--{$arrForm.birth_point.value|number_format}-->
                     pt
@@ -440,11 +423,9 @@
         <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$key]|default:"0"|h}-->" id="<!--{$key}-->_<!--{$shipping_index}-->" />
         <!--{if $arrForm.shipping_quantity.value > 1}-->
-            <h2>届け先商品情報&nbsp;<a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?order_id=<!--{$arrForm.order_id.value|h}-->&shipping_id=<!--{$shipping_index}-->', 'search', '615', '500'); return false;">商品の追加</a>
-            </h2>
             <!--{assign var=product_quantity value="shipping_product_quantity"}-->
             <input type="hidden" name="<!--{$product_quantity}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$product_quantity]|h}-->" />
 
             <!--{if count($arrShipping.shipment_product_class_id) > 0}-->
-                <table class="list order-edit-products">
+                <table class="list" id="order-edit-products">
                     <tr>
                         <th class="id">商品コード</th>
@@ -472,19 +453,14 @@
                                 <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
                                 <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"(なし)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"(なし)"|h}-->
-                                <br />
-                                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$item_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$shipping_index}-->', 'search', '615', '500'); return false;">変更</a>
-                                <!--{if count($arrForm.quantity.value) > 1}-->
-                                <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$item_index}-->);fnSetFormVal('form1', 'select_shipping_id', <!--{$shipping_index}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
-                                <!--{/if}-->
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
-                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->円
+                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax|number_format}-->円
                                 <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
                             </td>
                             <td class="right">
                                 <!--{assign var=key value="shipment_quantity"}-->
-                                <span class="attention"><!--{$arrErr[$key][$shipping_index][$item_index]}--></span>
-                                <input type="text" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" size="3" class="box3" maxlength="<!--{$arrForm[$key].length}-->" />
+                                <!--{$arrShipping[$key][$item_index]|h}-->
+                                <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
                             </td>
                         </tr>
@@ -492,25 +468,4 @@
                 </table>
             <!--{/if}-->
-        <!--{else}-->
-            <!-- 配送先が１つでも、shipment_itemを更新するために必要 -->
-            <!--{assign var=product_quantity value="shipping_product_quantity"}-->
-            <input type="hidden" name="<!--{$product_quantity}-->[<!--{$shipping_index}-->]" value="<!--{$arrShipping[$product_quantity]|h}-->" />
-            <!--{section name=item loop=$arrShipping.shipment_product_class_id|@count}-->
-                <!--{assign var=item_index value="`$smarty.section.item.index`"}-->
-                        <!--{assign var=key value="shipment_product_class_id"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_product_code"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key1 value="shipment_product_name"}-->
-                        <!--{assign var=key2 value="shipment_classcategory_name1"}-->
-                        <!--{assign var=key3 value="shipment_classcategory_name2"}-->
-                        <input type="hidden" name="<!--{$key1}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key1][$item_index]|h}-->" />
-                        <input type="hidden" name="<!--{$key2}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key2][$item_index]|h}-->" />
-                        <input type="hidden" name="<!--{$key3}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key3][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_price"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-                        <!--{assign var=key value="shipment_quantity"}-->
-                        <input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
-            <!--{/section}-->
         <!--{/if}-->
 
@@ -595,5 +550,5 @@
                     <span class="attention"><!--{$arrErr[$key][$shipping_index]}--></span>
                     <select name="<!--{$key}-->[<!--{$shipping_index}-->]" style="<!--{$arrErr[$key][$shipping_index]|sfGetErrorColor}-->">
-                        <option value="">指定無し</option>
+                        <option value="" selected="0">指定無し</option>
                         <!--{html_options options=$arrDelivTime selected=$arrShipping[$key]}-->
                     </select>
Index: branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	(revision 22572)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	(revision 22796)
@@ -390,15 +390,15 @@
             <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
             <td class="center">
-                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label><br />
-                <a href="./" onclick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','620','650'); return false;"><span class="icon_class">個別出力</span></a>
+                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label><br>
+                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','620','650'); return false;"><span class="icon_class">個別出力</span></a>
             </td>
             <td class="center"><a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_EDIT_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_edit">編集</span></a></td>
             <td class="center">
                 <!--{if $arrResults[cnt].order_email|strlen >= 1}-->
-                    <input type="checkbox" name="mail_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="mail_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="mail_order_id_<!--{$arrResults[cnt].order_id}-->">一括通知</label><br />
+                    <input type="checkbox" name="mail_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="mail_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="mail_order_id_<!--{$arrResults[cnt].order_id}-->">一括通知</label><br>
                     <a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_MAIL_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_mail">個別通知</span></a>
                 <!--{/if}-->
             </td>
-            <td class="center"><a href="?" onclick="fnModeSubmit('delete', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
+            <td class="center"><a href="?" onclick="fnModeSubmit('delete_order', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
         </tr>
         <!--{/section}-->
Index: branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 22796)
@@ -42,5 +42,5 @@
 <input type="hidden" name="mode" value="confirm" />
 <!--{foreach from=$arrForm.order_id item=order_id}-->
-    <input type="hidden" name="order_id[]" value="<!--{$order_id|h}-->" />
+    <input type="hidden" name="order_id[]" value="<!--{$order_id|h}-->">
 <!--{/foreach}-->
 
Index: branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 22218)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 22796)
@@ -141,8 +141,6 @@
                 <!--{assign var=price value=`$arrForm.price.value[$product_index]`}-->
                 <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}-->
-                <!--{assign var=tax_rate value=`$arrForm.tax_rate.value[$product_index]`}-->
-                <!--{assign var=tax_rule value=`$arrForm.tax_rule.value[$product_index]`}-->
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|number_format}--> 円(税率<!--{$tax_rate|number_format}-->%)</td>
-                <td class="right"><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+                <td class="right"><!--{$price|sfCalcIncTax|number_format}--> 円</td>
+                <td class="right"><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</td>
         </tr>
         <!--{/section}-->
@@ -221,5 +219,5 @@
                             <td class="right">
                                 <!--{assign var=key value="shipment_price"}-->
-                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->円
+                                <!--{$arrShipping[$key][$item_index]|sfCalcIncTax|number_format}-->円
                             </td>
                             <td class="right">
Index: branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 22571)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 22796)
@@ -37,10 +37,8 @@
         var class1_id = document.getElementById(class1).value;
         var class2_id = document.getElementById(class2).value;
-
         var product_class_id = document.getElementById("product_class_id" + product_id).value;
         var opner_product_id = 'add_product_id';
         var opner_product_class_id = 'add_product_class_id';
         var tpl_no = '<!--{$tpl_no}-->';
-        var shipping_id = '<!--{$shipping_id}-->';
 
         if (tpl_no != '') {
@@ -49,7 +47,4 @@
             fm1.getElementById("no").value = escape('<!--{$tpl_no}-->');
         }
-        if (shipping_id != '') {
-            fm1.getElementById("select_shipping_id").value = escape('<!--{$shipping_id}-->');
-        }
         if (document.getElementById(class1).type == 'select-one' && class1_id == '__unselected') {
             err_text = class_name1 + "を選択してください。\n";
@@ -58,13 +53,4 @@
             err_text = err_text + class_name2 + "を選択してください。\n";
         }
-
-        if(!class1_id){
-            err_text = productsClassCategories[product_id]['__unselected2']['#0']['stock_find'] ? '' : '只今品切れ中です';
-        }else if(class1_id && !class2_id){
-            err_text = productsClassCategories[product_id][class1_id]['#0']['stock_find'] ? '' : '只今品切れ中です';
-        }else{
-            err_text = productsClassCategories[product_id][class1_id]['#' + class2_id]['stock_find'] ? '' : '只今品切れ中です';
-        }
-
         if (err_text != '') {
             alert(err_text);
@@ -140,5 +126,4 @@
 <input name="anchor_key" type="hidden" value="" />
 <input name="search_pageno" type="hidden" value="" />
-<input name="shipping_id" type="hidden" value="<!--{$shipping_id}-->" />
 <input name="no" type="hidden" value="<!--{$tpl_no|h}-->" />
 <table class="form">
@@ -191,4 +176,5 @@
             <!--{assign var=id value=$arrProducts[cnt].product_id}-->
             <form name="product_form<!--{$id|h}-->" action="?" onsubmit="return false;">
+                <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                 <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
                 <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
@@ -198,5 +184,4 @@
                     </td>
                     <td>
-                        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
                         <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->
                         <!--{assign var=codemax value=`$arrProducts[cnt].product_code_max`}-->
@@ -209,42 +194,40 @@
                     </td>
                     <td>
-                    <!--{$arrProducts[cnt].name|h}-->
-                    <!--{assign var=class1 value=classcategory_id`$id`_1}-->
-                    <!--{assign var=class2 value=classcategory_id`$id`_2}-->
-                    <!--{if $tpl_classcat_find1[$id]}-->
-                    <dl>
-                        <dt><!--{$tpl_class_name1[$id]|h}-->：</dt>
-                        <dd>
-                            <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
-                                <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
-                            </select>
-                            <!--{if $arrErr[$class1] != ""}-->
-                            <br /><span class="attention">※ <!--{$tpl_class_name1[$id]}-->を入力して下さい。</span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-                    <!--{else}-->
-                    <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
-                    <!--{/if}-->
-
-                    <!--{if $tpl_classcat_find2[$id]}-->
-                    <dl>
-                        <dt><!--{$tpl_class_name2[$id]|h}-->：</dt>
-                        <dd>
-                            <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
-                            <!--{if $arrErr[$class2] != ""}-->
-                            <br /><span class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</span>
-                            <!--{/if}-->
-                        </dd>
-                    </dl>
-                    <!--{else}-->
-                    <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
-                    <!--{/if}-->
-                    <!--{if !$tpl_stock_find[$id]}-->
-                        <div class="attention">只今品切れ中です。</div>
-                    <!--{/if}-->
-                    <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
-                    <input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                    <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
+                        <!--{$arrProducts[cnt].name|h}-->
+
+                        <!--{assign var=class1 value=classcategory_id`$id`_1}-->
+                        <!--{assign var=class2 value=classcategory_id`$id`_2}-->
+                        <!--{if $tpl_classcat_find1[$id]}-->
+                        <dl>
+                            <dt><!--{$tpl_class_name1[$id]|h}-->：</dt>
+                            <dd>
+                                <select name="classcategory_id1" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"    onchange="fnSetClassCategories(this.form);">
+                                    <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
+                                </select>
+                                <!--{if $arrErr[$class1] != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name1[$id]}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </dd>
+                        </dl>
+                        <!--{else}-->
+                        <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
+                        <!--{/if}-->
+
+                        <!--{if $tpl_classcat_find2[$id]}-->
+                        <dl>
+                            <dt><!--{$tpl_class_name2[$id]|h}-->：</dt>
+                            <dd>
+                                <select name="classcategory_id2" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->" onchange="fnCheckStock(this.form);"></select>
+                                <!--{if $arrErr[$class2] != ""}-->
+                                <br /><span class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</span>
+                                <!--{/if}-->
+                            </dd>
+                        </dl>
+                        <!--{else}-->
+                        <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
+                        <!--{/if}-->
+                        <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
+                        <input type="hidden" name="product_class_id<!--{$id|h}-->" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
+                        <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
                     </td>
                     <td class="center"><a href="javascript:;" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->'); return false;">決定</a></td>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22563)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/index.tpl	(revision 22796)
@@ -102,6 +102,4 @@
     var url = "<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php";
     var statusImagePath = "<!--{$TPL_URLPATH}-->";
-    var arrPayment = <!--{$json_payment}-->
-    var arrCustomerOrderStatus = <!--{$json_customer_order_status}-->
 
     function getHistory(limit) {
@@ -136,26 +134,15 @@
                         historyEl = $(historyEl).clone(true).insertAfter(historyEl);
                         maxCnt++;
-                        
-                        var regex = new RegExp('([0-9]{2,4}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).([0-9]{1,2}).');
-                        var matches = history.create_date.match(regex);
-                        var formatted_date = history.create_date;
-                        if(matches != null){
-                            formatted_date = matches[1]+'/'+matches[2]+'/'+matches[3]+' '+matches[4]+':'+matches[5];
-                        }
-                        
-                        var formatted_payment_total = history.payment_total.toString().replace(/([0-9]+?)(?=(?:[0-9]{3})+$)/g , '$1,');
 
                         //注文番号をセット
                         $($(".arrowBox span.order_id").get(maxCnt)).text(history.order_id);
                         //購入日時をセット
-                        $($(".arrowBox span.create_date").get(maxCnt)).text(formatted_date);
+                        $($(".arrowBox span.create_date").get(maxCnt)).text(history.create_date);
                         //支払い方法をセット
-                        $($(".arrowBox span.payment_id").get(maxCnt)).text(arrPayment[history.payment_id]);
+                        $($(".arrowBox span.payment_id").get(maxCnt)).text(history.payment_id);
                         //合計金額をセット
-                        $($(".arrowBox span.payment_total").get(maxCnt)).text(formatted_payment_total);
+                        $($(".arrowBox span.payment_total").get(maxCnt)).text(history.payment_total);
                         //履歴URLをセット
                         $($(".arrowBox a").get(maxCnt)).attr("href", url + "?order_id=" + history.order_id);
-                        //注文状況をセット
-                        $($(".arrowBox span.order_status").get(maxCnt)).text(arrCustomerOrderStatus[history.status]);
                     }
                 }
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 22796)
@@ -25,5 +25,5 @@
 <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`popup_header.tpl" subtitle="新しいお届け先の追加・変更"}-->
 
-<section>
+<section id="windowcolumn">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
 
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 22499)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 22796)
@@ -159,12 +159,12 @@
                         //販売価格が範囲か判定
                         if (product.price02_min == product.price02_max) {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_inctax_format + '円';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_tax_format + '円';
                         } else {
-                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_inctax_format + '～' + product.price02_max_inctax_format + '円';
+                            priceVale = "<!--{$smarty.const.SALE_PRICE_TITLE}-->：" + product.price02_min_tax_format + '～' + product.price02_max_tax_format + '円';
                         }
                         price.append(priceVale);
 
                         //削除ボタンをセット
-                        $($(".favoriteBox p.btn_delete img").get(maxCnt)).attr("onclick", "javascript:fnModeSubmit('delete_favorite','product_id','" + product.product_id + "');");
+                        $($(".favoriteBox p.btn_delete a").get(maxCnt)).attr("href", "javascript:fnModeSubmit('delete_favorite','product_id','" + product.product_id + "');");
 
                     }
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 22601)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 22796)
@@ -35,4 +35,12 @@
                 <em>購入日時</em>：&nbsp;<!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
                 <em>お支払い方法</em>：&nbsp;<!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <!--{if $tpl_arrOrderData.deliv_time_id != ""}-->
+                    <br />
+                    <em>お届け時間</em>：&nbsp;</strong><!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+                <!--{/if}-->
+                <!--{if $tpl_arrOrderData.deliv_date != ""}-->
+                    <br />
+                    <em>お届け日</em>：&nbsp;</strong><!--{$tpl_arrOrderData.deliv_date|h}-->
+                <!--{/if}-->
             </p>
 
@@ -43,43 +51,4 @@
             </form>
         </div>
-        <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
-            <h3>お届け先<!--{if $isMultiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-        <div class="historyBox">	
-        <p>
-            <!--{if $isMultiple}-->
-                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                        <em>商品コード：&nbsp;</em><!--{$item.productsClass.product_code|h}--><br />
-                        <em>商品名：&nbsp;</em>
-                                <!--{$item.productsClass.name|h}--><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}--><br />
-                                <!--{/if}-->
-                        
-                        <em>単価：&nbsp;</em><!--{$item.price|sfCalcIncTax:$tpl_arrOrderData.order_tax_rate:$tpl_arrOrderData.order_tax_rule|number_format}-->円<br />
-                        <em>数量：&nbsp;</em><!--{$item.quantity}--><br />
-                        <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                        <em>小計</em><!--{$item.total_inctax|number_format}-->円
-                        *}-->
-                        <br />
-                    <!--{/foreach}-->
-            <!--{/if}-->
-
-            <em>お名前</em>：&nbsp;<!--{$shippingItem.shipping_name01|h}-->&nbsp;<!--{$shippingItem.shipping_name02|h}--><br />
-            <em>お名前(フリガナ)</em>：&nbsp;<!--{$shippingItem.shipping_kana01|h}-->&nbsp;<!--{$shippingItem.shipping_kana02|h}--><br />
-            <em>郵便番号</em>：&nbsp;〒<!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--><br />
-            <em>住所</em>：&nbsp;<!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--><br />
-            <em>電話番号</em>：&nbsp;<!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--><br />
-                            <!--{if $shippingItem.shipping_fax01 > 0}-->
-            <em>FAX番号</em>：&nbsp;<!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}--><br />
-                            <!--{/if}-->            
-            <em>お届け日</em>：&nbsp;<!--{$shippingItem.shipping_date|default:'指定なし'|h}--><br />
-            <em>お届け時間</em>：&nbsp;<!--{$shippingItem.shipping_time|default:'指定なし'|h}--><br />
-</p>
-</div>
-
-        <!--{/foreach}-->
 
         <div class="formBox">
@@ -117,9 +86,8 @@
                                 <!--←商品種別-->
                             </div>
-                            <!--{assign var=tax_rate value=`$orderDetail.tax_rate`}-->
-                            <!--{assign var=tax_rule value=`$orderDetail.tax_rule`}-->
+
                             <ul>
                                 <li><span class="mini">数量：</span><!--{$quantity|h}--></li>
-                                <li class="result"><span class="mini">小計：</span><!--{$price|sfCalcIncTax:$tax_rate:$tax_rule|sfMultiply:$quantity|number_format}-->円</li>
+                                <li class="result"><span class="mini">小計：</span><!--{$price|sfCalcIncTax|sfMultiply:$quantity|number_format}-->円</li>
                             </ul>
                         </div>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/change_confirm.tpl	(revision 22796)
@@ -111,5 +111,5 @@
         <div class="btn_area">
             <ul class="btn_btm">
-                <li><input type="submit" value="完了ページへ" class="btn data-role-none" name="complete" id="complete" /></li>
+                <li><input type="submit" value="完了ページへ" class="btn data-role-none" alt="完了ページへ" name="complete" id="complete" /></li>
                 <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">戻る</a></li>
             </ul>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/multiple.tpl	(revision 22796)
@@ -70,5 +70,5 @@
                             </p>
                             <ul>
-                                <li class="result"><span class="mini">数量</span></li>
+                                <li class="result"><span class="mini">数量</li>
                                 <li>
                                     <input type="number" name="<!--{$key}-->[<!--{$index}-->]" class="cartin_quantity txt" value="<!--{$arrForm[$key].value[$index]}-->" max="9" style="" />
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 22458)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 22796)
@@ -169,5 +169,6 @@
 
         <!--★お届け先の確認★-->
-        <!--{if $arrShipping}-->
+        <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け先を表示しない） *}-->
+        <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
             <section class="delivconfirm_area">
                 <h3 class="subtitle">お届け先</h3>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 22523)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 22796)
@@ -205,9 +205,8 @@
                                     <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="boxLong top data-role-none">
                                         <option value="" selected="">お届け日：指定なし</option>
-                                        <!--{assign var=shipping_date_value value=$arrForm[$key].value|default:$shippingItem.shipping_date}-->
-                                        <!--{html_options options=$arrDelivDate selected=$shipping_date_value}-->
+                                        <!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
                                     </select>
                                 <!--{/if}-->
-                                
+
                                 <!--★お届け時間★-->
                                 <!--{assign var=key value="deliv_time_id`$index`"}-->
@@ -215,6 +214,5 @@
                                 <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="boxLong data-role-none">
                                     <option value="" selected="">お届け時間：指定なし</option>
-                                    <!--{assign var=shipping_time_value value=$arrForm[$key].value|default:$shippingItem.time_id}-->
-                                    <!--{html_options options=$arrDelivTime selected=$shipping_time_value}-->
+                                    <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
                                 </select>
                             </div>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 22796)
@@ -125,5 +125,5 @@
                                             <li class="quantity"><span class="mini">数量:</span><!--{$arrItem.quantity|number_format}--></li>
                                             <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.png" width="22" height="21" alt="＋" onclick="fnFormModeSubmit('form<!--{$key}-->', 'up','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></li>
-                                            <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></li>
+                                            <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$arrItem.cart_no}-->'); return false" /></a></li>
                                             <li class="result"><span class="mini">小計：</span><!--{$arrItem.total_inctax|number_format}-->円</li>
                                         </ul>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl	(revision 22796)
@@ -62,5 +62,5 @@
                     value="<!--{$arrForm.kana01.value|default:$arrData.kana01|h}-->"
                     maxlength="<!--{$smarty.const.STEXT_LEN}-->"
-                    style="<!--{$arrErr.kana01|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="セイ"/>&nbsp;&nbsp;
+                    style="<!--{$arrErr.kana01|sfGetErrorColor}-->"class="boxHarf text data-role-none" placeholder="セイ"/>&nbsp;&nbsp;
                 <input type="text" name="kana02"
                     value="<!--{$arrForm.kana02.value|default:$arrData.kana02|h}-->"
@@ -93,5 +93,5 @@
                 <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
                 <select name="pref" style="<!--{$arrErr.pref|sfGetErrorColor}-->" class="boxHarf top data-role-none">
-                    <option value="">都道府県</option>
+                    <option value="" selected="selected">都道府県</option>
                     <!--{html_options options=$arrPref selected=$arrForm.pref.value|default:$arrData.pref|h}-->
                 </select>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl	(revision 22438)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/forgot/index.tpl	(revision 22796)
@@ -47,9 +47,8 @@
             <p>
                 メールアドレス<br />
-                <span class="attention"><!--{$arrErr.email}--></span>
                 <input type="email" name="email"
                 value="<!--{$tpl_login_email|h}-->"
-                style="<!--{$arrErr.email|sfGetErrorColor}-->; ime-mode: disabled;"
-                maxlength="200" class="text boxLong data-role-none" />
+                style="<!--{$errmsg|sfGetErrorColor}-->; ime-mode: disabled;"
+                maxlength="200" class="boxLong data-role-none" />
             </p>
             <span class="attention"><!--{$errmsg}--></span>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	(revision 22494)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	(revision 22796)
@@ -34,5 +34,5 @@
                             <p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
                             <p class="sale_price">
-                                <span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> 円</span>
+                                <span class="mini">販売価格(税込):</span><span class="price"><!--{$arrBestProducts[cnt].price02_min_inctax|number_format}--> 円</span>
                             </p>
                         </div>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	(revision 22583)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl	(revision 22796)
@@ -29,5 +29,5 @@
                 <a id="windowcolumn<!--{$smarty.section.data.index}-->" href="javascript:getNewsDetail(<!--{$arrNews[data].news_id}-->);">
                 <span class="news_title"><!--{$arrNews[data].news_title|h}--></span></a><br />
-                <span class="news_date"><!--{$arrNews[data].cast_news_date|date_format:"%Y年 %m月 %d日"}--></span>
+                <span class="news_date"><!--{$arrNews[data].news_date_disp|date_format:"%Y年 %m月 %d日"}--></span>
             </li>
         <!--{/section}-->
@@ -79,5 +79,5 @@
 
                             //年月をセット
-                            var newsDateDispArray = news.cast_news_date.split("-"); //ハイフンで年月日を分解
+                            var newsDateDispArray = news.news_date_disp.split("-"); //ハイフンで年月日を分解
                             var newsDateDisp = newsDateDispArray[0] + "年 " + newsDateDispArray[1] + "月 " + newsDateDispArray[2] + "日";
                             $($("#news_area ul.newslist li span.news_date").get(maxCnt)).text(newsDateDisp);
@@ -134,5 +134,5 @@
 
                         //年月をセット
-                        //var newsDateDispArray = news.cast_news_date.split("-"); //ハイフンで年月日を分解
+                        //var newsDateDispArray = news.news_date_disp.split("-"); //ハイフンで年月日を分解
                         //var newsDateDisp = newsDateDispArray[0] + "年 " + newsDateDispArray[1] + "月 " + newsDateDispArray[2] + "日";
                         //$($("#windowcolumn dl.view_detail dt").get(maxCnt)).text(newsDateDisp);
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 22602)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category.tpl	(revision 22796)
@@ -25,7 +25,53 @@
     <h2 class="title_block">商品カテゴリ</h2>
     <nav id="categorytree">
-        <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$arrTree treeID="categorytreelist" display=1 level=0}-->
+        <ul id="categorytreelist">
+            <!--{assign var=preLev value=1}-->
+            <!--{assign var=firstdone value=0}-->
+            <!--{section name=cnt loop=$arrTree}-->
+                <!--{* インデントは Smarty 構文を優先としています。 *}-->
+                <!--{* カテゴリ表示・非表示切り替え *}-->
+                <!--{if $arrTree[cnt].view_flg != "2"}-->
+                    <!--{* 表示フラグがTRUEなら表示 *}-->
+                    <!--{assign var=level value=`$arrTree[cnt].level`}-->
+                    <!--{* level2以下なら表示（level指定可能） *}-->
+                    <!--{if $level <= 5 || $arrTree[cnt].display == 1}-->
+                        <!--{assign var=levdiff value=`$level-$preLev`}-->
+                        <!--{if $levdiff > 0}-->
+                            <ul>
+                        <!--{elseif $levdiff == 0 && $firstdone == 1}-->
+                            </li>
+                        <!--{elseif $levdiff < 0}-->
+                            <!--{section name=d loop=`$levdiff*-1`}-->
+                                    </li>
+                                </ul>
+                            <!--{/section}-->
+                            </li>
+                        <!--{/if}-->
+
+                        <li class="level<!--{$level}--><!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> onmark<!--{/if}-->"><span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$arrTree[cnt].category_id}-->"<!--{if in_array($arrTree[cnt].category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$arrTree[cnt].category_name|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a></span>
+                        <!--{if $firstdone == 0}-->
+                            <!--{assign var=firstdone value=1}-->
+                        <!--{/if}-->
+                        <!--{assign var=preLev value=`$level`}-->
+                    <!--{/if}-->
+
+                    <!--{* セクションの最後に閉じタグを追加 *}-->
+                    <!--{if $smarty.section.cnt.last}-->
+                        <!--{if $preLev-1 > 0}-->
+                            <!--{section name=d loop=`$preLev-1`}-->
+                                    </li>
+                                </ul>
+                            <!--{/section}-->
+                            </li>
+                        <!--{else}-->
+                            </li>
+                        <!--{/if}-->
+                    <!--{/if}-->
+                <!--{/if}-->
+            <!--{/section}-->
+        </ul>
 
         <script>//<![CDATA[
+            initCategoryList(); //カテゴリリストの初期化
         //]]></script>
     </nav>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/category_tree_fork.tpl	(revision 22602)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2013 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.
- *}-->
-
-<ul<!--{if $treeID != ""}--> id="<!--{$treeID}-->"<!--{/if}--><!--{if $level > 5 || !$display}--> style="display: none;"<!--{/if}-->>
-<!--{foreach from=$children item=child}-->
-    <li class="level<!--{$child.level}--><!--{if in_array($child.category_id, $tpl_category_id)}--> onmark<!--{/if}-->">
-        <span class="category_header"></span><span class="category_body"><a rel="external" href="<!--{$smarty.const.ROOT_URLPATH}-->products/list.php?category_id=<!--{$child.category_id}-->"<!--{if in_array($child.category_id, $tpl_category_id)}--> class="onlink"<!--{/if}-->><!--{$child.category_name|h}-->(<!--{$child.product_count|default:0}-->)</a></span>
-        <!--{if in_array($child.category_id, $arrParentID)}-->
-            <!--{assign var=disp_child value=1}-->
-        <!--{else}-->
-            <!--{assign var=disp_child value=0}-->
-        <!--{/if}-->
-        <!--{if isset($child.children|smarty:nodefaults)}-->
-            <!--{include file="`$smarty.const.SMARTPHONE_TEMPLATE_REALDIR`frontparts/bloc/category_tree_fork.tpl" children=$child.children treeID="" display=$disp_child level=$child.level}-->
-        <!--{/if}-->
-    </li>
-<!--{/foreach}-->
-</ul>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl	(revision 22796)
@@ -65,5 +65,5 @@
     <!--{/if}-->
     <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" class="boxHarf top data-role-none">
-        <option value="">都道府県</option>
+        <option value="" selected="selected">都道府県</option>
         <!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
     </select>
@@ -128,6 +128,6 @@
         <!--{/if}-->
         <span style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
-            <input type="radio" id="man" name="<!--{$key1}-->" value="1" <!--{if $arrForm[$key1] eq 1}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="man">男性</label>&nbsp;&nbsp;
-            <input type="radio" id="woman" name="<!--{$key1}-->" value="2" <!--{if $arrForm[$key1] eq 2}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="woman">女性</label>
+            <p><input type="radio" id="man" name="<!--{$key1}-->" value="1" <!--{if $arrForm[$key1] eq 1}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="man">男性</label>&nbsp;&nbsp;
+            <input type="radio" id="woman" name="<!--{$key1}-->" value="2" <!--{if $arrForm[$key1] eq 2}--> checked="checked" <!--{/if}--> class="data-role-none" /><label for="woman">女性</label></p>
         </span>
     </dd>
@@ -140,5 +140,5 @@
         <!--{/if}-->
         <select name="<!--{$key1}-->" class="boxLong data-role-none">
-            <option value="">選択してください</option>
+            <option value="" selected="selected">選択してください</option>
             <!--{html_options options=$arrJob selected=$arrForm[$key1]}-->
         </select>
@@ -179,5 +179,5 @@
             <!--{/if}-->
             <select name="reminder" style="<!--{$arrErr.reminder|sfGetErrorColor}-->" class="boxLong top data-role-none">
-                <option value="">質問を選択してください</option>
+                <option value="" selected="selected">質問を選択してください</option>
                 <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
             </select>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl	(revision 22796)
@@ -79,5 +79,5 @@
         </table>
         <div class="btn_area">
-                <p><input type="submit" value="次へ" class="btn data-role-none" name="next" id="next" /></p>
+                <p><input type="submit" value="次へ" class="btn data-role-none" alt="次へ" name="next" id="next" /></p>
             </div>
     </form>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 22796)
@@ -210,14 +210,4 @@
                     <!--{/if}-->
 
-                    <!--▼メーカー-->
-                    <!--{if $arrProduct.maker_name|strlen >= 1}-->
-                        <p class="maker">
-                            <span class="mini">メーカー：</span><span>
-                                <!--{$arrProduct.maker_name|h}-->
-                            </span>
-                        </p>
-                    <!--{/if}-->
-                    <!--▲メーカー-->
-
                     <!--▼メーカーURL-->
                     <!--{if $arrProduct.comment1|strlen >= 1}-->
@@ -370,5 +360,5 @@
                 <!--{if count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
                     <!--★新規コメントを書き込む★-->
-                    <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub">新規コメントを書き込む</a>
+                    <a href="./review.php?product_id=<!--{$arrProduct.product_id}-->" target="_blank" class="btn_sub" />新規コメントを書き込む</a>
                 <!--{/if}-->
             </div>
@@ -387,5 +377,5 @@
             <!--{/if}-->
         </div>
-    
+    </div>
     <!--お客様の声ここまで-->
 
@@ -424,5 +414,5 @@
 
     <div class="btn_area">
-        <p><a href="javascript:void(0);" class="btn_more" data-rel="back">戻る</a></p>
+        <p><a href="javascript:void(0);" class="btn_more" data-rel="back">商品一覧に戻る</a></p>
     </div>
 </section>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	(revision 22494)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	(revision 22796)
@@ -95,5 +95,5 @@
                 <!--★商品価格★-->
                 <p>
-                    <span class="pricebox sale_price"><span class="mini"><!--{$smarty.const.SALE_PRICE_TITLE|h}-->(税込):</span></span>
+                    <span class="pricebox sale_price"><span class="mini">販売価格(税込):</span></span>
                     <span class="price">
                         <span id="price02_default_<!--{$id}-->">
@@ -207,7 +207,7 @@
                     //販売価格が範囲か判定
                     if (product.price02_min == product.price02_max) {
-                        priceVale = product.price02_min_inctax_format + '円';
+                        priceVale = product.price02_min_tax_format + '円';
                     } else {
-                        priceVale = product.price02_min_inctax_format + '～' + product.price02_max_inctax_format + '円';
+                        priceVale = product.price02_min_tax_format + '～' + product.price02_max_tax_format + '円';
                     }
                     price.append(priceVale);
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/review_confirm.tpl	(revision 22796)
@@ -65,5 +65,5 @@
         <div class="btn_area">
             <ul class="btn_btm">
-                <li><input type="submit" value="完了ページへ" class="btn data-role-none" name="complete" id="complete" /></li>
+                <li><input type="submit" value="完了ページへ" class="btn data-role-none" alt="完了ページへ" name="complete" id="complete" /></li>
                 <li><a class="btn_back" href="Javascript:fnModeSubmit('return', '', '');" rel="external">戻る</a></li>
             </ul>
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl	(revision 22363)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/site_main.tpl	(revision 22796)
@@ -21,5 +21,5 @@
  *}-->
 
-<body class="<!--{$tpl_page_class_name|h}-->">
+<body>
     <div data-role="page" data-keep-native=".data-role-none" data-theme="f">
 
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl	(revision 22574)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/popup_header.tpl	(revision 22796)
@@ -29,4 +29,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0" />
     <meta name="format-detection" content="telephone=no">
+    <meta http-equiv="Content-Script-Type" content="text/javascript" />
+    <meta http-equiv="Content-Style-Type" content="text/css" />
     <!--{* 共通CSS *}-->
     <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->css/import.css" />
Index: branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 22363)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/site_frame.tpl	(revision 22796)
@@ -22,5 +22,5 @@
  *}-->
 
-<html lang="ja">
+<html lang="ja" class="<!--{$tpl_page_class_name|h}-->">
     <head>
         <meta charset="UTF-8">
