Index: /branches/version-2_5-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php
===================================================================
--- /branches/version-2_5-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php	(revision 20408)
+++ /branches/version-2_5-dev/data/class_extends/page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php	(revision 20408)
@@ -0,0 +1,68 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(CLASS_REALDIR . "pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php");
+
+/**
+ * ログイン(ヘッダブロック) のページクラス(拡張).
+ *
+ * LC_Page_FrontParts_Bloc_LoginHeader をカスタマイズする場合はこのクラスを編集する.
+ *
+ * @package Page
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class LC_Page_FrontParts_Bloc_LoginHeader_Ex extends LC_Page_FrontParts_Bloc_LoginHeader {
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        parent::process();
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
+?>
Index: /branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php	(revision 20408)
+++ /branches/version-2_5-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader.php	(revision 20408)
@@ -0,0 +1,77 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(CLASS_EX_REALDIR . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_Login_Ex.php");
+
+/**
+ * ログイン(ヘッダブロック) のページクラス.
+ *
+ * @package Page
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class LC_Page_FrontParts_Bloc_LoginHeader extends LC_Page_FrontParts_Bloc_Login_Ex {
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->setTplMainpage('login_header.tpl');
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        $this->action();
+        $this->sendResponse();
+    }
+
+    /**
+     * Page のアクション.
+     *
+     * @return void
+     */
+    function action() {
+        parent::action();
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
+?>
Index: /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php	(revision 20344)
+++ /branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php	(revision 20408)
@@ -92,4 +92,7 @@
      */
     function action() {
+        // 顧客クラスs
+        $objCustomer = new SC_Customer();
+
         // パラメータ管理クラス
         $this->objFormParam = new SC_FormParam();
@@ -104,12 +107,4 @@
         $product_id = $this->lfCheckProductId($this->objFormParam->getValue('admin'),$this->objFormParam->getValue('product_id'));
         $this->mode = $this->getMode();
-
-        $objCustomer = new SC_Customer();
-
-        // ログイン判定
-        if ($objCustomer->isLoginSuccess() === true) {
-            //お気に入りボタン表示
-            $this->tpl_login = true;
-        }
 
         // 規格選択セレクトボックスの作成
@@ -270,4 +265,12 @@
         //関連商品情報表示
         $this->arrRecommend = $this->lfPreGetRecommendProducts($product_id);
+
+        // ログイン判定
+        if ($objCustomer->isLoginSuccess() === true) {
+            //お気に入りボタン表示
+            $this->tpl_login = true;
+            $this->is_favorite = SC_Helper_DB_Ex::sfDataExists('dtb_customer_favorite_products', 'customer_id = ? AND product_id = ?', array($objCustomer->getValue('customer_id'), $product_id));
+        }
+
     }
 
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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl	(revision 20408)
@@ -32,5 +32,5 @@
             <p class="inputtext">会員の方は、登録時に入力されたメールアドレスとパスワードでログインしてください。</p>
             <div class="inputbox">
-                <dl class="formList clearfix">
+                <dl class="formlist clearfix">
                     <!--{assign var=key value="login_email"}-->
                     <span class="attention"><!--{$arrErr[$key]}--></span>
@@ -45,5 +45,5 @@
                     </dd>
                 </dl>
-                <dl class="formList clearfix">
+                <dl class="formlist clearfix">
                     <dt>
                         <!--{assign var=key value="login_pass"}-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 20408)
@@ -115,10 +115,10 @@
              <!--{/foreach}-->
                 <tr>
-                    <th colspan="4" class="resulttd">小計</th>
+                    <th colspan="4" class="alignR">小計</th>
                     <td class="alignR"><!--{$tpl_total_inctax[$cartKey]|number_format}-->円</td>
                 </tr>
                 <!--{if $smarty.const.USE_POINT !== false}-->
                     <tr>
-                        <th colspan="4" class="resulttd">値引き（ポイントご使用時）</th>
+                        <th colspan="4" class="alignR">値引き（ポイントご使用時）</th>
                         <td class="alignR">
                         <!--{assign var=discount value=`$arrForm.use_point*$smarty.const.POINT_VALUE`}-->
@@ -127,13 +127,13 @@
                 <!--{/if}-->
                 <tr>
-                    <th colspan="4" class="resulttd">送料</th>
+                    <th colspan="4" class="alignR">送料</th>
                     <td class="alignR"><!--{$arrForm.deliv_fee|number_format}-->円</td>
                 </tr>
                 <tr>
-                    <th colspan="4" class="resulttd">手数料</th>
+                    <th colspan="4" class="alignR">手数料</th>
                     <td class="alignR"><!--{$arrForm.charge|number_format}-->円</td>
                 </tr>
                 <tr>
-                    <th colspan="4" class="resulttd">合計</th>
+                    <th colspan="4" class="alignR">合計</th>
                     <td class="alignR"><span class="price"><!--{$arrForm.payment_total|number_format}-->円</span></td>
                 </tr>
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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 20408)
@@ -208,5 +208,5 @@
                 <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
                 <!--{assign var=index value=$smarty.foreach.shippingItem.index}-->
-                <div class="delivdate">
+                <div class="delivdate top">
                     <!--★お届け日★-->
                     <!--{assign var=key value="deliv_date`$index`"}-->
