Index: branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl	(revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl	(revision 19909)
@@ -51,2 +51,7 @@
   <p>JavaScript を有効にしてご利用下さい.</p>
 </noscript>
+<div id="popup-header">
+		<div id="popup-logo"><img src="<!--{$TPL_DIR}-->img/header/logo_popup.jpg" width="99" height="15" alt="EC-CUBE" /></div>
+</div>
+
+<div id="popup-container">
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 19909)
@@ -243,6 +243,6 @@
     <!--{* 検索条件設定テーブルここまで *}-->
 
-    <div class="btn">
-        <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span>この条件で検索する</span></a>
+    <div class="btn-area">
+        <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span class="btn-next">この条件で検索する</span></a>
     </div>
 </form>
@@ -283,5 +283,5 @@
             <th>希望配信</th>
             <th>登録日</th>
-            <th>削除</th>
+            <th class="delete">削除</th>
         </tr>
         <!--{section name=i loop=$arrResults}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl	(revision 19909)
@@ -34,7 +34,9 @@
     <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->">→続けて設定する</a>
   </div>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' )"><span>テンプレート設定画面へ戻る</span></a>
-  　<a class="btn-normal" href="javascript:;" name="subm03" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span>配信を予約する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' )"><span class="btn-prev">テンプレート設定画面へ戻る</span></a></li>
+      <li>　<a class="btn-action" href="javascript:;" name="subm03" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span class="btn-next">配信を予約する</span></a></li>
+    </ul>
   </div>
 </div>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl	(revision 19909)
@@ -83,6 +83,8 @@
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$mode}-->', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$mode}-->', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 </table>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 19909)
@@ -58,11 +58,13 @@
   </table>
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' )"><span>テンプレート設定画面へ戻る</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" name="subm02" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' )"><span class="btn-prev">テンプレート設定画面へ戻る</span></a></li>
     <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
-    <a class="btn-normal" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span>配信を予約する</span></a>
+      <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span class="btn-next">配信を予約する</span></a></li>
     <!--{else}-->
-    <a class="btn-normal" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span>配信する</span></a>
+      <li><a class="btn-action" href="javascript:;" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span class="btn-next">配信する</span></a></li>
     <!--{/if}-->
+    </ul>
   </div>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl	(revision 19909)
@@ -84,7 +84,9 @@
   <!--{/if}-->
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'back', '' )"><span>検索画面に戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_confirm', '' )" ><span>確認ページへ</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'back', '' )"><span class="btn-prev">検索画面に戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_confirm', '' )" ><span class="btn-next">確認ページへ</span></a></li>
+    </ul>
   </div>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/history.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/history.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/history.tpl	(revision 19909)
@@ -38,5 +38,5 @@
             <th>未配信数</th>
             <th>再試行</th>
-            <th>削除</th>
+            <th class="delete">削除</th>
         </tr>
         <!--{section name=cnt loop=$arrDataList}-->
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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 19909)
@@ -85,5 +85,9 @@
 </table>
 
-<div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', '');"><span>この内容で登録する</span></a></div>
+<div class="btn-area">
+  <ul>
+    <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode|h}-->', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+  </ul>
+</div>
 </form>
 
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl	(revision 19909)
@@ -55,5 +55,9 @@
   </table>
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'update', '', '');"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'update', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 19909)
@@ -64,5 +64,5 @@
             <th>リストア</th>
             <th>ダウンロード</th>
-            <th>削除</th>
+            <th class="delete">削除</th>
         </tr>
         <!--{section name=cnt loop=$arrBkupList}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/masterdata.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/masterdata.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/masterdata.tpl	(revision 19909)
@@ -66,5 +66,9 @@
     </tr>
   </table>
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="return document.form2.submit()"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="return document.form2.submit()"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 
   </form>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 19909)
@@ -38,6 +38,6 @@
       <th>稼動</th>
       <th>非稼動</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
@@ -49,5 +49,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','500','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','600','420'); 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">
@@ -68,5 +68,5 @@
 
   <div class="btn addnew">
-    <a class="btn-normal" href="javascript:;" onclick="win01('./input.php','input','500','420');"><span>メンバーを新規入力</span></a>
+    <a class="btn-normal" href="javascript:;" onclick="win01('./input.php','input','600','420');"><span>メンバーを新規入力</span></a>
   </div>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_footer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_footer.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_footer.tpl	(revision 19909)
@@ -22,4 +22,5 @@
  */
 *}-->
+</div>
 </body>
 </html>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/settings.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/settings.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/settings.tpl	(revision 19909)
@@ -42,6 +42,8 @@
   
   <!--登録ボタンここから-->
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'register', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'register', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
   <!--登録ボタンここまで-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log_detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log_detail.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log_detail.tpl	(revision 19909)
@@ -56,5 +56,5 @@
   </table>
 	<div class="btn">
-		<a class="btn-normal" href='./log.php'>一覧へ戻る</a>
+		<a class="btn-action" href='./log.php'><span class="btn-prev">一覧へ戻る</span></a>
 	</div>
 </div>
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 19909)
@@ -69,69 +69,67 @@
 <!--{* ▼HEADER *}-->
 <div id="header">
-  <div id="logo"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->home.php"><img src="<!--{$TPL_DIR}-->img/header/logo.jpg" width="230" height="50" alt="EC CUBE" /></a></div>
-  <ul id="sites">
-    <li><a href="<!--{$smarty.const.ADMIN_HOME_URL_PATH}-->"><span>MAIN PAGE</span></a></li>
-    <li><a href="<!--{$smarty.const.HTTP_URL}--><!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank"><span>SITE CHECK</span></a></li>
-  </ul>
-  <p>
-    WELCOME!&nbsp;<span><!--{* ログイン名 *}--><!--{$smarty.session.login_name|h}--></span>&nbsp;様&nbsp;
-    <a href="<!--{$smarty.const.ADMIN_LOGOUT_URL_PATH}-->">LOGOUT</a>
-  </p>
+  <div id="header-contents">
+    <div id="logo"><a href="<!--{$smarty.const.ADMIN_HOME_URL_PATH}-->"><img src="<!--{$TPL_DIR}-->img/header/logo.jpg" width="172" height="25" alt="EC-CUBE" /></a></div>
+    <div id="site-check">
+      <p class="info"><span>ログインID&nbsp;:&nbsp;<!--{* ログイン名 *}--><!--{$smarty.session.login_name|h}--></span>&nbsp;様&nbsp;</p>
+      <ul>
+        <li><a href="<!--{$smarty.const.HTTP_URL}--><!--{$smarty.const.DIR_INDEX_URL}-->" class="btn-tool-format" target="_blank"><span>SITE CHECK</span></a></li>
+        <li><a href="<!--{$smarty.const.ADMIN_LOGOUT_URL_PATH}-->" class="btn-tool-format">LOGOUT</a></li>
+      </ul>
+    </div>
+  </div>
 </div>
 <!--{* ▲HEADER *}-->
+
 <!--{* ▼NAVI *}-->
+<div id="navi-wrap">
 <ul id="navi">
     <li id="navi-basis" class="<!--{if $tpl_mainno eq "basis"}-->on<!--{/if}-->">
-        <a><span>基本情報管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span class="level1">基本情報管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`basis/subnavi.tpl"}-->
     </li>
     <li id="navi-products" class="<!--{if $tpl_mainno eq "products"}-->on<!--{/if}-->">
-        <a><span>商品管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>商品管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`products/subnavi.tpl"}-->
     </li>
     <li id="navi-customer" class="<!--{if $tpl_mainno eq "customer"}-->on<!--{/if}-->">
-        <a><span>顧客管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`customer/subnavi.tpl"}-->
     </li>
     <li id="navi-order" class="<!--{if $tpl_mainno eq "order"}-->on<!--{/if}-->">
-        <a><span>受注管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>受注管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`order/subnavi.tpl"}-->
     </li>
     <li id="navi-total" class="<!--{if $tpl_mainno eq "total"}-->on<!--{/if}-->">
-        <a><span>売上集計</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->total/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>売上集計</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`total/subnavi.tpl"}-->
     </li>
     <li id="navi-mail" class="<!--{if $tpl_mainno eq "mail"}-->on<!--{/if}-->">
-        <a><span>メルマガ管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->mail/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>メルマガ管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`mail/subnavi.tpl"}-->
     </li>
     <li id="navi-contents" class="<!--{if $tpl_mainno eq "contents"}-->on<!--{/if}-->">
-        <a><span>コンテンツ管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->contents/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>コンテンツ管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`contents/subnavi.tpl"}-->
     </li>
     <li id="navi-design" class="<!--{if $tpl_mainno eq "design"}-->on<!--{/if}-->">
-        <a><span>デザイン管理</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>デザイン管理</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`design/subnavi.tpl"}-->
     </li>
     <li id="navi-system" class="<!--{if $tpl_mainno eq "system"}-->on<!--{/if}-->">
-        <a><span>システム設定</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->system/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>システム設定</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`system/subnavi.tpl"}-->
     </li>
     <li id="navi-ownersstore" class="<!--{if $tpl_mainno eq "ownersstore"}-->on<!--{/if}-->">
-        <a><span>OWNERS STORE</span></a>
+        <a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->ownersstore/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>オーナーズストア</span></a>
         <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`ownersstore/subnavi.tpl"}-->
     </li>
