Index: /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/search_zero.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/search_zero.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/search_zero.tpl	(revision 21535)
@@ -21,7 +21,7 @@
  *}-->
 <!--{* 検索該当0件 *}-->
-    <div id="undercolumn_error"> 
-        <div class="message_area"> 
-            <!--★エラーメッセージ--> 
+    <div id="undercolumn_error">
+        <div class="message_area">
+            <!--★エラーメッセージ-->
             <p class="error">
             <!--{if $smarty.get.mode == "search"}-->
@@ -31,5 +31,5 @@
                 現在、商品はございません。
             <!--{/if}-->
-            </p> 
-        </div> 
+            </p>
+        </div>
     </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl	(revision 20941)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl	(revision 21535)
@@ -12,12 +12,14 @@
             .focus(function() {
                 if ($(this).val() == 'メールアドレス') {
-                    $(this).val('')
-                           .css('color', '#000');
+                    $(this)
+                        .val('')
+                        .css('color', '#000');
                 }
             })
             .blur(function() {
                 if (!$(this).val()) {
-                    $(this).val('メールアドレス')
-                           .css('color', '#AAA');
+                    $(this)
+                        .val('メールアドレス')
+                        .css('color', '#AAA');
                 }
             });
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 21348)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/products/detail.tpl	(revision 21535)
@@ -1,2 +1,3 @@
+**<!--{$arrErr|@var_dump}-->
 <!--{*
  * This file is part of EC-CUBE
@@ -270,5 +271,5 @@
                             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")});
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 21341)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/products/list.tpl	(revision 21535)
@@ -161,5 +161,5 @@
                 <!--{if count($productStatus[$id]) > 0}-->
                     <ul class="status_icon clearfix">
-                        <!--{foreach from=$productStatus[$id] item=status}--> 
+                        <!--{foreach from=$productStatus[$id] item=status}-->
                             <li>
                                 <img src="<!--{$TPL_URLPATH}--><!--{$arrSTATUS_IMAGE[$status]}-->" width="60" height="17" alt="<!--{$arrSTATUS[$status]}-->"/>
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 20809)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/site_main.tpl	(revision 21535)
@@ -97,5 +97,5 @@
 
         <!--{* ▼CENTER COLUMN *}-->
-        <div 
+        <div
             <!--{if $tpl_column_num == 3}-->
                 id="three_maincolumn"
Index: /branches/version-2_12-dev/data/Smarty/templates/default/shopping/multiple.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/shopping/multiple.tpl	(revision 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/shopping/multiple.tpl	(revision 21535)
@@ -85,6 +85,6 @@
                         <td>
                             <!--{assign var=key value="quantity"}-->
-                            <!--{if $arrErr[$key][$index] != ''}--> 
-                                <span class="attention"><!--{$arrErr[$key][$index]}--></span> 
+                            <!--{if $arrErr[$key][$index] != ''}-->
+                                <span class="attention"><!--{$arrErr[$key][$index]}--></span>
                             <!--{/if}-->
                             <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]}-->" class="box40" style="<!--{$arrErr[$key][$index]|sfGetErrorColor}-->" />
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 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 21535)
@@ -65,5 +65,5 @@
                 <li>
                     <input type="image" onclick="return fnCheckSubmit();" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_next_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_next.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_next.jpg" alt="次へ" name="next-top" id="next-top" />
-                </li> 
+                </li>
                     <!--{else}-->
                 <li>
Index: /branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 21535)
@@ -50,5 +50,5 @@
                         payment_tbody.empty();
                         for (var i in data.arrPayment) {
-                            // ラジオボタン 
+                            // ラジオボタン
                             <!--{* IE7未満対応のため name と id をベタ書きする *}-->
                             var radio = $('<input type="radio" name="payment_id" id="pay_' + i + '" />')
Index: /branches/version-2_12-dev/data/Smarty/templates/default/guide/privacy.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/default/guide/privacy.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/default/guide/privacy.tpl	(revision 21535)
@@ -32,5 +32,5 @@
         <p class="message">個人情報の定義</p>
         <p>お客さま個人に関する情報(以下「個人情報」といいます)であって、お客さまのお名前、住所、電話番号など当該お客さま個人を識別することができる情報をさします。他の情報と組み合わせて照合することにより個人を識別することができる情報も含まれます。</p>
-        
+
     </div>
 </div>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/cart/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 20954)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/cart/index.tpl	(revision 21535)
@@ -40,5 +40,5 @@
 <!--{foreach from=$cartKeys item=key}-->
 <form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="?"  utn>
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <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="">
@@ -93,5 +93,5 @@
     <br>
 	<!--{/if}-->
-    
+
 	<center><input type="submit" value="注文する"></center>
 </form>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/forgot/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/forgot/index.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/forgot/index.tpl	(revision 21535)
@@ -51,6 +51,6 @@
 <br>
 お名前：<font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font><br>
- 姓<input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- 名<input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+姓<input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+名<input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
 
 <br>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/forgot/secret.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/forgot/secret.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/forgot/secret.tpl	(revision 21535)
