Index: branches/version-2_5-dev/html/user_data/packages/default/css/import.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/import.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/import.css	(revision 20340)
@@ -1,4 +1,7 @@
 @charset "utf-8";
 
+/************************************************
+ import css (ポップアップ用)
+************************************************ */
 @import url("./set.css");
 @import url("./common.css");
@@ -6,8 +9,6 @@
 @import url("./table.css");
 @import url("./bloc.css");
-@import url("./header_bloc.css");
+@import url("./bloc_alpha.css");
 @import url("./popup_import.css");
-@import url("./popup.css");
 
 @import url("./print.css");
-/* @import url("./pluginbloc.css"); */
Index: branches/version-2_5-dev/html/user_data/packages/default/css/set.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/set.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/set.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-ブラウザリセット
+ ブラウザリセット
 ************************************************ */
 html, body, div, span, applet, object, iframe, h1, h2, h3,
Index: branches/version-2_5-dev/html/user_data/packages/default/css/print.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/print.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/print.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-	印刷用
+ 印刷用
 ************************************************ */
 
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 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/contents.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-各ページコンテンツ用
+ 各ページコンテンツ用
 /************************************************
 /* ==============================================
@@ -37,34 +37,9 @@
 }
 
-div#undercolumn_contact .box120 {
-    width: 120px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_contact .box60 {
-    width: 60px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_contact .box380 {
-    width: 380px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#undercolumn_contact .area380 {
-    width: 380px;
-    height: 250px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
 .zipimg img {
-	vertical-align: middle;
-}
+    vertical-align: middle;
+}
+
+
 /* ==============================================
 ▼MYページ
@@ -98,6 +73,6 @@
     margin-bottom: 30px;
     padding: 10px;
+    border: solid 1px #ffcc62;
     background-color: #fffaf0;
-    border: solid 1px #ffcc62;
 }
 div#mynavi_area div.point_announce p{
@@ -112,27 +87,7 @@
 div#mypagecolumn h4 {
     margin: 10px auto;
-    font-size: 120%;
     border-bottom: 1px solid #999;
     text-align: left;
-}
-
-div#mycontents_area table th.resulttd {
-    text-align: right;
-}
-
-div#mycontents_area table.delivname th {
-    text-align: left;
-    width: 140px;
-}
-
-div#mycontents_area table caption {
-    border-top: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    border-left: 1px solid #ccc;
-    padding: 8px;
-    background-color: #f0f0f0;
-    text-align: left;
-    font-weight: bold;
-    color: #000;
+    font-size: 120%;
 }
 
@@ -140,10 +95,20 @@
 /* 購入履歴一覧/詳細
 ----------------------------------------------- */
-div#mycontents_area p.myconditionarea {
+div#mycontents_area div.mycondition_area {
     margin: 0 auto 20px 0;
     padding: 10px;
     border: solid 1px #ccc;
-}
-
+    width: 97%;
+    background: #f9f9f9;
+
+}
+div#mycontents_area div.mycondition_area p {
+    float: left;
+}
+div#mycontents_area div.mycondition_area .btn {
+    width: 160px;
+    margin-top: 15px;
+    float: right;
+}
 .add_address {
     margin-bottom: 20px;
@@ -151,11 +116,10 @@
 
 
-
 /* 会員登録内容変更/退会
 ----------------------------------------------- */
 div#mycontents_area .box120 {
-    width: 120px;
     padding: 2px;
     border: 1px solid #ccc;
+    width: 120px;
 }
 
@@ -179,9 +143,9 @@
 
 div#undercolumn_entry .kiyaku_text {
-    width: 94%;
     margin: 20px auto;
     padding: 10px;
+    border: solid 1px #ccc;
+    width: 94%;
     background: #fff;
-    border: solid 1px #ccc;
 }
 
@@ -190,14 +154,14 @@
 ▼ログイン
 =============================================== */
-div#under02column_login {
-    width: 100%;
+div#undercolumn_login {
     margin: 0 auto;
-}
-
-div#under02column_login .login_area{
+    width: 100%;
+}
+
+div#undercolumn_login .login_area {
     margin-bottom: 30px;
 }
 
-div#under02column_login .login_area .inputbox {
+div#undercolumn_login .login_area .inputbox {
     margin: 15px auto 15px auto;
     padding: 15px 20px 10px 20px;
@@ -205,13 +169,6 @@
 }
 
-div#under02column_login .login_area .inputbox .btn_area{
-    margin-top: 0px;
-}
-
-div#under02column_login .login_area .inputbox .box300 {
-    width: 300px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
+div#undercolumn_login .login_area .inputbox .btn_area {
+    margin-top: 0;
 }
 
@@ -220,5 +177,5 @@
 ▼エラー
 =============================================== */
-div#under02column_error .message_area {
+div#undercolumn_error .message_area {
     margin: 30px auto;
     padding: 30px;
@@ -227,5 +184,5 @@
 }
 
-div#under02column_error .messagearea .error {
+div#undercolumn_error .messagearea .error {
     padding: 120px 0;
 }
@@ -233,35 +190,27 @@
 
 /* ==============================================
-▼下層共通指定 02 
-===============================================
-div#under02column {
-    width: 100%;
-}
- */
-/* ==============================================
 ▼商品一覧
 =============================================== */
 /* ページ送り
 ----------------------------------------------- */
-.pagenumberarea {
+.pagenumber_area {
     padding-bottom: 10px;
     background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
 }
-
-.pagecondarea {
+.pagecond_area {
     padding: 10px;
     margin-bottom: 20px;
 }
-.pagenumberarea {
+.pagenumber_area {
     margin: 20px 0;
 }
-.pagecondarea {
+.pagecond_area {
     border: 1px solid #ccc;
 }
-.pagenumberarea .navi {
+.pagenumber_area .navi {
     width: 100%;
     text-align: left;
 }
-.pagenumberarea .change {
+.pagenumber_area .change {
     float: right;
     text-align: right;
@@ -272,6 +221,6 @@
 ----------------------------------------------- */
 div.list_area {
-    width: 100%;
-    padding: 0px 0 30px 0;
+    padding: 0 0 30px 0;
+    width: 100%;
     overflow: auto;
 }
@@ -286,6 +235,6 @@
 /* 商品ステータス */
 div.listrightbloc ul.status_icon {
-    width: 100%;
-    margin-bottom: 10px;
+    margin-bottom: 10px;
+    width: 100%;
 }
 div.listrightbloc ul.status_icon li {
@@ -296,6 +245,6 @@
 /* 商品名 */
 div.listrightbloc h3 {
+    font-weight: bold;
     font-size: 120%;
-    font-weight: bold;
 }
 
@@ -318,8 +267,8 @@
 /* 買い物かご */
 div.listrightbloc .cart_area {
+    padding: 10px;
+    border: 1px solid #cef0f4;
+    background-color: #ecf5ff;
     width: 94%;
-    padding: 10px;
-    background-color: #ecf5ff;
-    border: 1px solid #cef0f4;
 }
 
@@ -351,8 +300,8 @@
 }
 div.listrightbloc .cartin .quantity {
+    padding: 3px 10px 0 0;
     width: 150px;
     float :left;
     text-align: right;
-    padding: 3px 10px 0 0;
 }
 div.listrightbloc .cartin .quantity .box {
@@ -369,7 +318,15 @@
 =============================================== */
 /* レイアウト
+
+    tplファイルのマークアップが同じ項目
+    *1カラム時 [one_maincolumn]
+    *2カラム時 [two_maincolumn_left]
+               [two_maincolumn_right]
+    *3カラム時 [three_maincolumn]
+
 ----------------------------------------------- */
 #detailarea ,
-.subarea {
+.sub_area {
+    margin-bottom: 20px;
     width: 100%;
 }
@@ -385,31 +342,35 @@
 }
 #one_maincolumn div.subtext {
+    margin-bottom: 20px;
+    float: left;
     width: 69%;
-    margin-bottom: 20px;
-    float: left;
 }
 #one_maincolumn div.subphotoimg {
+    float: right;
     width: 25%;
-    float: right;
     text-align: right;
 }
 
 /* 2カラム用 */
+#two_maincolumn_left div#detailphotobloc ,
 #two_maincolumn_right div#detailphotobloc {
+    float: left;
     width: 37%;
-    float: left;
-}
+}
+#two_maincolumn_left div#detailrightbloc ,
 #two_maincolumn_right div#detailrightbloc {
+    float: right;
     width: 63%;
-    float: right;
-}
+}
+#two_maincolumn_left div.subtext,
 #two_maincolumn_right div.subtext {
+    margin-bottom: 20px;
+    float: left;
     width: 73%;
-    margin-bottom: 20px;
-    float: left;
-}
+}
+#two_maincolumn_left div.subphotoimg ,
 #two_maincolumn_right div.subphotoimg {
+    float: right;
     width: 25%;
-    float: right;
     text-align: right;
 }
@@ -417,19 +378,19 @@
 /* 3カラム用 */
 #three_maincolumn div#detailphotobloc {
+    float: left;
     width: 49%;
-    float: left;
 }
 #three_maincolumn div#detailrightbloc {
+    float: right;
     width: 50%;
-    float: right;
 }
 #three_maincolumn div.subtext {
+    margin-bottom: 20px;
+    float: left;
     width: 63%;
-    float: left;
-    margin-bottom: 20px;
 }
 #three_maincolumn div.subphotoimg {
+    float: right;
     width: 35%;
-    float: right;
     text-align: right;
 }
@@ -440,10 +401,9 @@
     margin: 0 0 10px 0;
     padding: 0 0 15px 0;
+    color: #666;
+    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
+    font-weight: bold;
     font-size: 160%;
-    font-weight: bold;
-    background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
-    color: #666;
-}
-
+}
 div#detailrightbloc .point ,
 div#detailrightbloc .relative_cat {
@@ -452,9 +412,7 @@
     background: url("../img/background/line_dot_01.gif") repeat-x bottom ;
 }
-
 div#detailrightbloc .main_comment {
     margin-bottom: 20px;
 }
-
 div.cart_area {
     padding: 10px;
@@ -463,9 +421,8 @@
 }
 
-
 /* 商品ステータス */
 div#detailrightbloc ul.status_icon {
-    width: 100%;
-    margin-bottom: 10px;
+    margin-bottom: 10px;
+    width: 100%;
 }
 div#detailrightbloc ul.status_icon li {
@@ -477,32 +434,30 @@
 /* 規格 */
 div#detailrightbloc div.classlist {
-    width: 100%;
     margin-bottom: 10px;
     padding-bottom: 10px;
+    width: 100%;
     background: url("../img/background/line_dot_02.gif") repeat-x bottom ;
 }
 div#detailrightbloc .classlist {
-    width: 100%;
     margin-bottom: 5px;
 }
+div#detailrightbloc ul {
+    margin-bottom: 10px;
+    width: 100%;
+}
 div#detailrightbloc ul li {
-    float: left;
     vertical-align: top;
+    float: left;
 }
 
 /* 買い物かご */
 div#detailrightbloc .cartin {
-    margin: 0;
-    float :right;
-}
-div#detailrightbloc .cartin .quantity {
-    width: 150px;
-    float :left;
-    text-align: right;
-    padding: 3px 10px 0 0;
+    text-align: center;
 }
 div#detailrightbloc .cartin_btn {