@@ -230,6 +230,7 @@
                     </select>
                     <!--{if $is_multiple}-->
-                        &nbsp;<!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
-                        &nbsp;<!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}-->
+                         <br />
+                        <!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
+                        <!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}-->
                     <!--{/if}-->
                  </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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 20408)
@@ -133,5 +133,5 @@
             <!--{assign var=key value="order_email"}-->
             <span class="attention"><!--{$arrErr[$key]}--></span>
-            <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" class="box380" /><br />
+            <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" class="box380 top" /><br />
             <!--{assign var=key value="order_email02"}-->
             <span class="attention"><!--{$arrErr[$key]}--></span>
@@ -144,9 +144,11 @@
           <td>
             <!--{assign var=key value="order_sex"}-->
-            <span class="attention"><!--{$arrErr[$key]}--></span>
-            <!--{if $arrErr[$key]}-->
-              <!--{assign var=err value="background-color: `$smarty.const.ERR_COLOR`"}-->
-            <!--{/if}-->
-            <!--{html_radios name="$key" options=$arrSex selected=$arrForm[$key].value style="$err"}-->
+    <!--{if $arrErr[$key]}-->
+    <div class="attention"><!--{$arrErr[$key]}--></div>
+    <!--{/if}-->
+    <span style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+        <input type="radio" id="man" name="<!--{$key}-->" value="1" <!--{if $arrForm[$key] eq 1}--> checked="checked" <!--{/if}--> /><label for="man">男性</label>
+        <input type="radio" id="woman" name="<!--{$key}-->" value="2" <!--{if $arrForm[$key] eq 2}--> checked="checked" <!--{/if}--> /><label for="woman">女性</label>
+    </span>
           </td>
         </tr>
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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20408)
@@ -138,5 +138,5 @@
                             <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
                         </td>
-                        <td id="quantity"><!--{$item.quantity}-->
+                        <td class="alignC"><!--{$item.quantity}-->
                             <ul id="quantity_level">
                                 <li><a href="?" onclick="fnFormModeSubmit('form<!--{$key}-->','up','cart_no','<!--{$item.cart_no}-->'); return false"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.jpg" width="16" height="16" alt="＋" /></a></li>
@@ -148,9 +148,9 @@
                  <!--{/foreach}-->
                  <tr>
-                     <th colspan="5" class="resulttd">小計</th>
+                     <th colspan="5" class="alignR">小計</th>
                      <td class="alignR"><!--{$tpl_total_inctax[$key]|number_format}-->円</td>
                  </tr>
                  <tr>
-                     <th colspan="5" class="resulttd">合計</th>
+                     <th colspan="5" class="alignR">合計</th>
                      <td class="alignR"><span class="price"><!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->円</span></td>
                  </tr>
@@ -158,10 +158,10 @@
                      <!--{if $arrData[$key].birth_point > 0}-->
                          <tr>
-                             <th colspan="5" class="resulttd">お誕生月ポイント</th>
+                             <th colspan="5" class="alignR">お誕生月ポイント</th>
                              <td class="alignR"><!--{$arrData[$key].birth_point|number_format}-->pt</td>
                          </tr>
                      <!--{/if}-->
                      <tr>
-                         <th colspan="5" class="resulttd">今回加算ポイント</th>
+                         <th colspan="5" class="alignR">今回加算ポイント</th>
                          <td class="alignR"><!--{$arrData[$key].add_point|number_format}-->pt</td>
                     </tr>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/contact/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/contact/index.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/contact/index.tpl	(revision 20408)
@@ -103,5 +103,5 @@
         <td>
           <span class="attention"><!--{$arrErr.email}--><!--{$arrErr.email02}--></span>
-          <input type="text" class="box380" name="email" value="<!--{$arrForm.email.value|h|default:$arrData.email|h}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.email|sfGetErrorColor}-->; ime-mode: disabled;" /><br />
+          <input type="text" class="box380 top" name="email" value="<!--{$arrForm.email.value|h|default:$arrData.email|h}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.email|sfGetErrorColor}-->; ime-mode: disabled;" /><br />
           <!--{* ログインしていれば入力済みにする *}-->
           <!--{if $smarty.server.REQUEST_METHOD != 'POST' && $smarty.session.customer}-->
@@ -117,5 +117,5 @@
         <td>
           <span class="attention"><!--{$arrErr.contents}--></span>
-          <textarea name="contents" class="area380" cols="60" rows="20" style="<!--{$arrErr.contents.value|h|sfGetErrorColor}-->; ime-mode: active;"><!--{$arrForm.contents|h}--></textarea>
+          <textarea name="contents" class="box380" cols="60" rows="20" style="<!--{$arrErr.contents.value|h|sfGetErrorColor}-->; ime-mode: active;"><!--{$arrForm.contents|h}--></textarea>
         </td>
       </tr>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 20340)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 20408)
@@ -24,7 +24,7 @@
 <!--{$tpl_header}-->
 
-*******************************************************
+************************************************
 　ご請求金額
-*******************************************************
+************************************************
 
 ご注文番号：<!--{$arrOrder.order_id}-->
@@ -34,7 +34,7 @@
 
 <!--{if $arrOther.title.value}-->