@@ -33,9 +33,9 @@
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 <input type="hidden" name="mode" value="secret_check">
-      <!--{foreach key=key item=item from=$arrForm}-->
+    <!--{foreach key=key item=item from=$arrForm}-->
         <!--{if $key ne 'reminder_answer'}-->
-      <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
+            <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
         <!--{/if}-->
-      <!--{/foreach}-->
+    <!--{/foreach}-->
 
 <!--{$arrReminder[$arrForm.reminder]|h}-->：<input type="text" name="reminder_answer" value="" size="40"><br>
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 20987)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/entry/index.tpl	(revision 21535)
@@ -102,5 +102,5 @@
 	<font color="#FF0000"><!--{$arrErr.email}--></font>
 	<input type="text" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">
-  <br>
+    <br>
 
 	●パスワード<font color="#FF0000"> *</font><br>
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 21288)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_item.tpl	(revision 21535)
@@ -29,5 +29,5 @@
 <!--{/if}-->
 <form method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 	<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">
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find1.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find1.tpl	(revision 20941)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find1.tpl	(revision 21535)
@@ -29,5 +29,5 @@
 <!--{/if}-->
 <form method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 	<select name="classcategory_id1">
 		<option value="">選択してください</option>
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 20941)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/select_find2.tpl	(revision 21535)
@@ -29,5 +29,5 @@
 <!--{/if}-->
 <form method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 	<select name="classcategory_id2">
 		<option value="">選択してください</option>
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 20976)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/products/detail.tpl	(revision 21535)
@@ -34,14 +34,14 @@
 <!--{if $subImageFlag == true}-->
 <br>画像
-  <!--{if ($smarty.get.image == "" || $smarty.get.image == "main_image")}-->
+    <!--{if ($smarty.get.image == "" || $smarty.get.image == "main_image")}-->
 [1]
-  <!--{else}-->
+    <!--{else}-->
 [<a href="?product_id=<!--{$smarty.get.product_id}-->&amp;image=main_image">1</a>]
-  <!--{/if}-->
-  
-  <!--{assign var=num value="2"}-->
-  <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
-  <!--{assign var=key value="sub_image`$smarty.section.cnt.iteration`"}-->
-  <!--{if $arrFile[$key].filepath != ""}-->
+    <!--{/if}-->
+
+    <!--{assign var=num value="2"}-->
+    <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
+    <!--{assign var=key value="sub_image`$smarty.section.cnt.iteration`"}-->
+    <!--{if $arrFile[$key].filepath != ""}-->
     <!--{if $key == $smarty.get.image}-->
 [<!--{$num}-->]
@@ -50,6 +50,6 @@
     <!--{/if}-->
     <!--{assign var=num value="`$num+1`"}-->
-  <!--{/if}-->
-  <!--{/section}-->
+    <!--{/if}-->
+    <!--{/section}-->
 <br>
 <!--{/if}-->
@@ -125,5 +125,5 @@
 <form name="form1" method="post" action="?">
 	<input type="hidden" name="mode" value="select">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 
 	<input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/site_main.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/site_main.tpl	(revision 20930)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/site_main.tpl	(revision 21535)
@@ -72,5 +72,5 @@
         <!-- ▼<!--{$MainHeadItem.bloc_name}--> -->
         <!--{if $MainHeadItem.php_path != ""}-->
-           <!--{include_php file=$MainHeadItem.php_path items=$MainHeadItem}-->
+            <!--{include_php file=$MainHeadItem.php_path items=$MainHeadItem}-->
         <!--{else}-->
             <!--{include file=$MainHeadItem.tpl_path items=$MainHeadItem}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl	(revision 20885)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl	(revision 21535)
@@ -23,5 +23,5 @@
 *}-->
 <form name="form1" id="form1" method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 	<input type="hidden" name="mode" value="complete">
 	<!--{foreach from=$arrForm key=key item=item}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/change.tpl	(revision 20953)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/change.tpl	(revision 21535)
@@ -100,8 +100,7 @@
 	【携帯メールアドレス】<font color="#FF0000">※</font><br>
 	<font color="#FF0000"><!--{$arrErr.email_mobile}--></font>
-	<input type="text" name="email_mobile" value="<!--{$arrForm.email_mobile|h}-->" istyle="3">
-  <br>
+	<input type="text" name="email_mobile" value="<!--{$arrForm.email_mobile|h}-->" istyle="3"><br>
 
-  <!--{* PCメールアドレス *}-->
+    <!--{* PCメールアドレス *}-->
 	<input type="hidden" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">
 
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/login.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/login.tpl	(revision 20941)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/login.tpl	(revision 21535)
@@ -25,5 +25,5 @@
 	<input type="hidden" name="mode" value="login" >
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-    <input type="hidden" name="url" value="<!--{$smarty.server.REQUEST_URI|h}-->" />    
+    <input type="hidden" name="url" value="<!--{$smarty.server.REQUEST_URI|h}-->" />
 <!--{if !$tpl_valid_phone_id}-->
 	●メールアドレス<br>
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/delivery_addr.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/delivery_addr.tpl	(revision 21276)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/mypage/delivery_addr.tpl	(revision 21535)
@@ -23,5 +23,5 @@
 *}-->
 <form name="form1" method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
 	<input type="hidden" name="mode" value="edit">
     <input type="hidden" name="other_deliv_id" value="<!--{$smarty.session.other_deliv_id|h}-->" />
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/index.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/index.tpl	(revision 21535)
@@ -35,5 +35,5 @@
 <!--▼会員登録がお済みのお客様-->
 <form name="member_form" id="member_form" method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
 	<input type="hidden" name="mode" value="login">
 <!--{if !$tpl_valid_phone_id}-->
