Index: /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_CSS.php	(revision 19715)
@@ -50,5 +50,5 @@
         $this->tpl_subno = "css";
         $this->tpl_mainno = "design";
-        $this->tpl_subtitle = 'CSS編集';
+        $this->tpl_subtitle = 'CSS設定';
     }
 
Index: /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Header.php	(revision 19715)
@@ -50,5 +50,5 @@
         $this->tpl_subno = "header";
         $this->tpl_mainno = "design";
-        $this->tpl_subtitle = 'ヘッダー･フッター編集';
+        $this->tpl_subtitle = 'ヘッダー/フッター設定';
     }
 
Index: /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_MainEdit.php	(revision 19715)
@@ -104,5 +104,5 @@
         // page_id が指定されている場合にはテンプレートデータの取得
         if (is_numeric($page_id) and $page_id != '') {
-            $this->lfGetPageData($page_id, $objView);
+            $this->lfGetPageData($page_id, $device_type_id, $objView);
         }
 
Index: /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	(revision 19713)
+++ /branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Up_Down.php	(revision 19715)
@@ -50,5 +50,5 @@
 	    $this->tpl_subno    = 'up_down';
 	    $this->tpl_mainno   = "design";
-	    $this->tpl_subtitle = 'アップロード/ダウンロード';
+	    $this->tpl_subtitle = 'テンプレート追加';
 	    $this->arrErr  = array();
 	    $this->arrForm = array();
Index: /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_TemplateInput.php	(revision 19715)
@@ -47,4 +47,5 @@
         $this->tpl_mainno = 'mail';
         $this->tpl_subnavi = 'mail/subnavi.tpl';
+        $this->tpl_subtitle = 'テンプレート設定';
         $this->tpl_subno = "template";
         $masterData = new SC_DB_MasterData_Ex();
Index: /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php	(revision 19670)
+++ /branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Log.php	(revision 19715)
@@ -48,5 +48,5 @@
         $this->tpl_subno    = 'log';
         $this->tpl_mainno   = 'system';
-        $this->tpl_subtitle = 'ログ表示';
+        $this->tpl_subtitle = 'EC-CUBE ログ表示';
         $this->line_max     = 50;
     }
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 19713)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 19715)
@@ -22,6 +22,4 @@
 <input type="hidden" name="bloc_cnt" value="<!--{$bloc_cnt}-->" />
 <div id="design" class="contents-main">
-    <!--{* ▼レイアウト編集ここから *}-->
-    <h2>レイアウト編集</h2>
     <!--{* ▼レイアウトここから *}-->
     <div style="float: left; width: 75%;" align="center">
@@ -278,4 +276,7 @@
     <!--▼ページ一覧　ここから-->
     <h2 style="clear: both;">編集可能ページ一覧</h2>
+    <div class="btn addnew">
+        <button type='button' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>ページを新規入力</span></button>
+    </div>
     <table class="list center">
         <tr>
@@ -291,5 +292,5 @@
             </td>
             <td>
-                <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->" ><strong>編集</strong></a>
+                <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->" >編集</a>
             </td>
             <td>
@@ -306,7 +307,4 @@
     <!--{/foreach}-->
     </table>
-    <div class="btn addnew">
-        <button type='button' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>ページを新規入力</span></button>
-    </div>
     <!--▲ページ一覧　ここまで-->
 </div>
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 19713)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	(revision 19715)
@@ -28,5 +28,5 @@
       <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ページ詳細設定</span></a></li>
       <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ブロック編集</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ﾍｯﾀﾞｰ/ﾌｯﾀｰ設定</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>ヘッダー/フッター設定</span></a></li>
       <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>CSS編集</span></a></li>
       <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_PC}-->"><span>テンプレート設定</span></a></li>
@@ -39,5 +39,5 @@
       <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ページ詳細設定</span></a></li>
       <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ブロック編集</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ﾍｯﾀﾞｰ/ﾌｯﾀｰ設定</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>ヘッダー/フッター設定</span></a></li>
       <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>CSS編集</span></a></li>
       <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_MOBILE}-->"><span>テンプレート設定</span></a></li>
@@ -49,7 +49,7 @@
       <li<!--{if $tpl_subno == 'layout'}--> class="on"<!--{/if}--> id="navi-design-layout"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/<!--{$smarty.const.DIR_INDEX_URL}-->?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>レイアウト設定</span></a></li>
       <li<!--{if $tpl_subno == 'main_edit'}--> class="on"<!--{/if}--> id="navi-design-main"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/main_edit.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ページ詳細設定</span></a></li>
-      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック編集</span></a></li>
-      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ﾍｯﾀﾞｰ/ﾌｯﾀｰ設定</span></a></li>
-      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS編集</span></a></li>
+      <li<!--{if $tpl_subno == 'bloc'}--> class="on"<!--{/if}--> id="navi-design-bloc"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/bloc.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ブロック設定</span></a></li>
+      <li<!--{if $tpl_subno == 'header'}--> class="on"<!--{/if}--> id="navi-design-header"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/header.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>ヘッダー/フッター設定</span></a></li>
+      <li<!--{if $tpl_subno == 'css'}--> class="on"<!--{/if}--> id="navi-design-css"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/css.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>CSS設定</span></a></li>
       <li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-design-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/template.php?device_type_id=<!--{$smarty.const.DEVICE_TYPE_SMARTPHONE}-->"><span>テンプレート設定</span></a></li>
       <li<!--{if $tpl_subno == 'up_down'}--> class="on"<!--{/if}--> id="navi-design-add"><a href="<!--{$smarty.const.URL_DIR}-->admin/design/up_down.php?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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/css.tpl	(revision 19715)
@@ -27,7 +27,6 @@
 <input type="hidden" name="old_css_name" value="<!--{$old_css_name}-->" />
 <div id="design" class="contents-main">
-  <h2>CSS編集</h2>
 
-  <!--▼CSS編集　ここから-->
+  <!--▼CSS設定ここから-->
   <table class="form">
     <tr>
@@ -42,6 +41,6 @@
       <td>
         <textarea name="css" cols=90 rows=<!--{$area_row}--> align="left" wrap=off style="width: 650px;"><!--{$css_data}--></textarea>
-        <div class="btn right">
-          <button type="button" onClick="ChangeSize(this, css, 50, 30, area_row)"><span>大きくする</span></button>
+        <div class="btn">
+          <button type="button" onClick="ChangeSize(this, css, 50, 30, area_row)"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
         </div>
       </td>
@@ -51,21 +50,26 @@
     <button type="submit" onclick="fnFormModeSubmit('form_css','confirm','','');"><span>この内容で登録する</span></button>
   </div>
-  <!--▲CSS編集　ここまで-->
+  <!--▲CSS設定　ここまで-->
 
   <!--▼CSSファイル一覧　ここから-->
   <h2>編集可能CSSファイル</h2>
+  <div class="btn addnew">
+    <button type="button" onclick="location.href='http://<!--{$smarty.server.HTTP_HOST}--><!--{$smarty.server.PHP_SELF|escape}-->'"><span>CSSを新規入力</span></button>
+  </div>
   <table class="list center" id="design-css-list">
     <tr>
       <th class="name">ファイル名</th>
-      <th class="action">&nbsp;</th>
+      <th class="menu">編集</th>
+      <th class="action">削除</th>
     </tr>
     <!--{if count($arrCSSList) > 0}-->
     <!--{foreach key=key item=item from=$arrCSSList}-->
     <tr>
+			<td><!--{$item.file_name}--></td>
       <td style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
-        <a href="<!--{$smarty.server.PHP_SELF}-->?css_name=<!--{$item.css_name}-->"><!--{$item.file_name}--></a>
+        <a href="<!--{$smarty.server.PHP_SELF}-->?css_name=<!--{$item.css_name}-->">編集</a>
       </td>
       <td style="background:<!--{if $item.css_name == $css_name}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
-        <button type="button" name="del_<!--{$item.css_name}-->" onclick="fnFormModeSubmit('form_css','delete','css_name','<!--{$item.css_name}-->');"><span>削除</span></button>
+        <a href="javascript:;" onclick="fnFormModeSubmit('form_css','delete','css_name','<!--{$item.css_name}-->');">削除</a>
       </td>
     </tr>
@@ -77,7 +81,4 @@
     <!--{/if}-->
   </table>
-  <div class="btn addnew">
-    <button type="button" onclick="location.href='http://<!--{$smarty.server.HTTP_HOST}--><!--{$smarty.server.PHP_SELF|escape}-->'"><span>CSSを新規入力</span></button>
-  </div>
   <!--▲CSSファイル一覧　ここまで-->
 
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/header.tpl	(revision 19715)
@@ -49,5 +49,5 @@
     <textarea name="header" rows="<!--{$header_row}-->" wrap="off" style="width: 100%;"><!--{$header_data|smarty:nodefaults}--></textarea>
     <div class="btn">