-    <!--{if "DEBUG_LOAD_PLUGIN"|defined && $smarty.const.DEBUG_LOAD_PLUGIN}-->
-        <li id="navi-plugin" class="<!--{if $tpl_mainno eq "plugin"}-->on<!--{/if}-->">
-            <a><span>プラグイン</span></a>
-            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`plugin/subnavi.tpl"}-->
-        </li>
-    <!--{/if}-->
 </ul>
+</div>
 <div style="clear: both;"></div>
 <!--{* ▲NAVI *}-->
 
-<!--{if $smarty.server.PHP_SELF != $smarty.const.ADMIN_HOME_URL_PATH && $tpl_subtitle}-->
-<h1><!--{$tpl_subtitle}--></h1>
+<!--{if $tpl_subtitle}-->
+<h1><div class="title"><!--{$tpl_subtitle}--></div></h1>
 <!--{/if}-->
 
@@ -144,14 +142,17 @@
 <!--{* ▼FOOTER *}-->
 <div id="footer">
-  <div id="topagetop">
-    <a href="#top">GO TO PAGE TOP</a>
-  </div>
-  <div id="copyright">
-    Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
-  </div>
+	<div id="footer-contents">
+		<div id="copyright">Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</div>
+		<div id="topagetop">
+			<ul class="sites">
+				<li><a href="#top" class="btn-tool-format">PAGE TOP</a></li>
+			</ul>
+		</div>
+	</div>
 </div>
 <!--{* ▲FOOTER *}-->
 
 </div>
+</div>
 </body>
 </html>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 19909)
@@ -164,5 +164,9 @@
   <!--{* ▲登録テーブルここまで *}-->
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="return func_regist();"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="return func_regist();"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 </form>
 
@@ -183,6 +187,6 @@
       <th>日付</th>
       <th>タイトル</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
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 19873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 19909)
@@ -37,59 +37,14 @@
 <div id="admin-contents" class="contents-main">
 <div id="contents-filemanager-tree">
-  ディレクトリ
   <div id="tree"></div>
 </div>
-<div id="contents-filemanager-nowdir">
-  <div id="now_dir">
-    <img src="<!--{$TPL_DIR}-->img/contents/folder_open.gif" alt="フォルダ">
-    &nbsp;<!--{$tpl_now_file}-->
-  </div>
-  <div id="file_view">
-    <table id="contents-filemanager-filelist" class="list">
-      <tr>
-        <th>ファイル名</th>
-        <th>サイズ</th>
-        <th>更新日付</th>
-      </tr>
-      <!--{if !$tpl_is_top_dir}-->
-      <tr id="parent_dir" onclick="fnSetFormVal('form1', 'select_file', '<!--{$tpl_parent_dir|h}-->');fnSelectFile('parent_dir', '#808080');" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$tpl_parent_dir|h}-->', true, '<!--{$tpl_now_dir|h}-->', true)" style="" onMouseOver="fnChangeBgColor('parent_dir', '#808080');" onMouseOut="fnChangeBgColor('parent_dir', '');">
-        <td>
-          <img src="<!--{$TPL_DIR}-->img/contents/folder_parent.gif" alt="フォルダ">&nbsp;..
-        </td>
-        <td class="right">&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <!--{/if}-->
-      <!--{section name=cnt loop=$arrFileList}-->
-      <!--{assign var="id" value="select_file`$smarty.section.cnt.index`"}-->
-      <tr id="<!--{$id}-->" onclick="fnSetFormVal('form1', 'select_file', '<!--{$arrFileList[cnt].file_path|h}-->');fnSelectFile('<!--{$id}-->', '#808080');" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$arrFileList[cnt].file_path|h}-->', <!--{if $arrFileList[cnt].is_dir|h}-->true<!--{else}-->false<!--{/if}-->, '<!--{$tpl_now_dir|h}-->', false)" style="" onMouseOver="fnChangeBgColor('<!--{$id}-->', '#808080');" onMouseOut="fnChangeBgColor('<!--{$id}-->', '');">
-        <td>
-          <!--{if $arrFileList[cnt].is_dir}-->
-          <img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">
-          <!--{else}-->
-          <img src="<!--{$TPL_DIR}-->img/contents/file.gif">
-          <!--{/if}-->
-          <!--{$arrFileList[cnt].file_name|h}-->
-        </td>
-        <td class="right"><!--{$arrFileList[cnt].file_size|number_format}--></td>
-        <td><!--{$arrFileList[cnt].file_time|h}--></td>
-      </tr>
-      <!--{/section}-->
-    </table>
-  </div>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('view','',''); return false;"><span>表示</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('download','',''); return false;"><span>ダウンロード</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="setTreeStatus('tree_status');fnModeSubmit('delete','',''); return false;"><span>削除</span></a>
-  </div>
-</div>
-<div id="contents-filemanager-action">
-  <p>現在のディレクトリ&nbsp;：&nbsp;<!--{$tpl_now_dir|sfTrimURL}-->/</p>
-  <table class="form">
+
+<div id="contents-filemanager-right">
+  <table class="now_dir">
     <tr>
       <th>ファイルのアップロード</th>
       <td>
         <!--{if $arrErr.upload_file}--><span class="attention"><!--{$arrErr.upload_file}--></span><!--{/if}-->
-        <input type="file" name="upload_file" size="64" <!--{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="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>
       </td>
     </tr>
@@ -102,6 +57,51 @@
     </tr>
   </table>
+
+  <h2><!--{$tpl_now_dir|h}--></h2>
+
+  <div id="file_view">
+    <table id="contents-filemanager-filelist" class="list">
+      <tr>
+        <th>ファイル名</th>
+        <th>サイズ</th>
+        <th>更新日付</th>
+        <th class="edit">表示</th>
+        <th>ダウンロード</th>
+        <th class="delete">削除</th>
+      </tr>
+      <!--{if !$tpl_is_top_dir}-->
+      <tr id="parent_dir" onclick="fnSetFormVal('form1', 'select_file', '<!--{$tpl_parent_dir|h}-->');fnSelectFile('parent_dir', '#808080');" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$tpl_parent_dir|h}-->', true, '<!--{$tpl_now_dir|h}-->', true)" style="">
+        <td>
+          <img src="<!--{$TPL_DIR}-->img/contents/folder_parent.gif" alt="フォルダ">&nbsp;..
+        </td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+        <td>&nbsp;</td>
+      </tr>
+      <!--{/if}-->
+      <!--{section name=cnt loop=$arrFileList}-->
+      <!--{assign var="id" value="select_file`$smarty.section.cnt.index`"}-->
+      <tr id="<!--{$id}-->" style="">
+        <td class="file-name" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$arrFileList[cnt].file_path|h}-->', <!--{if $arrFileList[cnt].is_dir|h}-->true<!--{else}-->false<!--{/if}-->, '<!--{$tpl_now_dir|h}-->', false)">
+          <!--{if $arrFileList[cnt].is_dir}-->
+          <img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">
+          <!--{else}-->
+          <img src="<!--{$TPL_DIR}-->img/contents/file.gif">
+          <!--{/if}-->
+          <!--{$arrFileList[cnt].file_name|h}-->
+        </td>
+        <td class="right"><!--{$arrFileList[cnt].file_size|number_format}--></td>
+        <td class="center"><!--{$arrFileList[cnt].file_time|h}--></td>
+        <td class="center"><a href="javascript:;" onclick="fnSetFormVal('form1', 'select_file', '<!--{$arrFileList[cnt].file_path|h}-->');fnSelectFile('<!--{$id}-->', '#808080');fnModeSubmit('view','',''); return false;">表示</a></td>
+        <td class="center"><a href="javascript:;" onclick="fnSetFormVal('form1', 'select_file', '<!--{$arrFileList[cnt].file_path|h}-->');fnSelectFile('<!--{$id}-->', '#808080');setTreeStatus('tree_status');fnModeSubmit('download','',''); return false;">ダウンロード</a></td>
+        <td class="center"><a href="javascript:;" onclick="fnSetFormVal('form1', 'select_file', '<!--{$arrFileList[cnt].file_path|h}-->');fnSelectFile('<!--{$id}-->', '#808080');setTreeStatus('tree_status');fnModeSubmit('delete','',''); return false;">削除</a></td>
+      </tr>
+      <!--{/section}-->
+    </table>
+  </div>
+</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 19835)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 19909)
@@ -66,6 +66,6 @@
       <td>
         <div class="btn">
-          <a class='button' href="javascript:;" name='csv' onclick="fnTargetSelf(); fnFormModeSubmit('form1','csv_output','csv_output_id',<!--{$item.sql_id}-->);"><span>CSV出力</span></a>
-          <a class='button' href="javascript:;" name='del' onclick="fnTargetSelf(); fnFormModeSubmit('form1','delete','sql_id',<!--{$item.sql_id}-->);"><span>削除</span></a>
+          <a class="btn-normal" href="javascript:;" name='csv' onclick="fnTargetSelf(); fnFormModeSubmit('form1','csv_output','csv_output_id',<!--{$item.sql_id}-->);"><span>CSV出力</span></a>
+          <a class="btn-normal" href="javascript:;" name='del' onclick="fnTargetSelf(); fnFormModeSubmit('form1','delete','sql_id',<!--{$item.sql_id}-->);"><span>削除</span></a>
         </div>
       </td>
@@ -76,5 +76,5 @@
 
   <div class="btn addnew">
-    <a class='button' href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>SQLを新規入力</span></a>
+    <a class="btn-normal" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>SQLを新規入力</span></a>
   </div>
 
@@ -102,6 +102,10 @@
 
   <div class="btn">
-    <a class="btn-normal" href="javascript:;" name="subm" onclick="mode.value='confirm'; fnTargetSelf();"><span>この内容で登録する</span></a>
     <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();"><span class="btn-next">この内容で登録する</span></a></li>
+      </ul>
+    </div>
   </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 19771)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 19909)
@@ -45,7 +45,7 @@
 <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">
-    <h2><!--{$SubnaviName}--></h2>
-    <div>
+    <div class="ms2side__area">
         <span class="attention"><!--{$arrErr.output_list}--></span>
         <select multiple name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
@@ -54,5 +54,9 @@
     </div>
 
-    <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', '');"><span>この内容で登録する</span></a></div>
+    <div class="btn-area">
+      <ul>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+      </ul>
+    </div>
 
 </div>
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl	(revision 19909)
@@ -58,5 +58,5 @@
   
   if ( flag ){
-    win03('./recommend_search.php?rank=' + rank,'search','500','500');
+    win03('./recommend_search.php?rank=' + rank,'search','600','600');
   }
 }
@@ -71,5 +71,5 @@
       <th>画像</th>
       <th>商品名</th>
-      <th>削除</th>
+      <th class="delete">削除</th>
       <th>変更</th>
       <th>コメント</th>
@@ -78,5 +78,5 @@
     <!--▼おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
     <tr>
-      <th><!--{$smarty.section.cnt.iteration}--></th>
+       <th class="column"><!--{$smarty.section.cnt.iteration}--></th>
       <td>
         <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
@@ -103,5 +103,5 @@
         <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>
         <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
-        <br /><a class="btn-normal" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span>登録する</span></a>
+        <br /><a class="btn-action" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span class="btn-next">登録する</span></a>
         <!--{/if}-->
         </form>
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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	(revision 19909)
@@ -59,6 +59,9 @@
     </tr>
   </table>
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');"><span>検索を開始</span></a>
-
+  <div class="btn-area">
+    <ul>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');"><span class="btn-next">検索を開始</span></a></li>
+    </ul>
+  </div>
   <!--{* ▼検索結果表示 *}-->
   <!--{if $tpl_linemax}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/zip_install.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 19909)
@@ -24,7 +24,5 @@
 <!--{if $tpl_mode|strlen == 0 || $arrErr|@count >= 1}-->
     <style type="text/css">
-        .item {
-            margin-top: 1em;
-        }
+        
     </style>
     <form name="form1" id="form1" method="get" action="?" onsubmit="return false;">
@@ -38,21 +36,25 @@
         <!--{/if}-->
 
-        <div style="margin: 1em 0;">
+        <div class="basis-zip-item info">
             <p>通常は、[自動登録] を利用してください。<br />
                 ただし、タイムアウトしてしまう環境では、タイムアウトした後に [手動登録] を正常に完了するまで繰り返してください。</p>
         </div>
 
-        <div class="item">
-            <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('auto', '', '');">自動登録</a><br />
-            全ての郵便番号を削除してから、登録しなおします。タイムアウトした場合、元の状態に戻ります。
+        <div class="basis-zip-item">
+            <h2>自動更新</h2>
+            <p>全ての郵便番号を削除してから、登録しなおします。タイムアウトした場合、元の状態に戻ります。</p>
+            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('auto', '', '');"><span class="btn-next">自動更新</span></a></p>
         </div>
-        <div class="item">
-            <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('delete', '', '');">手動削除</a><br />
-            全ての郵便番号を削除します。再登録するまで、住所自動入力は機能しなくなります。
+
+        <div class="basis-zip-item delete">
+            <h2>手動更新</h2>
+            <p>指定した行数から郵便番号を登録します。タイムアウトした場合、直前まで登録されます。</p>
+            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', '');"><span class="btn-next">手動更新</span></a>　開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8"><span class="attention"><!--{$arrErr.startRowNum}--></span></p>
         </div>
-        <div class="item">
-            <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('manual', '', '');">手動登録</a>
-            開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|h}-->" size="8"><span class="attention"><!--{$arrErr.startRowNum}--></span><br />
-            指定した行数から郵便番号を登録します。タイムアウトした場合、直前まで登録されます。
+
+        <div class="basis-zip-item end">
+            <h2>削除</h2>
+            <p>全ての郵便番号を削除します。再登録するまで、住所自動入力は機能しなくなります。</p>
+            <p><a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('delete', '', '');"><span class="btn-next">削除</span></a></p>
         </div>
     </form>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 19909)
@@ -53,11 +53,13 @@
         </select>日
         <br />
-        <span class="attention">振替え休日は自動設定されないので、振替え先の日付を設定してください。</span>
+        <span class="attention">振替休日は自動設定されないので、振替え先の日付を設定してください。</span>
       </td>
     </tr>
   </table>
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 
@@ -66,6 +68,6 @@
       <th>タイトル</th>
       <th>日付</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/point.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/point.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/point.tpl	(revision 19909)
@@ -48,5 +48,10 @@
   </table>
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('point_form', '<!--{$tpl_mode}-->', '', '');"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('point_form', '<!--{$tpl_mode}-->', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 </div>
 </form>
+
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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl	(revision 19909)
@@ -91,5 +91,9 @@
     </table>
   
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
   
 </div>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 19909)
@@ -44,11 +44,15 @@
     </tr>
   </table>
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 
   <table class="list">
     <tr>
       <th>規約タイトル</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl	(revision 19909)
@@ -32,6 +32,6 @@
       <th>手数料（円）</th>
       <th>利用条件</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
@@ -48,5 +48,5 @@
         <!--{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','530','400'); return false;">編集</a><!--{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">
@@ -62,5 +62,5 @@
   </table>
   <div class="btn addnew">
-    <a class="btn-normal" href="javascript:;" name="subm2" onclick="win03('./payment_input.php','payment_input','550','400');"><span>支払方法を新規入力</span></a>
+    <a class="btn-normal" href="javascript:;" name="subm2" onclick="win03('./payment_input.php','payment_input','600','400');"><span>支払方法を新規入力</span></a>
   </div>
 </div>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl	(revision 19909)
@@ -27,5 +27,5 @@
       <th>管理タイトル/管理内容</th>
       <th>選択項目</th>
-      <th>編集</th>
+      <th class="edit">編集</th>
     </tr>
     <!--{section name=cnt loop=$arrControlList}-->
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 19909)
@@ -123,7 +123,9 @@
   <!--{/if}-->
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="location.href='./delivery.php';"><span>前のページに戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="location.href='./delivery.php';"><span class="btn-prev">前のページに戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 </div>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 19909)
@@ -112,6 +112,9 @@
   </table>
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'regist', '', '');"
-><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'regist', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 </div>
 </form>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl	(revision 19909)
@@ -31,6 +31,6 @@
       <th>配送業者</th>
       <th>名称</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 19909)
@@ -179,5 +179,9 @@
   </table>
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', '');"><span>この内容で登録する</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
+  </div>
 </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 19909)
@@ -54,5 +54,9 @@
       </table>
     
-      <div class="btn"><a class="btn-normal" href="javascript:;" onclick="document.form1.page_id.value = <!--{$item.page_id}-->; fnFormModeSubmit('form1', 'confirm', '', '');"><span>この内容で登録する</span></a></div>
+      <div class="btn-area">
+        <ul>
+          <li><a class="btn-action" href="javascript:;" onclick="document.form1.page_id.value = <!--{$item.page_id}-->; fnFormModeSubmit('form1', 'confirm', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+        </ul>
+      </div>
     
     </div>
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 19877)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 19909)
@@ -334,6 +334,8 @@
  </table>
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', '<!--{$tpl_mode}-->', '', '');"><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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	(revision 19909)
@@ -65,4 +65,5 @@
                         <!--{html_options options=$arrPref selected=$list_data.pref}-->
                     </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 />
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 19909)
@@ -130,7 +130,8 @@
             </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', '', '');"><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', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
         </div>
     </div>
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 19909)
@@ -232,7 +232,9 @@
         </table>
 
-        <div class="btn">
-            <a class="btn-normal" href="javascript:;" onclick="return fnReturn();"><span>検索画面に戻る</span></a>
-            <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', '');"><span>確認ページへ</span></a>
+        <div class="btn-area">
+          <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', '', '');"><span class="btn-next">確認ページへ</span></a></li>
+          </ul>
         </div>
 
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 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 19909)
@@ -22,14 +22,5 @@
  */
 *}-->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->">
-<meta http-equiv="content-script-type" content="text/javascript">
-<meta http-equiv="content-style-type" content="text/css">
-<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
-<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/css.js"></script>
-<script type="text/javascript" src="<!--{$smarty.const.URL_PATH}-->js/navi.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`admin_popup_header.tpl"}-->
 <script type="text/javascript">
 <!--
