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 19943)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/deliv.tpl	(revision 19965)
@@ -28,4 +28,7 @@
         <h2 class="title"><!--{$tpl_title|h}--></h2>
 
+<div id="add-wrap" class="clearfix">
+
+<div id="add-left">
         <p>下記一覧よりお届け先住所を選択して、「選択したお届け先に送る」ボタンをクリックしてください。</p>
         <!--{if $tpl_addrmax < $smarty.const.DELIV_ADDR_MAX}-->
@@ -39,4 +42,14 @@
             </p>
         <!--{/if}-->
+</div>
+
+<div id="add-right">
+<p class="add-m">この商品を複数の<br />お届け先に送りますか？</p>
+<a href="javascript:;" onclick="fnModeSubmit('multiple', '', ''); return false" onmouseover="chgImg('<!--{$TPL_DIR}-->img/button/btn_several_address_on.gif','several');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/button/btn_several_address.gif','several');"><img src="<!--{$TPL_DIR}-->img/button/btn_several_address.gif" width="129" height="20" alt="お届け先を複数指定する" name="several" id="several" /></a>
+</div>
+
+</div>
+
+        
         <form name="form1" id="form1" method="post" action="?">
             <input type="hidden" name="mode" value="customer_addr" />
@@ -90,5 +103,5 @@
             <!--{/section}-->
         </table>
-        <p><a href="javascript:;" onclick="fnModeSubmit('multiple', '', ''); return false">お届け先を複数指定する</a></p>
+
             <div class="tblareabtn">
                 <a href="<!--{$smarty.const.CART_URLPATH}-->" onmouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back_on.gif',back03)" onmouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/button/btn_back.gif',back03)">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 19965)
@@ -45,5 +45,5 @@
             <td>
                 <!--{if $arrErr.pref}--><span class="attention"><!--{$arrErr.pref}--></span><br /><!--{/if}-->
-                <select name="pref">
+                <select class="top" name="pref">
                     <option value="" selected="selected" style="<!--{$arrErr.pref|sfGetErrorColor}-->">都道府県を選択</option>
                     <!--{html_options options=$arrPref selected=$list_data.pref}-->
@@ -275,4 +275,12 @@
     <!--検索結果表示テーブル-->
     <table class="list">
+    <colgroup width="5%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="25%">
+    <colgroup width="15%">
+    <colgroup width="10%">
+    <colgroup width="15%">
+    <colgroup width="5%">
         <tr>
             <th>#</th>
@@ -283,5 +291,5 @@
             <th>希望配信</th>
             <th>登録日</th>
-            <th class="delete">削除</th>
+            <th>削除</th>
         </tr>
         <!--{section name=i loop=$arrResults}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl	(revision 19958)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl	(revision 19965)
@@ -74,5 +74,5 @@
       <th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</th>
       <td>
-        <textarea name="body" cols="90" rows="40" class="area90" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.body|h}--></textarea>
+        <textarea name="body" cols="90" rows="40" class="area90 top" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.body|h}--></textarea>
         <!--{if $arrErr.body}--><br /><span class="attention"><!--{$arrErr.body}--></span><!--{/if}-->
 				<div>
@@ -88,4 +88,4 @@
     </ul>
   </div>
-</table>
+</form>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl	(revision 19835)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl	(revision 19965)
@@ -23,6 +23,16 @@
 *}-->
 <form name="form1" id="form1" method="post" action="?">
+<div class="btn">
+    <a class="btn-action" href="./template_input.php"><span class="btn-next">テンプレートを新規入力</span></a>
+</div>
+<!--{if count($list_data) > 0}-->
 <div id="mail" class="contents-main">
     <table class="list center">
+    <colgroup width="15%">
+    <colgroup width="35%">
+    <colgroup width="20%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="10%">
         <tr>
             <th>作成日</th>
@@ -45,7 +55,4 @@
         <!--{/section}-->
     </table>
-
-    <div class="btn addnew">
-        <a class="btn-normal" href="./template_input.php"><span>テンプレートを新規入力</span></a>
-    </div>
 </div>
+<!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 19965)
@@ -32,4 +32,15 @@
   <!--▼メンバー一覧ここから-->
   <table class="list">
+    <colgroup width="15%">
+    <colgroup width="20%">
+    <colgroup width="20%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="20%">
+    <div class="btn">
+      <a class="btn-action" href="javascript:;" onclick="win01('./input.php','input','615','450'); return false;"><span class="btn-next">メンバーを新規入力</span></a>
+    </div>
     <tr>
       <th>権限</th>
@@ -38,6 +49,6 @@
       <th>稼動</th>
       <th>非稼動</th>
-      <th class="edit">編集</th>
-      <th class="delete">削除</th>
+      <th>編集</th>
+      <th>削除</th>
       <th>移動</th>
     </tr>
@@ -49,5 +60,5 @@
       <td align="center"><!--{if $list_data[data].work eq 1}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="稼動" onclick="fnChangeRadio(this.name, 1, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" checked /><!--{else}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="稼動" onclick="fnChangeRadio(this.name, 1, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);"/><!--{/if}--></td>
       <td align="center"><!--{if $list_data[data].work eq 0}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="非稼動"  onclick="fnChangeRadio(this.name, 0, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" checked /><!--{else}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="非稼動" onclick="fnChangeRadio(this.name, 0, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" <!--{if $workmax <= 1 }-->disabled<!--{/if}-->  /><!--{/if}--></td>
-      <td align="center"><a href="#" onClick="win01('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','600','420'); return false;">編集</a></td>
+      <td align="center"><a href="#" onClick="win01('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','615','450'); return false;">編集</a></td>
       <td align="center"><!--{if $workmax > 1 }--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
       <td align="center">
@@ -66,8 +77,4 @@
     <!--▲ページ送り-->
   </div>
-
-  <div class="btn addnew">
-    <a class="btn-normal" href="javascript:;" onclick="win01('./input.php','input','600','420'); return false;"><span>メンバーを新規入力</span></a>
-  </div>
 </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/editdb.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 19965)
@@ -25,5 +25,12 @@
 <form name="index_form"  method="post" action="?"> 
   <input type="hidden" name="mode" value="confirm" />
+    <div class="btn">
+        <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('index_form', 'confirm', '', '');"><span class="btn-next">変更する</span></a>
+    </div>
       <table class="list">
+        <colgroup width="8%">
+        <colgroup width="28%">
+        <colgroup width="25%">
+        <colgroup width="45%">
       <tr>
         <th>インデックス</th>
@@ -38,6 +45,6 @@
     <tr>
     <td class="center"><input type="checkbox" name="indexflag_new[]" value="<!--{$smarty.section.cnt.index}-->" <!--{if $arrForm[cnt].indexflag == "1"}-->checked<!--{/if}--> /></td>
-    <td><!--{$arrForm[cnt].table_name}--></td>
-    <td><!--{$arrForm[cnt].column_name}--></td>
+    <th class="column"><!--{$arrForm[cnt].table_name}--></th>
+    <th class="column"><!--{$arrForm[cnt].column_name}--></th>
     <td><!--{$arrForm[cnt].recommend_comment}--></td>
     </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 19965)
@@ -39,4 +39,6 @@
 
 <table>
+    <colgroup width="20%">
+    <colgroup width="80%">
   <tr>
     <th>名前</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl	(revision 19965)
@@ -31,5 +31,5 @@
   </p>
 
-  <table class="form">
+  <table class="list">
     <tr>
       <th>定数名</th>
@@ -38,5 +38,5 @@
 <!--{section name=cnt loop=$arrKeys}-->
     <tr>
-      <th>
+      <th class="column">
       <!--{$arrKeys[cnt]|h}-->
       </th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl	(revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl	(revision 19965)
@@ -113,9 +113,9 @@
             <table summary="新規受付一覧" id="home-order">
                 <tr>
-                    <th>受注日</th>
-                    <th>顧客名</th>
-                    <th>購入商品</th>
-                    <th>支払方法</th>
-                    <th>購入金額(円)</th>
+                    <th class="center">受注日</th>
+                    <th class="center">顧客名</th>
+                    <th class="center">購入商品</th>
+                    <th class="center">支払方法</th>
+                    <th class="center">購入金額(円)</th>
                 </tr>
                 <!--{section name=i loop=$arrNewOrder}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/products_list.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/products_list.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/products_list.tpl	(revision 19965)
@@ -73,5 +73,5 @@
             <!--{if $product.installed_flg}-->
                 <span class="icon_confirm">
-                <a href="#" onclick="win02('../load_module_config.php?module_id=<!--{$product.product_id}-->', 'load', 600, 400);return false;">
+                <a href="#" onclick="win02('../load_module_config.php?module_id=<!--{$product.product_id}-->', 'load', 615, 400);return false;">
                    設定</a>
                 </span>
@@ -79,5 +79,5 @@
                 <div id='ownersstore_settings<!--{$product.product_id|h}-->' style="display:none">
                 <span class="icon_confirm">
-                <a href="#" onclick="win02('../load_module_config.php?module_id=<!--{$product.product_id}-->', 'load', 600, 400);return false;">
+                <a href="#" onclick="win02('../load_module_config.php?module_id=<!--{$product.product_id}-->', 'load', 615, 400);return false;">
                    設定</a>
                 </span>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 19949)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 19965)