-      <button type="button" onClick="ChangeSize(this, header, 50, 13, header_row)"><span><!--{if $header_row > 13}-->小さくする<!--{else}-->大きくする<!--{/if}--></span></button>
+      <button type="button" onClick="ChangeSize(this, header, 50, 13, header_row)"><span><!--{if $header_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
     </div>
     <div class="btn">
@@ -76,6 +76,6 @@
   <input type="hidden" name="browser_type" value="" />
     <textarea name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{$footer_data|smarty:nodefaults}--></textarea>
-    <div align="right">
-      <button type="button" onClick="ChangeSize(this, footer, 50, 13, footer_row)"><span><!--{if $footer_row > 13}-->小さくする<!--{else}-->大きくする<!--{/if}--></span></button>
+    <div class="btn">
+      <button type="button" onClick="ChangeSize(this, footer, 50, 13, footer_row)"><span><!--{if $footer_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
     </div>
     <div class="btn">
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 19713)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 19715)
@@ -54,26 +54,37 @@
   </div>
   <!--{/if}-->
+  <table>
+    <tr>
+      <th>名称</th>
+      <td>
+  <!--{if $arrPageData.edit_flg == 2}-->
+      <!--{$arrPageData.page_name|escape}--><input type="hidden" name="page_name" value="<!--{$arrPageData.page_name|escape}-->" />
+  <!--{else}-->
+        <input type="text" name="page_name" value="<!--{$arrPageData.page_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.page_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+  <!--{/if}-->
   <!--{ if $arrErr.page_name != "" }-->
-  <div class="message">
-    <span class="attention"><!--{$arrErr.page_name}--></span>
-  </div>
+        <div class="message">
+          <span class="attention"><!--{$arrErr.page_name}--></span>
+        </div>
   <!--{/if}-->
-  <!--{if $arrPageData.edit_flg == 2}-->
-    名称：<!--{$arrPageData.page_name|escape}--><input type="hidden" name="page_name" value="<!--{$arrPageData.page_name|escape}-->" />
-  <!--{else}-->
-    名称：<input type="text" name="page_name" value="<!--{$arrPageData.page_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.page_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
-  <!--{/if}--><br />
-
-  <!--{ if $arrErr.url != "" }-->
-  <div class="attention">
-    <span class="attention"><!--{$arrErr.url}--></span>
-  </div>
-  <!--{/if}-->
-  URL：<!--{if $arrPageData.edit_flg == 2}-->
+     </td>
+   <tr>
+     <th>URL</th>
+     <td>
+   <!--{if $arrPageData.edit_flg == 2}-->
       <!--{$smarty.const.SITE_URL|escape}--><!--{$arrPageData.url|escape}-->
       <input type="hidden" name="url" value="<!--{$arrPageData.filename|escape}-->" />
     <!--{else}-->
       <!--{$user_URL|escape}--><input type="text" name="url" value="<!--{$arrPageData.directory|escape}--><!--{$arrPageData.filename|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.url != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> ime-mode: disabled;" size="40" class="box40" />.php<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
-    <!--{/if}--><br />
+    <!--{/if}-->
+    <!--{ if $arrErr.url != "" }-->
+      <div class="attention">
+        <span class="attention"><!--{$arrErr.url}--></span>
+      </div>
+    <!--{/if}-->
+     </td>
+   </tr>
+   <tr>
+     <td colspan="2">
 
   <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" <!--{$arrPageData.header_chk}--> />共通のヘッダーを使用する</label>&nbsp;
@@ -83,7 +94,11 @@
     <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
   </div>
+      </td>
+    </tr>
+  </table>
   <div class="btn">
-    <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span>大きくする</span></button>
+    <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
   </div>
+  </table>
 
   <div class="btn">
@@ -111,5 +126,5 @@
       <td>
         <!--{if $item.filename|strlen >= 1}-->
-          <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->"><strong>編集</strong></a>
+          <a href="?page_id=<!--{$item.page_id}-->&amp;device_type_id=<!--{$item.device_type_id}-->">編集</a>
         <!--{/if}-->
       </td>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/template.tpl	(revision 19715)
@@ -40,6 +40,5 @@
 <input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
 <div id="design" class="contents-main">
-  <h2>テンプレート設定</h2>
-  <p>
+  <p style="margin-bottom: 20px">
     テンプレートを選択し、「この内容で登録する」ボタンを押すと、<br />
     選択したテンプレートへデザインを変更することが出来ます。
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/up_down.tpl	(revision 19715)
@@ -39,6 +39,5 @@
 <input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
 <div id="disign" class="contents-main">
-  <h2>アップロード</h2>
-  <p>
+  <p class="remark">
     テンプレートパッケージのアップロードを行います。<br />
     アップロードしたパッケージは、「テンプレート設定」で選択できるようになります。
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/design/bloc.tpl	(revision 19715)
@@ -25,6 +25,6 @@
 <input type="hidden" name="mode" value="" />
 <input type="hidden" name="bloc_id" value="<!--{$bloc_id}-->" />
-  <!--{* ▼ブロック編集ここから *}-->
-  <h2>ブロック編集</h2>
+  <!--{* ▼ブロック設定ここから *}-->
+  <h2>ブロック設定</h2>
 
   <!--{if $arrBlocData.tpl_path != '' and $preview == on}-->
@@ -35,34 +35,52 @@
   <!--{/if}-->
 
-  <div>
-    <!--{ if $arrErr.bloc_name != "" }--> <div align="center"> <span class="attention"><!--{$arrErr.bloc_name}--></span></div> <!--{/if}-->
-    ブロック名：<input type="text" name="bloc_name" value="<!--{$arrBlocData.bloc_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.bloc_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span><br />
+  <table>
+    <tr>
+      <th>ブロック名</th>
+      <td>
+        <input type="text" name="bloc_name" value="<!--{$arrBlocData.bloc_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.bloc_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+        <!--{ if $arrErr.bloc_name != "" }--> <div align="center"> <span class="attention"><!--{$arrErr.bloc_name}--></span></div> <!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>ファイル名</th>
+      <td><input type="text" name="filename" value="<!--{$arrBlocData.filename|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.filename != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />.tpl<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
     <!--{ if $arrErr.filename != "" }--> <div align="center"> <span class="attention"><!--{$arrErr.filename}--></span></div> <!--{/if}-->
-    ファイル名：<input type="text" name="filename" value="<!--{$arrBlocData.filename|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.filename != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />.tpl<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
-  </div>
-  <div>
-    <textarea name="bloc_html" rows="<!--{$text_row}-->" style="width: 100%;"><!--{$arrBlocData.tpl_data|smarty:nodefaults}--></textarea>
-    <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
-  </div>
-  <div class="btn">
-    <button type="button" onClick="ChangeSize(this, bloc_html, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->小さくする<!--{else}-->大きくする<!--{/if}--></span></button>
-  </div>
+     </td>
+   </tr>
+   <tr>
+     <td colspan="2">
+       <textarea name="bloc_html" rows="<!--{$text_row}-->" style="width: 100%;"><!--{$arrBlocData.tpl_data|smarty:nodefaults}--></textarea>
+			 <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
+			 <div>
+				 <button type="button" onClick="ChangeSize(this, bloc_html, 50, 13, html_area_row)"><span><!--{if $text_row > 13}-->縮小<!--{else}-->拡大<!--{/if}--></span></button>
+			 </div>
+		 </td>
+	 </tr>
+ </table>
   <div class="btn">
     <button type='button' name='subm' onclick="fnFormModeSubmit('form_bloc','confirm','','');"><span>登録する</span></button>
     <button type='button' name='preview' onclick="fnFormModeSubmit('form_bloc','preview','','');"><span>プレビュー</span></button>
   </div>
-  <!--{* ▲ブロック編集ここまで *}-->
+  <!--{* ▲ブロック設定ここまで *}-->
 
   <!--{* ▼ブロック一覧ここから *}-->
   <h2>編集可能ブロック</h2>
+  <div class="btn addnew">
+    <button type='button' name='subm' onclick="location.href='http://<!--{$smarty.server.HTTP_HOST}--><!--{$smarty.server.PHP_SELF|escape}-->'"><span>ブロックを新規入力</span></button>
+  </div>
   <table class="list center">
+    <tr>
+      <th>名称</th><th>編集</th><th>削除</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>
-        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?bloc_id=<!--{$item.bloc_id}-->" ><!--{$item.bloc_name}--></a>
+        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?bloc_id=<!--{$item.bloc_id}-->" >編集</a>
       </td>
       <td>
         <!--{if $item.del_flg == 0}-->