@@ -47,16 +38,4 @@
 </script>
 
-<title>管理機能</title>
-</head>
-
-<body bgcolor="#ffffff" text="#494E5F" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-<!--{$GLOBAL_ERR}-->
-<noscript>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->css/common.css" type="text/css" >
-</noscript>
-
-<!--▼CONTENTS-->
-<div align="center">
-　
 <!--▼検索フォーム-->
 <form name="form1" id="form1" method="post" action="<!--{$smarty.server.REQUEST_URI|h}-->">
@@ -92,8 +71,10 @@
 </table>
 
-<br />
-<a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');" name="subm">検索を開始</a>
-<br />
-<br />
+<div class="btn-area">
+  <ul>
+    <li><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');" name="subm">検索を開始</a></li>
+  </ul>
+</div>
+
 <!--{if $smarty.post.mode == 'search' }-->
     <!--▼検索結果表示-->
@@ -143,8 +124,3 @@
 <!--{/if}-->
 </form>
-
-</div>
-<!--▲CONTENTS-->
-
-</body>
-</html>
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`admin_popup_footer.tpl"}-->
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 19909)
@@ -253,5 +253,9 @@
       <!--{html_options options=$arrPageRows selected=$arrForm.page_rows}-->
     </select> 件
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span>この条件で検索する</span></a>
+    <div class="btn-area">
+      <ul>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span class="btn-next">この条件で検索する</span></a></li>
+      </ul>
+    </div>
   </div>
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl	(revision 19909)
@@ -99,9 +99,11 @@
   <!--{/if}-->
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('confirm_return','',''); return false"><span>前へ戻る</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('confirm_return','',''); return false"><span class="btn-prev">前へ戻る</span></a></li>
     <!--{if $tpl_check > 0}-->
-    <a class="btn-normal" href="javascript:;" onclick="document.form1.submit();"><span>この内容で登録する</span></a>
+      <li><a class="btn-action" href="javascript:;" onclick="document.form1.submit();"><span class="btn-next">この内容で登録する</span></a></li>
     <!--{/if}-->
+    </ul>
   </div>
 </div>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl	(revision 19909)
@@ -22,4 +22,5 @@
  */
 *}-->
+<div id="products" class="contents-main">
 <form name="search_form" method="post" action="?" >
 <input type="hidden" name="mode" value="search" />
@@ -95,5 +96,9 @@
     <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
     </select> 件
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span>この条件で検索する</span></a>
+    <div class="btn-area">
+      <ul>
+        <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span class="btn-next">この条件で検索する</span></a></li>
+      </ul>
+    </div>
   </div>
   <!--検索条件設定テーブルここまで-->
@@ -133,6 +138,6 @@
       <th>ブログ記事タイトル</th>
       <th>状態</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
     </tr>
     
@@ -154,2 +159,3 @@
 <!--{ /if }-->
 <!--★★検索結果一覧★★-->    
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl	(revision 19909)
@@ -75,7 +75,9 @@
 </table>
 <!--▲編集テーブルここまで-->
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="document.form1.action='./trackback.php'; fnModeSubmit('search','','');"><span>検索画面に戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('complete','','');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="document.form1.action='./trackback.php'; fnModeSubmit('search','','');"><span class="btn-prev">検索画面に戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('complete','','');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 </div>
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 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 19909)
@@ -32,5 +32,5 @@
   <!--{* ▼画面左 *}-->
   <div id="products-rank-left">
-    <a href="?">▼ホーム</a><br />
+    <a href="?"><img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">&nbsp;ホーム</a><br />
     <!--{section name=cnt loop=$arrTree}-->
       <!--{assign var=level value="`$arrTree[cnt].level`}-->
@@ -49,7 +49,7 @@
       <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false">
       <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
-        <img src="<!--{$smarty.const.URL_PATH}-->misc/openf.gif">
+        <img src="<!--{$TPL_DIR}-->img/contents/folder_open.gif" alt="フォルダ">
       <!--{else}-->
-        <img src="<!--{$smarty.const.URL_PATH}-->misc/closef.gif">
+        <img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">
       <!--{/if}-->
       <!--{$disp_name|sfCutString:20|h}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
@@ -70,7 +70,38 @@
   <!--▼画面右-->
   <div id="products-rank-right">
+    <h2><!--{$breadcrumbs}--></h2>
   <!--{if count($arrProductsList) > 0}-->
-                    
-    <p><!--{$tpl_linemax}-->件が該当しました。</p>
+
+
+<script type="text/javascript">
+// カテゴリーテーブルのイニシャライズ
+$(document).ready(function() {
+    $("#categoryTable").tableDnD({
+	    onDragClass: "movingHandle",
+        onDrop: function(table, row) {
+            var rows = table.tBodies[0].rows;
+            var keys = row.id;
+
+            for (var i = 0; i < rows.length; i++) {
+                if (row.id == rows[i].id) {
+                    keys += "-" + i;
+                    break;
+                }
+            }
+
+            fnModeSubmit('moveByDnD','keySet', keys);
+        },
+        dragHandle: "dragHandle"
+    });
+
+    $("#categoryTable tr").hover(function() {
+        $(this.cells[0]).addClass('activeHandle');
+    }, function() {
+        $(this.cells[0]).removeClass('activeHandle');
+    });
+});
+</script>
+
+    <p><span class="attention"><!--{$tpl_linemax}-->件</span>が該当しました。</p>
     <!--{* ▼ページナビ *}-->
     <!--{$tpl_strnavi}-->
@@ -81,15 +112,24 @@
     <!--{/if}-->
     
-    <table class="list">
-      <tr>
+    <table class="list" id="categoryTable">
+      <tr class="nodrop nodrag">
+        <th>商品コード</th>
+        <th>商品名</th>
+        <th>商品画像</th>
         <th>順位</th>
-        <th>商品コード</th>
-        <th>商品画像</th>
-        <th>商品名</th>
         <th>移動</th>
       </tr>
+
       <!--{assign var=rank value=$tpl_start_row}-->
       <!--{section name=cnt loop=$arrProductsList}-->
         <tr>
+          <td><!--{from_to from=$arrProductsList[cnt].product_code_min to=$arrProductsList[cnt].product_code_max separator="～<br />"}--></td>          
+          <td>
+            <!--{$arrProductsList[cnt].name|h}-->
+          </td>
+          <td align="center">
+            <!--{* 商品画像 *}-->
+            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProductsList[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrProducts[cnt].name|h}-->">
+          </td>
           <!--{assign var=rank value=`$rank+1`}-->
           <td align="center">
@@ -97,13 +137,4 @@
             <!--{if $arrProductsList[cnt].status == "2"}--><br />(非公開)<!--{/if}-->
           </td>
-          <td><!--{from_to from=$arrProductsList[cnt].product_code_min to=$arrProductsList[cnt].product_code_max separator="～<br />"}--></td>
-          <td align="center">
-            <!--{* 商品画像 *}-->
-            <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProductsList[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrProducts[cnt].name|h}-->">
-          </td>
-          <td align="center">
-            <!--{$arrProductsList[cnt].name|h}-->
-          </td>
-          
           <td align="center">
           <!--{* 移動 *}-->
@@ -132,3 +163,3 @@
 
 </div>
-</form>    
+</form> 
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 19771)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 19909)
@@ -59,6 +59,8 @@
   </table>
   <!--▲登録テーブルここまで-->
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'csv_upload', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'csv_upload', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 19909)
@@ -286,8 +286,10 @@
   </table>
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('confirm_return','',''); return false;"><span>前のページに戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="document.form1.submit();"><span>この内容で登録する</span></a>
-  </div>
+	<div class="btn-area">
+		<ul>
+			<li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('confirm_return','',''); return false;"><span class="btn-prev">前のページに戻る</span></a></li>
+			<li><a class="btn-action" href="javascript:;" onclick="document.form1.submit();"><span class="btn-next">この内容で登録する</span></a></li>
+		</ul>
+	</div>
 </div>
 </form>
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 19771)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 19909)
@@ -59,6 +59,8 @@
   </table>
   <!--▲登録テーブルここまで-->
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'csv_upload', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'csv_upload', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 </div>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 19909)
@@ -38,11 +38,15 @@
         </table>
 
-        <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></button></a>
+        <div class="btn-area">
+          <ul>
+            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+          </ul>
+        </div>
 
         <table class="list">
             <tr>
                 <th>メーカー</th>
-                <th>編集</th>
-                <th>削除</th>
+                <th class="edit">編集</th>
+                <th class="delete">削除</th>
                 <th>移動</th>
             </tr>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 19909)
@@ -97,5 +97,10 @@
     <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
     </select> 件
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span>この条件で検索する</span></a>
+    <div class="btn-area">
+      <ul>
+        <li>
+          <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span class="btn-next">この条件で検索する</span></a></li>
+      </ul>
+    </div>
   </div>
 </form>  
@@ -133,6 +138,6 @@
       <th>おすすめレベル</th>
       <th>表示・非表示</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
     </tr>
 
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 19909)
@@ -46,6 +46,8 @@
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 
@@ -53,6 +55,6 @@
     <tr>
       <th>分類名</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
@@ -82,5 +84,5 @@
   </table>
   <div class="btn">
-    <a class="btn-normal" href="./class.php"><span>規格一覧に戻る</span></a>
+    <a class="btn-action" href="./class.php"><span class="btn-prev">規格一覧に戻る</span></a>
   </div>
 </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 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	(revision 19909)
@@ -39,6 +39,8 @@
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
 
@@ -47,6 +49,6 @@
       <th>規格名 (登録数)</th>
       <th>分類登録</th>
-      <th>編集</th>
-      <th>削除</th>
+      <th class="edit">編集</th>
+      <th class="delete">削除</th>
       <th>移動</th>
     </tr>
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 19909)
@@ -66,10 +66,12 @@
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_PRODUCTS_URL_PATH}-->'); fnModeSubmit('search','',''); return false;" ><span>検索結果へ戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('disp','','')"><span>表示する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_PRODUCTS_URL_PATH}-->'); fnModeSubmit('search','',''); return false;" ><span class="btn-prev">検索結果へ戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('disp','','')"><span class="btn-next">表示する</span></a></li>
     <!--{if count($arrClassCat) > 0}-->
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('delete','','');"><span>削除する</span></a>
+      <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('delete','','');"><span class="btn-next">削除する</span></a></li>
     <!--{/if}-->
+    </ul>
   </div>
 
@@ -83,5 +85,5 @@
 
   <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></button>
+    <a class="btn-normal" href="javascript:;" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></a>
   </div>
 
@@ -166,5 +168,9 @@
   </table>
 
-  <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>確認ページへ</span></a></div>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', '');"><span>確認ページへ</span></a></li>
+    </ul>
+  </div>
 
   <!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 19909)
@@ -96,7 +96,9 @@
         <!--▲編集テーブルここまで-->
 
-        <div class="btn">
-            <a class="btn-normal" href="javascript:;" onclick="document.form1.action='./review.php'; fnModeSubmit('search','','');" ><span>検索画面に戻る</span></a>
-            <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('complete','','');"><span>この内容で登録する</span></a>
+        <div class="btn-area">
+          <ul>
+            <li><a class="btn-action" href="javascript:;" onclick="document.form1.action='./review.php'; fnModeSubmit('search','','');" ><span class="btn-prev">検索画面に戻る</span></a></li>
+            <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('complete','','');"><span class="btn-next">この内容で登録する</span></a></li>
+          </ul>
         </div>
     </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl	(revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl	(revision 19909)
@@ -27,7 +27,7 @@
 <li<!--{if $tpl_subno == 'upload_csv'}--> class="on"<!--{/if}--> id="navi-products-uploadcsv"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv.php"><span>商品登録CSV</span></a></li>
 <li<!--{if $tpl_subno == 'class'}--> class="on"<!--{/if}--> id="navi-products-class"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/class.php"><span>規格管理</span></a></li>
-<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/category.php"><span>カテゴリ管理</span></a></li>
+<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/category.php"><span>カテゴリ登録</span></a></li>
 <li<!--{if $tpl_subno == 'upload_csv_category'}--> class="on"<!--{/if}--> id="navi-products-upload-csv-category"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/upload_csv_category.php"><span>カテゴリ登録CSV</span></a></li>
-<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/maker.php"><span>メーカー管理</span></a></li>
+<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/maker.php"><span>メーカー登録</span></a></li>
 <li<!--{if $tpl_subno == 'product_rank'}--> class="on"<!--{/if}--> id="navi-products-rank"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/product_rank.php"><span>商品並び替え</span></a></li>
 <li<!--{if $tpl_subno == 'review'}--> class="on"<!--{/if}--> id="navi-products-review"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->products/review.php"><span>レビュー管理</span></a></li>
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 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl	(revision 19909)
@@ -150,5 +150,11 @@
     <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
     </select> 件
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span>この条件で検索する</span></a>
+
+	<div class="btn-area">
+		<ul>
+			<li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span class="btn-next">この条件で検索する</span></a></li>
+		</ul>
+	</div>
+
   </div>
   <!--検索条件設定テーブルここまで-->
@@ -173,6 +179,6 @@
     <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('delete_all','','');">検索結果をすべて削除</a>
     <!--{/if}-->
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('csv','','');">CSV ダウンロード</a>
-    <a class="btn-normal" href="../contents/csv.php?tpl_subno_csv=product">CSV 出力項目設定</a>
+    <a class="btn-tool" href="javascript:;" onclick="fnModeSubmit('csv','','');">CSV ダウンロード</a>
+    <a class="btn-tool" href="../contents/csv.php?tpl_subno_csv=product">CSV 出力項目設定</a>
   </div>
   <!--{include file=$tpl_pager}-->
@@ -198,5 +204,5 @@
     </tr>
     <tr>
-      <th><a href="#" onClick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
+      <th nowrap><a href="#" onClick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
     </tr>
 
@@ -207,11 +213,9 @@
       <td class="id" rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
       <td class="thumbnail" rowspan="2">
-      <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">
-      </td>
+      <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65">      </td>
       <td rowspan="2"><!--{$arrProducts[cnt].product_code_min|h}-->
         <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
           <br />～ <!--{$arrProducts[cnt].product_code_max|h}-->
-        <!--{/if}-->
-      </td>
+        <!--{/if}-->      </td>
       <!--{* 価格 *}-->
       <td rowspan="2" class="right">
@@ -219,6 +223,5 @@
         <!--{if $arrProducts[cnt].price02_min != $arrProducts[cnt].price02_max}-->
           <br />～ <!--{$arrProducts[cnt].price02_max|number_format}-->
-        <!--{/if}-->
-      </td>
+        <!--{/if}-->      </td>
       <td><!--{$arrProducts[cnt].name|h}--></td>
       <!--{* 在庫 *}-->
@@ -228,6 +231,5 @@
         <!--{if $arrProducts[cnt].stock_unlimited_min != $arrProducts[cnt].stock_unlimited_max || $arrProducts[cnt].stock_min != $arrProducts[cnt].stock_max}-->
           <br />～ <!--{if $arrProducts[cnt].stock_unlimited_max}-->無制限<!--{else}--><!--{$arrProducts[cnt].stock_max|number_format}--><!--{/if}-->
-        <!--{/if}-->
-      </td>
+        <!--{/if}-->      </td>
       <!--{* 表示 *}-->
       <!--{assign var=key value=$arrProducts[cnt].status}-->
@@ -254,6 +256,5 @@
         <div id="disp_url<!--{$smarty.section.cnt.iteration}-->" style="display:none">
         <!--{$smarty.const.HTTP_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->
-        </div>
-      </td>
+        </div>      </td>
     </tr>
     <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl	(revision 19909)
@@ -25,10 +25,24 @@
 <input type="hidden" name="mode" value="" />
 <input type="hidden" name="product_id" value="" />
-  <div class="message">
-    登録が完了致しました。<br />
-    <a href="./product.php">→続けて登録を行う</a><br />
-    <a href="?" onclick="fnModeSubmit('pre_edit', 'product_id', '<!--{$arrForm.product_id}-->'); return false;">→この商品の規格を登録する</a>
-  </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="./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>
+			</ul>
+		</div>
+		<div class="btn-area-bottom"></div>
+	</div>
 </form>
+
+
+
 <!--{* オペビルダー用 *}-->
 <!--{if "sfViewAdminOpe"|function_exists === TRUE}-->
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 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	(revision 19909)
@@ -36,5 +36,5 @@
   <!--{* ▼画面左 *}-->
   <div id="products-category-left">
-    <a href="?">▼ホーム</a><br />
+    <a href="?"><img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">&nbsp;ホーム</a><br />
     <!--{section name=cnt loop=$arrTree}-->
       <!--{assign var=level value="`$arrTree[cnt].level`}-->
@@ -54,11 +54,11 @@
         <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false;">
         <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
-          <img src="<!--{$smarty.const.URL_PATH}-->misc/openf.gif">
+          <img src="<!--{$TPL_DIR}-->img/contents/folder_open.gif" alt="フォルダ">
         <!--{else}-->
-          <img src="<!--{$smarty.const.URL_PATH}-->misc/closef.gif">
+          <img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">
         <!--{/if}-->
         <!--{$disp_name|sfCutString:20|h}--></a><br />
       <!--{else}-->
-        <img src="<!--{$smarty.const.URL_PATH}-->misc/closef.gif">
+        <img src="<!--{$TPL_DIR}-->img/contents/folder_close.gif" alt="フォルダ">
         <!--{$disp_name|sfCutString:20|h}--></a><br />
       <!--{/if}-->
@@ -82,52 +82,28 @@
   <div id="products-category-right">
     
-    <!--{if $arrErr.category_name}-->
-    <span class="attention"><!--{$arrErr.category_name}--></span>
-    <!--{/if}-->
-    <input type="text" name="category_name" value="<!--{$arrForm.category_name|h}-->" size="30" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('edit','','');"><span>登録</span></a><span class="attention">（上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
-    
+
+    <div class="now_dir">
+        <!--{if $arrErr.category_name}-->
+        <span class="attention"><!--{$arrErr.category_name}--></span>
+        <!--{/if}-->
+        <input type="text" name="category_name" value="<!--{$arrForm.category_name|h}-->" size="30" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+        <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('edit','','');"><span class="btn-next">登録</span></a><span class="attention">&nbsp;（上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
+    </div>
+
+    <h2><!--{$breadcrumbs}--></h2>
     <!--{if count($arrList) > 0}-->
-<script type="text/javascript">
-// カテゴリーテーブルのイニシャライズ
-$(document).ready(function() {
-    $("#categoryTable").tableDnD({
-	    onDragClass: "movingHandle",
-        onDrop: function(table, row) {
-            var rows = table.tBodies[0].rows;
-            var keys = row.id;
 
-            for (var i = 0; i < rows.length; i++) {
-                if (row.id == rows[i].id) {
-                    keys += "-" + i;
-                    break;
-                }
-            }
-
-            fnModeSubmit('moveByDnD','keySet', keys);
-        },
-        dragHandle: "dragHandle"
-    });
-
-    $("#categoryTable tr").hover(function() {
-        $(this.cells[0]).addClass('activeHandle');
-    }, function() {
-        $(this.cells[0]).removeClass('activeHandle');
-    });
-});
-</script>
     <table class="list" id="categoryTable">
       <tr class="nodrop nodrag">
-	  	<th width="40">移動</th>
         <th>ID</th>
         <th>カテゴリ名</th>
-        <th>編集</th>
-        <th>削除</th>
+        <th class="edit">編集</th>
+        <th class="delete">削除</th>
         <th>移動</th>
       </tr>
+
       <!--{section name=cnt loop=$arrList}-->
       <tr id="<!--{$arrList[cnt].category_id}-->" style="background:<!--{if $arrForm.category_id != $arrList[cnt].category_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;" align="left">
-        <td class="dragHandle">&sect;</td>
-		<td class="center"><!--{$arrList[cnt].category_id}--></td>
+        <td class="center"><!--{$arrList[cnt].category_id}--></td>
         <td>
         <!--{if $arrList[cnt].level != $smarty.const.LEVEL_MAX}-->
@@ -137,5 +113,5 @@
         <!--{/if}-->
         </td>
-        <td align="center">
+        <td class="center">
           <!--{if $arrForm.category_id != $arrList[cnt].category_id}-->
           <a href="?" onclick="fnModeSubmit('pre_edit', 'category_id', <!--{$arrList[cnt].category_id}-->); return false;">編集</a>
@@ -144,8 +120,8 @@
           <!--{/if}-->
         </td>
-        <td align="center">
+        <td class="center">
           <a href="?" onclick="fnModeSubmit('delete', 'category_id', <!--{$arrList[cnt].category_id}-->); return false;">削除</a>
         </td>
-        <td align="center">
+        <td class="center">
         <!--{* 移動 *}-->
         <!--{if $smarty.section.cnt.iteration != 1}-->
@@ -156,4 +132,5 @@
         <!--{/if}-->
         </td>
+
       </tr>
       <!--{/section}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl	(revision 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl	(revision 19909)
@@ -60,6 +60,6 @@
     </tr>
 </table>
-<div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');" name="subm">検索を開始</a>
+<div class="btn-area">
+    <a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');" name="subm"><span class="btn-next">検索を開始</span></a>
 </div>
 
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 19909)
@@ -397,5 +397,5 @@
   <div id="recommend_select" style="display:none">
   <!--{/if}-->
-	<h2>関連商品</h2>
+  <h2>関連商品</h2>
   <table class="form">
     <!--{if $smarty.const.OPTION_RECOMMEND == 1}-->
@@ -414,5 +414,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', '500', '500'); ">変更</a>
+        <a class="btn-normal" href="javascript:;" name="change" onclick="selectAll('category_id'); win03('./product_select.php?no=<!--{$smarty.section.cnt.iteration}-->', 'search', '600', '500'); ">変更</a>
         <!--{assign var=key value="recommend_delete`$smarty.section.cnt.iteration`"}-->
         <input type="checkbox" name="<!--{$key}-->" value="1" />削除<br />
@@ -431,11 +431,13 @@
   </div>
 
-  <div class="btn">
+  <div class="btn-area">
     <!--{if count($arrSearchHidden) > 0}-->
     <!--▼検索結果へ戻る-->
-    <a class="btn-normal" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_PRODUCTS_URL_PATH}-->'); fnModeSubmit('search','',''); return false;"><span>検索画面に戻る</span></a>
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_PRODUCTS_URL_PATH}-->'); fnModeSubmit('search','',''); return false;"><span class="btn-prev">検索画面に戻る</span></a></li>
     <!--▲検索結果へ戻る-->
     <!--{/if}-->
-    <a class="btn-normal" onclick="selectAll('category_id'); document.form1.submit();"><span>確認ページへ</span></a>
+      <li><a class="btn-action" onclick="selectAll('category_id'); document.form1.submit();"><span class="btn-next">確認ページへ</span></a></li>
+    </ul>
   </div>
 </div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl	(revision 19771)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl	(revision 19909)
@@ -22,22 +22,26 @@
  */
 *}-->
+
+
 <!--{* ▼CONTENTS *}-->
-<div id="login-main">
-<form name="form1" id="form1" method="post" action="login.php">
-  <!--{* Enter キーで submit するためのダミーボタン *}-->
-  <input type="submit" value="LOGIN" style="position: absolute; top: -1000" />
-  <h1>EC-CUBE 管理画面</h1>
-  <div id="login-form">
-    <label for="login_id">ID</label>
-    <input type="text" name="login_id" size="20" class="box25" />
-    <label for="password">PASSWORD</label>
-    <input type="password" name="password" size="20" class="box25" />
-    <div class="btn">
-      <a class="btn-normal" href="javascript:;" onclick="document.form1.submit();"><span>LOGIN</span></a>
-    </div>
-  </div>
-  <div id="login-address">Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</div>
-</form>
-</div>
+	<div id="login-form-wrap">
+
+
+		<div id="login-form">
+	<form name="form1" id="form1" method="post" action="login.php">
+			<h1><img src="<!--{$TPL_DIR}-->img/contents/admin_login_logo.jpg" width="140" height="150" alt="EC-CUBE管理画面" /></h1>
+			<div id="input-form">
+				<p><label for="login_id">ID</label></p>
+				<input type="text" name="login_id" size="20" class="box25" />
+				<p><label for="password">PASSWORD</label></p>
+				<input type="password" name="password" size="20" class="box25" />
+				<p><a class="btn-tool-format" href="javascript:;" onclick="document.form1.submit();"><span>LOGIN</span></a></p>
+			</div>
+	</form>
+		</div>
+
+	</div>
+	<div id="copyright">Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</div>
+
 <!--{* エラーメッセージここから *}-->
 <!--{if $tpl_error}-->
@@ -56,7 +60,10 @@
 <!--{* ▲CONTENTS *}-->
 
-<SCRIPT Language="JavaScript">
+<script type="text/javascript">
 <!--
 document.form1.login_id.focus();
+$(function() {
+  $('#form1').append('<input type="submit" style="position: absolute; top: -1000px" />');
+});
 // -->
-</SCRIPT>
+</script>
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 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl	(revision 19909)
@@ -41,5 +41,5 @@
 <input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
 <div id="design" class="contents-main">
-  <p style="margin-bottom: 20px">
+  <p class="remark">
     テンプレートを選択し、「この内容で登録する」ボタンを押すと、<br />
     選択したテンプレートへデザインを変更することが出来ます。
@@ -51,5 +51,5 @@
       <th>保存先</th>
       <th>ダウンロード</th>
-      <th>削除</th>
+      <th class="delete">削除</th>
     </tr>
     <!--{foreach from=$templates item=tpl}-->
@@ -64,6 +64,8 @@
     <!--{/foreach}-->
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="submitRegister();return false;"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="submitRegister();return false;"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </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 19835)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19909)
@@ -55,5 +55,5 @@
              <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
              <div>
-                 <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, bloc_html, 50, 13, html_area_row)">拡大</a>
+                 <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, bloc_html, 50, 13, 'html_area_row')">拡大</a>
              </div>
          </td>
@@ -61,6 +61,6 @@
  </table>
     <div class="btn">
-        <a class='button' href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','','');"><span>登録する</span></a>
-        <a class='button' href="javascript:;" name='preview' onclick="fnFormModeSubmit('form_bloc','preview','','');"><span>プレビュー</span></a>
+        <a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','','');"><span class="btn-next">登録する</span></a>
+        <a class="btn-normal" href="javascript:;" name='preview' onclick="fnFormModeSubmit('form_bloc','preview','','');"><span>プレビュー</span></a>
     </div>
     <!--{* ▲ブロック設定 *}-->
@@ -69,17 +69,18 @@
     <h2>編集可能ブロック</h2>
     <div class="btn addnew">
-        <a class='button' href="?"><span>ブロックを新規入力</span></a>
+        <a class="btn-normal" href="?"><span>ブロックを新規入力</span></a>
     </div>
-    <table class="list center">
+    <table class="list">
         <tr>
-            <th>名称</th><th>編集</th><th>削除</th>
+            <th>名称</th><th class="edit">編集</th>
+            <th class="delete">削除</th>
         </tr>
         <!--{foreach key=key item=item from=$arrBlocList}-->
         <tr style="background-color:<!--{if $item.bloc_id == $bloc_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
             <td><!--{$item.bloc_name}--></td>
-            <td>
+            <td class="center">
                 <a href="?bloc_id=<!--{$item.bloc_id}-->&amp;device_type_id=<!--{$device_type_id}-->" >編集</a>
             </td>
-            <td>
+            <td class="center">
                 <!--{if $item.deletable_flg == 1}-->
                     <a href="javascript:;" onclick="fnFormModeSubmit('form_bloc','delete','bloc_id',this.name.substr(3));">削除</a>
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 19879)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19909)
@@ -288,6 +288,6 @@
         </table>
         <div class="btn">
-            <a class='button' href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','confirm','','');"><span>登録する</span></a>
-            <a class='button' href="javascript:;" name='preview' onclick="doPreview();"<!--{if $page_id == "0" or $exists_page == "0" }--> DISABLED<!--{/if}-->><span>プレビュー</span></a>
+            <a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','confirm','','');"><span class="btn-next">登録する</span></a>
+            <a class="btn-normal" href="javascript:;" name='preview' onclick="doPreview();"<!--{if $page_id == "0" or $exists_page == "0" }--> DISABLED<!--{/if}-->><span>プレビュー</span></a>
         </div>
     </div>
@@ -319,5 +319,5 @@
             </tr>
         </table>
-        <div class="btn"><a class='button' href="javascript:;" onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_bloc','','');"><span>ブロックを新規入力</span></a></div>
+        <div class="btn"><a class="btn-normal" href="javascript:;" onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_bloc','','');"><span>ブロックを新規入力</span></a></div>
     </div>
     <!--{* ▲未使用ブロックここまで *}-->
@@ -327,13 +327,13 @@
     <h2 style="clear: both;">編集可能ページ一覧</h2>
     <div class="btn addnew">
-        <a class='button' href="javascript:;" onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>ページを新規入力</span></a>
+        <a class="btn-normal" href="javascript:;" onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>ページを新規入力</span></a>
     </div>
-    <table class="list center">
-        <tr>
-            <th>名称</th>
-            <th><strong>レイアウト</strong></th>
-            <th>ページ詳細</th>
-            <th>削除</th>
-        </tr>
+    <table class="list">
+    <tr>
+      <th>名称</th>
+      <th class="edit">レイアウト</th>
+      <th class="edit center"><strong>ページ詳細</strong></th>
+      <th class="delete center">削除</th>
+    </tr>
     <!--{foreach key=key item=item from=$arrEditPage}-->
         <tr style="background-color:<!--{if $item.page_id == $page_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
@@ -341,13 +341,13 @@
                 <!--{$item.page_name}-->
             </td>
-            <td>
+            <td class="center">
                 <a href="?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="main_edit.php?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="#" onclick="fnTargetSelf(); fnFormModeSubmit('form1','delete','page_id','<!--{$item.page_id|h}-->'); return false;">削除</a>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	(revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	(revision 19909)
@@ -23,5 +23,5 @@
 *}-->
 <ul class="level1">
-  <li><a><span>PC</span></a>
+  <li><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>PC</span></a>
     <ul class="level2">
       <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>レイアウト設定</span></a></li>
@@ -34,5 +34,5 @@
     </ul>
   </li>
-  <li><a><span>モバイル</span></a>
+  <li><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>モバイル</span></a>
     <ul class="level2">
       <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>レイアウト設定</span></a></li>
@@ -45,5 +45,5 @@
     </ul>
   </li>
-  <li><a><span>スマートフォン</span></a>
+  <li><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>スマートフォン</span></a>
     <ul class="level2">
       <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
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 19835)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19909)
@@ -44,11 +44,13 @@
         <input type="hidden" name="area_row" value="<!--{$area_row}-->" />
         <div class="btn">
-          <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, css, 50, 30, area_row)">拡大</a>
+          <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, 'css', 50, 30, 'area_row')">拡大</a>
         </div>
       </td>
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form_css','confirm','','');"><span>この内容で登録する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form_css','confirm','','');"><span class="btn-next">この内容で登録する</span></a></li>
+    </ul>
   </div>
   <!--▲CSS設定　ここまで-->
@@ -59,9 +61,9 @@
     <a class="btn-normal" href="?"><span>CSSを新規入力</span></a>
   </div>
-  <table class="list center" id="design-css-list">
+  <table class="list" id="design-css-list">
     <tr>
       <th class="name">ファイル名</th>
-      <th class="menu">編集</th>
-      <th class="action">削除</th>
+      <th class="menu edit">編集</th>
+      <th class="action delete">削除</th>
     </tr>
     <!--{if count($arrCSSList) > 0}-->
@@ -69,8 +71,8 @@
     <tr>
 			<td><!--{$item.file_name}--></td>
-      <td style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
+      <td class="center" style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
         <a href="?css_name=<!--{$item.css_name}-->&amp;device_type_id=<!--{$device_type_id}-->">編集</a>
       </td>
-      <td style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
+      <td class="center" style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
         <a href="javascript:;" onclick="fnFormModeSubmit('form_css','delete','css_name','<!--{$item.css_name}-->');">削除</a>
       </td>
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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl	(revision 19909)
@@ -51,9 +51,9 @@
     <textarea name="header" rows="<!--{$header_row}-->" wrap="off" style="width: 100%;"><!--{$header_data|smarty:nodefaults}--></textarea>
     <div class="btn">
-      <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, header, 50, 13, header_row)"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></a>
+      <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, 'header', 50, 13, 'header_row')"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></a>
     </div>
     <div class="btn">
-      <a class='button' href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_header','confirm','','');"><span>登録</span></a>
-      <a class='button' href="javascript:;" name='preview' onclick="lfnSetBrowser('form_header', 'browser_type'); fnFormModeSubmit('form_header','preview','','');"><span>プレビュー</span></a>
+      <a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_header','confirm','','');"><span class="btn-next">登録</span></a>
+      <a class="btn-normal" href="javascript:;" name='preview' onclick="lfnSetBrowser('form_header', 'browser_type'); fnFormModeSubmit('form_header','preview','','');"><span>プレビュー</span></a>
     </div>
   </form>
@@ -81,13 +81,13 @@
     <textarea name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{$footer_data|smarty:nodefaults}--></textarea>
     <div class="btn">
-      <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, footer, 50, 13, footer_row)"><span><!--{if $footer_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></a>
+      <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, 'footer', 50, 13, 'footer_row')"><span><!--{if $footer_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></a>
     </div>
     <div class="btn">
-      <a class='button' href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_footer','confirm','','');"><span>登録</span></a>
-      <a class='button' href="javascript:;" name='preview' onclick="lfnSetBrowser('form_footer', 'browser_type'); fnFormModeSubmit('form_footer','preview','','');"><span>プレビュー</span></a>
+      <a class="btn-action" href="javascript:;" name='subm' onclick="fnFormModeSubmit('form_footer','confirm','','');"><span class="btn-next">登録</span></a>
+      <a class="btn-normal" href="javascript:;" name='preview' onclick="lfnSetBrowser('form_footer', 'browser_type'); fnFormModeSubmit('form_footer','preview','','');"><span>プレビュー</span></a>
     </div>
   </form>
   <!--{* ▲フッター編集ここまで *}-->
-
+</div>
 <script type="text/javascript">
   /* ブラウザの種類をセットする */
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 19835)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 19909)
@@ -95,5 +95,5 @@
                     <textarea 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}-->" />
-                    <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></a>
+                    <a class="btn-normal" href="javascript:;" onclick="ChangeSize(this, 'tpl_data', 50, 13, 'html_area_row')"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></a>
                 </div>
             </td>
@@ -101,9 +101,9 @@
     </table>
 
+
     <div class="btn">
-        <a class='button' href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','confirm','','');"><span>登録する</span></a>
-        <a class='button' href="javascript:;" name='preview' onclick="doPreview(); "><span>プレビュー</span></a>
+      <a class="btn-action" href="javascript:;" name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','confirm','','');"><span class="btn-next">登録する</span></a>
+      <a class="btn-normal" href="javascript:;" name='preview' onclick="doPreview(); "><span>プレビュー</span></a>
     </div>
-
 
     <h2>編集可能ページ一覧</h2>
@@ -139,4 +139,3 @@
         <a class="btn-normal" href="?"><span>ページを新規入力</span></a>
     </div>
-
 </form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/mail.tpl	(revision 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/mail.tpl	(revision 19909)
@@ -86,7 +86,9 @@
     </tr>
   </table>
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_URL_PATH}-->'); fnModeSubmit('search','',''); return false;"><span>検索結果へ戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', '');"><span>送信内容を確認</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_URL_PATH}-->'); fnModeSubmit('search','',''); return false;"><span class="btn-prev">検索結果へ戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', '');"><span class="btn-next">送信内容を確認</span></a></li>
+    </ul>
   </div>
 </div>
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 19835)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19909)
@@ -32,5 +32,5 @@
     <!--{foreach key=key item=item from=$arrORDERSTATUS}-->
       <a
-        class="button"
+        class="btn-normal"
         style="padding-right: 1em;"
         <!--{if $key != $SelectedStatus}-->
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 19909)
@@ -98,5 +98,5 @@
         <tr>
             <th>帳票出力</th>
-            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票出力</a></td>
+            <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','600','800'); return false;">帳票出力</a></td>
         </tr>
         <!--{/if}-->
@@ -218,5 +218,5 @@
                 <!--{assign var=key value="order_addr02"}-->
                 <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}-->" />
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60 addbox" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
             </td>
         </tr>
@@ -239,76 +239,10 @@
     <!--▲お客様情報ここまで-->
 
-    <!--▼お届け先情報ここから-->
-    <h2>お届け先情報
-        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">上記お客様情報をコピー</a>
-    </h2>
-    <table class="form">
-        <tr>
-            <th>お名前</th>
-            <td>
-                <!--{assign var=key1 value="deliv_name01"}-->
-                <!--{assign var=key2 value="deliv_name02"}-->
-                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
-                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
-            </td>
-        </tr>
-        <tr>
-            <th>お名前(カナ)</th>
-            <td>
-                <!--{assign var=key1 value="deliv_kana01"}-->
-                <!--{assign var=key2 value="deliv_kana02"}-->
-                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
-                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
-            </td>
-        </tr>
-        <tr>
-            <th>TEL</th>
-            <td>
-                <!--{assign var=key1 value="deliv_tel01"}-->
-                <!--{assign var=key2 value="deliv_tel02"}-->
-                <!--{assign var=key3 value="deliv_tel03"}-->
-                <span class="attention"><!--{$arrErr[$key1]}--></span>
-                <span class="attention"><!--{$arrErr[$key2]}--></span>
-                <span class="attention"><!--{$arrErr[$key3]}--></span>
-                <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
-                <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
-                <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
-            </td>
-        </tr>
-        <tr>
-            <th>住所</th>
-            <td>
-                <!--{assign var=key1 value="deliv_zip01"}-->
-                <!--{assign var=key2 value="deliv_zip02"}-->
-                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-                〒
-                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
-                 -
-                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
-                <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URL_PATH}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01');">住所入力</a><br />
-                <!--{assign var=key value="deliv_pref"}-->
-                <span class="attention"><!--{$arrErr[$key]}--></span>
-                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-                    <option value="" selected="">都道府県を選択</option>
-                    <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
-                </select><br />
-                <!--{assign var=key value="deliv_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 />
-                <!--{assign var=key value="deliv_addr02"}-->
-                <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}-->" />
-            </td>
-        </tr>
-    </table>
-    <!--▲お届け先情報ここまで-->
-
     <!--▼受注商品情報ここから-->
     <h2 id="order_products">
-        <a name="order_products">受注商品情報</a>
+        <a name="order_products"></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', '500', '500'); ">商品の追加</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'); ">商品の追加</a>
     </h2>
     <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
@@ -339,5 +273,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', '500', '500');">変更</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', '600', '500');">変更</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');">削除</a>
@@ -356,9 +290,9 @@
         <!--{/section}-->
         <tr>
-            <th colspan="5" class="right">小計</th>
+            <th class="column right" colspan="5"">小計</th>
             <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
         </tr>
         <tr>
-            <th colspan="5" class="right">値引</th>
+            <th class="column right" colspan="5"">値引</th>
             <td class="right">
                 <!--{assign var=key value="discount"}-->
@@ -369,5 +303,5 @@
         </tr>
         <tr>
-            <th colspan="5" class="right">送料</th>
+            <th class="column right" colspan="5"">送料</th>
             <td class="right">
                 <!--{assign var=key value="deliv_fee"}-->
@@ -378,5 +312,5 @@
         </tr>
         <tr>
-            <th colspan="5" class="right">手数料</th>
+            <th class="column right" colspan="5"">手数料</th>
             <td class="right">
                 <!--{assign var=key value="charge"}-->
@@ -387,5 +321,5 @@
         </tr>
         <tr>
-            <th colspan="5" class="right">合計</th>
+            <th class="column right" colspan="5"">合計</th>
             <td class="right">
                 <span class="attention"><!--{$arrErr.total}--></span>
@@ -394,5 +328,5 @@
         </tr>
         <tr>
-            <th colspan="5" class="right">お支払い合計</th>
+            <th class="column right" colspan="5"">お支払い合計</th>
             <td class="right">
                 <span class="attention"><!--{$arrErr.payment_total}--></span>
@@ -403,5 +337,5 @@
         <!--{if $smarty.const.USE_POINT !== false}-->
             <tr>
-                <th colspan="5" class="right">使用ポイント</th>
+                <th class="column right" colspan="5"">使用ポイント</th>
                 <td class="right">
                     <!--{assign var=key value="use_point"}-->
@@ -413,6 +347,6 @@
             <!--{if $arrForm.birth_point.value > 0}-->
             <tr>
-                <th colspan="5" class="right">お誕生日ポイント</th>
-                <td class="right">
+                <th class="column" colspan="5"">お誕生日ポイント</th>
+                <td class="right right">
                     <!--{$arrForm.birth_point.value|number_format}-->
                      pt
@@ -421,5 +355,5 @@
             <!--{/if}-->
             <tr>
-                <th colspan="5" class="right">加算ポイント</th>
+                <th class="column right" colspan="5"">加算ポイント</th>
                 <td class="right">
                     <!--{$arrForm.add_point.value|number_format|default:0}-->
@@ -430,32 +364,100 @@
     </table>
 
+    <!--▼お届け先情報ここから-->
+    <h2>お届け先情報
+        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お客様情報へお届けする</a>
+        <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お届け先を新規追加</a>
+        <a class="btn-normal" href="javascript:;" name="add_product">複数のお届け先を指定する</a>
+    </h2>
+
+    <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
+    <!--{assign var=shipping_id value=$shippingItem.shipping_id}-->
+    <h3>お届け先<!--{$smarty.foreach.shippingItem.iteration}--></h3>
+    <table class="list" id="order-edit-products">
+      <tr>
+        <th class="id">商品コード</th>
+        <th class="name">商品名/規格1/規格2</th>
+        <th class="price">単価</th>
+        <th class="qty">数量</th>
+      </tr>
+      <!--{foreach item=item from=$shippingItem.shipment_item}-->
+      <tr>
+        <td><!--{$item.product_code|h}--></td>
+        <td>
+            <!--{$item.productsClass.name|h}-->/<!--{$item.productsClass.classcategory_name1|default:"(なし)"|h}-->/<!--{$item.productsClass.classcategory_name2|default:"(なし)"|h}-->
+        </td>
+        <td class="right">
+            <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円
+        </td>
+        <td class="right"><!--{$item.quantity}--></td>
+        <!--{* XXX 購入小計と誤差が出るためコメントアウト
+        <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td>
+        *}-->
+      </tr>
+      <!--{/foreach}-->
     <table class="form">
         <tr>
-            <th>お支払方法<br /><span class="attention">(お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</span></th>
-            <td>
-                <!--{assign var=key value="payment_id"}-->
-                <span class="attention"><!--{$arrErr[$key]}--></span>
-                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="fnModeSubmit('payment','anchor_key','order_products');">
-                    <option value="" selected="">選択してください</option>
-                    <!--{html_options options=$arrPayment selected=$arrForm[$key].value}-->
-                </select>
-            </td>
-        </tr>
-
-        <!--{if $arrForm.payment_info|@count > 0}-->
-        <tr>
-            <th><!--{$arrForm.payment_type}-->情報</th>
-            <td>
-                <!--{foreach key=key item=item from=$arrForm.payment_info}-->
-                <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
-                <!--{/foreach}-->
-            </td>
-        </tr>
-        <!--{/if}-->
-
+            <th>お名前</th>
+            <td>
+                <!--{assign var=key1 value="shipping_name01`$shipping_id`"}-->
+                <!--{assign var=key2 value="shipping_name02`$shipping_id`"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>お名前(カナ)</th>
+            <td>
+                <!--{assign var=key1 value="shipping_kana01`$shipping_id`"}-->
+                <!--{assign var=key2 value="shipping_kana02`$shipping_id`"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>TEL</th>
+            <td>
+                <!--{assign var=key1 value="shipping_tel01`$shipping_id`"}-->
+                <!--{assign var=key2 value="shipping_tel02`$shipping_id`"}-->
+                <!--{assign var=key3 value="shipping_tel03`$shipping_id`"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <span class="attention"><!--{$arrErr[$key3]}--></span>
+                <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+                <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
+                <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+            </td>
+        </tr>
+        <tr>
+            <th>住所</th>
+            <td>
+                <!--{assign var=key1 value="shipping_zip01`$shipping_id`"}-->
+                <!--{assign var=key2 value="shipping_zip02`$shipping_id`"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                〒
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                 -
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
+                <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URL_PATH}-->', 'shipping_zip01', 'shipping_zip02', 'shipping_pref', 'shipping_addr01');">住所入力</a><br />
+                <!--{assign var=key value="shipping_pref`$shipping_id`"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">都道府県を選択</option>
+                    <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+                </select><br />
+                <!--{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 />
+                <!--{assign var=key value="shipping_addr02`$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}-->" />
+            </td>
+        </tr>
         <tr>
             <th>お届け時間</th>
             <td>