-    width: 160px;
-    float :left;
+    text-align: center;
+}
+div#detailrightbloc .favorite_btn {
+    margin-top: 10px;
 }
 
@@ -535,6 +490,6 @@
 
 div#customervoice_area review_bloc .reviewbtn {
+    float: right;
     width: 160px;
-    float: right;
 }
 
@@ -547,6 +502,6 @@
 div#customervoice_area .voicetitle {
     margin-bottom: 5px;
+    color: #333;
     font-weight: bold;
-    color: #333;
 }
 
@@ -573,36 +528,36 @@
 /* カートの中
 ----------------------------------------------- */
-div#under02column_cart .point_announce {
+div#undercolumn_cart .point_announce {
     padding: 20px;
     margin-bottom: 20px;
     border: solid 1px #ffcc62;
-    text-align: center;
     background: #fffaf0;
     font-size: 120%;
+    text-align: center;
     line-height: 140%;
 }
-div#under02column_cart .totalmoney_area {
-    margin-bottom: 20px;
-}
-
-div#under02column_cart p {
+div#undercolumn_cart .totalmoney_area {
+    margin-bottom: 20px;
+}
+
+div#undercolumn_cart p {
     margin: 10px 5px;
 }
 
-div#under02column table th.resulttd {
+div#undercolumn table th.resulttd {
     text-align: right;
 }
 
-div#under02column td#quantity {
+div#undercolumn td#quantity {
    text-align: center;
    width: 70px;
 }
 
-div#under02column ul#quantity_level li {
+div#undercolumn ul#quantity_level li {
+    padding: 3px;
     display: inline;
-    padding: 3px;
-}
-
-div#under02column .empty {
+}
+
+div#undercolumn .empty {
     text-align: left;
 }
@@ -615,81 +570,54 @@
 /* お客様情報入力
 ----------------------------------------------- */
-div#under02column_customer {
-}
-
-.flowarea {
+div#undercolumn_customer {
+}
+
+.flow_area {
     margin: 0 0 20px 0;
 }
 
-div#under02column_customer th em {
+div#undercolumn_customer th em {
     color: #000;
     font-weight: bold;
 }
 
-div#under02column_customer .box120 {
-    width: 120px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#under02column_customer .box60 {
-    width: 60px;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-div#under02column_customer .box380 {
-    width: 380px;
+
+/* お支払い方法・お届け時間等の指定
+----------------------------------------------- */
+div#undercolumn_shopping .pay_area {
+    margin: 0 auto 30px;
+    width: 100%;
+}
+div#undercolumn_shopping .pay_area02 {
+    margin: 40px auto 30px auto;
+}
+div#undercolumn_shopping .pay_area02 .txtarea {
     margin: 5px 0 0 0;
     padding: 2px;
     border: 1px solid #ccc;
-}
-
-div#under02column_customer .box320 {
-    width: 320px;
-    margin: 5px 0 0 0;
-    padding: 2px;
-    border: 1px solid #ccc;
-}
-
-
-/* お支払い方法・お届け時間等の指定
------------------------------------------------ */
-div#under02column_shopping .pay_area {
-    width: 100%;
-    margin: 0 auto 30px;
-}
-
-div#under02column_shopping .pay_area02 {
-    margin: 40px auto 30px auto;
-}
-
-div#under02column_shopping .pay_area02 .txtarea {
     width: 99%;
     height: 150px;
-    margin: 5px 0 0 0;
-    padding: 2px;
+}
+div#undercolumn_shopping .pay_area02 .select-msg {
+    margin-bottom: 10px;
+}
+
+div#undercolumn_shopping .point_area {
+    margin: 40px auto 0 auto;
+}
+
+div#undercolumn_shopping .point_area .point_announce {
+    padding: 20px;
     border: 1px solid #ccc;
 }
-div#under02column_shopping .pay_area02 .select-msg {
-    margin-bottom: 10px;
-}
-
-div#under02column_shopping .point_area {
-    margin: 40px auto 0 auto;
-}
-
-div#under02column_shopping .point_area .point_announce {
-    border: 1px solid #ccc;
-    padding: 20px;
-}
-
-div#under02column_shopping .point_area p {
-    margin-bottom: 20px;
-}
-
-div#under02column_shopping .point_area .point_announce li {
+
+div#undercolumn_shopping .point_area p {
+    margin-bottom: 20px;
+}
+
+div#undercolumn_shopping .point_area .point_announce li {
     margin-bottom: 5px;
 }
+
 
 /* お届け先の指定
@@ -705,17 +633,17 @@
 }
 
-#under02column_shopping .information {
+#undercolumn_shopping .information {
     margin-bottom: 10px;
 }
 
 #address_area .add_multiple {
+    padding: 15px 10px;
+    border: 1px solid #ffcc62;
+    float: right;
     width: 30%;
-    padding: 15px 10px;
-    float: right;
-    border: 1px solid #ffcc62;
+    color: #555;
+    background: #fffaf0;
     text-align: center;
-    background: #fffaf0;
     font-weight: bold;
-    color: #555;
 }
 
@@ -725,6 +653,6 @@
 
 #address_area p.addbtn {
+    font-weight: bold;
     font-size: 10px;
-    font-weight: bold;
 }
 
@@ -732,10 +660,9 @@
 ▼検索結果
 =============================================== */
-p.conditionarea {
-    clear: both;
-    width: 566px;
+p.condition_area {
     margin: 0 auto;
     padding: 5px;
     border: solid 1px #333;
-}
-
+    width: 566px;
+}
+
Index: branches/version-2_5-dev/html/user_data/packages/default/css/popup_import.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/popup_import.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/popup_import.css	(revision 20340)
@@ -9,8 +9,6 @@
 @import url("./table.css");
 @import url("./bloc.css");
-@import url("./header_bloc.css");
-@import url("./popup_import.css");
+@import url("./bloc_alpha.css");
 @import url("./popup.css");
 
 @import url("./print.css");
-/* @import url("./pluginbloc.css"); */
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 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/bloc.css	(revision 20340)
@@ -2,5 +2,5 @@
 
 /************************************************
-ブロック用
+ ブロック用
 ************************************************ */
 /*** 目次 ***
@@ -21,5 +21,7 @@
 -おすすめ商品
     tplファイルのマークアップが同じ項目
-    *メインカラム用 2カラム時 [two_maincolumn_right]
+    *メインカラム用 1カラム時 [one_maincolumn 
+    *メインカラム用 2カラム時 [two_maincolumn_left]
+                              [two_maincolumn_right]
     *メインカラム用 3カラム時 [three_maincolumn]
     *サイドカラム用           [side_column]
@@ -46,6 +48,6 @@
 }
 .side_column .bloc_body .box {
+    border: solid 1px #ccc;
     width: 145px;
-    border: solid 1px #ccc;
 }
 .main_column .bloc_outer {
@@ -77,17 +79,17 @@
 ----------------------------------------------- */
 /* タイトルの背景 白 */
-#loginarea h2 ,
-#searcharea h2 ,
-#calenderarea h2 ,
-#cartarea h2 ,
+#login_area h2 ,
+#search_area h2 ,
+#calender_area h2 ,
+#cart_area h2 ,
 #cart h2 {
+    padding: 5px 0 8px 10px;
     border-style: solid;
     border-color: #f90 #ccc #ccc;
     border-width: 1px 1px 0;
     background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
-    padding: 5px 0 8px 10px;
     font-size: 14px;
 }
-#categoryarea h2 {
+#category_area h2 {
     border-top: solid 1px #f90;
     background: url('../img/background/bg_tit_bloc_01.jpg') repeat-x left bottom;
@@ -97,16 +99,16 @@
 
 /* タイトルの背景 オレンジ */
-#recomendarea .titleWrap ,
-#newsarea.titleWrap {
+#recomend_area .titleWrap ,
+#news_area.titleWrap {
     padding-bottom: 1px;
     font-size: 14px;
 }
 
-#recomendarea h2 ,
-#newsarea h2 {
+#recomend_area h2 ,
+#news_area h2 {
+    padding: 5px 0 8px 10px;
     border-style: solid;
     border-color: #f90 #ccc #ccc;
     border-width: 1px 1px 0;
-    padding: 5px 0 8px 10px;
     background: url('../img/background/bg_btn_bloc_02.jpg') repeat-x left bottom #fef3d8;
 }
@@ -116,11 +118,11 @@
 ▼ヘッダー上、フッター下のブロックエリア
 =============================================== */
-div#topcolumn{
+div#topcolumn {
+    margin:0px;
     clear:both;
-    margin:0px; 
-}
-div#bottomcolumn{
+}
+div#bottomcolumn {
+    margin:0px;
     clear: both;
-    margin:0px;
 }
 
@@ -133,44 +135,48 @@
 ▼新着情報
 =============================================== */
-#newsarea .bloc_body {
+#news_area .bloc_body {
     padding: 10px;
 }
-#newsarea .newsContents {
+#news_area .newsContents {
     padding-right: 10px;
+    max-height:260px;
+    height: auto !important;
     height: 260px;
     overflow:auto;
     overflow-y:scroll;
 }
-#newsarea dl.newsList {
+
+#news_area dl.newsList {
     background: url("../img/background/line_dot_01.gif") repeat-x bottom;
 }
-#newsarea dl.newsList dt {
-    margin-bottom: 5px;
-}
-#newsarea dl.newsList dd {
+#news_area dl.newsList dt {
+    margin-bottom: 5px;
+}
+#news_area dl.newsList dd {
     margin-bottom: 10px;
     padding-bottom: 10px;
 }
-#newsarea dl.end {
+#news_area dl.end {
     padding: 10px 0;
     background: url("") no-repeat bottom;
 }
 
+
 /* ===============================================
 ▼現在のカゴの中
 =============================================== */
-#cartarea .information {
+#cart_area .information {
     padding: 10px;
 }
-#cartarea .postage {
+#cart_area .postage {
     margin-top: 10px;
     padding-top: 10px;
     background: url("../img/background/line_dot_01.gif") repeat-x top;
 }
-#cartarea .postage .point_announce {
+#cart_area .postage .point_announce {
     padding: 2px 0 2px 20px;
     background: url("../img/icon/ico_price.gif") no-repeat left top;
 }
-#cartarea .btn {
+#cart_area .btn {
     padding: 10px 0;
     background: url("../img/background/line_dot_01.gif") repeat-x top #f7f7e6;
@@ -182,25 +188,25 @@
 ▼カテゴリー
 =============================================== */
-#categoryarea .bloc_body{
+#category_area .bloc_body{
     background-color: #fffaf0;
 }
 
-#categoryarea li{
+#category_area li{
     padding-left: 5px;
 }
-#categoryarea li.level1{
+#category_area li.level1{
     border-bottom: solid 1px #ccc;
 }
-#categoryarea li.level1 p{
+#category_area li.level1 p{
     padding-left: 20px;
     margin: 7px 3px;
 }
-#categoryarea li.level1 p {
+#category_area li.level1 p {
     background: url("../img/icon/ico_arrow_01.gif") 2px 3px no-repeat;
 }