-        <input type="button" value="削除" name="del<!--{$item.bloc_id}-->" onclick="fnFormModeSubmit('form_bloc','delete','bloc_id',this.name.substr(3));" />
+        <a href="javascript:;" onclick="fnFormModeSubmit('form_bloc','delete','bloc_id',this.name.substr(3));">削除</a>
         <input type="hidden" value="<!--{$item.bloc_id}-->" name="del_id<!--{$item.bloc_id}-->" />
         <!--{/if}-->
@@ -71,8 +89,4 @@
     <!--{/foreach}-->
   </table>
-
-  <div class="btn addnew">
-    <button type='button' name='subm' onclick="location.href='http://<!--{$smarty.server.HTTP_HOST}--><!--{$smarty.server.PHP_SELF|escape}-->'"><span>ブロックを新規入力</span></button>
-  </div>
   <!--{* ▲ブロック一覧ここまで *}-->
 
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 19680)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 19715)
@@ -93,5 +93,5 @@
         <tr>
             <th>帳票出力</th>
-            <td><a href="./" onClick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票を出力するにはこちらをクリックして下さい。</a></td>
+            <td><button type="button" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票出力</button></td>
         </tr>
         <!--{/if}-->
@@ -346,6 +346,6 @@
             <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
             <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
-            <td><!--{$price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</td>
-            <td><!--{$price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+            <td class="right"><!--{$price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</td>
+            <td class="right"><!--{$price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td>
         </tr>
         <!--{/section}-->
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/order/index.tpl	(revision 19715)
@@ -108,6 +108,4 @@
                 <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
             </td>
-        </tr>
-        <tr>
             <th>対応状況</th>
             <td>
@@ -127,6 +125,4 @@
             <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" />
             </td>
-        </tr>
-        <tr>
             <th>顧客名(カナ)</th>
             <td>
@@ -143,6 +139,4 @@
                 <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" />
             </td>
-        </tr>
-        <tr>
             <th>TEL</th>
             <td>
@@ -154,5 +148,5 @@
         <tr>
             <th>生年月日</th>
-            <td>
+            <td colspan="3">
                 <span class="attention"><!--{$arrErr.search_sbirthyear}--></span>
                 <span class="attention"><!--{$arrErr.search_ebirthyear}--></span>
@@ -185,5 +179,5 @@
         <tr>
             <th>性別</th>
-            <td>
+            <td colspan="3">
             <!--{assign var=key value="search_order_sex"}-->
             <span class="attention"><!--{$arrErr[$key]}--></span>
@@ -193,5 +187,5 @@
         <tr>
             <th>支払方法</th>
-            <td>
+            <td colspan="3">
             <!--{assign var=key value="search_payment_id"}-->
             <span class="attention"><!--{$arrErr[$key]|escape}--></span>
@@ -201,5 +195,5 @@
         <tr>
             <th>受注日</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.search_sorderyear}--><span class="attention"><!--{$arrErr.search_sorderyear}--></span><!--{/if}-->
                 <!--{if $arrErr.search_eorderyear}--><span class="attention"><!--{$arrErr.search_eorderyear}--></span><!--{/if}-->
@@ -232,5 +226,5 @@
         <tr>
             <th>更新日</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.search_supdateyear}--><span class="attention"><!--{$arrErr.search_supdateyear}--></span><!--{/if}-->
                 <!--{if $arrErr.search_eupdateyear}--><span class="attention"><!--{$arrErr.search_eupdateyear}--></span><!--{/if}-->
@@ -273,6 +267,4 @@
                 円
             </td>
-        </tr>
-        <tr>
             <th>購入商品</th>
             <td>
@@ -284,5 +276,5 @@
     </table>
 
-    <div>
+    <div class="btn">
         検索結果表示件数
         <!--{assign var=key value="search_page_max"}-->
@@ -306,13 +298,13 @@
 <!--{/foreach}-->
     <h2>検索結果一覧</h2>
-　<p>
+		　<div class="btn">
         <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
         <!--{if $smarty.const.ADMIN_MODE == '1'}-->
         <button type="button" onclick="fnModeSubmit('delete_all','','');"><span>検索結果をすべて削除</span></button>
         <!--{/if}-->
-        <button type="button" onclick="fnModeSubmit('csv','','');">CSV DOWNLOAD</button>
-        <a href="../contents/csv.php?tpl_subno_csv=order">&gt;&gt; CSV出力項目設定</a>
+        <button type="button" onclick="fnModeSubmit('csv','','');">CSV ダウンロード</button>
+        <button type="button" onclick="location.href='../contents/csv.php?tpl_subno_csv=order'">CSV 出力項目設定</button>
         <button type="button" onclick="fnSelectCheckSubmit('pdf.php');"><span>PDF一括出力</span></button>
-    </p>
+    </div>
     <!--{include file=$tpl_pager}-->
 
@@ -336,6 +328,6 @@
             <th>
                 帳票<br />
-                <button type="button" onclick="fnBoxChecked(true);">全て選択</button>
-                <button type="button" onclick="fnBoxChecked(false);">全て解除</button>
+                <a href="javascript:;" onclick="fnBoxChecked(true);">全て選択</a>
+                <a href="javascript:;" onclick="fnBoxChecked(false);">全て解除</a>
             </th>
             <th>編集</th>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/order/status.tpl	(revision 19715)
@@ -29,4 +29,5 @@
 <div id="order" class="contents-main">
   <h2>抽出条件</h2>
+    <div class="btn">
     <!--{foreach key=key item=item from=$arrORDERSTATUS}-->
       <a
@@ -38,5 +39,6 @@
       ><!--{$item}--></a>
     <!--{/foreach}-->
-  <h2>編集</h2>
+    </div>
+  <h2>ステータス変更</h2>
   <!--{* 登録テーブルここから *}-->
   <!--{if $tpl_linemax > 0 }-->
@@ -67,4 +69,6 @@
   <table class="list center">
     <tr>
+      <th>選択</th>
+      <th>対応状況</th>
       <th>注文番号</th>
       <th>受注日</th>
@@ -73,10 +77,10 @@
       <th>購入金額（円）</th>
       <th>入金日<br>発送日</th>
-      <th>対応状況</th>
-      <th>選択</th>
     </tr>
     <!--{section name=cnt loop=$arrStatus}-->
     <!--{assign var=status value="`$arrStatus[cnt].status`"}-->
     <tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
+      <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
+      <td><!--{$arrORDERSTATUS[$status]}--></td>
       <td><a href ="<!--{$smarty.server.PHP_SELF|escape}-->" onclick="fnOpenWindow('./edit.php?order_id=<!--{$arrStatus[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrStatus[cnt].order_id}--></td>
       <td><!--{$arrStatus[cnt].create_date|sfDispDBDate:false}--></td>
@@ -87,6 +91,4 @@
       <td><!--{if $arrStatus[cnt].payment_date != ""}--><!--{$arrStatus[cnt].payment_date|sfDispDBDate:false}--><!--{else}-->未入金<!--{/if}--><br>
       <!--{if $arrStatus[cnt].status eq 5}--><!--{$arrStatus[cnt].commit_date|sfDispDBDate:false}--><!--{else}-->未発送<!--{/if}--></td>
-      <td><!--{$arrORDERSTATUS[$status]}--></td>
-      <td><input type="checkbox" name="move[]" value="<!--{$arrStatus[cnt].order_id}-->" ></td>
     </tr>
     <!--{/section}-->
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 19710)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 19715)
@@ -35,6 +35,4 @@
                 <input type="text" name="name" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$list_data.name|escape}-->" size="30" class="box30" style="<!--{$arrErr.name|sfGetErrorColor}-->" />
             </td>
-        </tr>
-        <tr>
             <th>顧客名(カナ)</th>
             <td>
@@ -52,6 +50,4 @@
                 </select>
             </td>
-        </tr>
-        <tr>
             <th>TEL</th>
             <td>
@@ -65,6 +61,4 @@
                 <!--{html_checkboxes_ex name="sex" options=$arrSex separator="&nbsp;" selected=$list_data.sex}-->
             </td>
-        </tr>
-        <tr>
             <th>誕生月</th>
             <td>
@@ -82,6 +76,4 @@
                 <!--{html_radios name="htmlmail" options=$arrHtmlmail separator="&nbsp;" selected=$list_data.htmlmail}-->
             </td>
-        </tr>
-        <tr>
             <th>購入商品コード</th>
             <td>
@@ -94,9 +86,7 @@
             <td>
                 <!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}--><span class="attention"><!--{$arrErr.buy_times_from}--><!--{$arrErr.buy_times_to}--></span><br /><!--{/if}-->
-                <input type="text" name="buy_times_from" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$list_data.buy_times_from|escape}-->" size="6" class="box6" style="<!--{$arrErr.buy_times_from|sfGetErrorColor}-->" /> 回 ～ 
+                <input type="text" name="buy_times_from" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$list_data.buy_times_from|escape}-->" size="6" class="box6" style="<!--{$arrErr.buy_times_from|sfGetErrorColor}-->" /> 回 ～
                 <input type="text" name="buy_times_to" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$list_data.buy_times_to|escape}-->" size="6" class="box6" style="<!--{$arrErr.buy_times_to|sfGetErrorColor}-->" /> 回
             </td>