@@ -43,5 +43,5 @@
 	<!--{assign var=key value="login_email"}-->
 	<font color="#FF0000"><!--{$arrErr[$key]}--></font>
-	<input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" 
+	<input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->"
 		size="40" istyle="3"><br>
 <!--{else}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/deliv.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/deliv.tpl	(revision 21435)
+++ /branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/deliv.tpl	(revision 21535)
@@ -59,5 +59,5 @@
     <center><input type="submit" value="お届け先情報変更"></center>
     </form>
-    
+
     <form method="post" action="?">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
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 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/template.tpl	(revision 21535)
@@ -84,7 +84,7 @@
 </form>
 <form name="form2" method="post" action="?">
-  <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-  <input type="hidden" name="mode" value="" />
-  <input type="hidden" name="template_code" value="" />
-  <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
+    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+    <input type="hidden" name="mode" value="" />
+    <input type="hidden" name="template_code" value="" />
+    <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 </form>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 20857)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 21535)
@@ -29,75 +29,75 @@
 
     <div id="design" class="contents-main">
-    <!--{if $arrErr.err != ""}-->
-        <div class="message">
-            <span class="attention"><!--{$arrErr.err}--></span>
-        </div>
-    <!--{/if}-->
+        <!--{if $arrErr.err != ""}-->
+            <div class="message">
+                <span class="attention"><!--{$arrErr.err}--></span>
+            </div>
+        <!--{/if}-->
 
-    <!--{* ▼ブロック設定 *}-->
-    <table>
-        <tr>
-            <th>ブロック名</th>
-            <td>
-                <!--{assign var=key value="bloc_name"}-->
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
-                <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
-                <!--{if $arrErr[$key] != ""}--> <div class="attention"><!--{$arrErr[$key]}--></div> <!--{/if}-->
-            </td>
-        </tr>
-        <tr>
-            <th>ファイル名</th>
-            <td>
-                <!--{assign var=key value="filename"}-->
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />.tpl
-                <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
-                <!--{if $arrErr[$key] != ""}--> <div class="attention"><!--{$arrErr[$key]}--></div> <!--{/if}-->
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2">
-                <!--{assign var=key value="bloc_html"}-->
-                <textarea class="top" id="<!--{$key}-->" name="<!--{$key}-->" rows="<!--{$text_row}-->" style="width: 99%;"><!--{$arrForm[$key].value|smarty:nodefaults|h}--></textarea>
-                <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
-                <div>
-                    <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#bloc_html', 50, 13); return false;">拡大</a>
-                </div>
-            </td>
-        </tr>
-    </table>
-    <div class="btn-area">
-        <ul>
-            <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
-        </ul>
-    </div>
-    <!--{* ▲ブロック設定 *}-->
-
-    <!--{* ▼ブロック一覧 *}-->
-    <h2>編集可能ブロック</h2>
-    <div class="btn addnew">
-        <a class="btn-normal" href="?device_type_id=<!--{$device_type_id|h}-->"><span>ブロックを新規入力</span></a>
-    </div>
-    <table class="list">
-        <tr>
-            <th>名称</th>
-            <th class="edit">編集</th>
-            <th class="delete">削除</th>
-        </tr>
-        <!--{foreach key=key item=item from=$arrBlocList}-->
-            <tr style="background-color:<!--{if $item.bloc_id == $bloc_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
-                <td><!--{$item.bloc_name}--></td>
-                <td class="center">
-                    <a href="?bloc_id=<!--{$item.bloc_id|h}-->&amp;device_type_id=<!--{$device_type_id|h}-->" >編集</a>
-                </td>
-                <td class="center">
-                    <!--{if $item.deletable_flg == 1}-->
-                        <a href="javascript:;" onclick="fnFormModeSubmit('form_bloc','delete','bloc_id',<!--{$item.bloc_id|h}-->);">削除</a>
-                        <input type="hidden" value="<!--{$item.bloc_id|h}-->" name="del_id<!--{$item.bloc_id|h}-->" />
-                    <!--{/if}-->
+        <!--{* ▼ブロック設定 *}-->
+        <table>
+            <tr>
+                <th>ブロック名</th>
+                <td>
+                    <!--{assign var=key value="bloc_name"}-->
+                    <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
+                    <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+                    <!--{if $arrErr[$key] != ""}--> <div class="attention"><!--{$arrErr[$key]}--></div> <!--{/if}-->
                 </td>
             </tr>