-#categoryarea li.level1 li p {
+#category_area li.level1 li p {
     background: url("../img/icon/ico_level.gif") 7px 7px no-repeat;
 }
-#categoryarea li a {
+#category_area li a {
     display: block;
     padding: 0;
@@ -217,12 +223,13 @@
 }
 
+
 /* ===============================================
 ▼ガイドリンク
 =============================================== */
-#guidearea {
+#guide_area {
     margin-top: 1em;
     border: none;
 }
-#guidearea li{
+#guide_area li{
     margin-bottom: 5px;
     letter-spacing: -0.05em;
@@ -234,13 +241,13 @@
 }
 ul.button_like li a {
-    display: block;
+    margin: 0;
     padding: 10px 15px 10px 10px;
-    text-decoration: none;
     border: 1px solid;
     border-bottom: none;
     border-color: #ccc;
+    display: block;
     background: url("../img/icon/ico_arrow_02.gif") no-repeat right;
+    text-decoration: none;
     outline: none;
-    margin: 0;
 }
 
@@ -250,37 +257,38 @@
 ※ヘッダー用はheader_block.css内に記述
 =============================================== */
-#container div#loginarea .bloc_body {
+#container div#login_area .bloc_body {
     padding: 10px;
 }
 
-#container div#loginarea .bloc_body p {
-    margin-bottom: 5px;
-}
-
-#container div#loginarea .bloc_body .btn {
+#container div#login_area .bloc_body p {
+    margin-bottom: 5px;
+}
+
+#container div#login_area .bloc_body .btn {
     text-align: center;
 }
 #container .login_area dl.formList {
+    margin-bottom: 8px;
     width: 420px;
-    margin-bottom: 8px;
 }
 #container .login_area dl.formList dt {
-    width: 90px;
     margin-bottom: 3px;
     padding-left: 15px;
+    color: #333;
     background: url("../img/icon/ico_arrow_03.gif") no-repeat left;
+    width: 90px;
+    float: left;
     font-size: 90%;
-    color: #333;
-    float: left;
 }
 #container .login_area dl.formList dd {
+    margin-bottom: 5px;
+    float: right;
     width: 300px;
-    margin-bottom: 5px;
-    float: right;
+    vertical-align: bottom;
     text-align: left;
-    vertical-align: bottom;
-}
-#container .login_area .login_memory {
+}
+#container div#login_area .bloc_body .mini {
     margin-top: 5px;
+    letter-spacing: -0.01em;
 }
 
@@ -289,42 +297,43 @@
 ▼検索
 =============================================== */
-div#searcharea .bloc_body {
+div#search_area .bloc_body {
     padding: 10px;
 }
-div#searcharea .bloc_body .btn {
+div#search_area .bloc_body .btn {
     text-align: center;
 }
 
+
 /* ===============================================
 ▼カレンダー
 =============================================== */
-#calenderarea {
+#calender_area {
     background-color: transparent;
     border: none;
 }
-#calenderarea .bloc_body {
+#calender_area .bloc_body {
     padding: 10px 0;
     background-color: #f1f9fc;
 }
-#calenderarea table {
+#calender_area table {
+    background: #fff;
+    border: none;
     width: 150px;
     margin: 0 auto 5px;
-    background: #fff;
-    border: none;
-    text-align:center;
     font-size: 90%;
 }
-#calenderarea table td {
+#calender_area table td {
     padding: 1px 3px;
     border-top: 1px solid #ccc;
     border-right: none;
-}
-#calenderarea th {
-    text-align: center;
+    text-align:center;
+}
+#calender_area th {
     padding: 1px 3px;
     background: #fff;
     border: none;
-}
-#calenderarea table .month {
+    text-align: center;
+}
+#calender_area table .month {
     margin-bottom: 5px;
     padding-left: 12px;
@@ -332,8 +341,8 @@
     font-size: 120%;
 }
-#calenderarea .off {
+#calender_area .off {
     color: #f00;
 }
-#calenderarea .information {
+#calender_area .information {
     margin-left: 10px;
     font-size: 90%;
@@ -346,5 +355,6 @@
 /*
    tplファイルのマークアップが同じ項目
-   メインカラム用 2カラム時 [two_maincolumn_right]
+   メインカラム用 2カラム時 [two_maincolumn_left]
+                            [two_maincolumn_right]
    メインカラム用 3カラム時 [three_maincolumn]
    サイドカラム用           [side_column]
@@ -353,19 +363,19 @@
 /* 共通
 ----------------------------------------------- */
-#recomendarea .bloc_body ,
+#recomend_area .bloc_body ,
 #whobought_area .whobought_bloc {
-    width: 100%;
     margin-bottom: 10px;
     padding: 10px 0 10px;
     border: none;
+    width: 100%;
     background: url("../img/background/line_dot_01.gif") repeat-x bottom;
 }
 
-#recomendarea .bloc_body p ,
+#recomend_area .bloc_body p ,
 #whobought_area .whobought_bloc p {
     margin: 0 0 5px 0;
 }
 
-#recomendarea .bloc_body img ,
+#recomend_area .bloc_body img ,
 #whobought .whobought_bloc img {
     display: block;
@@ -374,5 +384,5 @@
 }
 
-#recomendarea .bloc_body h3 ,
+#recomend_area .bloc_body h3 ,
 #whobought_area .whobought_bloc h3 {
     font-size: 100%;
@@ -380,23 +390,29 @@
 }
 
+
 /* 画像
 ----------------------------------------------- */
-#recomendarea .bloc_body .productImage ,
+#recomend_area .bloc_body .productImage ,
 #whobought_area .whobought_bloc .productImage {
+    margin-bottom: 10px;
     float: left;
     width: 90px;
-    margin-bottom: 10px;
-}
+}
+
 
 /* 左右の振り分け
 ----------------------------------------------- */
-#two_maincolumn_right #recomendarea .recomendleft ,
-#three_maincolumn #recomendarea .recomendleft ,
+#one_maincolumn #recomend_area .recomendleft ,
+#two_maincolumn_right #recomend_area .recomendleft ,
+#two_maincolumn_left #recomend_area .recomendleft ,
+#three_maincolumn #recomend_area .recomendleft ,
 #whobought_area .whobought_bloc .whobought_left {
     float: left;
     width: 47.5%;
 }
-#two_maincolumn_right #recomendarea .recomendright ,
-#three_maincolumn #recomendarea .recomendright ,
+#one_maincolumn #recomend_area .recomendright ,
+#two_maincolumn_right #recomend_area .recomendright ,
+#two_maincolumn_left #recomend_area .recomendright ,
+#three_maincolumn #recomend_area .recomendright ,
 #whobought_area .whobought_bloc .whobought_right {
     float: right;
@@ -405,9 +421,17 @@
 
 
-/* 商品説明テキスト横幅
------------------------------------------------ */
+/* 商品説明テキスト
+----------------------------------------------- */
+/* メインカラム用 1カラム時*/
+#one_maincolumn #recomend_area .bloc_body .productContents {
+    float: right;
+    width: 74%;
+}
+
 /* メインカラム用 2カラム時*/
-#two_maincolumn_right #recomendarea .bloc_body .productContents ,
-#two_maincolumn_right #whobought_area .whobought_bloc .productContents {
+#two_maincolumn_right #recomend_area .bloc_body .productContents ,
+#two_maincolumn_left #recomend_area .bloc_body .productContents ,
+#two_maincolumn_right #whobought_area .whobought_bloc .productContents ,
+#two_maincolumn_left #whobought_area .whobought_bloc .productContents {
     float: right;
     width: 74%;
@@ -415,5 +439,5 @@
 
 /* メインカラム用 3カラム時*/
-#three_maincolumn #recomendarea .bloc_body .productContents ,
+#three_maincolumn #recomend_area .bloc_body .productContents ,
 #three_maincolumn #whobought_area .whobought_bloc .productContents {
     float: right;
@@ -422,31 +446,30 @@
 
 
-/* サイドカラム用 (幅px固定)
------------------------------------------------ */
-.side_column #recomendarea .bloc_body {
+/* サイドカラム用 (幅px固定) */
+.side_column #recomend_area .bloc_body {
     margin-top: 5px;
-    margin-right: 0px;
+    margin-right: 0;
     width: 157px;
-    padding: 0px;
-}
-.side_column #recomendarea .bloc_body .productContents {
+    padding: 0;
+}
+.side_column #recomend_area .bloc_body .productContents {
+    padding: 0;
+    margin: 0;
     width: 80px;
-    padding: 0px;
-    margin: 0px;
-}
-.side_column #recomendarea .recomendleft {
+}
+.side_column #recomend_area .recomendleft {
+    padding: 0;
     width: 70px;
-    padding: 0;
     float: left;
 }
-.side_column #recomendarea .recomendright {
-    width: 70px;
+.side_column #recomend_area .recomendright {
     margin: 0;
     padding: 0;
+    width: 70px;
     float: right;
 }
 
 /* IE6以下*/
-* html .side_column #recomendarea .bloc_body {
+* html .side_column #recomend_area .bloc_body {
     width: 180px;
 }
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 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/popup.css	(revision 20340)
@@ -2,43 +2,42 @@
 
 /************************************************
-ポップアップウィンドウ
+ ポップアップウィンドウ
 ************************************************ */
 /* 共通
 ----------------------------------------------- */
 div#windowcolumn {
+    border-top: solid 3px #f90;
     height: 100%;
     margin: 15px 15px 0 15px;
     background: #fff;
-    border-top: solid 3px #f90;
 }
 
 div#windowcolumn h2 {
     margin-bottom: 10px;
+    padding: 8px;
     border-top: solid 1px #ebeced;
+    color: #f60;
     background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
     background-color: #fef3d8;
-    padding: 8px;
     font-size: 170%;
-    color: #f60;
 }
 
-div#windowarea {
-    width: 540px;
+div#window_area {
     margin: 15px auto 0 auto;
     padding-bottom: 20px;
+    width: 540px;
 }
 
-div#windowarea p.information {
+div#window_area p.information {
     margin-bottom: 20px;
 }
 
-div#windowarea .message {
-    margin-bottom: 20px;
-    font-size: 140%;
+div#window_area .message {
+    margin-bottom: 20px;    color: #f60;
     line-height: 150%;
     font-weight: bold;
-    color: #f60;
+    font-size: 140%;
 }
-div#windowarea table {
+div#window_area table {
     width: 540px;
 }
@@ -46,15 +45,15 @@
 /* お客様の声の書き込み、新しいお届け先の追加・変更
 ----------------------------------------------- */
-div#windowarea #forgot {
+div#window_area #forgot {
     margin: 0 auto;
+    padding: 20px;
     width: 440px;
-    padding: 20px;
     border: 1px solid #ccc;
     text-align: left;
 }
-div#windowarea #forgot .mailaddres {
+div#window_area #forgot .mailaddres {
     margin-bottom: 10px;
 }
-div#windowarea .zipimg img {
+div#window_area .zipimg img {
     margin: 5px 0 0 0;
 }
@@ -78,19 +77,19 @@
 ----------------------------------------------- */
 div#zipsearchcolumn {
-    width: 460px;
     margin: 15px auto 0 auto;