-*******************************************************
+************************************************
 　<!--{$arrOther.title.name}-->情報
-*******************************************************
+************************************************
 
 <!--{foreach key=key item=item from=$arrOther}-->
@@ -45,7 +45,7 @@
 <!--{/if}-->
 
-*******************************************************
+************************************************
 　ご注文商品明細
-*******************************************************
+************************************************
 
 <!--{section name=cnt loop=$arrOrderDetail}-->
@@ -56,16 +56,16 @@
 
 <!--{/section}-->
--------------------------------------------------------
+-------------------------------------------------
 小　計 ￥ <!--{$arrOrder.subtotal|number_format|default:0}--> (うち消費税 ￥<!--{$arrOrder.tax|number_format|default:0}-->）
 値引き ￥ <!--{$arrOrder.use_point+$arrOrder.discount|number_format|default:0}-->
 送　料 ￥ <!--{$arrOrder.deliv_fee|number_format|default:0}-->
 手数料 ￥ <!--{$arrOrder.charge|number_format|default:0}-->
-=================================================
+============================================
 合　計 ￥ <!--{$arrOrder.payment_total|number_format|default:0}-->
 
 
-*******************************************************
+************************************************
 　配送情報
-*******************************************************
+************************************************
 
 <!--{foreach item=shipping name=shipping from=$arrShipping}-->
@@ -88,5 +88,5 @@
 <!--{/foreach}-->
 <!--{if $arrOrder.customer_id && $smarty.const.USE_POINT !== false}-->
-=================================================
+============================================
 <!--{* ご注文前のポイント {$tpl_user_point} pt *}-->
 ご使用ポイント <!--{$arrOrder.use_point|default:0}--> pt
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl	(revision 20408)
@@ -41,5 +41,5 @@
                     <!--{/if}-->
                 <!--{else}-->
-                <dl class="formList">
+                <dl class="formlist">
                     <dt>メールアドレス</dt>
                     <dd>
@@ -52,5 +52,5 @@
                     </dd>
                 </dl>
-                <dl class="formList">
+                <dl class="formlist">
                     <dt class="password">パスワード</dt>
                     <dd><input type="password" name="login_pass" class="box140" /></dd>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 20340)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 20408)
@@ -24,8 +24,8 @@
     <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_news.jpg"alt="新着情報" /><span class="rss"><a href="<!--{$smarty.const.ROOT_URLPATH}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" target="_blank"><img src="<!--{$TPL_URLPATH}-->img/button/btn_rss.jpg"alt="RSS" /></a></span></h2>
         <div class="bloc_body">
-            <div class="newsContents">
+            <div class="news_contents">
             <!--{section name=data loop=$arrNews}-->
             <!--{assign var="date_array" value="-"|explode:$arrNews[data].news_date_disp}-->
-            <dl class="newsList">
+            <dl class="newslist">
                 <dt><!--{$date_array[0]}-->年<!--{$date_array[1]}-->月<!--{$date_array[2]}-->日</dt>
                 <dt>
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 20408)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login_header.tpl	(revision 20408)
@@ -0,0 +1,40 @@
+<div class="bloc_outer">
+    <div id="header_login_area" class="clearfix">
+        <form name="login_form" id="login_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_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}-->
+                    <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_form', 'logout', '', ''); return false;" alt="ログアウト" />
+                     </p>
+                    <!--{/if}-->
+                <!--{else}-->
+                <ul class="formlist clearfix">
+                    <li class="mail">
+                        <input type="text" class="box150" name="login_email" value="<!--{$tpl_login_email|h}-->" style="ime-mode: disabled;" />
+                    </li>
+                    <li class="login_memory">
+                        <input type="checkbox" name="login_memory" id="login_memory" value="1" <!--{$tpl_login_memory|sfGetChecked:1}--> /><label for="login_memory"><span>記憶</span></label>
+                    </li>
+                    <li class="password"><input type="password" class="box100" name="login_pass" /></li>
+                    <li class="btn">
+                        <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_login_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/common/btn_header_login.jpg',this)" src="<!--{$TPL_URLPATH}-->img/common/btn_header_login.jpg" />
+                    </li>
+                    <li class="forgot">
+                        <a href="<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->" onclick="win01('<!--{$smarty.const.HTTPS_URL|sfTrimURL}-->/forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->','forget','600','400'); return false;" target="_blank">パスワードを忘れた方</a>
+                    </li>
+                </ull>
+
+              <!--{/if}-->
+            </div>
+        </form>
+    </div>
+</div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl	(revision 20408)
@@ -36,5 +36,5 @@
                 </dd>
             </dl>
-            <dl class="formList">
+            <dl class="formlist">
                 <!--{if $arrMakerList}-->
                 <dt>メーカーから選ぶ</dt>
@@ -45,5 +45,5 @@
                 </dd>
             </dl>
-            <dl class="formList">
+            <dl class="formlist">
                 <!--{/if}-->
                 <dt>商品名を入力</dt>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl	(revision 20408)
@@ -34,4 +34,6 @@
         <input type="hidden" name="product_id" value="<!--{$arrForm.product_id}-->" />
         <table summary="お客様の声書き込み">