-        <!--{/foreach}-->
-    </table>
-    <!--{* ▲ブロック一覧 *}-->
-  </div>
+            <tr>
+                <th>ファイル名</th>
+                <td>
+                    <!--{assign var=key value="filename"}-->
+                    <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />.tpl
+                    <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+                    <!--{if $arrErr[$key] != ""}--> <div class="attention"><!--{$arrErr[$key]}--></div> <!--{/if}-->
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2">
+                    <!--{assign var=key value="bloc_html"}-->
+                    <textarea class="top" id="<!--{$key}-->" name="<!--{$key}-->" rows="<!--{$text_row}-->" style="width: 99%;"><!--{$arrForm[$key].value|smarty:nodefaults|h}--></textarea>
+                    <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
+                    <div>
+                        <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#bloc_html', 50, 13); return false;">拡大</a>
+                    </div>
+                </td>
+            </tr>
+        </table>
+        <div class="btn-area">
+            <ul>
+                <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
+            </ul>
+        </div>
+        <!--{* ▲ブロック設定 *}-->
+
+        <!--{* ▼ブロック一覧 *}-->
+        <h2>編集可能ブロック</h2>
+        <div class="btn addnew">
+            <a class="btn-normal" href="?device_type_id=<!--{$device_type_id|h}-->"><span>ブロックを新規入力</span></a>
+        </div>
+        <table class="list">
+            <tr>
+                <th>名称</th>
+                <th class="edit">編集</th>
+                <th class="delete">削除</th>
+            </tr>
+            <!--{foreach key=key item=item from=$arrBlocList}-->
+                <tr style="background-color:<!--{if $item.bloc_id == $bloc_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
+                    <td><!--{$item.bloc_name}--></td>
+                    <td class="center">
+                        <a href="?bloc_id=<!--{$item.bloc_id|h}-->&amp;device_type_id=<!--{$device_type_id|h}-->" >編集</a>
+                    </td>
+                    <td class="center">
+                        <!--{if $item.deletable_flg == 1}-->
+                            <a href="javascript:;" onclick="fnFormModeSubmit('form_bloc','delete','bloc_id',<!--{$item.bloc_id|h}-->);">削除</a>
+                            <input type="hidden" value="<!--{$item.bloc_id|h}-->" name="del_id<!--{$item.bloc_id|h}-->" />
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            <!--{/foreach}-->
+        </table>
+        <!--{* ▲ブロック一覧 *}-->
+    </div>
 </form>
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 21419)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 21535)
@@ -112,5 +112,5 @@
     <!--▲お客様情報ここまで-->
 
-    <!--▼受注商品情報ここから-->        
+    <!--▼受注商品情報ここから-->
     <h2>受注商品情報</h2>
     <table class="list">
@@ -185,5 +185,5 @@
         <!--{/if}-->
     </table>
-    <!--▼お届け先情報ここから-->        
+    <!--▼お届け先情報ここから-->
     <h2>お届け先情報</h2>
     <!--{if $arrForm.product_type_id.value[0] != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
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 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 21535)
@@ -185,5 +185,5 @@
                     <td class="center">
                         <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" />
-                    </td>    
+                    </td>
                     <td>
                         <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->
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 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/order/index.tpl	(revision 21535)
@@ -92,5 +92,5 @@
                 <span class="attention"><!--{$arrErr[$key2]}--></span>
                 <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
-                ～ 
+                ～
                 <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
             </td>
@@ -250,5 +250,5 @@
                 <span class="attention"><!--{$arrErr[$key2]}--></span>
                 <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
-                円 ～ 
+                円 ～
                 <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
                 円
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/mail/query.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/mail/query.tpl	(revision 21419)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/mail/query.tpl	(revision 21535)
@@ -69,5 +69,5 @@
         <tr>
             <th>誕生月</th>
-            <td><!--{if $arrSearchData.search_birth_month}--><!--{$arrSearchData.search_birth_month|h}-->月<!--{else}-->(未指定)<!--{/if}--></td>                
+            <td><!--{if $arrSearchData.search_birth_month}--><!--{$arrSearchData.search_birth_month|h}-->月<!--{else}-->(未指定)<!--{/if}--></td>
         </tr>
         <tr>
@@ -106,5 +106,5 @@
             <th>購入金額</th>
             <td>
-                <!--{if $arrSearchData.search_buy_total_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_from|h}-->円<!--{/if}--> ～ 
+                <!--{if $arrSearchData.search_buy_total_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_from|h}-->円<!--{/if}--> ～
                 <!--{if $arrSearchData.search_buy_total_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_total_to|h}-->円<!--{/if}-->
             </td>
@@ -113,5 +113,5 @@
             <th>購入回数</th>
             <td>
-                <!--{if $arrSearchData.search_buy_times_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_from|h}-->回<!--{/if}--> ～ 
+                <!--{if $arrSearchData.search_buy_times_from == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_from|h}-->回<!--{/if}--> ～
                 <!--{if $arrSearchData.search_buy_times_to == null}-->(未指定)<!--{else}--><!--{$arrSearchData.search_buy_times_to|h}-->回<!--{/if}-->
             </td>