-        </tr>
-        <tr>
             <th>購入金額</th>
             <td>
@@ -108,15 +98,7 @@
             </td>
         </tr>
-        <!--{*非会員はメルマガ非対応
-        <tr>
-            <th>種別</th>
-            <td>
-            <!--{html_checkboxes name="customer" options=$arrCustomerType separator="&nbsp;" selected=$list_data.customer}-->
-            </td>
-        </tr>
-        *}-->
         <tr>
             <th>メールアドレス</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.email}--><span class="attention"><!--{$arrErr.email}--></span><!--{/if}-->
                 <span style="<!--{$arrErr.email|sfGetErrorColor}-->">
@@ -125,8 +107,8 @@
             </td>
         </tr>
-        
+
         <tr>
             <th>携帯メールアドレス</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.email_mobile}--><span class="attention"><!--{$arrErr.email_mobile}--></span><!--{/if}-->
                 <span style="<!--{$arrErr.email_mobile|sfGetErrorColor}-->">
@@ -135,23 +117,23 @@
             </td>
         </tr>
-        
+
         <tr>
             <th>配信メールアドレス種別</th>
-            <td>
+            <td colspan="3">
                 <!--{html_radios name="mail_type" options=$arrMailType separator="<br />" selected=$list_data.mail_type}-->
             </td>
         </tr>
-        
+
         <tr>
             <th>職業</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.job}--><span class="attention"><!--{$arrErr.job}--></span><!--{/if}-->
                 <!--{html_checkboxes_ex name="job" options=$arrJob separator="&nbsp;" selected=$list_data.job}-->
             </td>
         </tr>
-        
+
         <tr>
             <th>生年月日</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><span class="attention"><!--{$arrErr.b_start_year}--><!--{$arrErr.b_end_year}--></span><br /><!--{/if}-->
                 <select name="b_start_year" style="<!--{$arrErr.b_start_year|sfGetErrorColor}-->">
@@ -183,5 +165,5 @@
         <tr>
             <th>登録日</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.start_year || $arrErr.end_year}--><span class="attention"><!--{$arrErr.start_year}--><!--{$arrErr.end_year}--></span><br /><!--{/if}-->
                 <select name="start_year" style="<!--{$arrErr.start_year|sfGetErrorColor}-->">
@@ -213,5 +195,5 @@
         <tr>
             <th>最終購入日</th>
-            <td>
+            <td colspan="3">
                 <!--{if $arrErr.buy_start_year || $arrErr.buy_end_year}--><span class="attention"><!--{$arrErr.buy_start_year}--><!--{$arrErr.buy_end_year}--></span><br /><!--{/if}-->
                 <select name="buy_start_year" style="<!--{$arrErr.buy_start_year|sfGetErrorColor}-->">
@@ -241,5 +223,5 @@
             </td>
         </tr>
-        
+
         <tr>
             <th>購入商品名</th>
@@ -250,6 +232,4 @@
                 </span>
             </td>
-        </tr>
-        <tr>
             <th>カテゴリ</th>
             <td>
@@ -280,5 +260,5 @@
 
     <h2>検索結果一覧</h2>
-    <p>
+    <div class="btn">
         <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
         <!--{if $smarty.const.ADMIN_MODE == '1'}-->
@@ -288,5 +268,5 @@
             <button type="submit" onclick="document.form1['mode'].value='input';"><span>配信内容を設定する</span></button>
         <!--{/if}-->
-    </p>
+    </div>
     <!--{include file=$tpl_pager}-->
 
@@ -309,5 +289,5 @@
             <td class="center"><!--{$smarty.section.i.iteration}--></td>
             <td class="center"><!--{$arrResults[i].customer_id|default:"非会員"}--></td>
-            
+
             <!--{assign var=key value="`$arrResults[i].customer_id`"}-->
             <td class="center">
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_input.tpl	(revision 19715)
@@ -56,5 +56,4 @@
 <input type="hidden" name="template_id" value="<!--{$arrForm.template_id}-->" />
 <div id="mail" class="contents-main">
-  <h2>配信内容設定：<!--{$title}--></h2>
   <table class="form">
     <tr>
@@ -77,4 +76,8 @@
         <textarea name="body" cols="90" rows="40" class="area90" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.body|escape}--></textarea>
         <!--{if $arrErr.body}--><br /><span class="attention"><!--{$arrErr.body}--></span><!--{/if}-->
+				<div>
+					<button type="button" onclick="fnCharCount('form1','body','cnt_footer');" name="next" id="next"><span>文字数カウント</span></button>
+					<span>今までに入力したのは<input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />文字です。</span>
+				</div>
       </td>
     </tr>
@@ -82,6 +85,4 @@
   <div class="btn">
     <button type="submit"><span>この内容で登録する</span></button>
-    <button type="button" onclick="fnCharCount('form1','body','cnt_footer');" name="next" id="next"><span>文字数カウント</span></button>
-    <span>今までに入力したのは<input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />文字です。</span>
   </div>
 </table>
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl	(revision 19715)
@@ -24,5 +24,4 @@
 <form name="form1" id="form1" method="post" action="?">
 <div id="mail" class="contents-main">
-  <h2>テンプレート</h2>
   <table class="list center">
     <tr>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_confirm.tpl	(revision 19715)
@@ -27,5 +27,4 @@
 <!--{/foreach}-->
 <div id="mail" class="contents-main">
-  <h2>配信設定：配信内容設定</h2>
   <table class="form">
     <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/input.tpl	(revision 19715)
@@ -27,5 +27,4 @@
 <!--{/foreach}-->
 <div id="mail" class="contents-main">
-  <h2>配信設定：配信内容設定</h2>
   <table class="form">
     <tr>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/history.tpl	(revision 19715)
@@ -45,5 +45,5 @@
             <td><!--{$arrDataList[cnt].end_date|sfDispDBDate|escape}--></td>
             <td class="left"><!--{$arrDataList[cnt].subject|escape}--></td>
-            <td><a href="./preview.php?send_id=<!--{$arrDataList[cnt].send_id|escape}-->" target="_blank">確認</a></td>
+            <td><a href="javascript:;" onclick="win03('./preview.php?send_id=<!--{$arrDataList[cnt].send_id|escape}-->', 'confirm', '720', '600')">確認</a></td>
             <td><a href="#" onclick="win03('./<!--{$smarty.const.DIR_INDEX_URL}-->?mode=query&amp;send_id=<!--{$arrDataList[cnt].send_id|escape}-->','query','720','420'); return false;">確認</a></td>
             <td><!--{$arrDataList[cnt].count_all|escape}--></td>
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/total/index.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/total/index.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/total/index.tpl	(revision 19715)
@@ -105,5 +105,5 @@
 
   <div class="btn">
-    <button type="button" onclick="fnModeSubmit('csv','','');"><span>検索結果をCSVダウンロード</span></button>
+    <button type="button" onclick="fnModeSubmit('csv','','');"><span>CSVダウンロード</span></button>
   </div>
 
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/system/editdb.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 19670)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/editdb.tpl	(revision 19715)
@@ -23,6 +23,4 @@
 *}-->
 
-<h2>インデックス管理</h2>
-
 <form name="index_form"  method="post" action="?"> 
   <input type="hidden" name="mode" value="confirm" />
@@ -39,5 +37,5 @@
   
     <tr>
-    <td><input type="checkbox" name="indexflag_new[]" value="<!--{$smarty.section.cnt.index}-->" <!--{if $arrForm[cnt].indexflag == "1"}-->checked<!--{/if}--> /></td>
+    <td class="center"><input type="checkbox" name="indexflag_new[]" value="<!--{$smarty.section.cnt.index}-->" <!--{if $arrForm[cnt].indexflag == "1"}-->checked<!--{/if}--> /></td>
     <td><!--{$arrForm[cnt].table_name}--></td>
     <td><!--{$arrForm[cnt].column_name}--></td>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/parameter.tpl	(revision 19715)
@@ -25,9 +25,9 @@
 <input type="hidden" name="mode" value="update" />
 <div id="basis" class="contents-main">
-  <ul class="red fs12st">
-    <li>パラメータの値がPHP定数として設定されます。</li>
-    <li>文字列は「&quot;」で囲んで下さい。</li>
-    <li>設定値によってはサイトが機能しなくなる場合もありますので、十分ご注意下さい。</li>
-  </ul>
+  <p class="remark red fs12st">
+    パラメータの値がPHP定数として設定されます。<br />
+    文字列は「&quot;」で囲んで下さい。<br />
+    設定値によってはサイトが機能しなくなる場合もありますので、十分ご注意下さい。
+  </p>
 
   <table class="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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 19715)
