Index: /branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 20523)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 20525)
@@ -176,26 +176,26 @@
                 <colgroup width="80%"></colgroup>
                 <thead>
-                  <tr>
-                    <th>選択</th>
-                    <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->" id="payment_method">お支払方法</th>
-                  </tr>
+                    <tr>
+                        <th>選択</th>
+                        <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->" id="payment_method">お支払方法</th>
+                    </tr>
                 </thead>
                 <tbody>
-                  <!--{section name=cnt loop=$arrPayment}-->
-                  <tr>
-                    <td class="alignC"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->"  value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> /></td>
-                    <td>
-                      <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|h}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label>
-                    </td>
-                    <!--{if $img_show}-->
+                    <!--{section name=cnt loop=$arrPayment}-->
+                        <tr>
+                        <td class="alignC"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->"  value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> /></td>
                         <td>
-                            <!--{if $arrPayment[cnt].payment_image != ""}-->
-                                <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrPayment[cnt].payment_image}-->" />
-                            <!--{/if}-->
+                            <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|h}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label>
                         </td>
-                    <!--{/if}-->
-                  </tr>
-                <!--{/section}-->
-              </tbody>
+                        <!--{if $img_show}-->
+                            <td>
+                                <!--{if $arrPayment[cnt].payment_image != ""}-->
+                                    <img src="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrPayment[cnt].payment_image}-->" />
+                                <!--{/if}-->
+                            </td>
+                        <!--{/if}-->
+                        </tr>
+                    <!--{/section}-->
+                </tbody>
             </table>
         </div>
@@ -230,10 +230,10 @@
                 </select>
                 <!--{if $is_multiple}-->
-                     <br />
+                    <br />
                     <!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
                     <!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}-->
                 <!--{/if}-->
-             </div>
-             <!--{/foreach}-->
+            </div>
+            <!--{/foreach}-->
         </div>
         <!--{/if}-->
@@ -247,14 +247,14 @@
                     </p>
                     <div class="point_announce">
-                       <p><span class="user_name"><!--{$name01|h}--> <!--{$name02|h}-->様</span>の、現在の所持ポイントは「<span class="point"><!--{$tpl_user_point|default:0|number_format}-->Pt</span>」です。<br />
-                       今回ご購入合計金額：<span class="price"><!--{$arrPrice.subtotal|number_format}-->円</span> <span class="attention">(送料、手数料を含みません。)</span>
-                       </p>
+                        <p><span class="user_name"><!--{$name01|h}--> <!--{$name02|h}-->様</span>の、現在の所持ポイントは「<span class="point"><!--{$tpl_user_point|default:0|number_format}-->Pt</span>」です。<br />
+                            今回ご購入合計金額：<span class="price"><!--{$arrPrice.subtotal|number_format}-->円</span> <span class="attention">(送料、手数料を含みません。)</span>
+                        </p>
                         <ul>
                             <li>
-                             <input type="radio" id="point_on" name="point_check" value="1" <!--{$arrForm.point_check.value|sfGetChecked:1}--> onclick="fnCheckInputPoint();" /><label for="point_on">ポイントを使用する</label>
-                                 <!--{assign var=key value="use_point"}--><br />
-                             今回のお買い物で、<input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|default:$tpl_user_point}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box60" />&nbsp;Ptを使用する。<span class="attention"><!--{$arrErr[$key]}--></span>
-                             </li>
-                             <li><input type="radio" id="point_off" name="point_check" value="2" <!--{$arrForm.point_check.value|sfGetChecked:2}--> onclick="fnCheckInputPoint();" /><label for="point_off">ポイントを使用しない</label></li>
+                            <input type="radio" id="point_on" name="point_check" value="1" <!--{$arrForm.point_check.value|sfGetChecked:1}--> onclick="fnCheckInputPoint();" /><label for="point_on">ポイントを使用する</label>
+                                <!--{assign var=key value="use_point"}--><br />
+                            今回のお買い物で、<input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|default:$tpl_user_point}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box60" />&nbsp;Ptを使用する。<span class="attention"><!--{$arrErr[$key]}--></span>
+                            </li>
+                            <li><input type="radio" id="point_off" name="point_check" value="2" <!--{$arrForm.point_check.value|sfGetChecked:2}--> onclick="fnCheckInputPoint();" /><label for="point_off">ポイントを使用しない</label></li>
                         </ul>
                 </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 20523)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 20525)
@@ -72,5 +72,5 @@
 
                     <p class="zipimg"><a href="<!--{$smarty.const.ROOT_URLPATH}-->address/<!--{$smarty.const.DIR_INDEX_PATH}-->" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01'); return false;" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_address_input.jpg" alt="住所自動入力" /></a>