@@ -132,5 +132,5 @@
                 <!--{$arrSearchData.search_buy_start_year}-->年<!--{$arrSearchData.search_buy_start_month}-->月<!--{$arrSearchData.search_buy_start_day}-->日&nbsp;～
                 <!--{if $arrSearchData.search_buy_end_year}-->&nbsp;<!--{$arrSearchData.search_buy_end_year}-->年<!--{$arrSearchData.search_buy_end_month}-->月<!--{$arrSearchData.search_buy_end_day}-->日<!--{/if}-->
-            <!--{else}-->(未指定)<!--{/if}-->    
+            <!--{else}-->(未指定)<!--{/if}-->
             </td>
         </tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/total/index.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/total/index.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/total/index.tpl	(revision 21535)
@@ -102,5 +102,5 @@
         <!--{foreach key=key item=item from=$arrHidden}-->
             <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
-        <!--{/foreach}-->    
+        <!--{/foreach}-->
 
             <!--検索結果表示テーブル-->
@@ -134,5 +134,5 @@
             <!--{foreach key=key item=item from=$arrHidden}-->
                 <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
-            <!--{/foreach}-->    
+            <!--{/foreach}-->
             <!--検索結果表示テーブル-->
             <h2><!--{include file=$tpl_graphsubtitle}--></h2>
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 21345)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 21535)
@@ -23,5 +23,5 @@
 *}-->
 
-<form name="index_form" method="post" action="?"> 
+<form name="index_form" method="post" action="?">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
     <input type="hidden" name="mode" value="confirm" />
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/plugin.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/plugin.tpl	(revision 21522)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/plugin.tpl	(revision 21535)
@@ -25,11 +25,11 @@
     $(function() {
 
-       /**
-        * 「有効/有効にする」チェックボタン押下時
-        */
+        /**
+         * 「有効/有効にする」チェックボタン押下時
+         */
         $('input[id^=plugin_enable]').change(function(event) {
             // モード(有効 or 無効)
             var mode = event.target.name;
-            
+
             if(mode === 'disable') {
                 result = window.confirm('プラグインを無効しても宜しいですか？');
@@ -44,14 +44,14 @@
         });
 
-   /**
-    * 通信エラー表示.
-    */
+    /**
+     * 通信エラー表示.
+     */
     function remoteException(XMLHttpRequest, textStatus, errorThrown) {
         alert('通信中にエラーが発生しました。');
     }
 
-   /**
-    * アップデートリンク押下時の処理.
-    */
+    /**
+     * アップデートリンク押下時の処理.
+     */
     $('.update_link').click(function(event) {
         var plugin_id = event.target.name;
@@ -60,8 +60,8 @@
     });
 
-   /**
-    * アプデートボタン押下時の処理.
-    * アップデート対象ファイル以外はPOSTされない様にdisabled属性を付与
-    */
+    /**
+     * アプデートボタン押下時の処理.
+     * アップデート対象ファイル以外はPOSTされない様にdisabled属性を付与
+     */
     function removeUpdateFile(select_id) {
         $('input[name="update_plugin_file"]').attr("disabled", "disabled");
@@ -69,7 +69,7 @@
     }
 
-   /**
-    * インストール
-    */
+    /**
+     * インストール
+     */
     function install() {
         if (window.confirm('プラグインをインストールしても宜しいでしょうか？')){
@@ -78,29 +78,29 @@
     }
 
-   /**
-    * アンインストール(削除)
-    */
+    /**
+     * アンインストール(削除)
+     */
     function uninstall(plugin_id, plugin_code) {
         if (window.confirm('一度削除したデータは元に戻せません。\nプラグインを削除しても宜しいですか？')){
-           fnSetFormValue('plugin_id', plugin_id);
-           fnModeSubmit('uninstall', 'plugin_code', plugin_code);
+            fnSetFormValue('plugin_id', plugin_id);
+            fnModeSubmit('uninstall', 'plugin_code', plugin_code);
         }
     }
-    
-   /**
-    * アップデート
-    */
+
+    /**
+     * アップデート
+     */
     function update(plugin_id, plugin_code) {
         if (window.confirm('プラグインをアップデートしても宜しいですか？')){
-           removeUpdateFile('update_file_' + plugin_id);
-           fnSetFormValue('plugin_id', plugin_id);
-           fnModeSubmit('update','plugin_code', plugin_code);
+            removeUpdateFile('update_file_' + plugin_id);
+            fnSetFormValue('plugin_id', plugin_id);
+            fnModeSubmit('update','plugin_code', plugin_code);
         }
     }
-    
-
-   /**
-    * 優先度変更.
-    */
+
+
+    /**
+     * 優先度変更.
+     */
     function priority(plugin_id, plugin_code) {
         var priority = $("*[name=priority_" + plugin_code +"]").val();
@@ -108,5 +108,5 @@
         fnModeSubmit('priority','plugin_id',plugin_id);
     }
-    
+
 //]]>
 </script>
@@ -203,5 +203,5 @@
 
                                 <!-- アップデートリンク押下時に表示する. -->
-                                <div id="plugin_update_<!--{$plugin.plugin_id}-->" style="display: none">                                
+                                <div id="plugin_update_<!--{$plugin.plugin_id}-->" style="display: none">
                                     <input id="update_file_<!--{$plugin.plugin_id}-->" name="<!--{$plugin.plugin_code}-->" type="file" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box30" size="30" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}--> />
                                     <a class="btn-action" href="javascript:;" onclick="update(<!--{$plugin.plugin_id}-->, '<!--{$plugin.plugin_code}-->'); return false;"><span class="btn-next">アップデート</span></a>
@@ -218,5 +218,5 @@
             <!--競合アラート-->
             <!--{if $plugin.conflict_message != ""}-->
-            <tr> 
+            <tr>
                 <td class="attention_fookpoint" colspan="3">
                     <p class="attention"><!--{$plugin.conflict_message}--></p>
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 21511)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/input.tpl	(revision 21535)
@@ -73,8 +73,8 @@
             <span class="attention">※必須入力</span><br />
             ※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字
-	    <br />
+            <br />
             <input type="password" name="password02" size="20" class="box20" value="<!--{$arrForm.password02}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
-	    <p><span class="attention mini">確認のために2度入力してください。</span></p>
-    </td>
+            <p><span class="attention mini">確認のために2度入力してください。</span></p>
+        </td>
     </tr>
     <tr>
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/system/adminarea.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/system/adminarea.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/system/adminarea.tpl	(revision 21535)
@@ -26,5 +26,5 @@
     $("a.btn-action").click(function(){
         $("form#form1").submit();
-        return false;   
+        return false;
     });
 });
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 21388)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl	(revision 21535)
@@ -55,5 +55,5 @@
                 flag = false;
             }