@@ -26,9 +26,8 @@
 <input type="hidden" name="list_name" value="" />
 <div id="system" class="contents-main">
-    <h2>バックアップ作成</h2>
-    <ul>
-        <li>データベースのバックアップを行います。</li>
-        <li>テンプレートファイル等はバックアップされません。</li>
-    </ul>                                        
+    <p class="remark">
+        データベースのバックアップを行います。<br />
+        テンプレートファイル等はバックアップされません。
+		</p>
     <table class="form">
         <tr>
@@ -72,8 +71,8 @@
             <td ><!--{$arrBkupList[cnt].bkup_memo}--></td>
             <td align="center"><!--{$arrBkupList[cnt].create_date|sfCutString:19:true:false}--></td>
-            <td align="center"><a href="#" onclick="document.body.style.cursor = 'wait'; fnModeSubmit('restore','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">restore</a></td>
-            <td align="center"><a href="#" onclick="fnModeSubmit('download','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">download</a></td>
+            <td align="center"><a href="#" onclick="document.body.style.cursor = 'wait'; fnModeSubmit('restore','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">リストア</a></td>
+            <td align="center"><a href="#" onclick="fnModeSubmit('download','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">ダウンロード</a></td>
             <td align="center">
-                <a href="#" onclick="fnModeSubmit('delete','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">delete</a>
+                <a href="#" onclick="fnModeSubmit('delete','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">削除</a>
             </td>
         </tr>
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/system/log.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/system/log.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/log.tpl	(revision 19715)
@@ -23,5 +23,4 @@
 *}-->
 
-<h2>EC-CUBE ログ</h2>
 <p>直近の<!--{$line_max}-->行</p>
 <table class="list log">
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/system/system.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/system/system.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/system.tpl	(revision 19715)
@@ -23,5 +23,4 @@
 *}-->
 
-<h2>システム情報</h2>
 <table border="0" cellspacing="1" cellpadding="8" summary=" ">
     <!--{foreach from=$arrSystemInfo item=info}-->
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/masterdata.tpl	(revision 19715)
@@ -25,5 +25,5 @@
   <form name="form1" id="form1" method="post" action="?">
   <input type="hidden" name="mode" value="show" />
-  <div id="basis-masterdata-select">
+  <div id="basis-masterdata-select" class="btn">
     <select name="master_data_name" id="master_data_name">
     <!--{html_options output=$arrMasterDataName values=$arrMasterDataName selected=$masterDataName}-->
@@ -38,11 +38,10 @@
   <input type="hidden" name="mode" value="edit" />
   <input type="hidden" name="master_data_name" value="<!--{$masterDataName}-->" />
-  <h2>マスタデータ編集</h2>
-  <ul class="attention">
-    <li>マスタデータの値を設定できます。</li>
-    <li>重複したIDを登録することはできません。</li>
-    <li>空のIDを登録すると、値は削除されます。</li>
-    <li>設定値によってはサイトが機能しなくなる場合もありますので、十分ご注意下さい。</li>
-  </ul>
+  <p class="remark attention">
+    マスタデータの値を設定できます。<br />
+    重複したIDを登録することはできません。<br />
+    空のIDを登録すると、値は削除されます。<br />
+    設定値によってはサイトが機能しなくなる場合もありますので、十分ご注意下さい。
+  </p>
   <!--{if $errorMessage != ""}-->
   <div class="message">
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl	(revision 19670)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl	(revision 19715)
@@ -29,5 +29,5 @@
 <li<!--{if $tpl_subno == 'system'}--> class="on"<!--{/if}--> id="navi-system-system"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/system.php"><span>システム情報</span></a></li>
 <li<!--{if $tpl_subno == 'plugin'}--> class="on"<!--{/if}--> id="navi-system-plugin"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/plugin.php"><span>プラグイン管理</span></a></li>
-<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/log.php"><span>ログ表示</span></a></li>
+<li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'log'}--> class="on"<!--{/if}--> id="navi-system-log"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/log.php"><span>EC-CUBE ログ表示</span></a></li>
 <li<!--{if $tpl_mainno == 'system' && $tpl_subno == 'editdb'}--> class="on"<!--{/if}--> id="navi-system-editdb"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/editdb.php"><span>高度なデータベース管理</span></a></li>
 </ul>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/settings.tpl	(revision 19715)
@@ -28,5 +28,5 @@
 
   <!--入力項目ここから-->
-  <p><span class="attention">※認証キーは<a href="<!--{$smarty.const.OSTORE_URL}-->" target="_blank">EC-CUBEオーナーズストア</a>で取得できます。</span></p>
+  <p class="remark"><span class="attention">※認証キーは<a href="<!--{$smarty.const.OSTORE_URL}-->" target="_blank">EC-CUBEオーナーズストア</a>で取得できます。</span></p>
   <table class="form">
     <tr>
Index: /branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl
===================================================================
--- /branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl	(revision 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log.tpl	(revision 19715)
@@ -37,5 +37,5 @@
   <!--{foreach from=$arrInstallLogs item=log name=log_loop}-->
     <tr>
-      <td><!--{$log.module_name|escape}--></td>
+      <td class="left"><!--{$log.module_name|escape}--></td>
       <td><!--{if $log.error_flg}-->失敗<!--{else}-->成功<!--{/if}--></td>
       <td class="left"><!--{$log.update_date|sfDispDBDate|escape}--></td>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/log_detail.tpl	(revision 19715)
@@ -27,6 +27,4 @@
 <div id="ownersstore" class="contents-main">
 
-  <h2>詳細</h2>
-  
   <table class="form">
     <tr>
@@ -57,5 +55,7 @@
     </tr>
   </table>
-
+	<div class="btn">
+		<button type="button" onclick="location.href='./log.php'">一覧へ戻る</button>
+	</div>
 </div>
 </form>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/contents/index.tpl	(revision 19715)
@@ -113,5 +113,4 @@
 <input type="hidden" name="news_id" value="<!--{$arrForm.news_id|escape}-->" />
 <input type="hidden" name="term" value="" />
-  <h2>新規登録</h2>
   <!--{* ▼登録テーブルここから *}-->
   <table>
@@ -168,5 +167,5 @@
 </form>
 
-  <h2>登録済み新着情報</h2>
+  <h2>新着情報一覧</h2>
   <!--{if $arrErr.moveposition}-->
   <p><span class="attention"><!--{$arrErr.moveposition}--></span></p>
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 19710)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 19715)
@@ -257,11 +257,11 @@
                 </tr>
                 <!--{section name=cnt loop=$arrPurchaseHistory}-->
-                <tr class="center">
+                <tr>
                     <td><!--{$arrPurchaseHistory[cnt].create_date|sfDispDBDate}--></td>
-                    <td><a href="#" onclick="fnOpenWindow('../order/edit.php?order_id=<!--{$arrPurchaseHistory[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrPurchaseHistory[cnt].order_id}--></a></td>
-                    <td><!--{$arrPurchaseHistory[cnt].payment_total|number_format}-->円</td>
-                    <td><!--{if $arrPurchaseHistory[cnt].status eq 5}--><!--{$arrPurchaseHistory[cnt].commit_date|sfDispDBDate}--><!--{else}-->未発送<!--{ /if }--></td>
+                    <td class="center"><a href="#" onclick="fnOpenWindow('../order/edit.php?order_id=<!--{$arrPurchaseHistory[cnt].order_id}-->','order_disp','800','900'); return false;" ><!--{$arrPurchaseHistory[cnt].order_id}--></a></td>
+                    <td class="center"><!--{$arrPurchaseHistory[cnt].payment_total|number_format}-->円</td>
+                    <td class="center"><!--{if $arrPurchaseHistory[cnt].status eq 5}--><!--{$arrPurchaseHistory[cnt].commit_date|sfDispDBDate}--><!--{else}-->未発送<!--{ /if }--></td>
                     <!--{assign var=payment_id value="`$arrPurchaseHistory[cnt].payment_id`"}-->
-                    <td><!--{$arrPayment[$payment_id]|escape}--></td>
+                    <td class="center"><!--{$arrPayment[$payment_id]|escape}--></td>
                 </tr>
                 <!--{/section}-->
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 19710)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 19715)
@@ -82,18 +82,4 @@
       <th>顧客ID</th>
       <td><!--{if $arrErr.customer_id}--><span class="attention"><!--{$arrErr.customer_id}--></span><br /><!--{/if}--><input type="text" name="customer_id" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$arrForm.customer_id|escape}-->" size="30" class="box30" <!--{if $arrErr.customer_id}--><!--{sfSetErrorStyle}--><!--{/if}--> /></td>