-                <!--{assign var=key value="deliv_time_id"}-->
+                <!--{assign var=key value="deliv_time_id`$shipping_id`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
                 <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
@@ -468,5 +470,5 @@
             <th>お届け日</th>
             <td>
-                <!--{assign var=key value="deliv_date"}-->
+                <!--{assign var=key value="deliv_date`$shipping_id`"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>
                 <input
@@ -479,4 +481,34 @@
             </td>
         </tr>
+
+    </table>
+    <!--{/foreach}-->
+    <!--▲お届け先情報ここまで-->
+
+
+    <table class="form">
+        <tr>
+            <th>お支払方法<br /><span class="attention">(お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</span></th>
+            <td>
+                <!--{assign var=key value="payment_id"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="fnModeSubmit('payment','anchor_key','order_products');">
+                    <option value="" selected="">選択してください</option>
+                    <!--{html_options options=$arrPayment selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
+
+        <!--{if $arrForm.payment_info|@count > 0}-->
+        <tr>
+            <th><!--{$arrForm.payment_type}-->情報</th>
+            <td>
+                <!--{foreach key=key item=item from=$arrForm.payment_info}-->
+                <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
+                <!--{/foreach}-->
+            </td>
+        </tr>
+        <!--{/if}-->
+
         <tr>
             <th>メモ</th>
@@ -490,9 +522,11 @@
     <!--▲受注商品情報ここまで-->
 
-    <div class="btn">
+    <div class="btn-area">
+      <ul>
         <!--{if count($arrSearchHidden) > 0}-->
-        <a class="btn-normal" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_URL_PATH}-->'); fnModeSubmit('search','',''); return false;"><span>検索画面に戻る</span></a>
+        <li><a class="btn-action" href="javascript:;" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_URL_PATH}-->'); fnModeSubmit('search','',''); return false;"><span class="btn-prev">検索画面に戻る</span></a></li>
         <!--{/if}-->
-        <a class="btn-normal" href="javascript:;" onclick="return fnFormConfirm();"><span>この内容で登録する</span></a>
+        <li><a class="btn-action" href="javascript:;" onclick="return fnFormConfirm();"><span class="btn-next">この内容で登録する</span></a></li>
+      </ul>
     </div>
 
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 19909)
@@ -270,5 +270,9 @@
         <!--{html_options options=$arrPageMax selected=$arrForm[$key].value}-->
         </select> 件
-        <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span>この条件で検索する</span></a>
+        <div class="btn-area">
+          <ul>
+            <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('search_form', 'search', '', '');"><span class="btn-next">この条件で検索する</span></a></li>
+          </ul>
+        </div>
     </div>
     <!--検索条件設定テーブルここまで-->
@@ -314,7 +318,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>編集</th>
+            <th class="edit">編集</th>
             <th>メール</th>
-            <th>削除</th>
+            <th class="delete">削除</th>
         </tr>
 
@@ -332,5 +336,5 @@
             <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','500','650'); return false;"><span class="icon_class">個別出力</span></a>
+                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','600','650'); return false;"><span class="icon_class">個別出力</span></a>
             </td>
             <td class="center"><a href="?" onclick="fnChangeAction('<!--{$smarty.const.ADMIN_ORDER_EDIT_URL_PATH}-->'); 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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 19909)
@@ -123,6 +123,8 @@
   </table>
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="return lfPopwinSubmit('form1');"><span>この内容で作成する</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="return lfPopwinSubmit('form1');"><span class="btn-next">この内容で作成する</span></a></li>
+    </ul>
   </div>
 
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_confirm.tpl	(revision 19785)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_confirm.tpl	(revision 19909)
@@ -45,7 +45,9 @@
   </table>
 
-  <div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnModeSubmit('return', '', '');"><span>前のページへ戻る</span></a>
-    <a class="btn-normal" href="javascript:;" onclick="return confirm('この内容でメールを送信しても宜しいですか');"><span>メール送信</span></a>
+  <div class="btn-area">
+    <ul>
+      <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('return', '', '');"><span class="btn-prev">前のページへ戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="return confirm('この内容でメールを送信しても宜しいですか');"><span class="btn-next">メール送信</span></a></li>
+    </ul>
   </div>
 </div>
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 19805)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 19909)
@@ -147,6 +147,8 @@
     </tr>
 </table>