-        } 
+        }
     }
 
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 21345)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend_search.tpl	(revision 21535)
@@ -106,5 +106,5 @@
         <tr>
             <td colspan="4">商品が登録されていません</td>
-        </tr>    
+        </tr>
         <!--{/section}-->
     </table>
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 20911)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 21535)
@@ -68,5 +68,5 @@
             <tr>
                 <td colspan="4"><span class="attention"><!--{$arrErr[$key]}--><!--{$arrErr[$key_next]}--></span></td>
-            </tr>        
+            </tr>
             <!--{/if}-->
             <tr>
@@ -123,10 +123,10 @@
             <tr>
                 <td colspan="4"><span class="attention"><!--{$arrErr[$key]}--><!--{$arrErr[$key_next]}--></span></td>
-            </tr>        
+            </tr>
             <!--{/if}-->
             <tr>
             <th><!--{$arrPref[$keyno]}--></td>
             <!--{if $smarty.section.cnt.last}-->
-            <!--{assign var=colspan value="3"}-->    
+            <!--{assign var=colspan value="3"}-->
             <!--{else}-->
             <!--{assign var=colspan value="1"}-->
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 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 21535)
@@ -47,5 +47,5 @@
         <tr>
             <th>郵便番号<span class="attention"> *</span></th>
-            <td> 
+            <td>
             <!--{assign var=key1 value="law_zip01"}-->
             <!--{assign var=key2 value="law_zip02"}-->
@@ -56,5 +56,5 @@
             〒
             <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"    size="6" class="box6" />
-            - 
+            -
             <input type="text"    name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"    size="6" class="box6" />
             <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'law_zip01', 'law_zip02', 'law_pref', 'law_addr01'); return false;">住所入力</a>
@@ -99,6 +99,6 @@
             <span class="attention"><!--{$arrErr[$key3]}--></span>
             <!--{/if}-->
-            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
-            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"    size="6" class="box6" /> - 
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"    size="6" class="box6" /> -
             <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
             </td>
@@ -115,6 +115,6 @@
             <span class="attention"><!--{$arrErr[$key3]}--></span>
             <!--{/if}-->
-            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
-            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
             <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
             </td>
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 21511)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 21535)
@@ -199,9 +199,7 @@
                 <td>
                     <span class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></span>
-                    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字（記号不可）
-<br>
-		    <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" size="30" class="box30" <!--{if $arrErr.password02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-                <p><span class="attention mini">確認のために2度入力してください。</span></p>
-
+                    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_MIN_LEN}-->～<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字（記号不可）<br />
+                    <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" size="30" class="box30" <!--{if $arrErr.password02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                    <p><span class="attention mini">確認のために2度入力してください。</span></p>
                 </td>
             </tr>
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 21343)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 21535)
@@ -250,5 +250,5 @@
                         <span class="attention"><!--{$arrErr[$key][$index]}--></span>
                     <!--{/if}-->
-                     <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
+                    <input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
                     <!--{assign var=key value="stock_unlimited"}--><br />
                     <!--{if $arrErr[$key][$index]}-->
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 21345)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/index.tpl	(revision 21535)
@@ -169,5 +169,5 @@
     </div>
     <!--検索条件設定テーブルここまで-->