-                         <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
+                        <span class="mini">&nbsp;郵便番号を入力後、クリックしてください。</span></p>
                 </td>
             </tr>
@@ -206,6 +206,6 @@
                 <th>郵便番号<span class="attention">※</span></th>
                 <td>
-                 <!--{assign var=key1 value="shipping_zip01"}-->
-                 <!--{assign var=key2 value="shipping_zip02"}-->
+                <!--{assign var=key1 value="shipping_zip01"}-->
+                <!--{assign var=key2 value="shipping_zip02"}-->
                     <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
                     <p class="top">〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"    class="box60" />&nbsp;-&nbsp;    <input type="text"    name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />　
Index: /branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl	(revision 20523)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl	(revision 20525)
@@ -71,10 +71,10 @@
             <!--{section name=cnt loop=$arrAddr}-->
                 <tr>
-                     <td class="alignC">
-                         <!--{if $smarty.section.cnt.first}-->
+                    <td class="alignC">
+                        <!--{if $smarty.section.cnt.first}-->
                             <input type="radio" name="deliv_check" id="chk_id_<!--{$smarty.section.cnt.iteration}-->" value="-1" <!--{if $arrForm.deliv_check.value == "" || $arrForm.deliv_check.value == -1}--> checked="checked"<!--{/if}--> />
-                         <!--{else}-->
+                        <!--{else}-->
                             <input type="radio" name="deliv_check" id="chk_id_<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrAddr[cnt].other_deliv_id}-->"<!--{if $arrForm.deliv_check.value == $arrAddr[cnt].other_deliv_id}--> checked="checked"<!--{/if}--> />
-                         <!--{/if}-->
+                        <!--{/if}-->
                     </td>
                     <td class="alignC">
@@ -111,12 +111,12 @@
 
         <div class="btn_area">
-             <ul>
-                 <li>
-                      <a href="<!--{$smarty.const.CART_URLPATH}-->" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg',back03)">
-                     <img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" border="0" name="back03" id="back03" /></a>
-                 </li>
-                 <li>
-                 <input type="image" 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="send_button" id="send_button" />
-                 </li>
+            <ul>
+                <li>
+                    <a href="<!--{$smarty.const.CART_URLPATH}-->" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg',back03)">
+                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" border="0" name="back03" id="back03" /></a>
+                </li>
+                <li>
+                <input type="image" 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="send_button" id="send_button" />
+                </li>
             </ul>
         </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl	(revision 20523)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl	(revision 20525)
@@ -97,5 +97,5 @@
                     <ul>
                         <li>
-                           <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="buystep" id="buystep" />
+                            <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="buystep" id="buystep" />
                         </li>
                     </ul>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	(revision 20523)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	(revision 20525)
@@ -40,6 +40,6 @@
                 <!--{/foreach}-->
             </p>
-         <!--{/if}-->
-         <!-- ▲コンビに決済の場合には表示 -->
+        <!--{/if}-->
+        <!-- ▲コンビに決済の場合には表示 -->
 
         <div id="complete_area">
@@ -59,8 +59,8 @@
         <div class="btn_area">
             <ul>
-               <li>
+                <li>
                     <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');">
                         <img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" /></a>
-               </li>
+                </li>
             </ul>
         </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/error.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/error.tpl	(revision 20518)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/error.tpl	(revision 20525)
@@ -20,5 +20,5 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
- <!--▼CONTENTS-->
+<!--▼CONTENTS-->
 <div id="undercolumn">
     <div id="undercolumn_error">
Index: /branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20518)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20525)
@@ -145,24 +145,24 @@
                         </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>
+                <!--{/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}-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/contact/confirm.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/contact/confirm.tpl	(revision 20519)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/contact/confirm.tpl	(revision 20525)
@@ -48,7 +48,7 @@
                 <th>郵便番号</th>
                 <td>
-                     <!--{if strlen($arrForm.zip01.value) > 0 && strlen($arrForm.zip02.value) > 0}-->
-                         〒<!--{$arrForm.zip01.value|h}-->-<!--{$arrForm.zip02.value|h}-->
-                     <!--{/if}-->
+                    <!--{if strlen($arrForm.zip01.value) > 0 && strlen($arrForm.zip02.value) > 0}-->
+                        〒<!--{$arrForm.zip01.value|h}-->-<!--{$arrForm.zip02.value|h}-->
+                    <!--{/if}-->
                 </td>
             </tr>
@@ -71,5 +71,5 @@
             <tr>
                 <th>お問い合わせ内容<span class="attention">※</span><br />