-<div class="btn">
-    <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');"><span>検索を開始</span></button>
+<div class="btn-area">
+  <ul>
+    <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'search', '', '');"><span class="btn-next">検索を開始</span></a></li>
+  </ul>
 </div>
 </form>
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 19833)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl	(revision 19909)
@@ -23,10 +23,24 @@
 *}-->
 <!--{* ▼CONTENTS *}-->
-<div id="login-error">
-  <div class="message">
-    <!--{$tpl_error}-->
-  </div>
-  <div class="btn">
-    <a class="btn-normal" href="<!--{$smarty.const.ADMIN_LOGIN_URL_PATH}-->"><span>ログインページにページに戻る</span></button>
+<div id="error-wrap">
+  <div id="error">
+    <div class="logo">
+      <img src="<!--{$TPL_DIR}-->img/contents/logo_resize.jpg" width="99" height="15" alt="EC-CUBE" />
+    </div>
+    <div class="error-top"></div>
+    <div class="contents">
+      <div class="message">
+        <!--{$tpl_error}-->
+      </div>
+    </div>
+    <div class="btn-area-top"></div>
+    <div class="btn-area">
+      <ul>
+        <li>
+          <a class="btn-action" href="<!--{$smarty.const.ADMIN_LOGIN_URL_PATH}-->"><span class="btn-prev">ログインページに戻る</span></a>
+        </li>
+      </ul>
+    </div>
+    <div class="btn-area-bottom"></div>
   </div>
 </div>
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 19864)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 19909)
@@ -500,4 +500,28 @@
 
         return $arrRet;