-</form>  
+</form>
 
 
@@ -299,5 +299,5 @@
 </form>
 
-<!--★★検索結果一覧★★-->        
+<!--★★検索結果一覧★★-->
 <!--{/if}-->
 </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 21352)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl	(revision 21535)
@@ -418,5 +418,5 @@
                 <!--{assign var=key value="recommend_delete`$smarty.section.cnt.iteration`"}-->
                 <input type="checkbox" name="<!--{$key}-->" value="1" />削除<br />
-               <!--{assign var=key value="recommend_comment`$smarty.section.cnt.iteration`"}-->
+                <!--{assign var=key value="recommend_comment`$smarty.section.cnt.iteration`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
                 商品コード:<!--{$arrRecommend[$recommend_no].product_code_min}--><br />
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 21345)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 21535)
@@ -86,5 +86,5 @@
             <p class="remark"><span class="attention"><!--{$tpl_linemax}-->件</span>が該当しました。</p>
             <div class="pager">
-              <!--{$tpl_strnavi}-->
+                <!--{$tpl_strnavi}-->
             </div>
 
@@ -110,5 +110,5 @@
                 <!--{section name=cnt loop=$arrProductsList}-->
                     <tr>
-                        <td><!--{from_to from=$arrProductsList[cnt].product_code_min to=$arrProductsList[cnt].product_code_max separator="～<br />"}--></td>                    
+                        <td><!--{from_to from=$arrProductsList[cnt].product_code_min to=$arrProductsList[cnt].product_code_max separator="～<br />"}--></td>
                         <td>
                             <!--{$arrProductsList[cnt].name|h}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/admin/products/review.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/admin/products/review.tpl	(revision 20764)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/review.tpl	(revision 21535)
@@ -106,5 +106,5 @@
         </div>
     </div>
-</form>    
+</form>
 
 
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 21345)
+++ /branches/version-2_12-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 21535)
@@ -92,3 +92,3 @@
     </div>
 </div>
-</form>    
+</form>
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/delivery_addr.tpl	(revision 21535)
@@ -30,5 +30,5 @@
     <div class="information">
         <p><span class="attention">※</span>は必須入力項目です。<br />