-    </tr>
-    <tr>
-      <th>顧客名</th>
-      <td><!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><br /><!--{/if}--><input type="text" name="name" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.name|escape}-->" size="30" class="box30" <!--{if $arrErr.name}--><!--{sfSetErrorStyle}--><!--{/if}--> /></td>
-    </tr>
-    <tr>
-      <th>顧客名(カナ)</th>
-      <td><!--{if $arrErr.kana}--><span class="attention"><!--{$arrErr.kana}--></span><br /><!--{/if}--><input type="text" name="kana" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.kana|escape}-->" size="30" class="box30" <!--{if $arrErr.kana}--><!--{sfSetErrorStyle}--><!--{/if}--> /></td>
-    </tr>
-    <tr>
-      <th>会員状態</th>
-      <td><!--{html_checkboxes name="status" options=$arrStatus separator="&nbsp;" selected=$arrForm.status}--></td>
-    </tr>
-    <tr>
       <th>都道府県</th>
       <td>
@@ -106,8 +92,12 @@
     </tr>
     <tr>
+      <th>顧客名</th>
+      <td><!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><br /><!--{/if}--><input type="text" name="name" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.name|escape}-->" size="30" class="box30" <!--{if $arrErr.name}--><!--{sfSetErrorStyle}--><!--{/if}--> /></td>
+      <th>顧客名(カナ)</th>
+      <td><!--{if $arrErr.kana}--><span class="attention"><!--{$arrErr.kana}--></span><br /><!--{/if}--><input type="text" name="kana" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.kana|escape}-->" size="30" class="box30" <!--{if $arrErr.kana}--><!--{sfSetErrorStyle}--><!--{/if}--> /></td>
+    </tr>
+    <tr>
       <th>性別</th>
       <td><!--{html_checkboxes name="sex" options=$arrSex separator="&nbsp;" selected=$arrForm.sex}--></td>
-    </tr>
-    <tr>
       <th>誕生月</th>
       <td><!--{if $arrErr.birth_month}--><span class="attention"><!--{$arrErr.birth_month}--></span><br /><!--{/if}-->
@@ -119,6 +109,10 @@
     </tr>
     <tr>
+      <th>会員状態</th>
+      <td colspan="3"><!--{html_checkboxes name="status" options=$arrStatus separator="&nbsp;" selected=$arrForm.status}--></td>
+    </tr>
+    <tr>
       <th>誕生日</th>
-      <td>
+      <td colspan="3">
         <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><span class="attention"><!--{$arrErr.b_start_year}--><!--{$arrErr.b_end_year}--></span><br /><!--{/if}-->
         <select name="b_start_year" <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
@@ -150,23 +144,21 @@
     <tr>
       <th>メールアドレス</th>
-      <td><!--{if $arrErr.email}--><span class="attention"><!--{$arrErr.email}--></span><!--{/if}--><input type="text" name="email" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.email|escape}-->" size="60" class="box60" <!--{if $arrErr.email}--><!--{sfSetErrorStyle}--><!--{/if}-->/></td>
+      <td colspan="3"><!--{if $arrErr.email}--><span class="attention"><!--{$arrErr.email}--></span><!--{/if}--><input type="text" name="email" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.email|escape}-->" size="60" class="box60" <!--{if $arrErr.email}--><!--{sfSetErrorStyle}--><!--{/if}-->/></td>
     </tr>
     <tr>
       <th>携帯メールアドレス</th>
-      <td><!--{if $arrErr.email_mobile}--><span class="attention"><!--{$arrErr.email_mobile}--></span><!--{/if}--><input type="text" name="email_mobile" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.email_mobile|escape}-->" size="60" class="box60" <!--{if $arrErr.email_mobile}--><!--{sfSetErrorStyle}--><!--{/if}-->/></td>
+      <td colspan="3"><!--{if $arrErr.email_mobile}--><span class="attention"><!--{$arrErr.email_mobile}--></span><!--{/if}--><input type="text" name="email_mobile" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.email_mobile|escape}-->" size="60" class="box60" <!--{if $arrErr.email_mobile}--><!--{sfSetErrorStyle}--><!--{/if}-->/></td>
     </tr>
     <tr>
       <th>電話番号</th>
-      <td><!--{if $arrErr.tel}--><span class="attention"><!--{$arrErr.tel}--></span><br /><!--{/if}--><input type="text" name="tel" maxlength="<!--{$smarty.const.TEL_LEN}-->" value="<!--{$arrForm.tel|escape}-->" size="60" class="box60" /></td>
+      <td colspan="3"><!--{if $arrErr.tel}--><span class="attention"><!--{$arrErr.tel}--></span><br /><!--{/if}--><input type="text" name="tel" maxlength="<!--{$smarty.const.TEL_LEN}-->" value="<!--{$arrForm.tel|escape}-->" size="60" class="box60" /></td>
     </tr>
     <tr>
       <th>職業</th>
-      <td><!--{html_checkboxes name="job" options=$arrJob separator="&nbsp;" selected=$arrForm.job}--></td>
+      <td colspan="3"><!--{html_checkboxes name="job" options=$arrJob separator="&nbsp;" selected=$arrForm.job}--></td>
     </tr>
     <tr>
       <th>購入金額</th>
       <td><!--{if $arrErr.buy_total_from || $arrErr.buy_total_to}--><span class="attention"><!--{$arrErr.buy_total_from}--><!--{$arrErr.buy_total_to}--></span><br /><!--{/if}--><input type="text" name="buy_total_from" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$arrForm.buy_total_from|escape}-->" size="6" class="box6" <!--{if $arrErr.buy_total_from || $arrErr.buy_total_to}--><!--{sfSetErrorStyle}--><!--{/if}--> /> 円 ～ <input type="text" name="buy_total_to" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$arrForm.buy_total_to|escape}-->" size="6" class="box6" <!--{if $arrErr.buy_total_from || $arrErr.buy_total_to}--><!--{sfSetErrorStyle}--><!--{/if}--> /> 円</td>
-    </tr>
-    <tr>
       <th>購入回数</th>
       <td><!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}--><span class="attention"><!--{$arrErr.buy_times_from}--><!--{$arrErr.buy_times_to}--></span><br /><!--{/if}--><input type="text" name="buy_times_from" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$arrForm.buy_times_from|escape}-->" size="6" class="box6" <!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}--><!--{sfSetErrorStyle}--><!--{/if}--> /> 回 ～ <input type="text" name="buy_times_to" maxlength="<!--{$smarty.const.INT_LEN}-->" value="<!--{$arrForm.buy_times_to|escape}-->" size="6" class="box6" <!--{if $arrErr.buy_times_from || $arrErr.buy_times_to}--><!--{sfSetErrorStyle}--><!--{/if}--> /> 回</td>
@@ -174,5 +166,5 @@
     <tr>
       <th>登録・更新日</th>
-      <td>
+      <td colspan="3">
         <!--{if $arrErr.start_year || $arrErr.end_year}--><span class="attention"><!--{$arrErr.start_year}--><!--{$arrErr.end_year}--></span><br /><!--{/if}-->
         <select name="start_year" <!--{if $arrErr.start_year || $arrErr.end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
@@ -204,5 +196,5 @@
     <tr>
       <th>最終購入日</th>
-      <td>
+      <td colspan="3">
         <!--{if $arrErr.buy_start_year || $arrErr.buy_end_year}--><span class="attention"><!--{$arrErr.buy_start_year}--><!--{$arrErr.buy_end_year}--></span><br /><!--{/if}-->
         <select name="buy_start_year" style="<!--{$arrErr.buy_start_year|sfGetErrorColor}-->">
@@ -240,6 +232,4 @@
         </span>
       </td>
-    </tr>
-    <tr>
       <th>購入商品コード</th>
       <td>
@@ -250,5 +240,5 @@
     <tr>
       <th>カテゴリ</th>
-      <td>
+      <td colspan="3">
         <select name="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
           <option value="">選択してください</option>
@@ -291,5 +281,5 @@
 
   <h2>検索結果一覧</h2>
-　<p>
+  <div class="btn">
     <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
     <!--検索結果-->
@@ -297,7 +287,7 @@
     <button type="button" onclick="fnModeSubmit('delete_all','','');">検索結果をすべて削除</button>
     <!--{/if}-->
-    <button type="button" onclick="fnModeSubmit('csv','','');">CSV DOWNLOAD</button>
-    <a href="../contents/csv.php?tpl_subno_csv=customer"> &gt;&gt; CSV出力項目設定</a>
-  </p>
+    <button type="button" onclick="fnModeSubmit('csv','','');">CSV ダウンロード</button>
+    <button type="button" onclick="location.href='../contents/csv.php?tpl_subno_csv=customer'">CSV 出力項目設定</button>
+  </div>
   <!--{include file=$tpl_pager}-->
 
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/basis/control.tpl	(revision 19715)
@@ -41,6 +41,6 @@
         </form>
       </td>
-      <td align="center">
-        <div class="btn"><button type="submit" onclick="document.form<!--{$smarty.section.cnt.index}-->.submit();"><span>編集</span></button></div>
+      <td class="menu">
+        <a href="javascript;" onclick="document.form<!--{$smarty.section.cnt.index}-->.submit();">編集</a>
       </td>
     </tr>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/basis/mail.tpl	(revision 19715)
@@ -82,5 +82,5 @@
       <span class="attention"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)
       </span>