+    }
+
+    /**
+     * カテゴリツリーを走査し, パンくずリスト用の配列を生成する.
+     *
+     * @param array カテゴリの配列
+     * @param integer $parent 上位カテゴリID
+     * @param array パンくずリスト用の配列
+     * @result void
+     * @see sfGetCatTree()
+     */
+    function findTree(&$arrTree, $parent, &$result) {
+        if ($result[count($result) - 1]['parent_category_id'] === 0) {
+            return;
+        } else {
+            foreach ($arrTree as $key => $val) {
+               if ($val['category_id'] == $parent) {
+                    $result[] = array('category_id' => $val['category_id'],
+                                      'parent_category_id' => (int) $val['parent_category_id'],
+                                      'category_name' => $val['category_name']);
+                    $this->findTree($arrTree, $val['parent_category_id'], $result);
+               }
+            }
+        }
     }
 
Index: branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/upgrade/LC_Page_Upgrade_Download.php	(revision 19909)
@@ -362,5 +362,5 @@
         $objQuery = new SC_Query;
         $arrInsert = array(
-           'id'           => $objQuery->nextVal('dtb_module_update_logs_log_id'),
+           'log_id'           => $objQuery->nextVal('dtb_module_update_logs_log_id'),
             'module_id'   => $objRet->product_id,
             'buckup_path' => $arrLog['buckup_path'],
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php	(revision 19909)
@@ -98,6 +98,8 @@
 
             // ファイル表示
+
         case 'view':
             // エラーチェック
+
             $arrErr = $this->lfErrorCheck();
 
@@ -105,8 +107,5 @@
                 // 選択されたファイルがディレクトリなら移動
                 if(is_dir($_POST['select_file'])) {
-                    ///$now_dir = $_POST['select_file'];
-                    // ツリー遷移用のjavascriptを埋め込む
-                    $arrErr['select_file'] = "※ ディレクトリを表示することは出来ません。<br/>";
-
+                    $now_dir = $this->lfCheckSelectDir($_POST['select_file']);
                 } else {
                     // javascriptで別窓表示(テンプレート側に渡す)
@@ -114,7 +113,10 @@
                     $file_url = ereg_replace(USER_REALDIR, "", $_POST['select_file']);
                     $this->tpl_onload = "win02('./file_view.php?file=". $file_url ."', 'user_data', '600', '400');";
+                    $now_dir = $this->lfCheckSelectDir(dirname($_POST['select_file']));
                 }
             }