+          <colgroup width="30%"></colgroup>
+          <colgroup width="70%"></colgroup>
           <tr>
             <th>商品名</th>
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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	(revision 20408)
@@ -42,5 +42,5 @@
 
 <!--▼CONTENTS-->
-<div id="undercolumn" class="product product_detail">
+<div id="undercolumn">
   <form name="form1" id="form1" method="post" action="?">
     <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
@@ -150,5 +150,4 @@
                         </span><span id="point_dynamic"></span>
                         Pt
-                    </span>
                 </div>
             <!--{/if}-->
@@ -231,17 +230,17 @@
           </div>
 
-        <div class="cartin">
-            <div class="cartin_btn">
-                <div id="cartbtn_default">
-                <!--★カゴに入れる★-->
-                    <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
-                    <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="カゴに入れる" name="cart" id="cart" /></a>
-                </div>
-            </div>
-
-        <div class="attention" id="cartbtn_dynamic"></div>
-        <!--{else}-->
-            <div class="attention" id="cartbtn_default">申し訳ございませんが、只今品切れ中です。</div>
-        <!--{/if}-->
+          <div class="cartin">
+              <div class="cartin_btn">
+                  <div id="cartbtn_default">
+                  <!--★カゴに入れる★-->
+                      <a href="javascript:void(document.form1.submit())" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin_on.jpg','cart');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg','cart');">
+                      <img src="<!--{$TPL_URLPATH}-->img/button/btn_cartin.jpg" alt="カゴに入れる" name="cart" id="cart" /></a>
+                  </div>
+              </div>
+          </div>
+          <div class="attention" id="cartbtn_dynamic"></div>
+    <!--{else}-->
+      <div class="attention" id="cartbtn_default">申し訳ございませんが、只今品切れ中です。</div>
+    <!--{/if}-->
 
         <!--★お気に入り登録★-->
@@ -251,13 +250,12 @@
                     <!--{if $arrErr[$add_favorite]}-->
                         <div class="attention"><!--{$arrErr[$add_favorite]}--></div><!--{/if}-->
-                            <!--{if !$arrProduct.favorite_count}-->
+                            <!--{if !$is_favorite}-->
                                 <a href="javascript:fnModeSubmit('add_favorite','favorite_product_id','<!--{$arrProduct.product_id|h}-->');" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg','add_favolite_product');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg','add_favolite_product');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite.jpg" alt="お気に入りに追加" name="add_favolite_product" id="add_favolite_product" /></a>
                             <!--{else}-->
-                            <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="お気に入り登録済" name="add_favolite_product" id="add_favolite_product" />
-                        <!--{/if}-->
-                    </div>
+                                <img src="<!--{$TPL_URLPATH}-->img/button/btn_add_favorite_on.jpg" alt="お気に入り登録済" name="add_favolite_product" id="add_favolite_product" />
+                            <!--{/if}-->
+                       </div>
                   <!--{/if}-->
-                </div>
-          </div>
+            </div>
         </div>
       <!--▲買い物かご-->
@@ -274,11 +272,9 @@
                 <h3><!--★サブタイトル★--><!--{$arrProduct[$key]|h}--></h3>
                 <!--{assign var=ckey value="sub_comment`$smarty.section.cnt.index+1`"}-->
-
-                <div class="subtext"><!--★サブテキスト★--><!--{$arrProduct[$ckey]|nl2br_html}--></div>
-
                 <!--▼サブ画像-->
                 <!--{assign var=key value="sub_image`$smarty.section.cnt.index+1`"}-->
                 <!--{assign var=lkey value="sub_large_image`$smarty.section.cnt.index+1`"}-->
                 <!--{if $arrProduct[$key]|strlen >= 1}-->
+                    <div class="subtext"><!--★サブテキスト★--><!--{$arrProduct[$ckey]|nl2br_html}--></div>
                     <div class="subphotoimg">
                         <!--{if $arrProduct[$lkey]|strlen >= 1}-->
@@ -287,11 +283,13 @@
                         <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" />
                 <!--{if $arrProduct[$lkey]|strlen >= 1}--></a>
-            <span class="mini">
-                <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
-                   画像を拡大する
-                 </a>
-            </span>
-            <!--{/if}-->
-                    </div>
+                <span class="mini">
+                    <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
+                      画像を拡大する
+                    </a>
+                </span>
+            <!--{/if}-->
+                    </div>
+                <!--{else}-->
+                    <p class="subtext"><!--★サブテキスト★--><!--{$arrProduct[$ckey]|nl2br_html}--></p>
                 <!--{/if}-->
                 <!--▲サブ画像-->
@@ -307,5 +305,5 @@
         <div class="review_bloc clearfix">
             <p>この商品に対するご感想をぜひお寄せください。</p>
-            <div class="reviewbtn">
+            <div class="review_btn">
                 <!--{if count($arrReview) < $smarty.const.REVIEW_REGIST_MAX}-->
                     <!--★新規コメントを書き込む★-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl	(revision 20340)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl	(revision 20408)
@@ -25,12 +25,12 @@
     <h2 class="title">お客様の声書き込み</h2>
     <div id="completebox">
-      <p>登録が完了しました。ご利用ありがとうございました。<br />
-       弊社にて登録内容を確認後、ホームページに反映させていただきます。<br />
+      <p class="message">登録が完了しました。ご利用ありがとうございました。</p>
+      <p>弊社にて登録内容を確認後、ホームページに反映させていただきます。<br />
        今しばらくお待ちくださいませ。</p>
     </div>