-      <div align="right">
+      <div>
         <button type="button" onclick="fnCharCount('form1','header','cnt_header');"><span>文字数カウント</span></button>
         <br />今までに入力したのは
@@ -102,5 +102,5 @@
       <textarea name="footer" cols="75" rows="12" class="area75" onChange="setFlag();" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key]|escape}--></textarea><br />
       <span class="attention"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span>
-      <div align="right">
+      <div>
         <button type="button" onclick="fnCharCount('form1','footer','cnt_footer');"><span>文字数カウント</span></button>
         <br />今までに入力したのは
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl	(revision 19715)
@@ -26,5 +26,4 @@
 <input type="hidden" name="deliv_id" value="" />
 <div id="basis" class="contents-main">
-  <h2>配送業者登録</h2>
 
   <table class="list">
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/basis/holiday.tpl	(revision 19715)
@@ -26,5 +26,4 @@
 <input type="hidden" name="holiday_id" value="<!--{$tpl_holiday_id}-->" />
 <div id="basis" class="contents-main">
-  <h2>定休日登録</h2>
 
   <table class="form">
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 19712)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	(revision 19715)
@@ -29,9 +29,7 @@
 <input type="hidden" name="keySet" value="">
 <div id="products" class="contents-main">
-  <h2>カテゴリー設定(最大<!--{$smarty.const.LEVEL_MAX}-->階層まで)</h2>
-
   <div class="btn">
-    <button type="button" onclick="fnModeSubmit('csv','','');">CSV DOWNLOAD</button>
-    <a href="../contents/csv.php?tpl_subno_csv=category">&gt;&gt; CSV出力項目設定</a>
+    <button type="button" onclick="fnModeSubmit('csv','','');">CSV ダウンロード</button>
+    <button type="button" onclick="location.href='../contents/csv.php?tpl_subno_csv=category'">CSV 出力項目設定</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 19711)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 19715)
@@ -73,5 +73,5 @@
 <!--{/foreach}-->
 <div id="products" class="contents-main">
-  <h2><!--コンテンツタイトル-->商品登録</h2>
+  <h2>基本情報</h2>
 
   <table class="form">
@@ -334,4 +334,5 @@
   <div id="sub_detail" style="display:none">
   <!--{/if}-->
+  <h2>サブ情報</h2>
   <table class="form">
     <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
@@ -396,4 +397,5 @@
   <div id="recommend_select" style="display:none">
   <!--{/if}-->
+	<h2>関連商品</h2>
   <table class="form">
     <!--{if $smarty.const.OPTION_RECOMMEND == 1}-->
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback.tpl	(revision 19715)
@@ -31,6 +31,4 @@
       <th>ブログ名</th>
       <td><input type="text" name="search_blog_name" value="<!--{$arrForm.search_blog_name|escape}-->" size="30" class="box30" /></td>
-    </tr>
-    <tr>
       <th>ブログ記事タイトル</th>
       <td><input type="text" name="search_blog_title" value="<!--{$arrForm.search_blog_title|escape}-->" size="30" class="box30" /></td>
@@ -39,6 +37,4 @@
       <th>URL</th>
       <td><input type="text" name="search_blog_url" value="<!--{$arrForm.search_blog_url|escape}-->" size="30" class="box30" /></td>
-    </tr>
-    <tr>
       <th>状態</th>
       <td>
@@ -52,6 +48,4 @@
       <th>商品名</th>
       <td><input type="text" name="search_name" value="<!--{$arrForm.search_name|escape}-->" size="30" class="box30" /></td>
-    </tr>
-    <tr>
       <th>商品コード</th>
       <td><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code|escape}-->" size="30" class="box30" /></td>
@@ -59,5 +53,5 @@
     <tr>
       <th>投稿日</th>
-      <td>
+      <td colspan="3">
       <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
       <span class="attention"><!--{$arrErr.search_startyear}--></span>
@@ -92,5 +86,5 @@
   </table>
 
-  <div>
+  <div class="btn">
     検索結果表示件数
     <!--{assign var=key value="search_page_max"}-->
@@ -121,12 +115,10 @@
 
   <h2>検索結果一覧</h2>
-  <p>
+  <div class="btn">
     <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
     <!--{if $smarty.const.ADMIN_MODE == '1'}-->
     <button type="button" onclick="fnModeSubmit('delete_all','','');"><span>検索結果をすべて削除</span></button>
     <!--{/if}-->
-  </p>
-  <div class="btn">
-    <button type="button" onclick="fnModeSubmit('csv','','');" ><span>CSV DOWNLOAD</span></button>
+    <button type="button" onclick="fnModeSubmit('csv','','');" ><span>CSV ダウンロード</span></button>
   </div>
   <!--{include file=$tpl_pager}-->
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 19711)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 19715)
@@ -22,5 +22,4 @@
  */
 *}-->
-<h2>確認</h2>
 <form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
   <!--{foreach key=key item=item from=$arrForm}-->
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 19715)
@@ -32,6 +32,4 @@
       <th>投稿者名</th>
       <td><input type="text" name="search_reviewer_name" value="<!--{$arrForm.search_reviewer_name|escape}-->" size="30" class="box30" /></td>
-    </tr>
-    <tr>
       <th>投稿者URL</th>
       <td><input type="text" name="search_reviewer_url" value="<!--{$arrForm.search_reviewer_url}-->" size="30" class="box30" /></td>
@@ -40,6 +38,4 @@
       <th>商品名</th>
       <td><input type="text" name="search_name" value="<!--{$arrForm.search_name|escape}-->" size="30" class="box30" /></td>
-    </tr>
-    <tr>
       <th>商品コード</th>
       <td><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code|escape}-->" size="30" class="box30" /></td>
@@ -49,6 +45,4 @@
       <!--{assign var=key value=search_sex}-->
       <td><!--{html_checkboxes name="$key" options=$arrSex selected=$arrForm[$key]}--></td>
-    </tr>
-    <tr>
       <th>おすすめレベル</th>
       <td>
@@ -61,5 +55,5 @@
     <tr>
       <th>投稿日</th>
-      <td>
+      <td colspan="3">
       <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
       <span class="attention"><!--{$arrErr.search_startyear}--></span>
@@ -121,11 +115,11 @@
   <!--{/foreach}-->
   <h2>検索結果一覧</h2>
-  <p>
+  <div class="btn">
     <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
     <!--{if $smarty.const.ADMIN_MODE == '1'}-->
     <button type="button" onclick="fnModeSubmit('delete_all','','');"><span>検索結果をすべて削除</span></button>
     <!--{/if}-->
-    <button type="button" onclick="fnModeSubmit('csv','','');"><span>CSV DOWNLOAD</span></button>
-  </p>
+    <button type="button" onclick="fnModeSubmit('csv','','');"><span>CSV ダウンロード</span></button>
+  </div>
   <!--{include file=$tpl_pager}-->
   
@@ -150,7 +144,7 @@
       <!--{assign var=key value="`$arrReview[cnt].recommend_level`"}-->
       <td><!--{$arrRECOMMEND[$key]}--></td>
-      <td><!--{if $arrReview[cnt].status eq 1}-->表示<!--{elseif $arrReview[cnt].status eq 2}-->非表示<!--{/if}--></td>
-      <td><button type="button" onclick="fnChangeAction('./review_edit.php'); fnModeSubmit('','review_id','<!--{$arrReview[cnt].review_id}-->');"><span>編集</span></button></td>
-      <td><button type="button" onclick="fnModeSubmit('delete','review_id','<!--{$arrReview[cnt].review_id}-->'); return false;"><span>削除</span></button></td>
+      <td class="menu"><!--{if $arrReview[cnt].status eq 1}-->表示<!--{elseif $arrReview[cnt].status eq 2}-->非表示<!--{/if}--></td>
+      <td class="menu"><a href="javascript:;" onclick="fnChangeAction('./review_edit.php'); fnModeSubmit('','review_id','<!--{$arrReview[cnt].review_id}-->');">編集</a></td>
+      <td class="menu"><a href="javascript:;" onclick="fnModeSubmit('delete','review_id','<!--{$arrReview[cnt].review_id}-->'); return false;">削除</a></td>
     </tr>
     <!--{/section}-->
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/classcategory.tpl	(revision 19715)
@@ -82,5 +82,5 @@
   </table>
   <div class="btn">