-                     <span class="mini">（全角1000字以下）</span></th>
+                    <span class="mini">（全角1000字以下）</span></th>
                 <td><!--{$arrForm.contents.value|h|nl2br}--></td>
             </tr>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl	(revision 20437)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/contact/complete.tpl	(revision 20525)
@@ -14,6 +14,8 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * G
- this program; if not, write to the Free Software
+ * 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.
  *}-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/entry/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/entry/index.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/entry/index.tpl	(revision 20525)
@@ -20,5 +20,5 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
- <!--▼CONTENTS-->
+<!--▼CONTENTS-->
 <div id="undercolumn">
     <div id="undercolumn_entry">
@@ -37,9 +37,9 @@
 
             <div class="btn_area">
-                 <ul>
-                     <li>
-                         <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_confirm_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_confirm.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_confirm.jpg" alt="確認ページへ" name="confirm" id="confirm" />
-                     </li>
-                 </ul>
+                <ul>
+                    <li>
+                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_confirm_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_confirm.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_confirm.jpg" alt="確認ページへ" name="confirm" id="confirm" />
+                    </li>
+                </ul>
             </div>
 
Index: /branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl	(revision 20519)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/entry/complete.tpl	(revision 20525)
@@ -42,5 +42,5 @@
                 <ul>
                     <li>
-                           <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" /></a>
+                        <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','b_toppage');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','b_toppage');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" border="0" name="b_toppage" /></a>
                     </li>
                 </ul>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/entry/kiyaku.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/entry/kiyaku.tpl	(revision 20519)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/entry/kiyaku.tpl	(revision 20525)
@@ -30,20 +30,20 @@
         <form name="form1" id="form1" method="post" action="?">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
-           <textarea name="textfield" class="kiyaku_text" cols="80" rows="30" readonly="readonly"><!--{$tpl_kiyaku_text}--></textarea>
+        <textarea name="textfield" class="kiyaku_text" cols="80" rows="30" readonly="readonly"><!--{$tpl_kiyaku_text}--></textarea>
 
-           <div class="btn_area">
-                <ul>
-                    <li>
-                       <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot_on.jpg','b_noagree');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot.jpg','b_noagree');">
-                         <img src="<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot.jpg" alt="同意しない" border="0" name="b_noagree" /></a>&nbsp;
-                    <li>
-                    </li>
-                       <a href="<!--{$smarty.const.ENTRY_URL}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_agree_on.jpg','b_agree');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_agree.jpg','b_agree');">
-                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_entry_agree.jpg" alt="同意して会員登録へ" border="0" name="b_agree" /></a>
-                    </li>
-                </ul>
-           </div>
+        <div class="btn_area">
+            <ul>
+                <li>
+                    <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot_on.jpg','b_noagree');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot.jpg','b_noagree');">
+                        <img src="<!--{$TPL_URLPATH}-->img/button/btn_entry_cannot.jpg" alt="同意しない" border="0" name="b_noagree" /></a>&nbsp;
+                <li>
+                </li>
+                    <a href="<!--{$smarty.const.ENTRY_URL}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_agree_on.jpg','b_agree');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_entry_agree.jpg','b_agree');">
+                <img src="<!--{$TPL_URLPATH}-->img/button/btn_entry_agree.jpg" alt="同意して会員登録へ" border="0" name="b_agree" /></a>
+                </li>
+            </ul>
+        </div>
 
-         </form>
+        </form>
     </div>
 </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	(revision 20520)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/recommend.tpl	(revision 20525)
@@ -22,53 +22,53 @@
 <!--{if count($arrBestProducts) > 0}-->
 <div class="bloc_outer" class="clearfix">