-        <div class="btn_area">
-    <ul>
-        <li><a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close_on.jpg','b_close');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close.jpg','b_close');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_close.jpg" alt="閉じる" border="0" name="b_close" /></a></li>
-    </ul>
+    <div class="btn_area">
+        <ul>
+            <li><a href="javascript:window.close()" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close_on.jpg','b_close');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_close.jpg','b_close');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_close.jpg" alt="閉じる" border="0" name="b_close" /></a></li>
+        </ul>
     </div>
   </div>
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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl	(revision 20408)
@@ -61,5 +61,5 @@
 
 <!--▼CONTENTS-->
-<div id="undercolumn" class="product product_list">
+<div id="undercolumn">
     <form name="form1" id="form1" method="get" action="?">
         <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
Index: /branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 20408)
@@ -33,4 +33,6 @@
 
         <table summary="お客様の声書き込み">
+          <colgroup width="30%"></colgroup>
+          <colgroup width="70%"></colgroup>
           <tr>
             <th>商品名</th>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/index.tpl	(revision 20340)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/index.tpl	(revision 20408)
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *}-->
-<div id="mainImage">
-                    <a href="http://www.ec-cube.net/" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/banner/bnr_top_main_on.jpg','bnr_top_main');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/banner/bnr_top_main.jpg','bnr_top_main');">
-                        <img src="<!--{$TPL_URLPATH}-->img/banner/bnr_top_main.jpg" alt="EC-CUBE" id="bnr_top_main" name="bnr_top_main" />
-                    </a>
+<div id="main_image">
+    <a href="http://www.ec-cube.net/" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/banner/bnr_top_main_on.jpg','bnr_top_main');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/banner/bnr_top_main.jpg','bnr_top_main');">
+        <img src="<!--{$TPL_URLPATH}-->img/banner/bnr_top_main.jpg" alt="EC-CUBE" id="bnr_top_main" name="bnr_top_main" />
+    </a>
 </div>
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl	(revision 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl	(revision 20408)
@@ -35,5 +35,5 @@
             <p class="inputtext">会員の方は、登録時に入力されたメールアドレスとパスワードでログインしてください。</p>
             <div class="inputbox">
-                <dl class="formList clearfix">
+                <dl class="formlist clearfix">
                     <!--{assign var=key value="login_email"}-->
                     <span class="attention"><!--{$arrErr[$key]}--></span>
@@ -48,5 +48,5 @@
                     </dd>
                 </dl>
-                <dl class="formList clearfix">
+                <dl class="formlist clearfix">
                     <dt>
                         <!--{assign var=key value="login_pass"}-->
Index: /branches/version-2_5-dev/data/Smarty/templates/default/mypage/mail_view.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/default/mypage/mail_view.tpl	(revision 20116)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/mail_view.tpl	(revision 20408)
@@ -1,4 +1,4 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="MYページ/メール履歴詳細"}-->
-
+<div id="window_area">
 <table class="form">
   <tr>
@@ -11,4 +11,4 @@
   </tr>
 </table>
-
+</div>
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_footer.tpl"}-->
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 20290)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/change_complete.tpl	(revision 20408)
@@ -35,13 +35,4 @@
        <p>今後ともご愛顧賜りますようよろしくお願い申し上げます。</p>
     </div>
-
-    <div class="btn_area">
-            <ul>
-                <li>
-                     <a href="<!--{$smarty.const.TOP_URLPATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage_on.jpg','fortop');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg','fortop');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_toppage.jpg" alt="トップページへ" name="fortop" id="fortop" /></a>
-                </li>
-            </ul>
-    </div>
-
   </div>
 </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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20408)
@@ -167,5 +167,5 @@
                           <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
                       </td>
-                      <td id="quantity"><!--{$item.quantity}--></td>
+                      <td class="alignC"><!--{$item.quantity}--></td>
                       <!--{* XXX 購入小計と誤差が出るためコメントアウト
                       <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
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 20407)
+++ /branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl	(revision 20408)
@@ -51,5 +51,5 @@
             <colgroup width="25%"></colgroup>
             <colgroup width="50%"></colgroup>
-               <colgroup width="10%"></colgroup>
+            <colgroup width="10%"></colgroup>
             <colgroup width="10%"></colgroup>
                 <tr>
