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 20116)
+++ /branches/version-2_5-dev/data/Smarty/templates/admin/mail/template.tpl	(revision 20198)
@@ -45,5 +45,5 @@
         <!--{section name=data loop=$list_data}-->
         <tr>
-            <td><!--{$list_data[data].disp_date|date_format:'%Y/%m/%d'|h}--></td>
+            <td><!--{$list_data[data].create_date|date_format:'%Y/%m/%d'|h}--></td>
             <td class="left"><!--{$list_data[data].subject|h}--></td>
             <!--{assign var=type value=$list_data[data].mail_method|h}-->
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 20160)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php	(revision 20198)
@@ -328,4 +328,32 @@
         return true;
     }
+    
+    /**
+     * 保存されているメールテンプレートの取得
+     * @param array $arrParams 特定IDのテンプレートを取り出したい時は$arrParams['template_id']で指定
+     * @return　array メールテンプレート情報を格納した配列
+     * @todo   表示順も引数で変更できるように
+     */
+    function sfGetMailTemplate($arrParams = array()){
+        // 初期化
+        $where = '';
+        $arrValues = array();
+        $objQuery =& SC_Query::getSingletonInstance();
+        
+        // 条件文
+        $where = 'del_flg = ?';
+        $arrValues[] = 0;
+        //template_id指定時
+        if (isset($arrParams['template_id'])) {
+            $where .= 'AND template_id = ?';
+            $arrValues[] = $arrParams['template_id'];
+        }
+        
+        // 表示順
+        $objQuery->setOrder("create_date DESC");
+        
+        $arrResults = $objQuery->select('*', 'dtb_mailmaga_template', $where, $arrValues);
+        return $arrResults;
+    }
 }
 ?>
Index: /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	(revision 20116)
+++ /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php	(revision 20198)
@@ -70,5 +70,5 @@
      */
     function action() {
-        $objQuery = new SC_Query();
+        $objMailHelper = new SC_Helper_Mail_Ex();
         $objSess = new SC_Session();
 
@@ -76,20 +76,8 @@
         SC_Utils_Ex::sfIsSuccess($objSess);
 
-        if (!isset($_GET['id'])) $_GET['id'] = "";
-
         switch ($this->getMode()) {
         case 'delete':
             if ( SC_Utils_Ex::sfCheckNumLength($_GET['id'])===true ){
-                // メール担当の画像があれば削除しておく
-                $sql = "SELECT charge_image FROM dtb_mailmaga_template WHERE template_id = ?";
-                $result = $objQuery->getOne($sql, array($_GET["id"]));
-                if (strlen($result) > 0) {
-                    @unlink(IMAGE_SAVE_REALDIR. $result);
-                }
-
-                // 登録削除
-                $sql = "UPDATE dtb_mailmaga_template SET del_flg = 1 WHERE template_id = ?";
-                $objQuery->query($sql, array($_GET['id']));
-
+                $this->lfDeleteMailTemplate($_GET['id']);
                 $this->objDisplay->reload(null, true);
             }
@@ -98,7 +86,5 @@
             break;
         }
-
-        $sql = "SELECT *, create_date as disp_date FROM dtb_mailmaga_template WHERE del_flg = 0 ORDER BY create_date DESC";
-        $this->list_data = $objQuery->getAll($sql);
+        $this->list_data = $objMailHelper->sfGetMailTemplate();
     }
 
@@ -111,4 +97,17 @@
         parent::destroy();
     }
+    
+    /**
+     * メールテンプレートの削除
+     * @param integer 削除したいテンプレートのID
+     * @return void
+     */
+    function lfDeleteMailTemplate($template_id){
+        $objQuery =& SC_Query::getSingletonInstance();
+        $sqlval["del_flg"] = "1";
+        $arrValIn[] = $template_id;
+        $objQuery->update("dtb_mailmaga_template", $sqlval, "template_id = ?", $arrValIn);
+    }
+
 }
 ?>
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 20128)
+++ /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php	(revision 20198)
@@ -318,9 +318,4 @@
                     $objSiteInfo = new SC_SiteInfo();
                     $objTemplate->arrInfo = $objSiteInfo->data;
-                    // メール担当写真の表示
-                    $objUpFile = new SC_UploadFile(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
-                    $objUpFile->addFile("メール担当写真", 'charge_image', array('jpg'), IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
-                    $objUpFile->setDBFileList($objTemplate->list_data);
-                    $objTemplate->arrFile = $objUpFile->getFormFileList(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
                     $objMakeTemplate = new SC_AdminView();
                     $objMakeTemplate->assignobj($objTemplate);
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 20116)
+++ /branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail_Preview.php	(revision 20198)
@@ -86,11 +86,4 @@
             $this->list_data = $result[0];
 
-            //メール担当写真の表示
-            $objUpFile = new SC_UploadFile(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
-            $objUpFile->addFile("メール担当写真", 'charge_image', array('jpg'), IMAGE_SIZE, true, SMALL_IMAGE_WIDTH, SMALL_IMAGE_HEIGHT);
-            $objUpFile->setDBFileList($this->list_data);
-            // Form用配列を渡す。
-            $this->arrFile = $objUpFile->getFormFileList(IMAGE_TEMP_URLPATH, IMAGE_SAVE_URLPATH);
-
             // メイン商品の情報取得
             // FIXME SC_Product クラスを使用した実装
Index: /branches/version-2_5-dev/html/install/sql/column_comment.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 20116)
+++ /branches/version-2_5-dev/html/install/sql/column_comment.sql	(revision 20198)
@@ -100,5 +100,4 @@
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (414, 'dtb_order', 'deliv_pref', '都道府県');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (100, 'dtb_mailmaga_template', 'subject', '件名');
-INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (101, 'dtb_mailmaga_template', 'charge_image', 'メール担当写真');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (102, 'dtb_mailmaga_template', 'mail_method', '1:テキストメール 2:HTMLメール 3:HTMLTEMPLATE');
 INSERT INTO dtb_table_comment (id, table_name, column_name, description) VALUES (103, 'dtb_mailmaga_template', 'header', 'ヘッダーテキスト');
Index: /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 20160)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 20198)
@@ -239,5 +239,4 @@
     template_id int NOT NULL,
     subject text,
-    charge_image text,
     mail_method int,
     header text,
Index: /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 20160)
+++ /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 20198)
@@ -239,5 +239,4 @@
     template_id int NOT NULL,
     subject text,
-    charge_image text,
     mail_method int,
     header text,