-    background-color: #fff;
     border-top: 5px solid #ffa85c;
     border-bottom: 5px solid #ffa85c;
+    width: 460px;
+    background-color: #fff;
 }
 
 div#zipsearchcolumn h2 {
+    margin: 0 0 15px 0;
     width: 460px;
-    margin: 0 0 15px 0;
 }
 
-div#zipsearcharea {
+div#zipsearch_area {
+    margin: 15px auto 0 auto;
     width: 460px;
-    margin: 15px auto 0 auto;
 }
 
@@ -100,5 +99,5 @@
 }
 
-div#zipsearcharea #completebox p{
+div#zipsearch_area #completebox p{
     padding: 60px 5px;
     text-align: center;
Index: branches/version-2_5-dev/html/user_data/packages/default/css/table.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/table.css	(revision 20290)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/table.css	(revision 20340)
@@ -7,16 +7,16 @@
 ----------------------------------------------- */
 table {
-    width: 100%;
     margin: 15px auto 20px auto;
     border-top: 1px solid #ccc;
     border-left: 1px solid #ccc;
+    width: 100%;
     border-collapse: collapse;
     text-align: left;
 }
 table th {
-    color: #333;
     padding: 8px;
     border-right: 1px solid #ccc;
     border-bottom: 1px solid #ccc;
+    color: #333;
     background-color: #f0f0f0;
     font-weight: normal;
@@ -30,11 +30,13 @@
 /* 見出し
 ----------------------------------------------- */
-div#under02column_shopping table th {
+div#undercolumn_shopping table th {
     text-align: center;
 }
-div#under02column_shopping table.delivname th {
+div#undercolumn_shopping table.delivname th {
     text-align: left;
     width: 155px;
 }
+
+/* MYページ */
 div#mycontents_area table th {
     text-align: center;
@@ -43,10 +45,27 @@
     text-align: right;
 }
+div#mycontents_area table th.alignL {
+    text-align: left;
+}
+div#mycontents_area table th.resulttd {
+    text-align: right;
+}
+div#mycontents_area table caption {
+    padding: 8px;
+    border-top: 1px solid #ccc;
+    border-right: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    color: #000;
+    background-color: #f0f0f0;
+    text-align: left;
+    font-weight: bold;
+}
 
-/* 見出し
+
+/* その他
 ----------------------------------------------- */
 table select {
+    margin-bottom: 7px;
     border: solid 1px #ccc;
-    margin-bottom: 7px;
 }
 
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 20310)
+++ branches/version-2_5-dev/html/user_data/packages/default/css/common.css	(revision 20340)
@@ -17,5 +17,5 @@
 }
 
-/*PHOTO*/
+/*写真*/
 .picture {
     border: 1px solid #ccc;
@@ -28,6 +28,6 @@
 /* 全体を包括 */
 .frame_outer {
+    margin: 0 auto;
     width: 100%;
-    margin: 0 auto;
     text-align: center;
 }
@@ -35,10 +35,11 @@
 /* コンテンツ */
 #container {
+    margin: 0 auto;
+    padding: 0 0 30px 0;
     width: 980px;
-    margin: 0 auto;
-    padding: 0 0 30px 0;
+    background: #fff;
     text-align: left;
-    background: #fff;
-}
+}
+
 
 /* ==============================================
@@ -50,7 +51,7 @@
 #bottomcolumn ,
 #footerbottomcolumn {
+    margin: 0 auto;
+    padding: 15px;
     width: 950px;
-    margin: 0 auto;
-    padding: 15px;
     background: #fff;
     text-align: left;
@@ -66,18 +67,19 @@
 /* 1カラム設定 */
 #one_maincolumn {
+    margin: 0 auto;
     width: 80%;
-    margin: 0 auto;
 }
 
 /* 2カラム設定 (メイン部が左) */
 #two_maincolumn_left {
-    width: 79%;
-    float: left;
+    padding-left: 1.5%;
+    float: left;
+    width: 78%;
 }
 
 /* 2カラム設定 (メイン部が右) */
 #two_maincolumn_right {
+    padding-right: 1.5%;
     width: 78%;
-    margin-right: 1.5%; /* 側を同等幅の未定義空間として、段落崩れを防ぐ */
     float: right;
 }
@@ -85,13 +87,11 @@
 /* 3カラム設定 */
 #three_maincolumn {
+    padding-left: 0.5%;
     width: 59%;
-    padding-left: 0.5%; /* 右側を同等幅の未定義空間として、段落崩れを防ぐ */
     float: left;
 }
 
 /* 下層コンテンツ */
-div#undercolumn { width: 100%; margin: 0;}
-/*
-#under02column
+div#undercolumn { width: 100%; margin: 0 0 30px 0;}
 
 
@@ -101,12 +101,4 @@
 /* フロート回り込み解除
 ----------------------------------------------- */
-br.clear {/* 消す */
-    clear: both;
-    display: none;
-    font-size: 0px;
-    line-height: 0%;
-    height: 0px
-}
-
 .clearfix:after {
     display:block;
@@ -122,17 +114,17 @@
 ----------------------------------------------- */
 a:link {
-    color: #3399cc;
+    color: #39c;
     text-decoration: none;
 }
 a:visited {
-    color: #3399cc;
+    color: #39c;
     text-decoration: none;
 }
 a:link:hover {
-    color: #ff6600;
+    color: #f60;
     text-decoration: underline;
 }
 a[href]:hover { 
-    color: #ff6600;
+    color: #f60;
 }
 
@@ -142,8 +134,8 @@
 h1,h2,h3,h4,h5 { font-size: 100%; line-height: 150%;}
 .price { color: #f00; }
+.sale_price { color: #f00; }
 .point { color: #f00; font-weight: bold; }
 .user_name { font-weight: bold; }
-.sale_price { color: #f00; }
-.normal_price { color: #f00; }
+.normal_price { color: #f00; font-size: 90%; }
 .recommend_level { color: #ecbd00; }
 
@@ -152,9 +144,4 @@
 .st { font-weight: bold; }
 .mini { font-size: 90%; }
-
-em {/* 消す */
-    font-style: normal;
-    color: #f00;
-}
 
 
@@ -167,4 +154,5 @@
 .pricetd em { font-weight: bold;}
 
+
 /* フォーム
 ----------------------------------------------- */
@@ -175,4 +163,6 @@
     padding: 2px;
 }
+
+.box40 {width: 40px; }
 .box60 {width: 60px; }
 .box100 {width: 100px; }
@@ -183,7 +173,9 @@
 .box240 {width: 240px; }
 .box300 {width: 300px; }
+.box320 {width: 320px; }
 .box350 {width: 350px; }
 .box380 {width: 380px; }
-/* フォームが縦に重なり合う場合にboxと併用する余白 */
+
+/* フォームが縦に重なり合う場合に併用する余白 */
 .top { margin-bottom: 5px; }
 
@@ -193,29 +185,28 @@
 h2.title {
     margin-bottom: 10px;
+    padding: 8px;
     border-top: solid 1px #ebeced;
+    color: #f60;
     background: url("../img/background/bg_tit_sub_01.jpg") repeat-x left bottom;
     background-color: #fef3d8;
-    padding: 8px;
     font-size: 170%;
-    color: #f60;
-}
-
-#one_maincolumn .subarea h3 ,
-#under02column .subarea h3 ,
-#two_maincolumn_right .subarea h3 ,
-#three_maincolumn .subarea h3 ,
-div#under02column_login .login_area h3 ,
-#under02column_shopping h3 ,
+}
+
+#one_maincolumn .sub_area h3 ,
+#two_maincolumn_right .sub_area h3 ,
+#two_maincolumn_left .sub_area h3 ,
+#three_maincolumn .sub_area h3 ,
+#undercolumn_login .login_area h3 ,
+#undercolumn_shopping h3 ,
 #mypagecolumn h3 ,
-#under02column_cart h3 {
-    font-size: 120%;
+#undercolumn_cart h3 {
     margin: 0 0 10px 0;
     padding: 5px 0 10px;
+    color: #f60;
     background: url("../img/background/line_01.gif") repeat-x left bottom;
-    color: #f60;
-    clear: both;
-}
-
-div#under02column_login .login_area h4 {
+    font-size: 120%;
+}
+
+div#undercolumn_login .login_area h4 {
     padding-left: 15px;
     background: url("../img/icon/ico_arrow_05.gif") no-repeat left;
@@ -230,57 +221,60 @@
 #errorHeader {
     color: #F00;
-	  font-weight: bold;
-	  font-size: 12px;
+    font-weight: bold;
+    font-size: 12px;
     background-color: #FEB;
     text-align: center;
     padding: 5px;
 }
-#headerWrap {
+
+#header_wrap {
+    border-top: solid 3px #f90;
     min-height: 82px;
     background: url("../img/common/bg_header.gif") repeat-x bottom #fffaf0;
-    border-top: solid 3px #f90;
 }
 #header {
+    margin: auto;
     width: 980px;
-    margin: auto;
-}
-#logoArea {
+}
+#logo_area {
     padding-left: 10px;
+    float: left;
     width: 390px;
-    float: left;
     text-align: left;
 }
 #header_utility {
+    float: right;
     width: 580px;
-    float: right;
-}
+}
+
 
 /* ロゴ
 ----------------------------------------------- */
-#siteDescription {
+#site_description {
     margin-top: 13px;
     font-size:90%;
 }
-#logoArea h1 {
+#logo_area h1 {
     width: 378px;
     height: 33px;
 }
-#logoArea h1 span{
+#logo_area h1 span{
     display: none;/* テキストロゴ非表示 */
 }
 
+
 /* ヘッダーナビ
 ----------------------------------------------- */
-div#headerNavi {
+div#header_navi {
+    float: right;
     width: 409px;
     height: 38px;
-    float: right;
-}
-div#headerNavi ul li {
-    float: left;
+}
+div#header_navi ul li {
     display: block;
-}
-div#headerNavi ul li.mypage,
-div#headerNavi ul li.entry {
+    float: left;
+}
+div#header_navi ul li.mypage,
+div#header_navi ul li.entry {
     margin-top: 6px;
 }
@@ -290,15 +284,15 @@
  フッター
 =============================================== */
-#footerWrap {
+#footer_wrap {
+    margin: 0 auto;
     width: 980px;
     height: 80px;
-    margin: 0 auto;
     background: #fff;
 }
 #footer {
+    padding-top: 10px;
+    border-top: solid 1px #ccc;
     width: 950px;
     margin: auto;
-    padding-top: 10px;
-    border-top: solid 1px #ccc;
 }
 #pagetop {
@@ -314,4 +308,5 @@
 }
 