@@ -84,5 +84,5 @@
 <!--{* ▼NAVI *}-->
 <div id="navi-wrap">
-<ul id="navi">
+<ul id="navi" class="clearfix">
     <li id="navi-basis" class="<!--{if $tpl_mainno eq "basis"}-->on<!--{/if}-->">
         <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span class="level1">基本情報管理</span></a>
@@ -127,5 +127,4 @@
 </ul>
 </div>
-<div style="clear: both;"></div>
 <!--{* ▲NAVI *}-->
 
@@ -135,5 +134,5 @@
 
 <!--{* ▼CONTENTS *}-->
-<div id="contents" class="clear-block">
+<div id="contents" class="clearfix">
   <!--{include file=$tpl_mainpage}-->
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 19909)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 19965)
@@ -46,5 +46,5 @@
       <td>
         <!--{if $arrErr.upload_file}--><span class="attention"><!--{$arrErr.upload_file}--></span><!--{/if}-->
-        <input type="file" name="upload_file" size="46" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">アップロード</a>
+        <input type="file" name="upload_file" size="40" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|h}-->"<!--{/if}-->><a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;">アップロード</a>
       </td>
     </tr>
@@ -60,6 +60,5 @@
   <h2><!--{$tpl_now_dir|h}--></h2>
 
-  <div id="file_view">
-    <table id="contents-filemanager-filelist" class="list">
+    <table class="list">
       <tr>
         <th>ファイル名</th>
@@ -103,5 +102,4 @@
   </div>
 </div>
-</div>
 
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 19965)
@@ -82,5 +82,5 @@
     </tr>
     <tr>
-      <th align="center">SQL文<br /> (SELECTは記述しないでください。)<span class="attention"> *</span></td>
+      <th align="center">SQL文<span class="attention"> *</span><br /> (SELECTは記述しないでください。)</td>
       <td align="left">
         <span class="attention"><!--{$arrErr.csv_sql}--></span>
@@ -94,10 +94,11 @@
   <div class="btn">
     <a class="btn-normal" href="javascript:;" name="subm" onclick="doPreview(); return false;"><span>構文エラーを確認する</span></a>
-    <div class="btn-area">
-      <ul>
-        <li><a class="btn-action" href="javascript:;" name="subm" onclick="mode.value='confirm'; fnTargetSelf(); return false;"><span class="btn-next">この内容で登録する</span></a></li>
-      </ul>
-    </div>
   </div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" name="subm" onclick="mode.value='confirm'; fnTargetSelf(); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
+
 
 
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 19965)
@@ -28,8 +28,13 @@
 $().ready(function() {
     $('#output_list').multiselect2side({
-        selectedPosition: 'left',
+        selectedPosition: 'right',
         moveOptions: true,
-        labelsx: '出力項目一覧',
-        labeldx: '出力可能項目一覧'
+        labelsx: 'CSV出力しない項目',
+        labeldx: 'CSV出力する項目',
+        labelTop: '一番上',
+        labelBottom: '一番下',
+        labelUp: '一つ上',
+        labelDown: '一つ下',
+        labelSort: '項目順序'
     });
     // multiselect2side の初期選択を解除
@@ -45,5 +50,4 @@
 <input type="hidden" name="mode" value="confirm" />
 <input type="hidden" name="tpl_subno_csv" value="<!--{$tpl_subno_csv}-->" />
-
 <div id="admin-contents" class="contents-main">
     <div class="ms2side__area">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl	(revision 19956)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl	(revision 19965)
@@ -59,5 +59,5 @@
   
   if ( flag ){
-    win03('./recommend_search.php?rank=' + rank,'search','600','600');
+    win03('./recommend_search.php?rank=' + rank,'search','615','600');
   }
 }
@@ -68,9 +68,16 @@
 <div id="admin-contents" class="contents-main">
   <table class="list center" id="recommend-table">
+    <colgroup width="4%">
+    <colgroup width="14%">
+    <colgroup width="27%">
+    <colgroup width="7%">
+    <colgroup width="8%">
+    <colgroup width="30%">
+    <colgroup width="15%">
     <tr>
       <th>#</th>
       <th>画像</th>
       <th>商品名</th>
-      <th class="delete">削除</th>
+      <th>削除</th>
       <th>変更</th>
       <th>コメント</th>
@@ -79,5 +86,5 @@
     <!--▼おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
     <tr>
-       <th class="column"><!--{$smarty.section.cnt.iteration}--></th>
+       <td><!--{$smarty.section.cnt.iteration}--></td>
       <td>
         <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
@@ -85,5 +92,5 @@
         <!--{/if}-->
       </td>
-      <td><!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></td>
+      <td class="left"><!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></td>
       <td>
         <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
@@ -102,10 +109,10 @@
         <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
         <span class="attention"><!--{$arrErr[$smarty.section.cnt.iteration].comment}--></span>
-        <textarea name="comment" cols="45" rows="4" style="width: 337px; height: 82px; <!--{$arrErr[$smarty.section.cnt.iteration].comment|sfGetErrorColor}-->" <!--{$arrItems[$smarty.section.cnt.iteration].product_id|sfGetEnabled}-->><!--{$arrItems[$smarty.section.cnt.iteration].comment}--></textarea>
+        <textarea class="top" name="comment" cols="45" rows="4" style="width: 337px; height: 82px; <!--{$arrErr[$smarty.section.cnt.iteration].comment|sfGetErrorColor}-->" <!--{$arrItems[$smarty.section.cnt.iteration].product_id|sfGetEnabled}-->><!--{$arrItems[$smarty.section.cnt.iteration].comment}--></textarea>
+        </form>
         <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-        <br /><a class="btn-action" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span class="btn-next">登録する</span></a>
+        <a class="btn-action" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span class="btn-next">登録する</span></a
         <!--{/if}-->
-        </form>
-      </td>
+    </td>
     </tr>
   <!--▲おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	(revision 19965)
@@ -45,4 +45,6 @@
 <input name="search_pageno" type="hidden" value="" />
   <table class="form">
+    <colgroup width="20%">
+    <colgroup width="80%">
     <tr>
       <th>カテゴリ</th>
@@ -70,4 +72,8 @@
     
   <table class="list">
+    <colgroup width="15%">
+    <colgroup width="13%">
+    <colgroup width="60%">
+    <colgroup width="13%">
     <tr>
       <th>商品画像</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 19909)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 19965)
@@ -183,4 +183,10 @@
   <input type="hidden" name="rank" value="" />
   <table class="list">
+    <colgroup width="5%">
+    <colgroup width="15%">
+    <colgroup width="45%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="25%">
     <tr>
       <th>順位</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl	(revision 19965)
@@ -24,4 +24,7 @@
 <div id="basis" class="contents-main">
   <table class="list">
+    <colgroup width="80%">
+    <colgroup width="10%">
+    <colgroup width="10%">
     <tr>
       <th>管理タイトル/管理内容</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 19965)
@@ -35,5 +35,5 @@
       <!--{assign var=key value="name"}-->
       <span class="attention"><!--{$arrErr[$key]}--></span>
-      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" /></td>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /></td>
     </tr>
     <tr>
@@ -42,5 +42,5 @@
       <!--{assign var=key value="service_name"}-->
       <span class="attention"><!--{$arrErr[$key]}--></span>
-      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" /></td>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /></td>
     </tr>
     <tr>
@@ -49,5 +49,5 @@
       <!--{assign var=key value="confirm_url"}-->
       <span class="attention"><!--{$arrErr[$key]}--></span>
-      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" /></td>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /></td>
     </tr>
     <!--{section name=cnt loop=$smarty.const.DELIVTIME_MAX}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 19965)
@@ -84,5 +84,5 @@
       <div>
         <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','header','cnt_header'); return false;"><span>文字数カウント</span></a>
-        <br />今までに入力したのは
+        今までに入力したのは
         <input type="text" name="cnt_header" size="4" class="box4" readonly = true style="text-align:right" />
         文字です。
@@ -104,5 +104,5 @@
       <div>
         <a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','footer','cnt_footer'); return false;"><span>文字数カウント</span></a>
-        <br />今までに入力したのは
+        今までに入力したのは
         <input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />
         文字です。
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl	(revision 19965)
@@ -26,11 +26,20 @@
 <input type="hidden" name="deliv_id" value="" />
 <div id="basis" class="contents-main">
-
+  <div class="btn">
+    <ul>
+        <li><a class="btn-action" href="javascript:;" name="subm2" onclick="fnChangeAction('./delivery_input.php'); fnModeSubmit('pre_edit','','');"><span class="btn-next">配送業者<!--{if $smarty.const.INPUT_DELIV_FEE}-->・配送料<!--{/if}-->を新規入力</span></a></li>
+    </ul>
+  </div>
   <table class="list">