Index: /branches/version-2_5-dev/html/frontparts/bloc/login_header.php
===================================================================
--- /branches/version-2_5-dev/html/frontparts/bloc/login_header.php	(revision 20408)
+++ /branches/version-2_5-dev/html/frontparts/bloc/login_header.php	(revision 20408)
@@ -0,0 +1,34 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(realpath(dirname(__FILE__)) . "/../../require.php");
+require_once(CLASS_EX_REALDIR . "page_extends/frontparts/bloc/LC_Page_FrontParts_Bloc_LoginHeader_Ex.php");
+
+// }}}
+// {{{ generate page
+$objPage = new LC_Page_FrontParts_BLoc_LoginHeader_Ex();
+register_shutdown_function(array($objPage, "destroy"));
+$objPage->init();
+$objPage->process();
+?>
Index: /branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 20395)
+++ /branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 20408)
@@ -7,4 +7,5 @@
 INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, deletable_flg) VALUES (10, 7, 'おすすめ商品', 'recommend.tpl', 'recommend', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/recommend.php', 0);
 INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, deletable_flg) VALUES (10, 8, 'カレンダー', 'calendar.tpl', 'calendar', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/calendar.php', 0);
+INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, deletable_flg) VALUES (10, 9, '【ヘッダー】ログイン', 'login_header.tpl', 'login_header', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/login_header.php', 0);
 INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, deletable_flg) VALUES (1, 1, 'カテゴリ', 'category.tpl', 'category', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'frontparts/bloc/category.php', 0);
 INSERT INTO dtb_bloc (device_type_id, bloc_id, bloc_name, tpl_path, filename, create_date, update_date, php_path, deletable_flg) VALUES (1, 2, '利用ガイド', 'guide.tpl', 'guide', CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, NULL, 0);
@@ -33,4 +34,5 @@
 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 1, 4, 5, 2, 0);
 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 1, 3, 6, 1, 0);
+INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 1, 10, 9, 1, 1);
 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 2, 1, 1, 2, 0);
 INSERT INTO dtb_blocposition (device_type_id, page_id, target_id, bloc_id, bloc_row, anywhere) VALUES (10, 2, 1, 2, 3, 0);
Index: /branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css	(revision 20340)
+++ /branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css	(revision 20408)
@@ -16,10 +16,9 @@
 -カテゴリー
 -ガイドリンク
--ログイン
+-ログイン（サイド用）
 -検索
 -カレンダー
 -おすすめ商品
-    tplファイルのマークアップが同じ項目
-    *メインカラム用 1カラム時 [one_maincolumn 
+    *メインカラム用 1カラム時 [one_maincolumn]
     *メインカラム用 2カラム時 [two_maincolumn_left]
                               [two_maincolumn_right]
@@ -59,11 +58,11 @@
 ----------------------------------------------- */
 /* ログイン 検索条件 */
-#container .bloc_outer .bloc_body dl.formList {
+#container .bloc_outer .bloc_body dl.formlist {
     margin-bottom: 8px;
 }
-#container .bloc_outer .bloc_body dl.formList dd {
-    margin-bottom: 5px;
-}
-#container .bloc_outer .bloc_body dl.formList dt {
+#container .bloc_outer .bloc_body dl.formlist dd {
+    margin-bottom: 5px;
+}
+#container .bloc_outer .bloc_body dl.formlist dt {
     margin-bottom: 3px;
     padding-left: 15px;
@@ -71,5 +70,5 @@
     font-size: 90%;
 }
-#container .bloc_outer .bloc_body dl.formList span{
+#container .bloc_outer .bloc_body dl.formlist span{
     vertical-align: top;
 }
@@ -99,10 +98,4 @@
 
 /* タイトルの背景 オレンジ */
-#recomend_area .titleWrap ,
-#news_area.titleWrap {
-    padding-bottom: 1px;
-    font-size: 14px;
-}
-
 #recomend_area h2 ,
 #news_area h2 {
@@ -138,5 +131,5 @@
     padding: 10px;
 }
-#news_area .newsContents {
+#news_area .news_contents {
     padding-right: 10px;
     max-height:260px;
@@ -147,11 +140,11 @@
 }
 
-#news_area dl.newsList {
+#news_area dl.newslist {
     background: url("../img/background/line_dot_01.gif") repeat-x bottom;
 }
-#news_area dl.newsList dt {
-    margin-bottom: 5px;
-}
-#news_area dl.newsList dd {
+#news_area dl.newslist dt {
+    margin-bottom: 5px;
+}
+#news_area dl.newslist dd {
     margin-bottom: 10px;
     padding-bottom: 10px;
@@ -254,6 +247,6 @@
 
 /* ===============================================
-▼ログイン
-※ヘッダー用はheader_block.css内に記述
+▼ログイン（サイド用）
+※ヘッダー用はbloc_alpha.css内に記述
 =============================================== */
 #container div#login_area .bloc_body {
@@ -268,9 +261,9 @@
     text-align: center;
 }
-#container .login_area dl.formList {
+#container .login_area dl.formlist {
     margin-bottom: 8px;
     width: 420px;
 }
-#container .login_area dl.formList dt {
+#container .login_area dl.formlist dt {
     margin-bottom: 3px;
     padding-left: 15px;
@@ -281,5 +274,5 @@
     font-size: 90%;
 }
-#container .login_area dl.formList dd {
+#container .login_area dl.formlist dd {
     margin-bottom: 5px;
     float: right;
@@ -445,5 +438,4 @@
 }
 
-
 /* サイドカラム用 (幅px固定) */
 .side_column #recomend_area .bloc_body {
Index: /branches/version-2_5-dev/html/user_data/packages/default/css/popup.css
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/default/css/popup.css	(revision 20340)
+++ /branches/version-2_5-dev/html/user_data/packages/default/css/popup.css	(revision 20408)
@@ -8,4 +8,5 @@
 div#windowcolumn {
     border-top: solid 3px #f90;
+    width: 560px;
     height: 100%;
     margin: 15px 15px 0 15px;