+
 /* ==============================================
  パーツ
@@ -320,4 +315,5 @@
 ----------------------------------------------- */
 .btn_area {
+    margin-top: 10px;
     width: 100%;
     text-align: center;
@@ -325,11 +321,8 @@
 
 .btn_area li {
+    padding-right: 10px;
     display: inline;
-    padding-right: 10px;
-}
-
-#cartbtn_default {
-    margin: 7px 0;
-}
+}
+
 
 /* 完了メッセージ
@@ -341,8 +334,8 @@
 div#undercolumn_entry .message {
     margin-bottom: 20px;
-    font-size: 160%;
+    color: #f60;
     line-height: 150%;
     font-weight: bold;
-    color: #f60;
+    font-size: 160%;
 }
 div#complete_area .shop_information {
@@ -353,6 +346,6 @@
 div#complete_area .shop_information .name {
     margin-bottom: 10px;
+    font-weight: bold;
     font-size: 140%;
-    font-weight: bold;
-}
-
+}
+
Index: branches/version-2_5-dev/html/user_data/packages/default/css/header_bloc.css
===================================================================
--- branches/version-2_5-dev/html/user_data/packages/default/css/header_bloc.css	(revision 20290)
+++ 	(revision )
@@ -1,51 +1,0 @@
-@charset "utf-8";
-
-/* ***********************************************
-インヘッダーブロック
-************************************************ */
-/* ログイン
------------------------------------------------ */
-#headerInternalColumn {
-    width: 520px;
-    height: 35px;
-    margin-top: 5px;
-    float: right;
-}
-
-/* ログイン
------------------------------------------------ */
-#header_login_area {
-    height: 30px;
-    padding: 0 10px;
-    background: #fef3d3;
-    border: solid 1px #ffc979;
-    letter-spacing: -0.075em;
-}
-#header_login_area ul.formList {
-    margin-top: 5px;
-}
-#header_login_area ul.formList li {
-    float: left;
-}
-#header_login_area ul.formList li.mail {
-    width: 155px;
-    padding-left: 28px;
-    background: url("../img/common/ico_arrow_login.gif") no-repeat left;
-    font-size: 90%;
-}
-#header_login_area ul.formList li.password {
-    padding-right: 5px;
-}
-#header_login_area ul.formList li.login_memory {
-    padding-right: 5px;
-    font-size: 90%;
-}
-#header_login_area ul.formList li.forgot{
-    margin-top: 3px;
-    padding-right: 5px;
-    font-size: 90%;
-}
-#header_login_area ul.formList li.btn {
-    width: 53px;
-    padding-right: 5px;
-}
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 20325)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/history.tpl	(revision 20340)
@@ -28,20 +28,26 @@
     <div id="mycontents_area">
         <h3><!--{$tpl_subtitle|h}--></h3>
-        <p class="myconditionarea">
-        <span class="st">購入日時：&nbsp;</span><!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
-        <span class="st">注文番号：&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
-        <span class="st">お支払い方法：&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
-        <!--{if $tpl_arrOrderData.deliv_time_id != ""}--><br />
-        <span class="st">お届け時間：&nbsp;</span><!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
-        <!--{/if}-->
-        <!--{if $tpl_arrOrderData.deliv_date != ""}--><br />
-        <span class="st">お届け日：&nbsp;</span><!--{$tpl_arrOrderData.deliv_date|h}-->
-        <!--{/if}-->
-        </p>
-
-        <form action="order.php" method="post">
+        <div class="mycondition_area clearfix">
+            <p>
+                <span class="st">購入日時：&nbsp;</span><!--{$tpl_arrOrderData.create_date|sfDispDBDate}--><br />
+                <span class="st">注文番号：&nbsp;</span><!--{$tpl_arrOrderData.order_id}--><br />
+                <span class="st">お支払い方法：&nbsp;</span><!--{$arrPayment[$tpl_arrOrderData.payment_id]|h}-->
+                <!--{if $tpl_arrOrderData.deliv_time_id != ""}--><br />
+                <span class="st">お届け時間：&nbsp;</span><!--{$arrDelivTime[$tpl_arrOrderData.deliv_time_id]|h}-->
+                <!--{/if}-->
+                <!--{if $tpl_arrOrderData.deliv_date != ""}--><br />
+                <span class="st">お届け日：&nbsp;</span><!--{$tpl_arrOrderData.deliv_date|h}-->
+                <!--{/if}-->
+            </p>
+            <p class="btn">
+                <a href="./<!--{$smarty.const.DIR_INDEX_PATH}-->" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re_on.jpg','order_id');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg','order_id');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_order_re.jpg" alt="この購入内容で再注文する" name="order_id" id="order_id" /></a>
+            </p>
+        </div>
+
+<!--        <form action="order.php" method="post">
             <input type="hidden" name="order_id" value="<!--{$tpl_arrOrderData.order_id}-->">
-            <input type="submit" name="submit" value="再注文">
+            <input type="submit" name="submit" value="この購入内容で再注文する">
         </form>
+-->
 
         <table summary="購入商品詳細">
@@ -124,9 +130,9 @@
                 <tr>
                     <th class="alignL">ご使用ポイント</th>
-                    <td class="alignL"><!--{assign var=key value="use_point"}--><!--{$tpl_arrOrderData[$key]|number_format|default:0}--> pt</td>
+                    <td><!--{assign var=key value="use_point"}--><!--{$tpl_arrOrderData[$key]|number_format|default:0}--> pt</td>
                 </tr>
                 <tr>
                     <th class="alignL">今回加算されるポイント</th>
-                    <td class="alignL"><!--{$tpl_arrOrderData.add_point|number_format|default:0}--> pt</td>
+                    <td><!--{$tpl_arrOrderData.add_point|number_format|default:0}--> pt</td>
                 </tr>
             </table>
@@ -175,21 +181,21 @@
                 <colgroup width="70%"></colgroup>
                 <tr>
-                    <th>お名前</th>
+                    <th class="alignL">お名前</th>
                     <td><!--{$shippingItem.shipping_name01|h}-->&nbsp;<!--{$shippingItem.shipping_name02|h}--></td>
                 </tr>
                 <tr>
-                    <th>お名前(フリガナ)</th>
+                    <th class="alignL">お名前(フリガナ)</th>
                     <td><!--{$shippingItem.shipping_kana01|h}-->&nbsp;<!--{$shippingItem.shipping_kana02|h}--></td>
                 </tr>
                 <tr>
-                    <th>郵便番号</th>
+                    <th class="alignL">郵便番号</th>
                     <td>〒<!--{$shippingItem.shipping_zip01}-->-<!--{$shippingItem.shipping_zip02}--></td>
                 </tr>
                 <tr>
-                    <th>住所</th>
+                    <th class="alignL">住所</th>
                     <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
                 </tr>
                 <tr>
-                    <th>電話番号</th>
+                    <th class="alignL">電話番号</th>
                     <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
                 </tr>
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/refusal.tpl	(revision 20340)
@@ -33,5 +33,5 @@
         <div class="message">会員を退会された場合には、現在保存されている購入履歴や、お届け先などの情報は、すべて削除されますがよろしいでしょうか？</div>
         <div class="message_area">
-	<p>※退会手続きが完了した時点で、現在保存されている購入履歴や、<br />お届け先等の情報はすべてなくなりますのでご注意ください。</p>
+    <p>※退会手続きが完了した時点で、現在保存されている購入履歴や、<br />お届け先等の情報はすべてなくなりますのでご注意ください。</p>
         <div class="btn_area">
             <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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery.tpl	(revision 20340)
@@ -50,5 +50,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/data/Smarty/templates/default/mypage/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl	(revision 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/login.tpl	(revision 20340)
@@ -23,7 +23,7 @@
 *}-->
 <!--▼CONTENTS-->
-<div id="under02column">
+<div id="undercolumn">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
-    <div id="under02column_login">
+    <div id="undercolumn_login">
         <form name="login_mypage" id="login_mypage" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_mypage')">
         <input type="hidden" name="mode" value="login" />
@@ -39,5 +39,5 @@
                     <dt>メールアドレス&nbsp;：</dt>
                     <dd>
-                        <input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" size="20" class="box300" />
+                        <input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" class="box300" />
                         <p class="login_memory">
                             <!--{assign var=key value="mypage_login_memory"}-->
@@ -54,5 +54,5 @@
                     </dt>
                     <dd>
-                        <input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box300" />
+                        <input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box300" />
                     </dd>
                 </dl>
Index: branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery_addr.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery_addr.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mypage/delivery_addr.tpl	(revision 20340)
@@ -24,5 +24,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="新しいお届け先の追加・変更"}-->
 
-<div id="windowarea">
+<div id="window_area">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
     <p>下記項目にご入力ください。「<span class="attention">※</span>」印は入力必須項目です。<br />
Index: branches/version-2_5-dev/data/Smarty/templates/default/header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/header.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/header.tpl	(revision 20340)
@@ -21,8 +21,8 @@
  *}-->
 <!--▼HEADER-->
-<div id="headerWrap">
+<div id="header_wrap">
     <div id="header" class="clearfix">
-        <div id="logoArea">
-            <p id="siteDescription">EC-CUBEは日本発のオープンソースECサイト構築システムです。</p>
+        <div id="logo_area">
+            <p id="site_description">EC-CUBEは日本発のオープンソースECサイト構築システムです。</p>
             <h1>
                 <a href="<!--{$smarty.const.TOP_URLPATH}-->"><img src="<!--{$TPL_URLPATH}-->img/common/logo.jpg" alt="EC-CUBE ONLINE SHOPPING SITE" /><span><!--{$arrSiteInfo.shop_name|h}-->/<!--{$tpl_title|h}--></span></a>
@@ -47,5 +47,5 @@
             <!--{* ▲HeaderInternal COLUMN*}-->
             </div>
-            <div id="headerNavi">
+            <div id="header_navi">
                 <ul>
                     <li class="mypage">
Index: branches/version-2_5-dev/data/Smarty/templates/default/error.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/error.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/error.tpl	(revision 20340)
@@ -21,6 +21,6 @@
  *}-->
  <!--▼CONTENTS-->
-<div id="under02column">
-  <div id="under02column_error">
+<div id="undercolumn">
+  <div id="undercolumn_error">
     <div class="message_area">
       <!--★エラーメッセージ-->
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl	(revision 20340)
@@ -21,8 +21,8 @@
  *}-->
 <!--▼CONTENTS-->
-<div id="under02column">
-    <div id="under02column_shopping">
-        <p class="flowarea">
-            <img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_01.gif" alt="購入手続きの流れ" />
+<div id="undercolumn">
+    <div id="undercolumn_shopping">
+        <p class="flow_area">
+            <img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_01.jpg" alt="購入手続きの流れ" />
         </p>
         <h2 class="title"><!--{$tpl_title|h}--></h2>
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 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/index.tpl	(revision 20340)
@@ -21,6 +21,6 @@
  *}-->
 <!--▼CONTENTS-->
-<div id="under02column">
-  <div id="under02column_login">
+<div id="undercolumn">
+  <div id="undercolumn_login">
     <h2 class="title"><!--{$tpl_title|h}--></h2>
     <form name="member_form" id="member_form" method="post" action="?" onsubmit="return fnCheckLogin('member_form')">
@@ -36,5 +36,5 @@
                     <dt>メールアドレス&nbsp;：</dt>
                     <dd>
-                        <input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" size="20" class="box300" />
+                        <input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: disabled;" class="box300" />
                         <p class="login_memory">
                             <!--{assign var=key value="login_memory"}-->
@@ -51,5 +51,5 @@
                     </dt>
                     <dd>
-                        <input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="40" class="box300" />
+                        <input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box300" />
                     </dd>
                 </dl>
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/complete.tpl	(revision 20340)
@@ -21,7 +21,7 @@
  *}-->
 <!--▼CONTENTS-->