+    <colgroup width="35%">
+    <colgroup width="30%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="15%">
     <tr>
       <th>配送業者</th>
       <th>名称</th>
-      <th class="edit">編集</th>
-      <th class="delete">削除</th>
+      <th>編集</th>
+      <th>削除</th>
       <th>移動</th>
     </tr>
@@ -52,7 +61,4 @@
     <!--{/section}-->
   </table>
-  <div class="btn addnew">
-    <a class="btn-normal" href="javascript:;" name="subm2" onclick="fnChangeAction('./delivery_input.php'); fnModeSubmit('pre_edit','',''); return false;"><span>配送業者<!--{if $smarty.const.INPUT_DELIV_FEE}-->・配送料<!--{/if}-->を新規入力</span></a>
-  </div>
 </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 19965)
@@ -67,5 +67,5 @@
           <span class="attention"><!--{$arrErr[$key]}--></span>
           <!--{/if}-->
-          <select name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+          <select class="top" name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
           <option value="" selected="selected">都道府県を選択</option>
           <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 19965)
@@ -149,5 +149,5 @@
         <p>
           <span class="attention"><!--{$arrErr.pref}--></span>
-          <select name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" >
+          <select class="top" name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" >
             <option value="" selected="selected">都道府県を選択</option>
             <!--{html_options options=$arrPref selected=$arrForm.pref}-->
@@ -269,5 +269,6 @@
         <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key]|h}--></textarea>
         <span class="attention"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span><br />
-        <span class="fs10">※管理機能へのアクセスを特定のIPアドレスからの接続のみに制限します。アクセスを許可するIPアドレスを1行づつ入力してください。何も入力しない場合は全てを許可します。</span><br />
+        <span>※管理機能へのアクセスを特定のIPアドレスからの接続のみに制限します。<br />
+        アクセスを許可するIPアドレスを1行づつ入力してください。何も入力しない場合は全てを許可します。</span><br />
       </td>
     </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/holiday.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 19965)
@@ -65,4 +65,9 @@
 
   <table class="list">
+    <colgroup width="50%">
+    <colgroup width="15%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="15%">
     <tr>
       <th>タイトル</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl	(revision 19965)
@@ -42,4 +42,6 @@
   
     <table class="form">
+    <colgroup width="20%">
+    <colgroup width="80%">
       <tr>
         <th>支払方法<span class="attention"> *</span></th>
@@ -85,5 +87,5 @@
           <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->">　<a href="" onclick="fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
           <!--{/if}-->
-          <input type="file" name="<!--{$key}-->" size="25" class="box25" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+          <input type="file" name="<!--{$key}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
           <a class="btn-normal" href="javascript:;" name="btn" onclick="fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->'); return false;">アップロード</a>
         </td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 19965)
@@ -51,8 +51,12 @@
 
   <table class="list">
+    <colgroup width="65%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="15%">
     <tr>
       <th>規約タイトル</th>
-      <th class="edit">編集</th>
-      <th class="delete">削除</th>
+      <th>編集</th>
+      <th>削除</th>
       <th>移動</th>
     </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl	(revision 19909)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl	(revision 19965)
@@ -26,29 +26,42 @@
 <input type="hidden" name="payment_id" value="<!--{$tpl_payment_id}-->" />
 <div id="basis" class="contents-main">
+  <div class="btn">
+    <ul>
+        <li>    <a class="btn-action" href="javascript:;" name="subm2" onclick="win03('./payment_input.php','payment_input','620','400');"><span class="btn-next">支払方法を新規入力</span></a>
+</li>
+    </ul>
+  </div>
   <table class="list">
+    <colgroup width="5%">
+    <colgroup width="30%">
+    <colgroup width="20%">
+    <colgroup width="20%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="15%">
     <tr>
-      <th>ID</th>
+      <th class="center">ID</th>
       <th>支払方法</th>
       <th>手数料（円）</th>
       <th>利用条件</th>
-      <th class="edit">編集</th>
-      <th class="delete">削除</th>
+      <th>編集</th>
+      <th>削除</th>
       <th>移動</th>
     </tr>
     <!--{section name=cnt loop=$arrPaymentListFree}-->
     <tr>
-      <td><!--{$arrPaymentListFree[cnt].payment_id|h}--></td>
-      <td><!--{$arrPaymentListFree[cnt].payment_method|h}--></td>
+      <td class="center"><!--{$arrPaymentListFree[cnt].payment_id|h}--></td>
+      <td class="center"><!--{$arrPaymentListFree[cnt].payment_method|h}--></td>
       <!--{if $arrPaymentListFree[cnt].charge_flg == 2}-->
-        <td align="center">-</td>
+        <td class="center">-</td>
       <!--{else}-->
-        <td align="right"><!--{$arrPaymentListFree[cnt].charge|number_format|h}--></td>
+        <td class="right"><!--{$arrPaymentListFree[cnt].charge|number_format|h}--></td>
       <!--{/if}-->
-      <td align="center">
+      <td class="center">
         <!--{if $arrPaymentListFree[cnt].rule > 0}--><!--{$arrPaymentListFree[cnt].rule|number_format|h}--><!--{else}-->0<!--{/if}-->円
         <!--{if $arrPaymentListFree[cnt].upper_rule > 0}-->～<!--{$arrPaymentListFree[cnt].upper_rule|number_format|h}-->円<!--{elseif $arrPaymentListFree[cnt].upper_rule == "0"}--><!--{else}-->～無制限<!--{/if}--></td>
-      <td align="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="win03('./payment_input.php?mode=pre_edit&amp;payment_id=<!--{$arrPaymentListFree[cnt].payment_id}-->','payment_input','600','400'); return false;">編集</a><!--{else}-->-<!--{/if}--></td>
-      <td align="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnModeSubmit('delete', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
-      <td align="center">
+      <td class="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="win03('./payment_input.php?mode=pre_edit&amp;payment_id=<!--{$arrPaymentListFree[cnt].payment_id}-->','payment_input','620','400'); return false;">編集</a><!--{else}-->-<!--{/if}--></td>
+      <td class="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnModeSubmit('delete', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
+      <td class="center">
       <!--{if $smarty.section.cnt.iteration != 1}-->
       <a href="?" onclick="fnModeSubmit('up','payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">上へ</a>
@@ -61,7 +74,4 @@
     <!--{/section}-->
   </table>
-  <div class="btn addnew">
-    <a class="btn-normal" href="javascript:;" name="subm2" onclick="win03('./payment_input.php','payment_input','600','400');"><span>支払方法を新規入力</span></a>
-  </div>
 </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_complete.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_complete.tpl	(revision 19965)
@@ -29,7 +29,19 @@
 <!--{/if}-->
 <!--{/foreach}-->
-<div id="customer" class="contents-main">
-  <h2>顧客編集</h2>
-  <div class="message">登録が完了致しました。</div>
-</div>
+	<div id="complete">
+		<div class="complete-top"></div>
+		<div class="contents">
+			<div class="message">
+				登録が完了致しました。
+			</div>
+		</div>
+		<div class="btn-area-top"></div>
+		<div class="btn-area">
+			<ul>
+				<li><!--{* TODO *}--><a class="btn-action" href="javascript:;" onclick="return fnReturn();"><span class="btn-prev">検索結果へ戻る</span></a></li>
+				<li><a class="btn-action" href="./customer.php"><span class="btn-next">続けて登録を行う</span></a></li>
+			</ul>
+		</div>
+		<div class="btn-area-bottom"></div>
+	</div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl	(revision 19965)
@@ -126,7 +126,9 @@
             </tr>
         </table>
-        <div class="btn">
-            <a class="btn-normal" href="javascript:;" onclick="func_return(); return false;"><span>編集画面に戻る</span></a>
-            <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'complete', '', ''); return false;"><span>この内容で登録する</span></a>
+        <div class="btn-area">
+          <ul>
+            <li><a class="btn-action" href="javascript:;" onclick="func_return(); return false;"><span class="btn-prev">編集画面に戻る</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'complete', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
+          </ul>
         </div>
     </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	(revision 19965)
@@ -61,5 +61,5 @@
                 <td>
                     <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
-                    <select name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                    <select class="top" name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
                         <option value="" selected="selected">都道府県を選択</option>
                         <!--{html_options options=$arrPref selected=$list_data.pref}-->
@@ -149,5 +149,5 @@
                     <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
                     質問： 
-                    <select name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                    <select class="top" name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
                         <option value="" selected="selected">選択してください</option>
                         <!--{html_options options=$arrReminder selected=$list_data.reminder}-->
@@ -182,7 +182,10 @@
         </table>
 
-        <div class="btn">
-            <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', ''); return false;"><span>確認ページへ</span></a>
+        <div class="btn-area">
+            <ul>
+                <li><a class="btn-action" href="javascript:;" onclick="fnSetFormSubmit('form1', 'mode', 'confirm'); return false;"><span class="btn-next">確認ページへ</span></a></li>
+            </ul>
         </div>
     </div>
 </form>