-  <div id="recomend_area">
-    <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.jpg" alt="*" class="title_icon" /></h2>
-    <!--{section name=cnt loop=$arrBestProducts step=2}-->
-    <div class="bloc_body clearfix">
-        <div class="recomendleft clearfix">
-            <div class="productImage">
-                <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->">
-                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[cnt].name|h}-->" /></a>
+    <div id="recomend_area">
+        <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_recommend.jpg" alt="*" class="title_icon" /></h2>
+        <!--{section name=cnt loop=$arrBestProducts step=2}-->
+        <div class="bloc_body clearfix">
+            <div class="recomendleft clearfix">
+                <div class="productImage">
+                    <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->">
+                        <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrBestProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[cnt].name|h}-->" /></a>
+                </div>
+                <div class="productContents">
+                    <h3>
+                        <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a>
+                    </h3>
+                    <!--{assign var=price01 value=`$arrBestProducts[cnt].price01_min`}-->
+                    <!--{assign var=price02 value=`$arrBestProducts[cnt].price02_min`}-->
+                    <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
+                        <span class="price"><!--{$price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</span>
+                    </p>
+                    <p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
+                </div>
             </div>
-            <div class="productContents">
-                <h3>
-                    <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[cnt].product_id|u}-->"><!--{$arrBestProducts[cnt].name|h}--></a>
-                </h3>
-                <!--{assign var=price01 value=`$arrBestProducts[cnt].price01_min`}-->
-                <!--{assign var=price02 value=`$arrBestProducts[cnt].price02_min`}-->
-                <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
-                    <span class="price"><!--{$price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</span>
-                </p>
-                <p class="mini comment"><!--{$arrBestProducts[cnt].comment|h|nl2br}--></p>
+
+            <div class="recomendright clearfix">
+                <div class="productImage">
+                    <!--{assign var=cnt2 value=`$smarty.section.cnt.iteration*$smarty.section.cnt.step-1`}-->
+                    <!--{if $arrBestProducts[$cnt2]|count > 0}-->
+
+                    <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[$cnt2].product_id|u}-->">
+                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrBestProducts[$cnt2].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[$cnt2].name|h}-->" /></a>
+                </div>
+                <div class="productContents">
+                    <h3>
+                        <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[$cnt2].product_id|u}-->"><!--{$arrBestProducts[$cnt2].name|h}--></a>
+                    </h3>
+
+                    <!--{assign var=price01 value=`$arrBestProducts[$cnt2].price01_min`}-->
+                    <!--{assign var=price02 value=`$arrBestProducts[$cnt2].price02_min`}-->
+
+                    <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
+                        <span class="price"><!--{$price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</span>
+                    </p>
+                    <p class="mini comment"><!--{$arrBestProducts[$cnt2].comment|h|nl2br}--></p>
+                    <!--{/if}-->
+                </div>
             </div>
+
         </div>
-
-        <div class="recomendright clearfix">
-            <div class="productImage">
-                <!--{assign var=cnt2 value=`$smarty.section.cnt.iteration*$smarty.section.cnt.step-1`}-->
-                <!--{if $arrBestProducts[$cnt2]|count > 0}-->
-
-                <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[$cnt2].product_id|u}-->">
-                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrBestProducts[$cnt2].main_list_image|sfNoImageMainList|h}-->&amp;width=80&amp;height=80" alt="<!--{$arrBestProducts[$cnt2].name|h}-->" /></a>
-            </div>
-            <div class="productContents">
-                <h3>
-                    <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrBestProducts[$cnt2].product_id|u}-->"><!--{$arrBestProducts[$cnt2].name|h}--></a>
-                </h3>
-
-                <!--{assign var=price01 value=`$arrBestProducts[$cnt2].price01_min`}-->
-                <!--{assign var=price02 value=`$arrBestProducts[$cnt2].price02_min`}-->
-
-                <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
-                    <span class="price"><!--{$price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</span>
-                </p>
-                <p class="mini comment"><!--{$arrBestProducts[$cnt2].comment|h|nl2br}--></p>
-                <!--{/if}-->
-            </div>
-        </div>
-
+        <!--{/section}-->
     </div>
-    <!--{/section}-->
-  </div>
 </div>
 <!--{/if}-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl	(revision 20433)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl	(revision 20525)
@@ -2,20 +2,20 @@
     <div id="header_login_area" class="clearfix">
         <form name="login_header_form" id="login_header_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_header_form')">
-            <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.PHP_SELF|h}-->" />
-            <div class="bloc_body clearfix">
-                <!--{if $tpl_login}-->
-                    <!--{if !$tpl_disable_logout}-->
+        <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.PHP_SELF|h}-->" />
+        <div class="bloc_body clearfix">
+            <!--{if $tpl_login}-->
+                <!--{if !$tpl_disable_logout}-->
                     <p class="btn">
-                      ようこそ
-                      <span class="user_name"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}--> 様</span> /
-                    <!--{if $smarty.const.USE_POINT !== false}-->
-                        所持ポイント: <span class="point"> <!--{$tpl_user_point|number_format|default:0}--> pt</span>
-                    <!--{/if}-->&nbsp;&nbsp;
-                       <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg',this)" src="<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg" onclick="fnFormModeSubmit('login_header_form', 'logout', '', ''); return false;" alt="ログアウト" />
-                     </p>
-                    <!--{/if}-->
-                <!--{else}-->
+                        ようこそ
+                        <span class="user_name"><!--{$tpl_name1|h}--> <!--{$tpl_name2|h}--> 様</span> /
+                        <!--{if $smarty.const.USE_POINT !== false}-->
+                            所持ポイント: <span class="point"> <!--{$tpl_user_point|number_format|default:0}--> pt</span>
+                        <!--{/if}-->&nbsp;&nbsp;
+                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg',this)" src="<!--{$TPL_URLPATH}-->img/common/btn_header_logout.jpg" onclick="fnFormModeSubmit('login_header_form', 'logout', '', ''); return false;" alt="ログアウト" />
+                    </p>
+                <!--{/if}-->
+            <!--{else}-->
                 <ul class="formlist clearfix">
                     <li class="mail">