-<div id="under02column">
-  <div id="under02column_shopping">
-    <p class="flowarea">
+<div id="undercolumn">
+  <div id="undercolumn_shopping">
+    <p class="flow_area">
       <img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_04.jpg" alt="購入手続きの流れ" />
     </p>
Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/multiple.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/multiple.tpl	(revision 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/multiple.tpl	(revision 20340)
@@ -31,7 +31,7 @@
     });
 //]]></script>
-<div id="under02column">
-    <div id="under02column_shopping">
-        <p class="flowarea">
+<div id="undercolumn">
+    <div id="undercolumn_shopping">
+        <p class="flow_area">
             <img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_01.jpg" alt="購入手続きの流れ" />
         </p>
@@ -55,5 +55,5 @@
                 <colgroup width="35%"></colgroup>
                 <colgroup width="10%"></colgroup>
-                <colgroup width="50%"></colgroup>
+                <colgroup width="45%"></colgroup>
                 <tr>
                     <th>商品写真</th>
@@ -70,6 +70,5 @@
                             <!--{/if}-->
                         >
-                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
-                        </td>
+                            <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="&lt;!--{$item.productsClass.name|h}--&gt;" /></a>                        </td>
                         <td><!--{* 商品名 *}--><strong><!--{$item.name|h}--></strong><br />
                             <!--{if $item.classcategory_name1 != ""}-->
@@ -79,20 +78,17 @@
                                 <!--{$item.class_name2}-->：<!--{$item.classcategory_name2}--><br />
                             <!--{/if}-->
-                            <!--{$item.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
-                        </td>
+                            <!--{$item.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円                        </td>
                         <td>
-                          <!--{assign var=key value="quantity`$index`"}-->
-                          <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value}-->" size="4" />
-                        </td>
+                        <!--{assign var=key value="quantity`$index`"}-->
+                        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value}-->" class="box40" /></td>
                         <td>
                           <input type="hidden" name="cart_no<!--{$index}-->" value="<!--{$index}-->" />
                           <input type="hidden" name="product_class_id<!--{$index}-->" value="<!--{$item.product_class_id}-->" />
                           <!--{assign var=key value="shipping`$index`"}-->
-                          <select name="<!--{$key}-->"><!--{html_options options=$addrs selected=$arrForm[$key].value}--></select>
-                        </td>
+                          <select name="<!--{$key}-->"><!--{html_options options=$addrs selected=$arrForm[$key].value}--></select>                        </td>
                      </tr>
                   <!--{/foreach}-->
             </table>
-            <div class="btn_area">
+<div class="btn_area">
                  <ul>
                      <li>
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 20340)
@@ -44,7 +44,7 @@
 
 <!--CONTENTS-->
-<div id="under02column">
-    <div id="under02column_shopping">
-        <p class="flowarea"><img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_03.jpg" alt="購入手続きの流れ" /></p>
+<div id="undercolumn">
+    <div id="undercolumn_shopping">
+        <p class="flow_area"><img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_03.jpg" alt="購入手続きの流れ" /></p>
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 20340)
@@ -119,7 +119,7 @@
 //]]>
 </script>
-<div id="under02column">
-    <div id="under02column_shopping">
-        <p class="flowarea">
+<div id="undercolumn">
+    <div id="undercolumn_shopping">
+        <p class="flow_area">
             <img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_02.jpg" alt="購入手続きの流れ" />
         </p>
@@ -251,5 +251,5 @@
                                  <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}-->" size="6" class="box60" />&nbsp;Ptを使用する。<span class="attention"><!--{$arrErr[$key]}--></span>
+                                 今回のお買い物で、<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>
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 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/nonmember_input.tpl	(revision 20340)
@@ -21,7 +21,7 @@
  *}-->
 <!--▼CONTENTS-->
-<div id="under02column">
-  <div id="under02column_customer">
-    <p class="flowarea"><img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_01.jpg" alt="購入手続きの流れ" /></p>
+<div id="undercolumn">
+  <div id="undercolumn_customer">
+    <p class="flow_area"><img src="<!--{$TPL_URLPATH}-->img/picture/img_flow_01.jpg" alt="購入手続きの流れ" /></p>
     <h2 class="title"><!--{$tpl_title|h}--></h2>
 
@@ -31,5 +31,5 @@
         入力後、一番下の「次へ」ボタンをクリックしてください。</p>
         </div>
-        <div class="add_plural">
+        <div class="add_multiple">
             <p>この商品を複数の<br />お届け先に送りますか？</p>
         <a href="javascript:;" onclick="fnModeSubmit('multiple', '', ''); return false" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_several_address_on.jpg','several');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_several_address.jpg','several');"><img src="<!--{$TPL_URLPATH}-->img/button/btn_several_address.jpg" alt="お届け先を複数指定する" name="several" id="several" /></a>
@@ -53,6 +53,6 @@
             <!--{assign var=key2 value="order_name02"}-->
             <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp;
-            名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />
+            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
+            名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
           </td>
         </tr>
@@ -63,6 +63,6 @@
             <!--{assign var=key2 value="order_kana02"}-->
             <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp;
-            メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />
+            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
+            メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
           </td>
         </tr>
@@ -73,5 +73,5 @@
             <!--{assign var=key2 value="order_zip02"}-->
             <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-            <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" 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;"  size="6" class="box60" />　
+            <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" />　
               <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a></p>
 
@@ -89,11 +89,11 @@
               <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
             </select>
-            <p class="mini">
+            <p>
               <!--{assign var=key value="order_addr01"}-->
-              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="40" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
               <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
-            <p class="mini">
+            <p>
               <!--{assign var=key value="order_addr02"}-->
-              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="40"  maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
               <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
             <p class="mini"><span class="attention">住所は2つに分けてご記入ください。マンション名は必ず記入してください。</span></p></td>
@@ -108,7 +108,7 @@
             <span class="attention"><!--{$arrErr[$key2]}--></span>
             <span class="attention"><!--{$arrErr[$key3]}--></span>
-            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" /> -
-            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" /> -
-            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" />
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
           </td>
         </tr>
@@ -122,7 +122,7 @@
             <span class="attention"><!--{$arrErr[$key2]}--></span>
             <span class="attention"><!--{$arrErr[$key3]}--></span>
-            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" /> -
-            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" /> -
-            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" />
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
           </td>
         </tr>
@@ -132,8 +132,8 @@
             <!--{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;" size="40" 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" /><br />
             <!--{assign var=key value="order_email02"}-->
             <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;" size="40" 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" /><br />
             <p class="mini"><span class="attention">確認のため2度入力してください。</span></p>
           </td>
@@ -192,6 +192,6 @@
             <!--{assign var=key2 value="shipping_name02"}-->
             <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp;
-            名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />
+            姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
+            名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
           </td>
         </tr>
@@ -202,6 +202,6 @@
             <!--{assign var=key2 value="shipping_kana02"}-->
             <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp;
-            メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />
+            セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
+            メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
           </td>
         </tr>
@@ -212,5 +212,5 @@
            <!--{assign var=key2 value="shipping_zip02"}-->
             <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-            <p>〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" 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" />　
+            <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" />　
               <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a></p>
 
@@ -228,11 +228,11 @@
               <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
             </select>
-            <p class="mini">
+            <p>
               <!--{assign var=key value="shipping_addr01"}-->
-              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="40" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
               <!--{$smarty.const.SAMPLE_ADDRESS1}--></p>
-            <p class="mini">
+            <p>
               <!--{assign var=key value="shipping_addr02"}-->
-              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="40"  maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
+              <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->; ime-mode: active;" class="box380" /><br />
               <!--{$smarty.const.SAMPLE_ADDRESS2}--></p>
             <p class="mini"><span class="attention">住所は2つに分けてご記入ください。マンション名は必ず記入してください。</span></p>
@@ -249,7 +249,7 @@
             <span class="attention"><!--{$arrErr[$key2]}--></span>
             <span class="attention"><!--{$arrErr[$key3]}--></span>
-            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" /> -
-            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  size="6" class="box60" /> -
-            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" size="6" class="box60" />
+            <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;"  class="box60" /> -
+            <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
           </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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl	(revision 20340)
@@ -32,6 +32,6 @@
 
 <!--▼CONTENTS-->
-<div id="under02column">
-    <div id="under02column_cart">
+<div id="undercolumn">
+    <div id="undercolumn_cart">
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/contact/index.tpl	(revision 20340)
@@ -55,8 +55,8 @@
         <td>
           <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
-          <p>
+          <p class="top">
             〒&nbsp;
-            <input type="text" name="zip01" class="box60 top" value="<!--{$arrForm.zip01.value|h|default:$arrData.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" style="<!--{$arrErr.zip01|sfGetErrorColor}-->; ime-mode: disabled;" />&nbsp;-&nbsp;
-            <input type="text" name="zip02" class="box60 top" value="<!--{$arrForm.zip02.value|h|default:$arrData.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" style="<!--{$arrErr.zip02|sfGetErrorColor}-->; ime-mode: disabled;" />　
+            <input type="text" name="zip01" class="box60" value="<!--{$arrForm.zip01.value|h|default:$arrData.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" style="<!--{$arrErr.zip01|sfGetErrorColor}-->; ime-mode: disabled;" />&nbsp;-&nbsp;
+            <input type="text" name="zip02" class="box60" value="<!--{$arrForm.zip02.value|h|default:$arrData.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" style="<!--{$arrErr.zip02|sfGetErrorColor}-->; ime-mode: disabled;" />　
             <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a>
           </p>
@@ -76,10 +76,10 @@
           <option value="">都道府県を選択</option><!--{html_options options=$arrPref selected=$arrForm.pref.value|h|default:$arrData.pref|h}--></select>
           
-          <p class="mini">
+          <p>
             <input type="text" class="box380" name="addr01" value="<!--{$arrForm.addr01.value|h|default:$arrData.addr01|h}-->" style="<!--{$arrErr.addr01|sfGetErrorColor}-->; ime-mode: active;" /><br />
             <!--{$smarty.const.SAMPLE_ADDRESS1}-->
           </p>
           
-          <p class="mini">
+          <p>
             <input type="text" class="box380" name="addr02" value="<!--{$arrForm.addr02.value|h|default:$arrData.addr02|h}-->" style="<!--{$arrErr.addr02|sfGetErrorColor}-->; ime-mode: active;" /><br />
             <!--{$smarty.const.SAMPLE_ADDRESS2}-->
Index: branches/version-2_5-dev/data/Smarty/templates/default/footer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/footer.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/footer.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <!--▼FOOTER-->
-<div id="footerWrap">
+<div id="footer_wrap">
     <div id="footer" class="clearfix">
         <div id="pagetop"><a href="#top">このページの先頭へ</a></div>
Index: branches/version-2_5-dev/data/Smarty/templates/default/forgot/secret.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/forgot/secret.tpl	(revision 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/forgot/secret.tpl	(revision 20340)
@@ -22,5 +22,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="パスワードを忘れた方(確認ページ)"}-->
 
-<div id="windowarea">
+<div id="window_area">
     <h2>パスワードの再発行 秘密の質問の確認</h2>
     <p class="information">
@@ -43,5 +43,5 @@
     <p>
         <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
-        <!--{$arrReminder[$arrForm.reminder]}-->：&nbsp;<!--★答え入力★--><input type="text" name="reminder_answer" value="" size="40" class="box300" style="<!--{$arrErr.reminder_answer|sfGetErrorColor}-->" /></p>
+        <!--{$arrReminder[$arrForm.reminder]}-->：&nbsp;<!--★答え入力★--><input type="text" name="reminder_answer" value="" class="box300" style="<!--{$arrErr.reminder_answer|sfGetErrorColor}-->" /></p>
         <span class="attention"><!--{$errmsg}--></span>
     </div>
Index: branches/version-2_5-dev/data/Smarty/templates/default/forgot/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/forgot/index.tpl	(revision 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/forgot/index.tpl	(revision 20340)
@@ -22,5 +22,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="パスワードを忘れた方(入力ページ)"}-->
 
-<div id="windowarea">
+<div id="window_area">
     <h2>パスワードの再発行</h2>
     <p class="information">ご登録時のメールアドレスと、ご登録されたお名前を入力して「次へ」ボタンをクリックしてください。<br />
Index: branches/version-2_5-dev/data/Smarty/templates/default/forgot/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/forgot/complete.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/forgot/complete.tpl	(revision 20340)
@@ -22,5 +22,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="パスワードを忘れた方(完了ページ)"}-->
 