+
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 19965)
@@ -112,8 +112,8 @@
                 <td>
                     <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
-                    <select name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-                        <option value="" selected="selected">都道府県を選択</option>
+                    <select class="top" name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                        <option class="top" value="" selected="selected">都道府県を選択</option>
                         <!--{html_options options=$arrPref selected=$list_data.pref}-->
-                    </select>
+                    </select><br />
                     <input type="text" name="addr01" value="<!--{$list_data.addr01|h}-->" size="60" class="box60" <!--{if $arrErr.addr01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
                     <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
@@ -199,5 +199,5 @@
                     <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
                     質問： 
-                    <select name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                    <select class="top" name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
                         <option value="" selected="selected">選択してください</option>
                         <!--{html_options options=$arrReminder selected=$list_data.reminder}-->
@@ -235,5 +235,5 @@
           <ul>
             <li><a class="btn-action" href="javascript:;" onclick="return fnReturn();"><span class="btn-prev">検索画面に戻る</span></a></li>
-            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', ''); return false;"><span class="btn-next">確認ページへ</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="fnSetFormSubmit('form1', 'mode', 'confirm'); return false;"><span class="btn-next">確認ページへ</span></a></li>
           </ul>
         </div>
@@ -244,9 +244,9 @@
 
         <h2>購入履歴一覧</h2>
+        <!--{if $tpl_linemax > 0}-->
         <p><span class="attention"><!--購入履歴一覧--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。</p>
 
         <!--{include file=$tpl_pager}-->
 
-        <!--{if $tpl_linemax > 0}-->
             <!--{* 購入履歴一覧表示テーブル *}-->
             <table class="list">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 19963)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 19965)
@@ -43,15 +43,17 @@
 <input name="search_pageno" type="hidden" value="">
 <input name="customer_id" type="hidden" value="">
-<table bgcolor="#cccccc" width="420" border="0" cellspacing="1" cellpadding="5" summary=" ">
-    <tr class="fs12n">
-        <td bgcolor="#f0f0f0" width="100">顧客ID</td>
-        <td bgcolor="#ffffff" width="287" colspan="2">
+<table class="form">
+    <colgroup width="20%">
+    <colgroup width="80%">
+    <tr>
+        <th class="colmun">顧客ID</th>
+        <td width="287" colspan="2">
             <!--{if $arrErr.search_customer_id}--><span class="red12"><!--{$arrErr.search_customer_id}--></span><!--{/if}-->
             <input type="text" name="search_customer_id" value="<!--{$arrForm.search_customer_id|h}-->" size="40" class="box40" style="<!--{$arrErr.search_customer_id|sfGetErrorColor}-->"/>
         </td>
     </tr>
-    <tr class="fs12n">
-        <td bgcolor="#f0f0f0">顧客名</td>
-        <td bgcolor="#ffffff">
+    <tr>
+        <th class="colmun">顧客名</th>
+        <td>
             <!--{if $arrErr.search_name01}--><span class="red12"><!--{$arrErr.search_name01}--></span><!--{/if}-->
             <!--{if $arrErr.search_name02}--><span class="red12"><!--{$arrErr.search_name02}--></span><!--{/if}-->
@@ -60,7 +62,7 @@
         </td>
     </tr>
-    <tr class="fs12n">
-        <td bgcolor="#f0f0f0">顧客名(カナ)</td>
-        <td bgcolor="#ffffff">
+    <tr class="n">
+        <th class="colmun">顧客名(カナ)</th>
+        <td>
             <!--{if $arrErr.search_kana01}--><span class="red12"><!--{$arrErr.search_kana01}--></span><!--{/if}-->
             <!--{if $arrErr.search_kana02}--><span class="red12"><!--{$arrErr.search_kana02}--></span><!--{/if}-->
@@ -73,8 +75,9 @@
 <div class="btn-area">
   <ul>
-    <li><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', ''); return false;" name="subm">検索を開始</a></li>
+    <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', ''); return false;" name="subm"><span class="btn-next">検索を開始</span></a></li>
   </ul>
 </div>
 
+<p>
 <!--{if $smarty.post.mode == 'search' }-->
     <!--▼検索結果表示-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 19965)
@@ -85,5 +85,5 @@
       <td>
         <!--{if $arrErr.pref}--><span class="attention"><!--{$arrErr.pref}--></span><br /><!--{/if}-->
-        <select name="pref">
+        <select class="top" name="pref">
           <option value="" selected="selected" <!--{if $arrErr.name}--><!--{sfSetErrorStyle}--><!--{/if}-->>都道府県を選択</option>
           <!--{html_options options=$arrPref selected=$arrForm.pref}-->
@@ -249,8 +249,8 @@
   </table>
   <div class="btn">
-    検索結果表示件数
+    <p class="page_rows">検索結果表示件数
     <select name="page_rows">
       <!--{html_options options=$arrPageRows selected=$arrForm.page_rows}-->
-    </select> 件
+    </select> 件</p>
     <div class="btn-area">
       <ul>
@@ -300,4 +300,11 @@
   <!--検索結果表示テーブル-->
   <table class="list" id="customer-search-result">
+    <colgroup width="5%">
+    <colgroup width="10%">
+    <colgroup width="25%">
+    <colgroup width="5%">
+    <colgroup width="30%">
+    <colgroup width="7%">
+    <colgroup width="7%">
     <tr>
       <th rowspan="2">種別</th>
@@ -317,5 +324,5 @@
         <td class="center" rowspan="2"><!--{if $row.status eq 1}-->仮<!--{else}-->本<!--{/if}--></td>
         <td><!--{$row.customer_id|h}--></td>
-        <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}-->(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
+        <td rowspan="2"><!--{$row.name01|h}--> <!--{$row.name02|h}--><br>(<!--{$row.kana01|h}--> <!--{$row.kana02|h}-->)</td>
         <td class="center" rowspan="2"><!--{$arrSex[$row.sex]|h}--></td>
         <td><!--{$row.tel01|h}-->-<!--{$row.tel02|h}-->-<!--{$row.tel03|h}--></td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl	(revision 19829)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl	(revision 19965)
@@ -29,7 +29,18 @@
 <!--{/if}-->
 <!--{/foreach}-->
-<div id="customer" class="contents-main">
-  <h2>顧客登録</h2>
-  <div class="message">登録が完了致しました。</div>
-</div>
+	<div id="complete">
+		<div class="complete-top"></div>
+		<div class="contents">
+			<div class="message">
+				登録が完了致しました。
+			</div>
+		</div>
+		<div class="btn-area-top"></div>
+		<div class="btn-area">
+			<ul>
+				<li><a class="btn-action" href="./customer.php"><span class="btn-next">続けて登録を行う</span></a></li>
+			</ul>
+		</div>
+		<div class="btn-area-bottom"></div>
+	</div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/classcategory.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 19965)
@@ -53,4 +53,8 @@
 
   <table class="list">
+    <colgroup width="55%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="15%">
     <tr>
       <th>分類名</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 19965)
@@ -84,6 +84,7 @@
   <!--{/foreach}-->
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></a>
+  <div class="list-info clearfix">
+    <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></a></div>
+    <p><span class="bold">アップロード可能な拡張子：</span><!--{$smarty.const.DOWNLOAD_EXTENSION}-->(パラメータ DOWNLOAD_EXTENSION)</p>
   </div>
 
@@ -92,9 +93,20 @@
   <input type="hidden" name="class_id1" value="<!--{$class_id1}-->" />
   <input type="hidden" name="class_id2" value="<!--{$class_id2}-->" />
-  <table class="list">
+  <table class="list" width="900">
+    <colgroup width="5%">
+    <colgroup width="9%">
+    <colgroup width="9%">
+    <colgroup width="9%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="8%">
+    <colgroup width="8%">
+    <colgroup width="8%">
     <tr>
-      <th><label for="allCheck">登録</label> <input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /></th>
-      <th>規格1(<!--{$arrClass[$class_id1]|default:"未選択"}-->)</th>
-      <th>規格2(<!--{$arrClass[$class_id2]|default:"未選択"}-->)</th>
+      <th><input type="checkbox" onclick="fnAllCheck(this, 'input[name^=check]')" id="allCheck" /> <label for="allCheck"><br>登録</label></th>
+      <th>規格1<br>(<!--{$arrClass[$class_id1]|default:"未選択"}-->)</th>
+      <th>規格2<br>(<!--{$arrClass[$class_id2]|default:"未選択"}-->)</th>
       <th>商品コード</th>
       <th>在庫数<span class="attention">*</span></th>
@@ -103,6 +115,6 @@
       <th>商品種別<span class="attention">*</span></th>
       <th><label for="allPaymentIds">支払方法</label><span class="attention">*</span> <input type="checkbox" name="allPaymentIds" onclick="fnAllCheck(this, 'input[name^=payment_ids]')" /></th>