-    <button type="button" onclick="location.href='./class.php'"><span>前のページに戻る</span></button>
+    <button type="button" onclick="location.href='./class.php'"><span>規格一覧に戻る</span></button>
   </div>
 </div>
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 18873)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/products/index.tpl	(revision 19715)
@@ -76,8 +76,17 @@
         <input type="text" name="search_product_id" value="<!--{$arrForm.search_product_id|escape}-->" size="30" class="box30" style="<!--{$arrErr.search_product_id|sfGetErrorColor}-->"/>
       </td>
+			<th>規格名称</th>
+			<td>
+        <!--{if $arrErr.search_product_class_name}-->
+        <span class="attention"><!--{$arrErr.search_product_class_name}--></span>
+        <!--{/if}-->
+        <input type="text" name="search_product_class_name" value="<!--{$arrForm.search_product_class_name|escape}-->" size="30" class="box30"style="<!--{$arrErr.search_product_class_name|sfGetErrorColor}-->" />
+      </td>
     </tr>
     <tr>
       <th>商品コード</th>
       <td><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code|escape}-->" size="30" class="box30" /></td>
+      <th>商品名</th>
+      <td><input type="text" name="search_name" value="<!--{$arrForm.search_name|escape}-->" size="30" class="box30" /></td>
     </tr>
     <tr>
@@ -89,19 +98,4 @@
         </select>
       </td>
-    </tr>
-    <tr>
-      <th>規格名称</th>
-      <td>
-        <!--{if $arrErr.search_product_class_name}-->
-        <span class="attention"><!--{$arrErr.search_product_class_name}--></span>
-        <!--{/if}-->
-        <input type="text" name="search_product_class_name" value="<!--{$arrForm.search_product_class_name|escape}-->" size="30" class="box30"style="<!--{$arrErr.search_product_class_name|sfGetErrorColor}-->" />
-      </td>
-    </tr>
-    <tr>
-      <th>商品名</th>
-      <td><input type="text" name="search_name" value="<!--{$arrForm.search_name|escape}-->" size="30" class="box30" /></td>
-    </tr>
-    <tr>
       <th>種別</th>
       <td><!--{html_checkboxes name="search_status" options=$arrDISP selected=$arrForm.search_status}--></td>
@@ -109,5 +103,5 @@
     <tr>
       <th>登録・更新日</th>
-      <td>
+      <td colspan="3">
         <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
         <span class="attention"><!--{$arrErr.search_startyear}--></span>
@@ -142,5 +136,5 @@
     <tr>
       <th>ステータス</th>
-      <td>
+      <td colspan="3">
       <!--{html_checkboxes name="search_product_flag" options=$arrSTATUS selected=$arrForm.search_product_flag}-->
       </td>
@@ -173,5 +167,5 @@
   <!--{/foreach}-->  
   <h2>検索結果一覧</h2>
-  <p>
+  <div class="btn">
     <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
     <!--検索結果-->
@@ -179,7 +173,7 @@
     <button type="button" onclick="fnModeSubmit('delete_all','','');">検索結果をすべて削除</button>
     <!--{/if}-->
-    <button type="button" onclick="fnModeSubmit('csv','','');">CSV DOWNLOAD</button>
-    <a href="../contents/csv.php?tpl_subno_csv=product"> &gt;&gt; CSV出力項目設定</a>
-  </p>
+    <button type="button" onclick="fnModeSubmit('csv','','');">CSV ダウンロード</button>
+    <button type="button" onclick="location.href='../contents/csv.php?tpl_subno_csv=product'">CSV 出力項目設定</button>
+  </div>
   <!--{include file=$tpl_pager}-->
 
@@ -211,6 +205,6 @@
     <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
     <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
-      <td rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
-      <td rowspan="2">
+      <td class="id" rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
+      <td class="thumbnail" rowspan="2">
       <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65">
       </td>
@@ -230,5 +224,5 @@
       <!--{* 在庫 *}-->
       <!--{* XXX 複数規格でかつ、全ての在庫数量が等しい場合は先頭に「各」と入れたれたら良いと思う。 *}-->
-      <td rowspan="2">
+      <td class="menu" rowspan="2">
         <!--{if $arrProducts[cnt].stock_unlimited_min}-->無制限<!--{else}--><!--{$arrProducts[cnt].stock_min|number_format}--><!--{/if}-->
         <!--{if $arrProducts[cnt].stock_unlimited_min != $arrProducts[cnt].stock_unlimited_max || $arrProducts[cnt].stock_min != $arrProducts[cnt].stock_max}-->
@@ -238,12 +232,12 @@
       <!--{* 表示 *}-->
       <!--{assign var=key value=$arrProducts[cnt].status}-->
-      <td rowspan="2"><!--{$arrDISP[$key]}--></td>
-      <td rowspan="2"><span class="icon_edit"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >編集</a></span></td>
-      <td rowspan="2"><span class="icon_confirm"><a href="<!--{$smarty.const.SITE_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->&amp;admin=on" target="_blank">確認</a></span></td>
+      <td class="menu" rowspan="2"><!--{$arrDISP[$key]}--></td>
+      <td class="menu" rowspan="2"><span class="icon_edit"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >編集</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_confirm"><a href="<!--{$smarty.const.SITE_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->&amp;admin=on" target="_blank">確認</a></span></td>
       <!--{if $smarty.const.OPTION_CLASS_REGIST == 1}-->
-      <td rowspan="2"><span class="icon_class"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product_class.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >規格</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_class"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product_class.php'); fnModeSubmit('pre_edit', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >規格</a></span></td>
       <!--{/if}-->
-      <td rowspan="2"><span class="icon_delete"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnSetFormValue('category_id', '<!--{$arrProducts[cnt].category_id}-->'); fnModeSubmit('delete', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;">削除</a></span></td>
-      <td rowspan="2"><span class="icon_copy"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('copy', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >複製</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_delete"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnSetFormValue('category_id', '<!--{$arrProducts[cnt].category_id}-->'); fnModeSubmit('delete', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;">削除</a></span></td>
+      <td class="menu" rowspan="2"><span class="icon_copy"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnChangeAction('./product.php'); fnModeSubmit('copy', 'product_id', <!--{$arrProducts[cnt].product_id}-->); return false;" >複製</a></span></td>
     </tr>
     <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
Index: /branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css
===================================================================
--- /branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css	(revision 19711)
+++ /branches/version-2_5-dev/html/user_data/packages/admin/css/admin_contents.css	(revision 19715)
@@ -59,7 +59,64 @@
 table.list th.left { text-align: left; }
 table.list th.right { text-align: right; }
+table.list td.id,
+table.list td.thumbnail {
+    text-align: center;
+}
+table.list td.menu {
+    text-align: center;
+    vertical-align: middle;
+}
 table.form th { width: 25%; }
 table.form td { width: 75%; }
 table.form thead th { text-align: center; width: auto; }
+
+input[type='submit'],
+input[type='button'],
+input[type='reset'],
+input[type='file'],
+button {
+    color: #000;
+    text-decoration: none;
+    background-attachment: scroll;
+    background-clip: border-box;
+    background-color: #eee;
+    background-image: url('../img/button/white-grad.png');
+    background-origin: padding-box;
+    line-height: 15px;
+    padding: 5px 10px;
+    white-space: nowrap;
+    border: solid 1px #999;
+    cursor: pointer;
+    font-size: 11px;
+
+    /* CSS3 radius */
+    border-bottom-left-radius: 5px 5px;
+    border-bottom-right-radius: 5px 5px;
+    border-top-left-radius: 5px 5px;
+    border-top-right-radius: 5px 5px;
+
+    /* Safari, Chrome radius */
+    -webkit-box-sizing: content-box;
+    -webkit-border-radius: 5px;
+
+    /* Firefox radius */
+    -moz-border-radius: 5px;
+}
+
+input[type='submit']:hover,
+input[type='button']:hover,
+input[type='reset']:hover,
+input[type='file']:hover,
+button:hover {
+    border: solid 1px #666;
+}
+
+input[type='submit']:active,
+input[type='button']:active,
+input[type='reset']:active,
+input[type='file']:active,
+button:active {
+    background-image: url('../img/button/white-grad-active.png');
+}
 
 #contents ul {margin: 0 0 0 2em;}
@@ -359,4 +416,9 @@
 #order-status-list th.id {width: 40px;}
 
+/* 期間別集計
+----------------------------------------------- */
+#graph-image {
+    margin: 0 0 20px 0;
+}
 
 /* デザイン管理
@@ -419,7 +481,9 @@
 /* フォーム
 ----------------------------------------------- */
-div.btn {
+div.btn,
+p.remark {
     margin: 0 0 20px 0;
 }
+
 /*FORM*/
 .box3 { width: 33px; }	/*W3*/