-  <div id="windowarea">
+  <div id="window_area">
     <h2 class="title">パスワードを忘れた方</h2>
     <p class="information">パスワードの発行が完了いたしました。ログインには下記のパスワードをご利用ください。<br />
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 20116)
+++ branches/version-2_5-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl	(revision 20340)
@@ -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/entry/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/entry/confirm.tpl	(revision 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/entry/confirm.tpl	(revision 20340)
@@ -33,4 +33,6 @@
 
       <table summary="入力内容確認">
+      <colgroup width="30%"></colgroup>
+      <colgroup width="70%"></colgroup>
         <tr>
           <th>お名前<span class="attention">※</span></th>
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 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/login.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="loginarea">
+    <div id="login_area">
         <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_login.gif"alt="ログイン" /></h2>
         <form name="login_form" id="login_form" method="post" action="<!--{$smarty.const.HTTPS_URL}-->frontparts/login_check.php" onsubmit="return fnCheckLogin('login_form')">
@@ -46,5 +46,7 @@
                     </dd>
                     <dd class="mini">
-                        <input type="checkbox" name="login_memory" id="login_memory" value="1" <!--{$tpl_login_memory|sfGetChecked:1}--> /><label for="login_memory"><span>コンピューターに記憶する</span></label>
+                        <input type="checkbox" name="login_memory" id="login_memory" value="1" <!--{$tpl_login_memory|sfGetChecked:1}-->
+/>
+<label for="login_memory"><span>コンピューターに記憶する</span></label>
                     </dd>
                 </dl>
@@ -57,5 +59,5 @@
                 </dl>
                 <p class="btn">
-                    <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_login_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_login.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_login.jpg" />
+                    <input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_login_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_login.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_login.jpg" alt="ログイン" />
                 </p>
               <!--{/if}-->
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 20311)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/search_products.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="searcharea">
+    <div id="search_area">
     <h2><span class="title"><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_search.gif"alt="検索条件" /></span></h2>
         <div class="bloc_body">
@@ -47,5 +47,5 @@
                 <!--{/if}-->
                 <dt>商品名を入力</dt>
-                <dd><input type="text" name="name" class="box140" size="10" maxlength="50" value="<!--{$smarty.get.name|h}-->" /></dd>
+                <dd><input type="text" name="name" class="box140" maxlength="50" value="<!--{$smarty.get.name|h}-->" /></dd>
             </dl>
             <p class="btn"><input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_search_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_bloc_search.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_bloc_search.jpg" alt="検索" name="search" /></p>
Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/calendar.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/calendar.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/calendar.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="calenderarea">
+    <div id="calender_area">
     <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_calender.gif"alt="カレンダー" /></h2>
         <div class="bloc_body">
Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl	(revision 20311)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/cart.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="cartarea">
+    <div id="cart_area">
     <h2 class="cart"><span class="title"><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_cart.gif"alt="現在のカゴの中" /></span></h2>
         <div class="bloc_body">
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 20311)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/news.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="newsarea">
+    <div id="news_area">
     <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">
Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 20315)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/category.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="categoryarea">
+    <div id="category_area">
         <div class="bloc_body">
         <h2><img src="<!--{$TPL_URLPATH}-->img/title/tit_bloc_category.gif"alt="商品カテゴリー" /></h2>
Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/guide.tpl	(revision 20340)
@@ -21,5 +21,5 @@
  *}-->
 <div class="bloc_outer">
-    <div id="guidearea" class="bloc_body">
+    <div id="guide_area" class="bloc_body">
         <!--{strip}-->
         <ul class="button_like">
Index: branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl	(revision 20291)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/bloc/best5.tpl	(revision 20340)
@@ -22,5 +22,5 @@
 <!--{if count($arrBestProducts) > 0}-->
 <div class="bloc_outer" class="clearfix">
-  <div id="recomendarea">
+  <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}-->
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 20116)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/search_zero.tpl	(revision 20340)
@@ -22,13 +22,13 @@
  <!--検索該当0の時-->
 <table width="570" cellspacing="0" cellpadding="0" summary=" ">
-	<tr><td height="15"></td></tr>
-	<tr>
-		<!--{if $smarty.get.mode == "search"}-->
-		<td height="150" align="center" class="fs12">該当件数<strong><span class="red">0件</span></strong>です。<br />
-		他の検索キーワードより再度検索をしてください。</td>
-		<!--{else}-->
-		<td height="150" align="center" class="fs12">現在、商品はございません。</td>
-		<!--{/if}-->
-	</tr>
+    <tr><td height="15"></td></tr>
+    <tr>
+        <!--{if $smarty.get.mode == "search"}-->
+        <td height="150" align="center" class="fs12">該当件数<strong><span class="red">0件</span></strong>です。<br />
+        他の検索キーワードより再度検索をしてください。</td>
+        <!--{else}-->
+        <td height="150" align="center" class="fs12">現在、商品はございません。</td>
+        <!--{/if}-->
+    </tr>
 </table>
 <!--検索該当0の時-->
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/frontparts/form_personal_input.tpl	(revision 20340)
@@ -32,6 +32,6 @@
     <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
     <!--{/if}-->
-    姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp;
-    名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />
+    姓&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
+    名&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
   </td>
 </tr>
@@ -44,6 +44,6 @@
     <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
     <!--{/if}-->
-    セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />&nbsp;
-    メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" size="15" class="box120" />
+    セイ&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />&nbsp;
+    メイ&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: active;" class="box120" />
   </td>
 </tr>
@@ -59,12 +59,13 @@
     <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></div>
     <!--{/if}-->
-    〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60 top" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60 top" />&nbsp;
+    <p class="top">〒&nbsp;<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;
     <a href="http://search.post.japanpost.jp/zipcode/" target="_blank"><span class="mini">郵便番号検索</span></a>
+    </p>
     <p class="zipimg"><a href="<!--{$smarty.const.ROOT_URLPATH}-->input_zip.php" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->'); return false;" target="_blank">
-    	<a href="<!--{$smarty.const.ROOT_URLPATH}-->input_zip.php" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->'); return false;" target="_blank">
-    		<img src="<!--{$TPL_URLPATH}-->img/button/btn_address_input.jpg" alt="住所自動入力" />
-    		</a>
+        <a href="<!--{$smarty.const.ROOT_URLPATH}-->input_zip.php" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', '<!--{$key1}-->', '<!--{$key2}-->', '<!--{$key3}-->', '<!--{$key4}-->'); return false;" target="_blank">
+            <img src="<!--{$TPL_URLPATH}-->img/button/btn_address_input.jpg" alt="住所自動入力" />
+            </a>
     </a>
-    	&nbsp;<span class="mini">郵便番号を入力後、クリックしてください。</span></p>
+        &nbsp;<span class="mini">郵便番号を入力後、クリックしてください。</span></p>
   </td>
 </tr>
@@ -76,10 +77,10 @@
     <!--{/if}-->
     <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
-		<option value="" selected="selected">都道府県を選択</option>
-		<!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
-	</select>
-    <p class="mini top"><input type="text" name="<!--{$key4}-->" value="<!--{$arrForm[$key4]|h}-->" class="box300" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->; ime-mode: active;" /><br />
+        <option value="" selected="selected">都道府県を選択</option>
+        <!--{html_options options=$arrPref selected=$arrForm[$key3]}-->
+    </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>
-    <p class="mini top"><input type="text" name="<!--{$key5}-->" value="<!--{$arrForm[$key5]|h}-->" class="box300" style="<!--{$arrErr[$key5]|sfGetErrorColor}-->; ime-mode: active;" /><br />
+    <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>
     <p class="mini"><span class="attention">住所は2つに分けてご記入ください。マンション名は必ず記入してください。</span></p>
@@ -95,5 +96,5 @@
     <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--><!--{$arrErr[$key3]}--></div>
     <!--{/if}-->
-    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
+    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
   </td>
 </tr>
@@ -108,5 +109,5 @@
     <div class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--><!--{$arrErr[$key3]}--></div>
     <!--{/if}-->
-    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
+    <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />&nbsp;-&nbsp;<input type="text" name="<!--{$key3}-->" value="<!--{$arrForm[$key3]|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->; ime-mode: disabled;" class="box60" />
   </td>
 </tr>
@@ -120,5 +121,5 @@
     <!--{/if}-->
     <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1]|h}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" class="box300 top" /><br />
-    <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" style="<!--{$arrErr[$key1]|cat:$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" size="40" class="box300" /><br />
+    <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2]|h}-->" style="<!--{$arrErr[$key1]|cat:$arrErr[$key2]|sfGetErrorColor}-->; ime-mode: disabled;" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" class="box300" /><br />
     <p class="mini"><span class="attention">確認のため2度入力してください。</span></p>
   </td>
@@ -191,7 +192,7 @@
     <div class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></div>
     <!--{/if}-->
-    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" size="15" class="box120" />
+    <input type="password" name="password" value="<!--{$arrForm.password|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" class="box120" />
     <p><span class="attention mini">半角英数字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字でお願いします。（記号不可）</span></p>
-    <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" size="15" class="box120" />
+    <input type="password" name="password02" value="<!--{$arrForm.password02|h}-->" maxlength="<!--{$smarty.const.PASSWORD_LEN2}-->" style="<!--{$arrErr.password|cat:$arrErr.password02|sfGetErrorColor}-->" class="box120" />
     <p><span class="attention mini">確認のために2度入力してください。</span></p>
   </td>
@@ -209,5 +210,5 @@
     </select>
     <br />
-    答え：<input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" style="<!--{$arrErr.reminder_answer|sfGetErrorColor}-->; ime-mode: active;" size="40" class="box260" />
+    答え：<input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" style="<!--{$arrErr.reminder_answer|sfGetErrorColor}-->; ime-mode: active;" class="box260" />
   </td>
 </tr>