@@ -34,6 +34,6 @@
                 </ull>
 
-              <!--{/if}-->
-            </div>
+            <!--{/if}-->
+        </div>
         </form>
     </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/search_zero.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/search_zero.tpl	(revision 20340)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/search_zero.tpl	(revision 20525)
@@ -20,5 +20,5 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
- <!--検索該当0の時-->
+<!--検索該当0の時-->
 <table width="570" cellspacing="0" cellpadding="0" summary=" ">
     <tr><td height="15"></td></tr>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 20520)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 20525)
@@ -81,5 +81,5 @@
         </select>
         <p class="top"><input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4]|h}-->" class="box300" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->; ime-mode: active;" /><br />
-         <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
+            <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
         <p class="top"><input type="text" name="<!--{$key5}-->" value="<!--{$arrForm[$key5]|h}-->" class="box300" style="<!--{$arrErr[$key5]|sfGetErrorColor}-->; ime-mode: active;" /><br />
             <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	(revision 20522)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	(revision 20525)
@@ -51,14 +51,14 @@
                 <!--★画像★-->
                 <!--{if $arrProduct.main_large_image|strlen >= 1}-->
-                   <a
-                    href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct.main_large_image|h}-->"
-                    class="expansion"
-                    target="_blank"
+                    <a
+                        href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct.main_large_image|h}-->"
+                        class="expansion"
+                        target="_blank"
                     >
-               <!--{/if}-->
-                  <img src="<!--{$arrFile[$key].filepath|h}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" alt="<!--{$arrProduct.name|h}-->" class="picture" />
-               <!--{if $arrProduct.main_large_image|strlen >= 1}-->
-                   </a>
-               <!--{/if}-->
+                <!--{/if}-->
+                    <img src="<!--{$arrFile[$key].filepath|h}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" alt="<!--{$arrProduct.name|h}-->" class="picture" />
+                <!--{if $arrProduct.main_large_image|strlen >= 1}-->
+                    </a>
+                <!--{/if}-->
             </div>
             <!--{if $arrProduct.main_large_image|strlen >= 1}-->
@@ -70,6 +70,5 @@
                             target="_blank"
                         >
-                          画像を拡大する
-                        </a>
+                            画像を拡大する</a>
                 </span>
             <!--{/if}-->
@@ -191,10 +190,10 @@
                             <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}-->
+                                <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>
@@ -203,6 +202,6 @@
                         <!--▼規格2-->
                         <ul class="clearfix">
-                              <li><!--{$tpl_class_name2|h}-->：</li>
-                              <li>
+                            <li><!--{$tpl_class_name2|h}-->：</li>
+                            <li>
                                 <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
                                 </select>
@@ -210,5 +209,5 @@
                                 <br /><span class="attention">※ <!--{$tpl_class_name2}-->を入力して下さい。</span>
                                 <!--{/if}-->
-                              </li>
+                            </li>
                         </ul>
                         <!--▲規格2-->
@@ -285,6 +284,5 @@
                             <span class="mini">
                                 <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
-                                  画像を拡大する
-                                </a>
+                                    画像を拡大する</a>
                             </span>
                         <!--{/if}-->
@@ -309,7 +307,7 @@
                     <!--★新規コメントを書き込む★-->
                     <a href="./review.php"
-                         onclick="win02('./review.php?product_id=<!--{$arrProduct.product_id}-->','review','600','640'); return false;"
-                         onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_comment_on.jpg','review');"
-                         onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_comment.jpg','review');" target="_blank">
+                        onclick="win02('./review.php?product_id=<!--{$arrProduct.product_id}-->','review','600','640'); return false;"
+                        onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_comment_on.jpg','review');"
+                        onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_comment.jpg','review');" target="_blank">
                         <img src="<!--{$TPL_URLPATH}-->img/button/btn_comment.jpg" alt="新規コメントを書き込む" name="review" id="review" /></a>
                 <!--{/if}-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl	(revision 20522)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl	(revision 20525)
@@ -172,38 +172,38 @@
                 <h3>
                     <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrProduct.product_id|u}-->" name="product<!--{$arrProduct.product_id}-->"><!--{$arrProduct.name|h}--></a>