-      <th>ダウンロードファイル名<BR><span class="red"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></th>
-      <th>ダウンロード商品用ファイルアップロード<BR>登録可能拡張子：<!--{$smarty.const.DOWNLOAD_EXTENSION}-->　(パラメータ DOWNLOAD_EXTENSION)</th>
+      <th>ダウンロード<br>ファイル名<span class="red"><br>上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
+      <th>ダウンロード商品用<br>ファイル</th>
     </tr>
     <!--{section name=cnt loop=$arrClassCat}-->
@@ -115,5 +127,5 @@
     <tr >
       <!--{assign var=key value="check:`$smarty.section.cnt.iteration`"}-->
-      <td align="center">
+      <td class="center" >
 				<!--{assign var=id value="product_class_id:`$smarty.section.cnt.iteration`"}-->
         <input type="hidden" name="classcategory_id1:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].classcategory_id1}-->" />
@@ -124,33 +136,33 @@
         <input type="checkbox" name="check:<!--{$smarty.section.cnt.iteration}-->" value="1" <!--{if $arrForm[$key] == 1}-->checked="checked"<!--{/if}-->>
       </td>
-      <td><!--{$arrClassCat[cnt].name1}--></td>
-      <td><!--{$arrClassCat[cnt].name2}--></td>
+      <td class="center"><!--{$arrClassCat[cnt].name1}--></td>
+      <td class="center"><!--{$arrClassCat[cnt].name2}--></td>
       <!--{assign var=key value="product_code:`$smarty.section.cnt.iteration`"}-->
-      <td align="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.STEXT_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
+      <td class="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.STEXT_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
       <!--{assign var=key value="stock:`$smarty.section.cnt.iteration`"}-->
       <!--{assign var=chkkey value="stock_unlimited:`$smarty.section.cnt.iteration`"}-->
-      <td align="center">
+      <td class="center">
         <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.AMOUNT_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-        <!--{assign var=key value="stock_unlimited:`$smarty.section.cnt.iteration`"}-->
+        <!--{assign var=key value="stock_unlimited:`$smarty.section.cnt.iteration`"}--><br />
         <input type="checkbox" name="<!--{$key}-->" value="1" <!--{if $arrForm[$key] == "1"}-->checked<!--{/if}--> onClick="fnCheckStockNoLimit('<!--{$smarty.section.cnt.iteration}-->','<!--{$smarty.const.DISABLED_RGB}-->');"/>無制限
       </td>
       <!--{assign var=key value="price01:`$smarty.section.cnt.iteration`"}-->
-      <td align="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
+      <td class="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
       <!--{assign var=key value="price02:`$smarty.section.cnt.iteration`"}-->
-      <td align="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
+      <td class="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
       <td>
         <!--{assign var=key value="product_type_id:`$smarty.section.cnt.iteration`"}-->
-        <input type="radio" name="<!--{$key}-->" value="<!--{$smarty.const.PRODUCT_TYPE_NORMAL}-->" <!--{if $arrForm[$key] == "1"}-->checked<!--{/if}-->/>通常商品　
-        <input type="radio" name="<!--{$key}-->" value="<!--{$smarty.const.PRODUCT_TYPE_DOWNLOAD}-->" <!--{if $arrForm[$key] == "2"}-->checked<!--{/if}--> />ダウンロード商品
+        <input type="radio" name="<!--{$key}-->" value="<!--{$smarty.const.PRODUCT_TYPE_NORMAL}-->" <!--{if $arrForm[$key] == "1"}-->checked<!--{/if}-->/>通常<br>
+        <input type="radio" name="<!--{$key}-->" value="<!--{$smarty.const.PRODUCT_TYPE_DOWNLOAD}-->" <!--{if $arrForm[$key] == "2"}-->checked<!--{/if}--> />ダウンロード
       </td>
-      <td>
+      <td class="class-payment center">
         <!--{assign var=key value="payment_ids:`$smarty.section.cnt.iteration`"}-->
         <span class="attention"><!--{$arrErr[$key]}--></span>
-        <!--{html_checkboxes name=$key options=$arrPayments selected=$arrForm[$key]}-->
+        <!--{html_checkboxes name=$key options=$arrPayments selected=$arrForm[$key] separator='<br />'}-->
       </td>
-      <td>
+      <td class="center">
         <!--{assign var=key value="down_filename:`$smarty.section.cnt.iteration`"}-->
         <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr[$key] != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" size="30" class="box30" />
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr[$key] != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" size="10" />
       </td>
       <!--{assign var=key value="down_realfilename:`$smarty.section.cnt.iteration`"}-->
@@ -161,5 +173,5 @@
             <a href="" onclick="fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
           <!--{/if}-->
-          <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+          <input type="file" name="<!--{$key}-->" size="10" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
           <a class="btn-normal" href="javascript:;" name="btn" onclick="fnModeSubmit('upload_down', 'down_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
@@ -170,5 +182,5 @@
   <div class="btn-area">
     <ul>
-      <li><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', ''); return false;"><span>確認ページへ</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', ''); return false;"><span class="btn-next">確認ページへ</span></a></li>
     </ul>
   </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	(revision 19965)
@@ -46,4 +46,9 @@
 
   <table class="list">
+    <colgroup width="45%">
+    <colgroup width="15%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="15%">
     <tr>
       <th>規格名 (登録数)</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl	(revision 19965)
@@ -142,5 +142,5 @@
   </table>
   <div class="btn">
-    検索結果表示件数
+    <p class="page_rows">検索結果表示件数
     <!--{assign var=key value="search_page_max"}-->
     <!--{if $arrErr[$key]}-->
@@ -149,5 +149,5 @@
     <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
     <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
-    </select> 件
+    </select> 件</p>
 
 	<div class="btn-area">
@@ -187,4 +187,16 @@
   <!--検索結果表示テーブル-->
   <table class="list" id="products-search-result">
+    <colgroup width="5%">
+    <colgroup width="8%">
+    <colgroup width="8%">
+    <colgroup width="8%">
+    <colgroup width="25%">
+    <colgroup width="8%">
+    <colgroup width="8%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="5%">
+    <colgroup width="5%">
     <tr>
       <th rowspan="2">商品ID</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl	(revision 19909)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl	(revision 19965)
@@ -35,4 +35,5 @@
 		<div class="btn-area">
 			<ul>
+				<li><a class="btn-action" href="./product.php"><span class="btn-prev">検索結果へ戻る</span></a></li>
 				<li><a class="btn-action" href="./product.php"><span class="btn-next">続けて登録を行う</span></a></li>
 				<li><a class="btn-action" href="?" onclick="fnModeSubmit('pre_edit', 'product_id', '<!--{$arrForm.product_id}-->'); return false;"><span class="btn-next">この商品の規格を登録する</span></a></li>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	(revision 19965)
@@ -95,4 +95,9 @@
 
     <table class="list" id="categoryTable">
+      <colgroup width="5%">
+      <colgroup width="60%">
+      <colgroup width="10%">
+      <colgroup width="10%">
+      <colgroup width="25%">
       <tr class="nodrop nodrag">
         <th>ID</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 19965)
@@ -114,6 +114,5 @@
       <th>公開・非公開<span class="attention"> *</span></th>
       <td>
-        <input type="radio" name="status" value="1" <!--{if $arrForm.status == "1"}-->checked<!--{/if}--> />公開　
-        <input type="radio" name="status" value="2" <!--{if $arrForm.status == "2"}-->checked<!--{/if}--> />非公開
+        <!--{html_radios name="status" options=$arrDISP selected=$arrForm.status separator='&nbsp;&nbsp;'}-->
       </td>
     </tr>
@@ -121,5 +120,5 @@
       <th>商品ステータス</th>
       <td>
-        <!--{html_checkboxes name="product_status" options=$arrSTATUS selected=$arrForm.product_status}-->
+        <!--{html_checkboxes name="product_status" options=$arrSTATUS selected=$arrForm.product_status separator='&nbsp;&nbsp;'}-->
       </td>
     </tr>
@@ -128,6 +127,5 @@
       <th>商品種別<span class="attention"> *</span></th>
       <td>