-            最大20件まで登録できます。</p> 
+            最大20件まで登録できます。</p>
     </div>
 
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/navi.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/navi.tpl	(revision 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/navi.tpl	(revision 21535)
@@ -33,5 +33,5 @@
                 <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
                     <li class="nav_favorite"><a href="favorite.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->" rel="external">お気に入り</a></li>
-                <!--{/if}-->                                                        
+                <!--{/if}-->
                     <li class="nav_refusal"><a href="refusal.php" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->" rel="external">退会手続き</a></li>
                 <!--{else}-->
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/favorite.tpl	(revision 21535)
@@ -87,5 +87,5 @@
             <div class="information">
                 <p>お気に入りが登録されておりません。</p>
-            </div>        
+            </div>
         </div><!-- /.form_area -->
     <!--{/if}-->
@@ -115,6 +115,6 @@
         //送信データを準備
         var postData = {};
-        $('#form1').find(':input').each(function(){  
-            postData[$(this).attr('name')] = $(this).val();  
+        $('#form1').find(':input').each(function(){
+            postData[$(this).attr('name')] = $(this).val();
         });
         postData["mode"] = "getList";
@@ -145,5 +145,5 @@
                         //商品写真をセット
                         $($(".favoriteBox img.productImg").get(maxCnt)).attr({
-                            src: imagePath + product.main_list_image, 
+                            src: imagePath + product.main_list_image,
                             alt: product.name
                         });
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/mypage/history.tpl	(revision 21535)
@@ -126,5 +126,5 @@
                         <!--{assign var=key value="`$tpl_arrMailHistory[cnt].template_id`"}-->
                         通知メール：<!--{$arrMAILTEMPLATE[$key]|h}--></p>
-                    <p><a href="javascript:;" onclick="getMailDetail(<!--{$tpl_arrMailHistory[cnt].send_id}-->)" rel="external"><!--{$tpl_arrMailHistory[cnt].subject|h}--></a></p> 
+                    <p><a href="javascript:;" onclick="getMailDetail(<!--{$tpl_arrMailHistory[cnt].send_id}-->)" rel="external"><!--{$tpl_arrMailHistory[cnt].subject|h}--></a></p>
                 </div>
                 <!--▲メール -->
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/deliv.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	(revision 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/deliv.tpl	(revision 21535)
@@ -58,5 +58,5 @@
                         <!--{if $smarty.section.cnt.first}-->
                             <dt class="first">
-                                <p>  
+                                <p>
                                     <input type="radio" name="deliv_check" id="chk_id_<!--{$smarty.section.cnt.iteration}-->" value="-1" <!--{if $arrForm.deliv_check.value == "" || $arrForm.deliv_check.value == -1}--> checked="checked"<!--{/if}--> class="data-role-none" />
                                     <label for="chk_id_<!--{$smarty.section.cnt.iteration}-->">会員登録住所</label>
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/complete.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/complete.tpl	(revision 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/complete.tpl	(revision 21535)
@@ -51,5 +51,5 @@
         <div class="btn_area">
             <a href="<!--{$smarty.const.TOP_URLPATH}-->" class="btn_toppage btn_sub" rel="external">トップページへ</a>
-        </div> 
+        </div>
     </div>
     <hr>
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 21535)
@@ -138,5 +138,5 @@
                     <div class="total_area">
                         <span class="mini">合計：</span><span class="price fb"><!--{$arrForm.payment_total|number_format}--> 円</span>
-                    </div>   
+                    </div>
                 </div><!-- /.formBox -->
 
@@ -180,5 +180,5 @@
                         <div class="formBox">
                             <dl class="deliv_confirm">
-                                <dt>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></dt>     
+                                <dt>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></dt>
                                 <dd>
                                     <p>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--><br />
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 21535)
@@ -127,5 +127,5 @@
         <!--★インフォメーション★-->
         <div class="information end">
-            <p>各項目を選択してください。</p>  
+            <p>各項目を選択してください。</p>
         </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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/cart/index.tpl	(revision 21535)
@@ -59,5 +59,5 @@
 
             <!--{foreach from=$cartKeys item=key}-->
-            
+
                 <!--☆送料無料アナウンス右にスライドボタン -->
                 <!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/confirm.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/confirm.tpl	(revision 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/contact/confirm.tpl	(revision 21535)
@@ -73,5 +73,5 @@
                 <li><a class="btn_back" href="?" onClick="fnModeSubmit('return', '', ''); return false;">戻る</a></li>
             </ul>
-        </div> 
+        </div>
     </form>
 </section>
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/bloc/recommend.tpl	(revision 21535)
@@ -35,5 +35,5 @@
                             <!--{assign var=price01 value=`$arrBestProducts[cnt].price01_min`}-->
                             <!--{assign var=price02 value=`$arrBestProducts[cnt].price02_min`}-->
-                            <p class="sale_price"><span class="mini"><!--<span class="mini">-->販売価格(税込):<!--</span>--></span><span class="price"><!--{$price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</span></p> 
+                            <p class="sale_price"><span class="mini"><!--<span class="mini">-->販売価格(税込):<!--</span>--></span><span class="price"><!--{$price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</span></p>
                         </div>
                     </div>
@@ -55,10 +55,10 @@
                 <!--{/if}-->
             <!--{/section}-->
-        </ul>    
+        </ul>
     </section>
 <!--{/if}-->
 <!-- ▲おすすめ商品 -->
 
-<script type="application/javascript"> 
+<script type="application/javascript">
     <!--//
     $(function(){
Index: /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/search_zero.tpl
===================================================================
--- /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/search_zero.tpl	(revision 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/frontparts/search_zero.tpl	(revision 21535)
@@ -23,5 +23,5 @@
 <!--{* 検索該当0件 *}-->
 <div>
-    <!--★エラーメッセージ--> 
+    <!--★エラーメッセージ-->
     <p class="error">
         <!--{if $smarty.get.mode == "search"}-->
@@ -31,4 +31,4 @@
             現在、商品はございません。
         <!--{/if}-->
-    </p> 
+    </p>
 </div>
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/products/detail.tpl	(revision 21535)
@@ -360,5 +360,5 @@
                                 <!--{else}-->
                                     <!--{$price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$price02_max|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
-                                <!--{/if}--> 
+                                <!--{/if}-->
                                 円</span>
                             </p>
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 21533)
+++ /branches/version-2_12-dev/data/Smarty/templates/sphone/products/list.tpl	(revision 21535)
@@ -90,5 +90,5 @@
                     <!--{if count($productStatus[$id]) > 0}-->
                         <ul class="status_icon">
-                            <!--{foreach from=$productStatus[$id] item=status}--> 
+                            <!--{foreach from=$productStatus[$id] item=status}-->
                                 <li><!--{$arrSTATUS[$status]}--></li>
                             <!--{/foreach}-->
@@ -102,6 +102,6 @@
                 <!--★商品価格★-->
                 <p>
-                    <span class="pricebox sale_price"><span class="mini">販売価格(税込):</span></span> 
-                    <span class="price"> 
+                    <span class="pricebox sale_price"><span class="mini">販売価格(税込):</span></span>
+                    <span class="price">
                         <span id="price02_default_<!--{$id}-->">
                         <!--{if $arrProduct.price02_min == $arrProduct.price02_max}-->
@@ -154,6 +154,6 @@
         //送信データを準備
         var postData = {};
-        $('#form1').find(':input').each(function(){  
-            postData[$(this).attr('name')] = $(this).val();  
+        $('#form1').find(':input').each(function(){
+            postData[$(this).attr('name')] = $(this).val();
         });
         postData["mode"] = "json";
@@ -183,5 +183,5 @@
                         //商品写真をセット
                         $($(".list_area .listphoto img").get(maxCnt)).attr({
-                            src: "<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=" + product.main_list_image + '&width=80&height=80', 
+                            src: "<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=" + product.main_list_image + '&width=80&height=80',
                             alt: product.name
                         });