-               </h3>
-               <!--★価格★-->
-               <div class="pricebox sale_price">
-                   <!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
-                   <span class="price">
-                       <span id="price02_default_<!--{$id}-->">
-                           <!--{if $arrProduct.price02_min == $arrProduct.price02_max}-->
-                               <!--{$arrProduct.price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
-                           <!--{else}-->
+                </h3>
+                <!--★価格★-->
+                <div class="pricebox sale_price">
+                    <!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
+                    <span class="price">
+                        <span id="price02_default_<!--{$id}-->">
+                            <!--{if $arrProduct.price02_min == $arrProduct.price02_max}-->
+                                <!--{$arrProduct.price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
+                            <!--{else}-->
                                 <!--{$arrProduct.price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->～<!--{$arrProduct.price02_max|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
-                           <!--{/if}-->
-                       </span><span id="price02_dynamic_<!--{$id}-->"></span>
-                       円</span>
-               </div>
-
-               <!--★コメント★-->
-               <div class="listcomment"><!--{$arrProduct.main_list_comment|h|nl2br}--></div>
-
-               <!--★商品詳細を見る★-->
-               <div class="detail_btn">
-                   <!--{assign var=name value="detail`$id`"}-->
-                   <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrProduct.product_id|u}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_detail_on.jpg','<!--{$name}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_detail.jpg','<!--{$name}-->');">
-                   <img src="<!--{$TPL_URLPATH}-->img/button/btn_detail.jpg" alt="商品詳細を見る" name="<!--{$name}-->" id="<!--{$name}-->" /></a>
-               </div>
-
-               <!--▼買い物かご-->
-               <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]}-->" />
-
-               <div class="cart_area clearfix">
-                   <!--{if $tpl_stock_find[$id]}-->
-                       <!--{if $tpl_classcat_find1[$id]}-->
-                           <div class="classlist">
-                               <dl class="size01 clearfix">
+                            <!--{/if}-->
+                        </span><span id="price02_dynamic_<!--{$id}-->"></span>
+                        円</span>
+                </div>
+
+                <!--★コメント★-->
+                <div class="listcomment"><!--{$arrProduct.main_list_comment|h|nl2br}--></div>
+
+                <!--★商品詳細を見る★-->
+                <div class="detail_btn">
+                    <!--{assign var=name value="detail`$id`"}-->
+                    <a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrProduct.product_id|u}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_detail_on.jpg','<!--{$name}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_detail.jpg','<!--{$name}-->');">
+                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_detail.jpg" alt="商品詳細を見る" name="<!--{$name}-->" id="<!--{$name}-->" /></a>
+                </div>
+
+                <!--▼買い物かご-->
+                <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]}-->" />
+
+                <div class="cart_area clearfix">
+                    <!--{if $tpl_stock_find[$id]}-->
+                        <!--{if $tpl_classcat_find1[$id]}-->
+                            <div class="classlist">
+                                <dl class="size01 clearfix">
                                         <!--▼規格1-->
                                         <dt><!--{$tpl_class_name1[$id]|h}-->：</dt>
@@ -215,5 +215,5 @@
                                                 <p class="attention">※ <!--{$tpl_class_name1[$id]}-->を入力して下さい。</p>
                                             <!--{/if}-->
-                                       </dd>
+                                        </dd>
                                         <!--▲規格1-->
                                 </dl>
@@ -224,5 +224,5 @@
                                         <dd>
                                             <select name="classcategory_id2" style="<!--{$arrErr.classcategory_id2|sfGetErrorColor}-->">
-                                           </select>
+                                            </select>
                                             <!--{if $arrErr.classcategory_id2 != ""}-->
                                                 <p class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</p>
@@ -236,5 +236,5 @@
                         <div class="cartin clearfix">
                             <div class="quantity">
-                               数量：<input type="text" name="quantity" class="box" value="<!--{$arrProduct.quantity|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
+                                数量：<input type="text" name="quantity" class="box" value="<!--{$arrProduct.quantity|default:1|h}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
                                 <!--{if $arrErr.quantity != ""}-->
                                     <br /><span class="attention"><!--{$arrErr.quantity}--></span>
@@ -249,7 +249,7 @@
                             </div>
                         </div>
-                   <!--{else}-->
+                    <!--{else}-->
                         <div class="cartbtn attention">申し訳ございませんが、只今品切れ中です。</div>
-                   <!--{/if}-->
+                    <!--{/if}-->
                 </div>
                 <!--▲買い物かご-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20521)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20525)
@@ -41,9 +41,9 @@
             </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="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>