@@ -27,4 +28,6 @@
     padding-bottom: 20px;
     width: 540px;
+    min-height:300px;
+    height: auto !important;
 }
 
@@ -54,7 +57,4 @@
 div#window_area #forgot .mailaddres {
     margin-bottom: 10px;
-}
-div#window_area .zipimg img {
-    margin: 5px 0 0 0;
 }
 
Index: /branches/version-2_5-dev/html/user_data/packages/default/css/bloc_alpha.css
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/default/css/bloc_alpha.css	(revision 20341)
+++ /branches/version-2_5-dev/html/user_data/packages/default/css/bloc_alpha.css	(revision 20408)
@@ -1,5 +1,5 @@
 @charset "utf-8";
 
-/* ***********************************************
+/************************************************
  インヘッダーブロック
 ************************************************ */
@@ -11,5 +11,5 @@
 }
 
-/* ログイン
+/* ログイン（ヘッダー用）
 ----------------------------------------------- */
 #header_login_area {
@@ -20,11 +20,11 @@
     letter-spacing: -0.075em;
 }
-#header_login_area ul.formList {
+#header_login_area ul.formlist {
     margin-top: 5px;
 }
-#header_login_area ul.formList li {
+#header_login_area ul.formlist li {
     float: left;
 }
-#header_login_area ul.formList li.mail {
+#header_login_area ul.formlist li.mail {
     padding-left: 28px;
     width: 155px;
@@ -32,21 +32,28 @@
     font-size: 90%;
 }
-#header_login_area ul.formList li.password {
+#header_login_area ul.formlist li.password {
     padding-right: 5px;
 }
-#header_login_area ul.formList li.login_memory {
+#header_login_area ul.formlist li.login_memory {
     padding-right: 5px;
     font-size: 90%;
 }
-#header_login_area ul.formList li.forgot{
+#header_login_area ul.formlist li.forgot{
     margin-top: 3px;
     padding-right: 5px;
     font-size: 90%;
 }
-#header_login_area ul.formList li.btn {
+#header_login_area ul.formlist li.btn {
     padding-right: 5px;
     width: 53px;
 }
-
+#header_login_area p.btn {
+    height: 20px;
+    padding: 5px 0;
+    vertical-align: middle;
+}
+#header_login_area p.btn input[type=image] {
+    vertical-align: middle;
+}
 
 /* ***********************************************
@@ -80,7 +87,2 @@
 }
 
-
-
-
-
-
Index: /branches/version-2_5-dev/html/user_data/packages/default/css/common.css
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/default/css/common.css	(revision 20340)
+++ /branches/version-2_5-dev/html/user_data/packages/default/css/common.css	(revision 20408)
@@ -3,5 +3,5 @@
 /************************************************
  共通設定
-/************************************************/
+************************************************ */
 body {
     font-family: Verdana,Arial,Helvetica,sans-serif;
@@ -93,5 +93,5 @@
 
 /* 下層コンテンツ */
-div#undercolumn { width: 100%; margin: 0 0 30px 0;}
+#undercolumn { width: 100%; margin: 0 0 30px 0;}
 
 
@@ -127,4 +127,5 @@
 a[href]:hover { 
     color: #f60;
+    text-decoration: underline;
 }
 
@@ -135,7 +136,7 @@
 .price { color: #f00; }
 .sale_price { color: #f00; }
+.normal_price { color: #f00; font-size: 90%; }
 .point { color: #f00; font-weight: bold; }
 .user_name { font-weight: bold; }
-.normal_price { color: #f00; font-size: 90%; }
 .recommend_level { color: #ecbd00; }
 
@@ -148,5 +149,4 @@
 /* 行揃え
 ----------------------------------------------- */
-.phototd { width: 75px; text-align: center; }
 .alignC { text-align: center; }
 .alignR { text-align: right; }
@@ -164,16 +164,16 @@
 }
 
-.box40 {width: 40px; }
-.box60 {width: 60px; }
-.box100 {width: 100px; }
-.box120 {width: 120px; }
-.box140 {width: 140px; }
-.box145 {width: 145px; }
-.box150 {width: 150px; }
-.box240 {width: 240px; }
-.box300 {width: 300px; }
-.box320 {width: 320px; }
-.box350 {width: 350px; }
-.box380 {width: 380px; }
+.box40 { width: 40px; }
+.box60 { width: 60px; }
+.box100 { width: 100px; }
+.box120 { width: 120px; }
+.box140 { width: 140px; }
+.box145 { width: 145px; }
+.box150 { width: 150px; }
+.box240 { width: 240px; }
+.box300 { width: 300px; }
+.box320 { width: 320px; }
+.box350 { width: 350px; }
+.box380 { width: 380px; }
 
 /* フォームが縦に重なり合う場合に併用する余白 */
@@ -219,13 +219,4 @@
 /* レイアウト
 ----------------------------------------------- */
-#errorHeader {
-    color: #F00;
-    font-weight: bold;
-    font-size: 12px;
-    background-color: #FEB;
-    text-align: center;
-    padding: 5px;
-}
-
 #header_wrap {
     border-top: solid 3px #f90;
@@ -259,5 +250,5 @@
     height: 33px;
 }
-#logo_area h1 span{
+#logo_area h1 span {
     display: none;/* テキストロゴ非表示 */
 }
@@ -291,8 +282,8 @@
 }
 #footer {
+    margin: auto;
     padding-top: 10px;
     border-top: solid 1px #ccc;
     width: 950px;
-    margin: auto;
 }
 #pagetop {
Index: /branches/version-2_5-dev/html/user_data/packages/default/css/contents.css
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/default/css/contents.css	(revision 20340)
+++ /branches/version-2_5-dev/html/user_data/packages/default/css/contents.css	(revision 20408)
@@ -3,5 +3,5 @@
 /************************************************
  各ページコンテンツ用
-/************************************************
+************************************************ */
 /* ==============================================
 ▼TOP
@@ -9,5 +9,5 @@
 /* メインイメージ
 ----------------------------------------------- */
-#mainImage {
+#main_image {
     margin-bottom: 10px;
     text-align: center;
@@ -33,6 +33,6 @@
 ----------------------------------------------- */
 div#undercolumn_contact {
-    width: 100%;
     margin: 0 auto;
+    width: 100%;
 }
 