-            break;
+
+            break;
+            
             // ファイルダウンロード
         case 'download':
@@ -188,5 +190,16 @@
         $this->tpl_is_top_dir = $is_top_dir;
         $this->tpl_parent_dir = $parent_dir;
-        $this->tpl_now_dir = $now_dir;
+        // TODO JSON で投げて, フロント側で処理した方が良い？
+        $this->tpl_now_dir = "";
+        $arrNowDir = preg_split('/\//', str_replace(HTML_REALDIR, '', $now_dir));
+        for ($i = 0; $i < count($arrNowDir); $i++) {
+            if (!empty($arrNowDir)) {
+                $this->tpl_now_dir .= $arrNowDir[$i];
+                if ($i < count($arrNowDir) - 1) {
+                     // フロント側で &gt; へエスケープするため, ここでは > を使用
+                    $this->tpl_now_dir .= ' > ';
+                }
+            }
+        }
         $this->tpl_now_file = basename($now_dir);
         $this->arrErr = isset($arrErr) ? $arrErr : "";
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php	(revision 19908)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileView.php	(revision 19909)
@@ -92,6 +92,6 @@
         } else {
             SC_Response_Ex::sendRedirect(USER_URL . $_GET['file']);
-            exit;
         }
+        exit;
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php	(revision 19909)
@@ -44,5 +44,4 @@
     function init() {
         parent::init();
-        $this->tpl_mainpage = 'contents/recomend_search.tpl';
         $this->tpl_mainno = 'contents';
         $this->tpl_subnavi = '';
@@ -143,4 +142,6 @@
         // カテゴリ取得
         $this->arrCatList = $objDb->sfGetCategoryList();
+
+        $this->setTemplate('contents/recomend_search.tpl');
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php	(revision 19909)
@@ -47,4 +47,5 @@
         parent::init();
         $this->tpl_mainpage = 'home.tpl';
+        $this->tpl_subtitle = 'ホーム';
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php	(revision 19833)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php	(revision 19909)
@@ -149,4 +149,5 @@
         // HIDDEN用に配列を渡す。
         $this->arrHidden = array_merge((array)$this->arrHidden, (array)$this->objUpFile->getHiddenFileList());
+        $this->setTemplate($this->tpl_mainpage);
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php	(revision 19909)
@@ -132,4 +132,18 @@
         $this->arrProductsList =
             $this->lfGetProduct($this->arrForm['parent_category_id']);
+        $arrBread = array();
+        $objDb->findTree($this->arrTree, $this->arrForm['parent_category_id'], $arrBread);
+        $this->breadcrumbs = "ホーム";
+        // TODO JSON で投げて, フロント側で処理した方が良い？
+        for ($i = count($arrBread) - 1; $i >= 0; $i--) {
+            // フロント側で &gt; へエスケープするため, ここでは > を使用
+            if ($i === count($arrBread) - 1) {
+                $this->breadcrumbs .= ' > ';
+            }
+            $this->breadcrumbs .= $arrBread[$i]['category_name'];
+            if ($i > 0) {
+                $this->breadcrumbs .= ' > ';
+            }
+        }
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php	(revision 19909)
@@ -253,4 +253,18 @@
         $this->arrList = $this->lfGetCat($this->arrForm['parent_category_id']);
         $this->arrTree = $objDb->sfGetCatTree($this->arrForm['parent_category_id']);
+        $arrBread = array();
+        $objDb->findTree($this->arrTree, $this->arrForm['parent_category_id'], $arrBread);
+        $this->breadcrumbs = "ホーム";
+        // TODO JSON で投げて, フロント側で処理した方が良い？
+        for ($i = count($arrBread) - 1; $i >= 0; $i--) {
+            // フロント側で &gt; へエスケープするため, ここでは > を使用
+            if ($i === count($arrBread) - 1) {
+                $this->breadcrumbs .= ' > ';
+            }
+            $this->breadcrumbs .= $arrBread[$i]['category_name'];
+            if ($i > 0) {
+                $this->breadcrumbs .= ' > ';
+            }
+        }
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Maker.php	(revision 19909)
@@ -26,5 +26,5 @@
 
 /**
- * メーカー管理 のページクラス.
+ * メーカー登録 のページクラス.
  *
  * @package Page
@@ -47,5 +47,5 @@
         $this->tpl_subnavi = 'products/subnavi.tpl';
         $this->tpl_subno = 'maker';
-        $this->tpl_subtitle = 'メーカー管理';
+        $this->tpl_subtitle = 'メーカー登録';
         $this->tpl_mainno = 'products';
     }
Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php	(revision 19909)
@@ -149,4 +149,5 @@
         // カテゴリ取得
         $this->arrCatList = $objDb->sfGetCategoryList();
+        $this->setTemplate($this->tpl_mainpage);
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Pdf.php	(revision 19909)
@@ -147,4 +147,5 @@
             break;
         }
+        $this->setTemplate($this->tpl_mainpage);
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	(revision 19805)
+++ branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php	(revision 19909)
@@ -205,4 +205,5 @@
         // カテゴリ取得
         $this->arrCatList = $objDb->sfGetCategoryList();
+        $this->setTemplate($this->tpl_mainpage);
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 19834)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 19909)
@@ -390,5 +390,5 @@
         $this->arrCatList = $objDb->sfGetCategoryList();
 
-        $this->arrCampaignList = $this->lfGetCampaignList($objQuery);
+        // $this->arrCampaignList = $this->lfGetCampaignList($objQuery);
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	(revision 19833)
+++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	(revision 19909)
@@ -143,4 +143,5 @@
             }
         }
+        $this->setTemplate($this->tpl_mainpage);
     }
 
Index: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 19833)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Input.php	(revision 19909)
@@ -96,4 +96,5 @@
             break;
         }
+        $this->setTemplate($this->tpl_mainpage);
     }