+                <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="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>
             </form>
         </div>
@@ -142,37 +142,37 @@
             <!--{if $isMultiple}-->
                 <table summary="お届け内容確認">
-                  <colgroup width="30%"></colgroup>
-                  <colgroup width="70%"></colgroup>
-                  <tr>
-                    <th>商品コード</th>
-                    <th>商品名</th>
-                    <th>単価</th>
-                    <th>数量</th>
-                    <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                    <th>小計</th>
-                    *}-->
-                  </tr>
-                  <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                      <tr>
-                          <td><!--{$item.productsClass.product_code|h}--></td>
-                          <td><!--{* 商品名 *}--><!--{$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}-->
-                              <!--{/if}-->
-                          </td>
-                          <td class="alignR">
-                              <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                          </td>
-                          <td class="alignC"><!--{$item.quantity}--></td>
-                          <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                          <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
-                          *}-->
-                      </tr>
-                  <!--{/foreach}-->
+                    <colgroup width="30%"></colgroup>
+                    <colgroup width="70%"></colgroup>
+                    <tr>
+                        <th>商品コード</th>
+                        <th>商品名</th>
+                        <th>単価</th>
+                        <th>数量</th>
+                        <!--{* XXX 購入小計と誤差が出るためコメントアウト
+                        <th>小計</th>
+                        *}-->
+                    </tr>
+                    <!--{foreach item=item from=$shippingItem.shipment_item}-->
+                        <tr>
+                            <td><!--{$item.productsClass.product_code|h}--></td>
+                            <td><!--{* 商品名 *}--><!--{$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}-->
+                                <!--{/if}-->
+                            </td>
+                            <td class="alignR">
+                                <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+                            </td>
+                            <td class="alignC"><!--{$item.quantity}--></td>
+                            <!--{* XXX 購入小計と誤差が出るためコメントアウト
+                            <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
+                            *}-->
+                        </tr>
+                    <!--{/foreach}-->
                 </table>
-             <!--{/if}-->
+            <!--{/if}-->
             <table summary="お届け先" class="delivname">
                     <colgroup width="30%"></colgroup>
@@ -224,5 +224,5 @@
             <ul>
                 <li>
-                 <a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg','change');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg','change');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" name="change" id="change" /></a>
+                    <a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg','change');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg','change');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る" name="change" id="change" /></a>
                 </li>
             </ul>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/refusal.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/refusal.tpl	(revision 20521)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/refusal.tpl	(revision 20525)
@@ -38,5 +38,5 @@
                     <ul>
                         <li>
-                          <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_refuse_on.jpg',this);" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_refuse.jpg',this);" src="<!--{$TPL_URLPATH}-->img/button/btn_refuse.jpg" alt="会員退会を行う" name="refusal" id="refusal" />
+                            <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_refuse_on.jpg',this);" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_refuse.jpg',this);" src="<!--{$TPL_URLPATH}-->img/button/btn_refuse.jpg" alt="会員退会を行う" name="refusal" id="refusal" />
                         </li>
                     </ul>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl	(revision 20408)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl	(revision 20525)
@@ -25,5 +25,5 @@
 <div id="mypagecolumn">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
-<!--{include file=$tpl_navi}-->
+    <!--{include file=$tpl_navi}-->
     <div id="mycontents_area">
         <h3><!--{$tpl_subtitle|h}--></h3>
@@ -32,10 +32,10 @@
 
         <!--{if $tpl_linemax < $smarty.const.DELIV_ADDR_MAX}-->
-          <!--{* 退会時非表示 *}-->
-          <!--{if $tpl_login}-->
-            <p class="add_address">
-                <a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_address_on.jpg','newadress');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_address.jpg','newadress');" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_address.jpg" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
-            </p>
-          <!--{/if}-->
+            <!--{* 退会時非表示 *}-->
+            <!--{if $tpl_login}-->
+                <p class="add_address">
+                    <a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/delivery_addr.php" onclick="win03('./delivery_addr.php','delivadd','600','640'); return false;" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_address_on.jpg','newadress');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_address.jpg','newadress');" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_address.jpg" alt="新しいお届け先を追加" border="0" name="newadress" /></a>
+                </p>
+            <!--{/if}-->
         <!--{/if}-->
 
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl	(revision 20521)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/index.tpl	(revision 20525)
@@ -55,13 +55,13 @@
                 </tr>
                 <!--{section name=cnt loop=$arrOrder}-->