-        <input type="radio" name="product_type_id" value="<!--{$smarty.const.PRODUCT_TYPE_NORMAL}-->" <!--{if $arrForm.product_type_id == $smarty.const.PRODUCT_TYPE_NORMAL}-->checked<!--{/if}-->/>通常商品　
-        <input type="radio" name="product_type_id" value="<!--{$smarty.const.PRODUCT_TYPE_DOWNLOAD}-->" <!--{if $arrForm.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->checked<!--{/if}--> />ダウンロード商品
+        <!--{html_radios name="product_type_id" options=$arrProductType selected=$arrForm.product_type_id separator='&nbsp;&nbsp;'}-->
       </td>
     </tr>
@@ -149,5 +147,5 @@
             <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
           <!--{/if}-->
-          <input type="file" name="down_file" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+          <input type="file" name="down_file" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
           <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_down', 'down_key', '<!--{$key}-->'); return false;">アップロード</a><br />登録可能拡張子：<!--{$smarty.const.DOWNLOAD_EXTENSION}-->　(パラメータ DOWNLOAD_EXTENSION)
       </td>
@@ -189,5 +187,5 @@
        <td>
          <span class="attention"><!--{$arrErr.payment_ids}--></span>
-         <!--{html_checkboxes name="payment_ids" options=$arrPayments selected=$arrForm.payment_ids}-->
+         <!--{html_checkboxes name="payment_ids" options=$arrPayments selected=$arrForm.payment_ids separator='&nbsp;&nbsp;'}-->
        </td>
     </tr>
@@ -275,5 +273,5 @@
       <td>
         <span class="attention"><!--{$arrErr.main_comment}--></span>
-        <textarea name="main_comment" value="<!--{$arrForm.main_comment|h}-->" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{if $arrErr.main_comment != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"  cols="60" rows="8" class="area60"><!--{$arrForm.main_comment|h}--></textarea><br />
+        <textarea name="main_comment" value="<!--{$arrForm.main_comment|h}-->" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{if $arrErr.main_comment != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" cols="60" rows="8" class="area60"><!--{$arrForm.main_comment|h}--></textarea><br />
         <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
       </td>
@@ -290,5 +288,5 @@
         <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
         <!--{/if}-->
-        <input type="file" name="main_list_image" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="file" name="main_list_image" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
         <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
@@ -302,5 +300,5 @@
         <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
         <!--{/if}-->
-        <input type="file" name="main_image" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="file" name="main_image" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
         <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
@@ -314,5 +312,5 @@
         <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
         <!--{/if}-->
-        <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="file" name="<!--{$key}-->" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
         <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
@@ -367,5 +365,5 @@
         <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
         <!--{/if}-->
-        <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
+        <input type="file" name="<!--{$key}-->" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
         <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
@@ -379,5 +377,5 @@
         <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
         <!--{/if}-->
-        <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
+        <input type="file" name="<!--{$key}-->" size="40" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
         <a class="btn-normal" href="javascript:;" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
@@ -414,5 +412,5 @@
         <a name="<!--{$anckey}-->"></a>
         <input type="hidden" name="<!--{$key}-->" value="<!--{$arrRecommend[$recommend_no].product_id|h}-->" />
-        <a class="btn-normal" href="javascript:;" name="change" onclick="selectAll('category_id'); win03('./product_select.php?no=<!--{$smarty.section.cnt.iteration}-->', 'search', '600', '500'); return false;">変更</a>
+        <a class="btn-normal" href="javascript:;" name="change" onclick="selectAll('category_id'); win03('./product_select.php?no=<!--{$smarty.section.cnt.iteration}-->', 'search', '615', '500'); return false;">変更</a>
         <!--{assign var=key value="recommend_delete`$smarty.section.cnt.iteration`"}-->
         <input type="checkbox" name="<!--{$key}-->" value="1" />削除<br />
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl	(revision 19965)
@@ -88,5 +88,5 @@
 
   <div class="btn">
-    検索結果表示件数
+    <p class="page_rows">検索結果表示件数
     <!--{assign var=key value="search_page_max"}-->
     <!--{if $arrErr[$key]}-->
@@ -95,5 +95,5 @@
     <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
     <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
-    </select> 件
+    </select> 件</p>
     <div class="btn-area">
       <ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 19965)
@@ -113,4 +113,9 @@
     
     <table class="list" id="categoryTable">
+        <colgroup width="20%">
+        <colgroup width="47%">
+        <colgroup width="10%">
+        <colgroup width="7%">
+        <colgroup width="15%">
       <tr class="nodrop nodrag">
         <th>商品コード</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 19965)
@@ -59,5 +59,5 @@
         <span class="attention"><!--{$arrErr.csv_file}--></span>
         <!--{/if}-->
-        <input type="file" name="csv_file" size="60" class="box60" /><span class="attention">(1行目タイトル行)</span>
+        <input type="file" name="csv_file" size="40" /><span class="attention">(1行目タイトル行)</span>
       </td>
     </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 19965)
@@ -43,6 +43,10 @@
           </ul>
         </div>
-
+        <!--{if count($arrMaker) > 0}-->
         <table class="list">
+            <colgroup width="60%">
+            <colgroup width="10%">
+            <colgroup width="10%">
+            <colgroup width="20%">
             <tr>
                 <th>メーカー</th>
@@ -80,4 +84,5 @@
             <!--{/section}-->
         </table>
+        <!--{/if}-->
     </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 19965)
@@ -89,5 +89,5 @@
 
   <div class="btn">
-    検索結果表示件数
+    <p class="page_rows">検索結果表示件数
     <!--{assign var=key value="search_page_max"}-->
     <!--{if $arrErr[$key]}-->
@@ -96,5 +96,5 @@
     <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
     <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
-    </select> 件
+    </select> 件</p>
     <div class="btn-area">
       <ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl	(revision 19965)
@@ -25,11 +25,10 @@
 
 <!--{* ▼CONTENTS *}-->
-	<div id="login-form-wrap">
+	<div id="login-wrap">
 
-
-		<div id="login-form">
-	<form name="form1" id="form1" method="post" action="login.php">
+		<div id="login-form" class="clearfix">
 			<h1><img src="<!--{$TPL_DIR}-->img/contents/admin_login_logo.jpg" width="140" height="150" alt="EC-CUBE管理画面" /></h1>
 			<div id="input-form">
+				<form name="form1" id="form1" method="post" action="login.php">
 				<p><label for="login_id">ID</label></p>
 				<input type="text" name="login_id" size="20" class="box25" />
@@ -37,6 +36,6 @@
 				<input type="password" name="password" size="20" class="box25" />
 				<p><a class="btn-tool-format" href="javascript:;" onclick="document.form1.submit(); return false;"><span>LOGIN</span></a></p>
+				</form>
 			</div>
-	</form>
 		</div>
 
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19965)
@@ -41,5 +41,5 @@
       <th>CSS内容</th>
       <td>
-        <textarea id="css" name="css" cols=90 rows=<!--{$area_row}--> align="left" wrap=off style="width: 650px;"><!--{$css_data}--></textarea>
+        <textarea id="css" class="top" name="css" cols=90 rows=<!--{$area_row}--> align="left" wrap=off style="width: 650px;"><!--{$css_data}--></textarea>
         <input type="hidden" name="area_row" value="<!--{$area_row}-->" />
         <div class="btn">
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl	(revision 19965)
@@ -49,12 +49,16 @@
   <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
-    <textarea id="header-area" name="header" rows="<!--{$header_row}-->" wrap="off" style="width: 100%;"><!--{$header_data|smarty:nodefaults}--></textarea>
+    <textarea id="header-area" class="top" name="header" rows="<!--{$header_row}-->" wrap="off" style="width: 100%;"><!--{$header_data|smarty:nodefaults}--></textarea>
     <div class="btn">
       <a id="header-area-resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#header-area-resize-btn', '#header-area', 50, 13); return false;"><span>拡大</span></a>
     </div>
-    <div class="btn">
-      <a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_header','confirm','',''); return false;"><span class="btn-next">登録</span></a>
-      <a class="btn-normal" href="javascript:;" name='preview' onclick="lfnSetBrowser('form_header', 'browser_type'); fnFormModeSubmit('form_header','preview','',''); return false;"><span>プレビュー</span></a>
+
+    <div class="btn-area">
+        <ul>
+          <li><a class="btn-action" href="javascript:;" name='preview' onclick="lfnSetBrowser('form_header', 'browser_type'); fnFormModeSubmit('form_header','preview','',''); return false;"><span class="btn-prev">プレビュー</span></a></li>
+          <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_header','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
+        </ul>
     </div>
+
   </form>
   <!--{* ▲ヘッダー編集ここまで *}-->
@@ -79,12 +83,16 @@
   <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 
-    <textarea id="footer-area" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{$footer_data|smarty:nodefaults}--></textarea>
+    <textarea id="footer-area" class="top" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{$footer_data|smarty:nodefaults}--></textarea>
     <div class="btn">
       <a id="footer-area-resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#footer-area-resize-btn', '#footer-area', 50, 13); return false;"><span>拡大</span></a>
     </div>
-    <div class="btn">
-      <a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_footer','confirm','',''); return false;"><span class="btn-next">登録</span></a>
-      <a class="btn-normal" href="javascript:;" name='preview' onclick="lfnSetBrowser('form_footer', 'browser_type'); fnFormModeSubmit('form_footer','preview','',''); return false;"><span>プレビュー</span></a>
+
+    <div class="btn-area">
+        <ul>
+          <li><a class="btn-action" href="javascript:;" name='preview' onclick="lfnSetBrowser('form_footer', 'browser_type'); fnFormModeSubmit('form_footer','preview','',''); return false;"><span class="btn-prev">プレビュー</span></a></li>
+          <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_footer','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
+        </ul>
     </div>
+
   </form>
   <!--{* ▲フッター編集ここまで *}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 19965)