@@ -223,4 +224,5 @@
         <input type="radio" name="mailmaga_flg" value="3" id="no" <!--{if $arrForm.mailmaga_flg eq 3}--> checked="checked" <!--{/if}--> /><label for="no">受け取らない</label>
     </span>
+    </span>
   </td>
 </tr>
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 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review_confirm.tpl	(revision 20340)
@@ -22,5 +22,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="お客様の声書き込み（確認ページ）"}-->
 
-  <div id="windowarea">
+  <div id="window_area">
     <h2 class="title">お客様の声書き込み</h2>
     <form name="form1" method="post" action="?">
@@ -62,8 +62,8 @@
         </table>
         <div class="btn_area">
-	<ul>
-		<li><input type="image" onclick=" mode.value='return';" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る"  name="back" id="back" /></li>
-		<li><input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_complete_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_complete.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_complete.jpg" alt="送信" name="send" id="send" /></li>
-	</ul>
+    <ul>
+        <li><input type="image" onclick=" mode.value='return';" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_back.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_back.jpg" alt="戻る"  name="back" id="back" /></li>
+        <li><input type="image" onmouseover="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_complete_on.jpg',this)" onmouseout="chgImgImageSubmit('<!--{$TPL_URLPATH}-->img/button/btn_complete.jpg',this)" src="<!--{$TPL_URLPATH}-->img/button/btn_complete.jpg" alt="送信" name="send" id="send" /></li>
+    </ul>
         </div>
       </form>
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 20328)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review.tpl	(revision 20340)
@@ -24,5 +24,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="お客様の声書き込み（入力ページ）"}-->
 
-  <div id="windowarea">
+  <div id="window_area">
     <h2 class="title">お客様の声書き込み</h2>
     <p class="windowtext">以下の商品について、お客様のご意見、ご感想をどしどしお寄せください。<br />
@@ -39,9 +39,9 @@
           <tr>
             <th>投稿者名<span class="attention">※</span></th>
-            <td><span class="attention"><!--{$arrErr.reviewer_name}--></span><input type="text" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size="40" class="box350" /></td>
+            <td><span class="attention"><!--{$arrErr.reviewer_name}--></span><input type="text" name="reviewer_name" value="<!--{$arrForm.reviewer_name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" class="box350" /></td>
           </tr>
           <tr>
             <th>投稿者URL</th>
-            <td><span class="attention"><!--{$arrErr.reviewer_url}--></span><input type="text" name="reviewer_url" value="<!--{$arrForm.reviewer_url|h}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size="40" class="box350" /></td>
+            <td><span class="attention"><!--{$arrErr.reviewer_url}--></span><input type="text" name="reviewer_url" value="<!--{$arrForm.reviewer_url|h}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" class="box350" /></td>
           </tr>
           <tr>
@@ -66,5 +66,5 @@
             <td>
               <span class="attention"><!--{$arrErr.title}--></span>
-              <input type="text" name="title" value="<!--{$arrForm.title|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size="40" class="box350" />
+              <input type="text" name="title" value="<!--{$arrForm.title|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" class="box350" />
             </td>
           </tr>
@@ -78,7 +78,7 @@
         </table>
         <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="conf" id="conf" /></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="conf" id="conf" /></li>
+    </ul>
         </div>
       </form>
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 20337)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	(revision 20340)
@@ -351,41 +351,45 @@
         <!--{/if}-->
 
-        <div class="cartin clearfix">
+          <!--★数量★-->
           <div class="quantity">
-              数量：<input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
+            <ul class="clearfix">
+                <li>数量：</li>
+                <li><input type="text" class="box60" name="quantity" value="<!--{$arrForm.quantity.value|default:1}-->" maxlength="<!--{$smarty.const.INT_LEN}-->" style="<!--{$arrErr.quantity|sfGetErrorColor}-->" />
               <!--{if $arrErr.quantity != ""}-->
-              <br /><span class="attention"><!--{$arrErr.quantity}--></span>
+                  <br /><span class="attention"><!--{$arrErr.quantity}--></span>
               <!--{/if}-->
+                </li>
           </div>
-          <div class="cartin_btn">
-            <div id="cartbtn_default">
-                  <!--★カゴに入れる★-->
-                  <div>
-                      <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="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}-->
+
+        <!--★お気に入り登録★-->
+        <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1 && $tpl_login === true}-->
+            <div class="favorite_btn">
+                <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
+                    <!--{if $arrErr[$add_favorite]}-->
+                        <div class="attention"><!--{$arrErr[$add_favorite]}--></div><!--{/if}-->
+                            <!--{if !$arrProduct.favorite_count}-->
+                                <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>
+                  <!--{/if}-->
+                </div>
+          </form>
           </div>
-        </div>
-      <div class="attention" id="cartbtn_dynamic"></div>
-    <!--{else}-->
-      <div class="attention" id="cartbtn_default">申し訳ございませんが、只今品切れ中です。</div>
-    <!--{/if}-->
-    <!--★カゴに入れる★-->
-    <!--{if $smarty.const.OPTION_FAVOFITE_PRODUCT == 1 && $tpl_login === true}-->
-          <div class="favorite">
-              <div>
-                  <!--{assign var=add_favorite value="add_favorite`$product_id`"}-->
-                  <!--{if $arrErr[$add_favorite]}--><div class="attention"><!--{$arrErr[$add_favorite]}--></div><!--{/if}-->
-                  <!--{if !$arrProduct.favorite_count}-->
-                      <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>
-          </div>
-   <!--{/if}-->
-            </div>
-          </form>
         </div>
       <!--▲買い物かご-->
@@ -398,5 +402,5 @@
         <!--{assign var=key value="sub_title`$smarty.section.cnt.index+1`"}-->
         <!--{if $arrProduct[$key] != ""}-->
-            <div class="subarea clearfix">
+            <div class="sub_area clearfix">
                 <h3><!--★サブタイトル★--><!--{$arrProduct[$key]|h}--></h3>
                 <!--{assign var=ckey value="sub_comment`$smarty.section.cnt.index+1`"}-->
@@ -409,21 +413,11 @@
                 <!--{if $arrProduct[$key]|strlen >= 1}-->
                     <div class="subphotoimg">
-                    <!--{if $arrProduct[$lkey]|strlen >= 1}-->
-                        <a
-                            href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->"
-                            class="expansion"
-                            onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_expansion_on.gif', 'expansion_<!--{$lkey|h}-->');"
-                            onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_expansion.gif', 'expansion_<!--{$lkey|h}-->');"
-                             target="_blank"
-                         >
-                    <!--{/if}-->
-                    <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrProduct.name|h}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" />
+                        <!--{if $arrProduct[$lkey]|strlen >= 1}-->
+                            <a href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" onmouseover="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_expansion_on.gif', 'expansion_<!--{$lkey|h}-->');" onmouseout="chgImg('<!--{$TPL_URLPATH}-->img/button/btn_expansion.gif', 'expansion_<!--{$lkey|h}-->');" target="_blank" >
+                        <!--{/if}-->
+                        <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 href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$arrProduct[$lkey]|h}-->" class="expansion" target="_blank">
                    画像を拡大する
                  </a>
@@ -511,5 +505,4 @@
                         <h3><a href="<!--{$smarty.const.P_DETAIL_URLPATH}--><!--{$arrRecommend[$cnt2].product_id|u}-->"><!--{$arrRecommend[$cnt2].name|h}--></a></h3>
                         <p class="sale_price"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：<span class="price">
-
                             <!--{if $price02_min == $price02_max}-->
                                 <!--{$price02_min|sfCalcIncTax:$arrSiteInfo.tax:$arrSiteInfo.tax_rule|number_format}-->
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 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/review_complete.tpl	(revision 20340)
@@ -22,5 +22,5 @@
 <!--{include file="`$smarty.const.TEMPLATE_REALDIR`popup_header.tpl" subtitle="お客様の声書き込み（完了ページ）"}-->
 
-  <div id="windowarea">
+  <div id="window_area">
     <h2 class="title">お客様の声書き込み</h2>
     <div id="completebox">
@@ -30,7 +30,7 @@
     </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>
+    <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 20337)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl	(revision 20340)
@@ -169,5 +169,5 @@
     <!--▼検索条件-->
     <!--{if $tpl_subtitle == "検索結果"}-->
-        <ul class="pagecondarea">
+        <ul class="pagecond_area">
             <li><strong>商品カテゴリ：</strong><!--{$arrSearch.category|h}--></li>
         <!--{if $arrSearch.maker|strlen >= 1}--><li><strong>メーカー：</strong><!--{$arrSearch.maker|h}--></li><!--{/if}-->
@@ -179,5 +179,5 @@
     <!--▼ページナビ(本文)-->
     <!--{capture name=page_navi_body}-->
-        <div class="pagenumberarea clearfix">
+        <div class="pagenumber_area clearfix">
             <div class="change">
                 <!--{if $orderby != 'price'}-->
Index: branches/version-2_5-dev/data/Smarty/templates/default/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/index.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/index.tpl	(revision 20340)
@@ -21,4 +21,6 @@
  *}-->
 <div id="mainImage">
-  <img src="<!--{$TPL_URLPATH}-->img/banner/bnr_top_main.jpg" alt="EC-CUBEイメージ" />
+                    <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/rss/products.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl	(revision 20116)
+++ branches/version-2_5-dev/data/Smarty/templates/default/rss/products.tpl	(revision 20340)
@@ -33,11 +33,11 @@
 <docs>http://backend.userland.com/rss</docs>
 <!--{section name=cnt loop=$arrProduct}-->
-	<!--{* １つのitem要素を出力する *}-->
-	<item>
-		<link><!--{$smarty.const.HTTP_URL}-->rss/product.php?product_id=<!--{$arrProduct[cnt].product_id}--></link>
-		<!--{foreach key=key item=item from=$arrProductKeys}-->
-			<<!--{$item}-->><!--{$arrProduct[cnt][$item]|h|sfMbConvertEncoding:$encode}--></<!--{$item}-->>
-		<!--{/foreach}-->
-	</item>
+    <!--{* １つのitem要素を出力する *}-->
+    <item>
+        <link><!--{$smarty.const.HTTP_URL}-->rss/product.php?product_id=<!--{$arrProduct[cnt].product_id}--></link>
+        <!--{foreach key=key item=item from=$arrProductKeys}-->
+            <<!--{$item}-->><!--{$arrProduct[cnt][$item]|h|sfMbConvertEncoding:$encode}--></<!--{$item}-->>
+        <!--{/foreach}-->
+    </item>
 <!--{/section}-->
 </channel>
Index: branches/version-2_5-dev/data/Smarty/templates/default/input_zip.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/input_zip.tpl	(revision 20290)
+++ branches/version-2_5-dev/data/Smarty/templates/default/input_zip.tpl	(revision 20340)
@@ -24,5 +24,5 @@
   <div id="zipsearchcolumn">
     <h2>住所検索</h2>
-    <div id="zipsearcharea">
+    <div id="zipsearch_area">
       <form name="form1" id="form1" method="post" action="?">
         <input type="hidden" name="state" value="<!--{$tpl_state}-->" />