-                <tr>
-                 <td><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></td>
-                 <td><!--{$arrOrder[cnt].order_id}--></td>
-                 <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
-                 <td><!--{$arrPayment[$payment_id]|h}--></td>
-                 <td class="alignR"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
-                 <td class="alignC"><a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
-             </tr>
-             <!--{/section}-->
+                    <tr>
+                        <td><!--{$arrOrder[cnt].create_date|sfDispDBDate}--></td>
+                        <td><!--{$arrOrder[cnt].order_id}--></td>
+                        <!--{assign var=payment_id value="`$arrOrder[cnt].payment_id`"}-->
+                        <td><!--{$arrPayment[$payment_id]|h}--></td>
+                        <td class="alignR"><!--{$arrOrder[cnt].payment_total|number_format}-->円</td>
+                        <td class="alignC"><a href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/history.php?order_id=<!--{$arrOrder[cnt].order_id}-->">詳細</a></td>
+                    </tr>
+                <!--{/section}-->
             </table>
 
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/change_complete.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/change_complete.tpl	(revision 20521)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/change_complete.tpl	(revision 20525)
@@ -31,7 +31,7 @@
         <div id="complete_area">
             <div class="message">
-                 会員登録内容の変更が完了いたしました。<br />
+                会員登録内容の変更が完了いたしました。<br />
             </div>
-             <p>今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
+            <p>今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
         </div>
     </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/navi.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/navi.tpl	(revision 20521)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/navi.tpl	(revision 20525)
@@ -26,34 +26,34 @@
         <ul class="mynavi_list clearfix">
 
-          <!--{if $tpl_login}-->
             <!--{* 会員状態 *}-->
-            <li><a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
-                購入履歴一覧</a></li>
-            <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
-                <li><a href="favorite.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
-                    お気に入り一覧</a></li>
+            <!--{if $tpl_login}-->
+                <li><a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
+                    購入履歴一覧</a></li>
+                <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
+                    <li><a href="favorite.php" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+                        お気に入り一覧</a></li>
+                <!--{/if}-->
+                <li><a href="change.php" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
+                    会員登録内容変更</a></li>
+                <li><a href="delivery.php" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
+                    お届け先追加・変更</a></li>
+                <li><a href="refusal.php" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
+                    退会手続き</a></li>
+
+            <!--{* 退会状態 *}-->
+            <!--{else}-->
+                <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
+                    購入履歴一覧</a></li>
+                <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
+                    <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
+                        お気に入り一覧</a></li>
+                <!--{/if}-->
+                <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
+                    会員登録内容変更</a></li>
+                <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
+                    お届け先追加・変更</a></li>
+                <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
+                    退会手続き</a></li>
             <!--{/if}-->
-            <li><a href="change.php" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
-                会員登録内容変更</a></li>
-            <li><a href="delivery.php" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
-                お届け先追加・変更</a></li>
-            <li><a href="refusal.php" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
-                退会手続き</a></li>
-          <!--{else}-->
-
-          <!--{* 退会状態 *}-->
-            <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'index'}--> selected<!--{/if}-->">
-                購入履歴一覧</a></li>
-            <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1}-->
-                <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'favorite'}--> selected<!--{/if}-->">
-                    お気に入り一覧</a></li>
-            <!--{/if}-->
-            <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'change'}--> selected<!--{/if}-->">
-                会員登録内容変更</a></li>
-            <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'delivery'}--> selected<!--{/if}-->">
-                お届け先追加・変更</a></li>
-            <li><a href="<!--{$smarty.const.TOP_URLPATH}-->" class="<!--{if $tpl_mypageno == 'refusal'}--> selected<!--{/if}-->">
-                退会手続き</a></li>
-          <!--{/if}-->
         </ul>
 
@@ -61,10 +61,10 @@
         <!--{if $point_disp !== false}-->
             <div class="point_announce clearfix">
-                 <p>ようこそ&nbsp;／&nbsp;
-                     <span class="user_name"><!--{$CustomerName1|h}--> <!--{$CustomerName2|h}-->様</span>
-                     <!--{if $smarty.const.USE_POINT !== false}-->&nbsp
-                         現在の所持ポイントは&nbsp;<span class="point st"><!--{$CustomerPoint|number_format|default:"0"|h}-->pt</span>&nbsp;です。
-                     <!--{/if}-->
-                 </p>
+                <p>ようこそ&nbsp;／&nbsp;
+                    <span class="user_name"><!--{$CustomerName1|h}--> <!--{$CustomerName2|h}-->様</span>
+                    <!--{if $smarty.const.USE_POINT !== false}-->&nbsp
+                        現在の所持ポイントは&nbsp;<span class="point st"><!--{$CustomerPoint|number_format|default:"0"|h}-->pt</span>&nbsp;です。
+                    <!--{/if}-->
+                </p>
             </div>
         <!--{/if}-->