@@ -89,10 +89,9 @@
         <tr>
             <td colspan="2">
-
-                <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" <!--{$arrPageData.header_chk}--> />共通のヘッダーを使用する</label>&nbsp;
-                <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" <!--{$arrPageData.footer_chk}--> />共通のフッターを使用する</label>
+                <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" checked="<!--{$arrPageData.header_chk}-->" />共通のヘッダーを使用する</label>&nbsp;
+                <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" checked="<!--{$arrPageData.footer_chk}-->" />共通のフッターを使用する</label>
                 <div>
-                    <textarea id="tpl_data" name="tpl_data" rows=<!--{$text_row}--> style="width: 100%;"><!--{$arrPageData.tpl_data|h|smarty:nodefaults}--></textarea>
-                    <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
+                    <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{$arrPageData.tpl_data|h|smarty:nodefaults}--></textarea>
+                    <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /><br />
                     <a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#tpl_data', 50, 13); return false;"><span>拡大</span></a>
                 </div>
@@ -101,16 +100,21 @@
     </table>
 
-
-    <div class="btn">
-      <a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','confirm','',''); return false;"><span class="btn-next">登録する</span></a>
-      <a class="btn-normal" href="javascript:;" name='preview' onclick="doPreview(); return false;"><span>プレビュー</span></a>
+    <div class="btn-area">
+        <ul>
+          <li><a class="btn-action" href="javascript:;" name='preview' onclick="doPreview(); return false;"><span class="btn-prev">プレビュー</span></a></li>
+          <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
+        </ul>
     </div>
 
     <h2>編集可能ページ一覧</h2>
-    <table class="list center">
+    <table class="list">
+        <colgroup width="70%">
+        <colgroup width="10%">
+        <colgroup width="10%">
+        <colgroup width="10%">
         <tr>
             <th>名称</th>
             <th>レイアウト</th>
-            <th><strong>ページ詳細</strong></th>
+            <th>ページ詳細</th>
             <th>削除</th>
         </tr>
@@ -120,13 +124,13 @@
                     <!--{$item.page_name}-->
                 </td>
-                <td>
+                <td class="center">
                     <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->" >編集</a>
                 </td>
-                <td>
+                <td class="center">
                     <!--{if $item.filename|strlen >= 1}-->
                         <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->">編集</a>
                     <!--{/if}-->
                 </td>
-                <td>
+                <td class="center">
                     <!--{if $item.edit_flg == 1}-->
                         <a href="javascript:;" onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','delete','page_id','<!--{$item.page_id|escape:'javascript'|h}-->'); return false;">削除</a>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl	(revision 19909)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl	(revision 19965)
@@ -46,4 +46,9 @@
   </p>
   <table class="list center">
+    <colgroup width="5%">
+    <colgroup width="30%">
+    <colgroup width="50%">
+    <colgroup width="10%">
+    <colgroup width="5%">
     <tr>
       <th>選択</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 19965)
@@ -72,6 +72,6 @@
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('upload', '', '');return false;"><span>アップロード</span></a>
+  <div class="btn-area">
+    <a class="btn-action" href="javascript:;" onclick="fnModeSubmit('upload', '', '');return false;"><span class="btn-next">この内容で登録する</span></a>
   </div>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19965)
@@ -52,5 +52,5 @@
      <tr>
          <td colspan="2">
-             <textarea id="bloc_html" name="bloc_html" rows="<!--{$text_row}-->" style="width: 100%;"><!--{$arrBlocData.tpl_data|smarty:nodefaults}--></textarea>
+             <textarea class="top" id="bloc_html" name="bloc_html" rows="<!--{$text_row}-->" style="width: 99%; height:80px"><!--{$arrBlocData.tpl_data|smarty:nodefaults}--></textarea>
              <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
              <div>
@@ -60,7 +60,9 @@
      </tr>
  </table>
-    <div class="btn">
-        <a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','',''); return false;"><span class="btn-next">登録する</span></a>
-        <a class="btn-normal" href="javascript:;" name='preview' onclick="fnFormModeSubmit('form_bloc','preview','',''); return false;"><span>プレビュー</span></a>
+    <div class="btn-area">
+        <ul>
+            <li><a class="btn-action" href="javascript:;" name='preview' onclick="fnFormModeSubmit('form_bloc','preview','',''); return false;"><span class="btn-prev">プレビュー</span></a></li>
+            <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
+        </ul>
     </div>
     <!--{* ▲ブロック設定 *}-->
@@ -73,5 +75,6 @@
     <table class="list">
         <tr>
-            <th>名称</th><th class="edit">編集</th>
+            <th>名称</th>
+            <th class="edit">編集</th>
             <th class="delete">削除</th>
         </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/upload.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/upload.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/upload.tpl	(revision 19965)
@@ -53,5 +53,7 @@
   </table>
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'upload', '', ''); return false;"><span>アップロード</span></a></div>
+<div class="btn-area">
+<a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'upload', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a>
+</div>
 
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19965)
@@ -287,8 +287,4 @@
             </tr>
         </table>
-        <div class="btn">
-            <a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','confirm','',''); return false;"><span class="btn-next">登録する</span></a>
-            <a class="btn-normal" href="javascript:;" name='preview' onclick="doPreview(); return false;"<!--{if $page_id == "0" or $exists_page == "0" }--> DISABLED<!--{/if}-->><span>プレビュー</span></a>
-        </div>
     </div>
     <!--{* ▲レイアウトここまで *}-->
@@ -322,4 +318,10 @@
     </div>
     <!--{* ▲未使用ブロックここまで *}-->
+        <div class="btn-area">
+            <ul>
+                <li><a class="btn-action" href="javascript:;" name='preview' onclick="doPreview();"<!--{if $page_id == "0" or $exists_page == "0" }--> DISABLED<!--{/if}-->><span class="btn-prev">プレビュー</span></a></li>
+                <li><a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','confirm','',''); return false;"><span class="btn-next">登録する</span></a></li>
+            </ul>
+        </div>
     <!--▲レイアウト編集　ここまで-->
 
@@ -333,5 +335,5 @@
       <th>名称</th>
       <th class="edit">レイアウト</th>
-      <th class="edit center"><strong>ページ詳細</strong></th>
+      <th class="edit center">ページ詳細</th>
       <th class="delete center">削除</th>
     </tr>
@@ -340,5 +342,5 @@
             <td>
                 <!--{$item.page_name}-->
-            </td>
+            </th>
             <td class="center">
                 <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->" >編集</a>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19965)
@@ -64,4 +64,13 @@
 
   <table class="list center">
+    <colgroup width="5%">
+    <colgroup width="7%">
+    <colgroup width="9%">
+    <colgroup width="15%">
+    <colgroup width="20%">
+    <colgroup width="10%">
+    <colgroup width="10%">
+    <colgroup width="12%">
+    <colgroup width="12%">
     <tr>
       <th><label for="move_check">選択</label> <input type="checkbox" name="move_check" id="move_check" onclick="fnAllCheck(this, 'input[name=move[]]')" /></th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 19963)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 19965)
@@ -91,5 +91,5 @@
         <tr>
             <th>帳票出力</th>
-            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','615','800'); return false;">帳票出力</a></td>
+            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','615','650'); return false;">帳票出力</a></td>
         </tr>
         <!--{/if}-->
@@ -201,5 +201,5 @@
                 <!--{assign var=key value="order_pref"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                <select class="top" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
                     <option value="" selected="">都道府県を選択</option>
                     <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
@@ -207,5 +207,5 @@
                 <!--{assign var=key value="order_addr01"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60 top" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
                 <!--{assign var=key value="order_addr02"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
@@ -235,6 +235,6 @@
     <h2 id="order_products">
         受注商品情報
-        <a class="btn-normal" href="javascript:;" name="cheek" onclick="fnModeSubmit('cheek','anchor_key','order_products'); return false;">計算結果の確認</a>
-        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '600', '500'); return false;">商品の追加</a>
+        <a class="btn-normal" href="javascript:;" name="cheek" onclick="fnModeSubmit('cheek','anchor_key','order_products');">計算結果の確認</a>
+        <a class="btn-normal" href="javascript:;" name="add_product" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '615', '500'); return false;">商品の追加</a>
     </h2>
     <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
@@ -265,5 +265,5 @@
                 <input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
                 <br />
-                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '600', '500'); return false;">変更</a>
+                <a class="btn-normal" href="javascript:;" name="change" onclick="win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '615', '500'); return false;">変更</a>
                 <!--{if $product_count > 1}-->
                     <a class="btn-normal" href="javascript:;" name="delete" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products'); return false;">削除</a>