@@ -76,5 +76,5 @@
     background-color: #fffaf0;
 }
-div#mynavi_area div.point_announce p{
+div#mynavi_area div.point_announce p {
     padding-left: 20px;
     background: url('../img/icon/ico_point.gif') no-repeat left ;
@@ -118,10 +118,4 @@
 /* 会員登録内容変更/退会
 ----------------------------------------------- */
-div#mycontents_area .box120 {
-    padding: 2px;
-    border: 1px solid #ccc;
-    width: 120px;
-}
-
 div#mycontents_area .message_area {
     margin: 30px auto;
@@ -184,5 +178,5 @@
 }
 
-div#undercolumn_error .messagearea .error {
+div#undercolumn_error .message_area .error {
     padding: 120px 0;
 }
@@ -199,6 +193,6 @@
 }
 .pagecond_area {
+    margin-bottom: 20px;
     padding: 10px;
-    margin-bottom: 20px;
 }
 .pagenumber_area {
@@ -218,5 +212,6 @@
 }
 
-/* 商品
+
+/* レイアウト
 ----------------------------------------------- */
 div.list_area {
@@ -225,12 +220,31 @@
     overflow: auto;
 }
+
 div.listphoto {
     float: left;
 }
-div.listrightbloc {
+
+/* メインカラム用 1カラム時*/
+#one_maincolumn div.listrightbloc {
     float: right;
     width: 74%;
 }
 
+/* メインカラム用 2カラム時*/
+#two_maincolumn_right div.listrightbloc ,
+#two_maincolumn_left div.listrightbloc {
+    float: right;
+    width: 80%;
+}
+
+/* メインカラム用 3カラム時*/
+#three_maincolumn div.listrightbloc {
+    float: right;
+    width: 74%;
+}
+
+
+/* 商品情報 各種設定
+----------------------------------------------- */
 /* 商品ステータス */
 div.listrightbloc ul.status_icon {
@@ -332,4 +346,6 @@
 }
 
+/* レイアウト
+----------------------------------------------- */
 /* 1カラム用 */
 #one_maincolumn div#detailphotobloc {
@@ -351,4 +367,7 @@
     text-align: right;
 }
+#one_maincolumn p.subtext {
+    margin-bottom: 20px;
+}
 
 /* 2カラム用 */
@@ -369,4 +388,8 @@
     width: 73%;
 }
+#two_maincolumn_left p.subtext,
+#two_maincolumn_right p.subtext {
+    margin-bottom: 20px;
+}
 #two_maincolumn_left div.subphotoimg ,
 #two_maincolumn_right div.subphotoimg {
@@ -390,4 +413,7 @@
     width: 63%;
 }
+#three_maincolumn p.subtext {
+    margin-bottom: 20px;
+}
 #three_maincolumn div.subphotoimg {
     float: right;
@@ -396,5 +422,5 @@
 }
 
-/* 商品
+/* 商品情報 各種設定
 ----------------------------------------------- */
 div#detailrightbloc h2 {
@@ -459,4 +485,5 @@
 }
 div#detailrightbloc .favorite_btn {
+    text-align: center;
     margin-top: 10px;
 }
@@ -489,5 +516,5 @@
 }
 
-div#customervoice_area review_bloc .reviewbtn {
+div#customervoice_area review_bloc .review_btn {
     float: right;
     width: 160px;
@@ -526,5 +553,8 @@
 
 
-/* カートの中
+/* ***********************************************
+▼カートの中
+/*********************************************** */
+/* 現在のカゴの中
 ----------------------------------------------- */
 div#undercolumn_cart .point_announce {
@@ -543,13 +573,4 @@
 div#undercolumn_cart p {
     margin: 10px 5px;
-}
-
-div#undercolumn table th.resulttd {
-    text-align: right;
-}
-
-div#undercolumn td#quantity {
-   text-align: center;
-   width: 70px;
 }
 
@@ -624,6 +645,6 @@
 ----------------------------------------------- */
 #address_area {
-    width: 100%;
     margin-bottom: 30px;
+    width: 100%;
 }
 
@@ -656,4 +677,5 @@
     font-size: 10px;
 }
+
 
 /* ==============================================