@@ -473,5 +473,5 @@
                 <!--{assign var=key value="shipping_pref_`$shipping_id`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                <select class="top" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
                     <option value="" selected="">都道府県を選択</option>
                     <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
@@ -479,5 +479,5 @@
                 <!--{assign var=key value="shipping_addr01_`$shipping_id`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
-                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60 top" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
                 <!--{assign var=key value="shipping_addr02_`$shipping_id`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 19965)
@@ -264,10 +264,10 @@
 
     <div class="btn">
-        検索結果表示件数
+        <p class="page_rows">検索結果表示件数
         <!--{assign var=key value="search_page_max"}-->
         <span class="attention"><!--{$arrErr[$key]}--></span>
         <select name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
         <!--{html_options options=$arrPageMax selected=$arrForm[$key].value}-->
-        </select> 件
+        </select> 件</p>
         <div class="btn-area">
           <ul>
@@ -303,5 +303,16 @@
 
     <!--{* 検索結果表示テーブル *}-->
-    <table class="list">
+        <table class="list">
+        <colgroup width="10%">
+        <colgroup width="10%">
+        <colgroup width="15%">
+        <colgroup width="10%">
+        <colgroup width="10%">
+        <colgroup width="10%">
+        <colgroup width="10%">
+        <colgroup width="10%">
+        <colgroup width="5%">
+        <colgroup width="5%">
+        <colgroup width="5%">
         <!--{* ペイジェントモジュール連携用 *}-->
         <!--{assign var=path value=`$smarty.const.MODULE_REALDIR`mdl_paygent/paygent_order_index.tpl}-->
@@ -318,7 +329,7 @@
             <th>対応状況</th>
             <th><label for="pdf_check">帳票</label> <input type="checkbox" name="pdf_check" id="pdf_check" onclick="fnAllCheck(this, 'input[name=pdf_order_id[]]')" /></th>
-            <th class="edit">編集</th>
+            <th>編集</th>
             <th>メール</th>
-            <th class="delete">削除</th>
+            <th>削除</th>
         </tr>
 
@@ -335,6 +346,6 @@
             <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
             <td class="center">
-                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label>&nbsp;
-                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','600','650'); return false;"><span class="icon_class">個別出力</span></a>
+                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label><br>
+                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','615','650'); return false;"><span class="icon_class">個別出力</span></a>
             </td>
             <td class="center"><a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_EDIT_URLPATH}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_edit">編集</span></a></td>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 19909)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 19965)
@@ -47,4 +47,6 @@
 
   <table class="form">
+    <colgroup width="20%">
+    <colgroup width="80%">
     <tr>
       <th>注文番号</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 19965)
@@ -27,4 +27,6 @@
 
 <table class="form">
+    <colgroup width="30%">
+    <colgroup width="80%">
     <tr>
         <th>対応状況</th>
@@ -49,4 +51,6 @@
 <h3>お客様情報</h3>
 <table class="form">
+    <colgroup width="30%">
+    <colgroup width="80%">
     <tr>
         <th>注文番号</th>
@@ -100,4 +104,6 @@
 <h3>お届け先情報</h3>
 <table class="form">
+    <colgroup width="30%">
+    <colgroup width="80%">
     <tr>
         <th>お名前</th>
@@ -151,10 +157,15 @@
 <h3>受注商品情報</h3>
 <table class="list">
-    <tr>
-        <th class="id">商品コード</th>
-        <th class="name">商品名/規格1/規格2</th>
-        <th class="price">単価</th>
-        <th class="qty">数量</th>
-        <th class="price">小計</th>
+    <colgroup width="15%">
+    <colgroup width="35%">
+    <colgroup width="15%">
+    <colgroup width="10%">
+    <colgroup width="15%">
+    <tr>
+        <th>商品コード</th>
+        <th>商品名/規格1/規格2</th>
+        <th>単価</th>
+        <th>数量</th>
+        <th>小計</th>
     </tr>
     <!--{section name=cnt loop=$arrForm.quantity.value}-->
@@ -162,5 +173,5 @@
     <tr>
         <td><!--{$arrForm.product_code.value[$key]|h}--></td>
-        <td><!--{$arrForm.product_name.value[$key]|h}-->/<!--{$arrForm.classcategory_name1.value[$key]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$key]|default:"(なし)"|h}--></td>
+        <td><!--{$arrForm.product_name.value[$key]|h}--><br><!--{$arrForm.classcategory_name1.value[$key]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$key]|default:"(なし)"|h}--></td>
         <td class="right"><!--{if $arrForm.price.value[$key] != 0}--><!--{$arrForm.price.value[$key]|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
         <td class="center"><!--{$arrForm.quantity.value[$key]|h}--></td>
@@ -171,9 +182,9 @@
     <!--{/section}-->
     <tr>
-        <th colspan="4" class="right">小計</th>
+        <th colspan="4" class="column right">小計</th>
         <td align="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
     </tr>
     <tr>
-        <th colspan="4" class="right">ポイント値引き</th>
+        <th colspan="4" class="column right">ポイント値引き</th>
         <td align="right"><!--{assign var=point_discount value="`$arrForm.use_point.value*$smarty.const.POINT_VALUE`"}--><!--{$point_discount|number_format}-->円</td>
     </tr>
@@ -181,32 +192,32 @@
     <!--{if $discount != "" && $discount > 0}-->
                          <tr>
-        <th colspan="4" class="right">値引き</th>
+        <th colspan="4" class="column right">値引き</th>
         <td align="right"><!--{$discount|number_format}-->円</td>
     </tr>
     <!--{/if}-->
     <tr>
-        <th colspan="4" class="right">送料</th>
+        <th colspan="4" class="column right">送料</th>
         <td align="right"><!--{assign var=key value="deliv_fee"}--><!--{$arrForm[$key].value|number_format|h}--> 円</td>
     </tr>
     <tr>
-        <th colspan="4" class="right">手数料</th>
+        <th colspan="4" class="column right">手数料</th>
         <td align="right"><!--{assign var=key value="charge"}-->
     <span class="attention"><!--{$arrErr[$key]}--></span><!--{$arrForm[$key].value|number_format|h}--> 円</td>
     </tr>
     <tr>
-        <th colspan="4" class="right">合計</th>
+        <th colspan="4" class="column right">合計</th>
         <td align="right"><!--{$arrForm.total.value|number_format}--> 円</td>
     </tr>
     <tr>
-        <th colspan="4" class="right">お支払い合計</th>
+        <th colspan="4" class="column right">お支払い合計</th>
         <td align="right"><!--{$arrForm.payment_total.value|number_format}--> 円</td>
     </tr>
     <tr>
-        <th colspan="4" class="right">使用ポイント</th>
+        <th colspan="4" class="column right">使用ポイント</th>
         <td align="right"><!--{assign var=key value="use_point"}--><!--{if $arrForm[$key].value != ""}--><!--{$arrForm[$key].value|number_format}--><!--{else}-->0<!--{/if}--> pt</td>
     </tr>
     <!--{if $arrForm.birth_point.value > 0}-->
     <tr>
-        <th colspan="4" class="right">お誕生日ポイント</th>
+        <th colspan="4" class="column right">お誕生日ポイント</th>
         <td align="right">
         <!--{$arrForm.birth_point.value|number_format}-->
@@ -215,5 +226,5 @@
     <!--{/if}-->
     <tr>
-        <th colspan="4" class="right">加算ポイント</th>
+        <th colspan="4" class="column right">加算ポイント</th>
         <td align="right">
         <!--{$arrForm.add_point.value|default:0|number_format}-->
@@ -222,15 +233,15 @@
     <tr>
         <!--{if $arrForm.customer_id.value > 0}-->
-        <th colspan="4" class="right">現在ポイント</th>
+        <th colspan="4" class="column right">現在ポイント</th>
         <td align="right">
         <!--{$arrForm.point.value|number_format}-->
          pt</td>
         <!--{else}-->
-        <th colspan="4" class="right">現在ポイント</th><td align="center">(なし)</td>
+        <th colspan="4" class="column right">現在ポイント</th><td align="center">(なし)</td>
         <!--{/if}-->
     </tr>
     <!--{*
     <tr>
-        <th colspan="4" class="right">反映後ポイント (ポイントの変更は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。)</th>
+        <th colspan="4" class="column right">反映後ポイント (ポイントの変更は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。)</th>
         <td align="right">
             <span class="attention"><!--{$arrErr.total_point}--></span>
@@ -243,4 +254,6 @@
 
 <table class="form">
+    <colgroup width="30%">
+    <colgroup width="80%">
     <tr>
         <th>お支払方法</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 19965)
@@ -129,4 +129,6 @@
 <input name="no" type="hidden" value="<!--{$tpl_no}-->" />
 <table class="form">
+    <colgroup width="20%">
+    <colgroup width="80%">
     <tr>
         <th>カテゴリ</th>
@@ -162,4 +164,8 @@
     <!--▼検索後表示部分-->
     <table class="list">
+    <colgroup width="20%">
+    <colgroup width="20%">
+    <colgroup width="50%">
+    <colgroup width="10%">
         <tr>
             <th class="image">商品画像</th>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl	(revision 19943)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl	(revision 19965)
@@ -22,4 +22,5 @@
  */
 *}-->
+
 <!--{* ▼CONTENTS *}-->
 <div id="error-wrap">