Index: branches/version-2_5-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_5-dev/data/mtb_constants_init.php	(revision 18871)
+++ branches/version-2_5-dev/data/mtb_constants_init.php	(revision 18873)
@@ -480,9 +480,9 @@
 define('TEMPLATE_DIR', SMARTY_TEMPLATES_DIR . TEMPLATE_NAME . "/");
 /** SMARTYテンプレート(管理機能) */
-define('TEMPLATE_ADMIN_DIR', SMARTY_TEMPLATES_DIR . DEFAULT_TEMPLATE_NAME . "/admin/");
+define('TEMPLATE_ADMIN_DIR', SMARTY_TEMPLATES_DIR . "admin/");
 /** SMARTYコンパイル */
 define('COMPILE_DIR', DATA_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/");
 /** SMARTYコンパイル(管理機能) */
-define('COMPILE_ADMIN_DIR', COMPILE_DIR . "admin/");
+define('COMPILE_ADMIN_DIR', DATA_PATH . "Smarty/templates_c/admin/");
 /** SMARTYテンプレート(FTP許可) */
 define('TEMPLATE_FTP_DIR', USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/");
Index: branches/version-2_5-dev/data/class/SC_View.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_View.php	(revision 18701)
+++ branches/version-2_5-dev/data/class/SC_View.php	(revision 18873)
@@ -181,4 +181,5 @@
         $this->_smarty->template_dir = TEMPLATE_ADMIN_DIR;
         $this->_smarty->compile_dir = COMPILE_ADMIN_DIR;
+        $this->assign("TPL_DIR", URL_DIR . USER_DIR . USER_PACKAGE_DIR . DEFAULT_TEMPLATE_NAME . "/");
         $this->initpath();
     }
Index: branches/version-2_5-dev/data/Smarty/templates/admin/sales/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/sales/index.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/sales/index.tpl	(revision 18873)
@@ -0,0 +1,118 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--▼CONTENTS-->
+<table width="780" border="0" cellspacing="0" cellpadding="0" summary=" ">
+	<tr>
+		<td bgcolor="#ffffff" align="center" valign="top" height="400">
+		<table width="740" border="0" cellspacing="0" cellpadding="0" summary=" ">
+			<tr>
+				<!--▼SUB NAVI-->
+				<td class="fs12n"><span class="over">■売上集計</span></td>
+				<!--▲SUB NAVI-->
+			</tr><tr><td height="25"></td></tr>
+		</table>
+		
+		<!--▼MAIN CONTENTS-->
+		<table width="740" border="0" cellspacing="0" cellpadding="0" summary=" ">
+			<tr>
+				<td class="fs14n"><strong>■売上集計</strong></td>
+			</tr>
+			<tr><td height="10"></td></tr>
+		</table>
+		
+		<!--▼検索テーブルここから-->
+		<form name="form1" id="form1" method="post" action="">
+		<table bgcolor="#cccccc" width="730" border="0" cellspacing="1" cellpadding="5" summary=" ">
+			<tr class="fs12n">
+				<td bgcolor="#ffffff">
+				<input type="radio" value="年度指定" name="search" checked="checked">　
+				<select name="year">
+				<option selected="selected">--</option>
+				</select>年
+				<select name="month">
+				<option selected="selected">--</option>
+				</select>月度（30日締めです）
+				</td>
+			</tr>
+			<tr class="fs12n">
+				<td bgcolor="#ffffff">
+				<input type="radio" value="期間指定" name="search">　
+				<select name="year_from">
+				<option selected="selected">--</option>
+				</select>年
+				<select name="month_from">
+				<option selected="selected">--</option>
+				</select>月
+				<select name="day_from">
+				<option selected="selected">--</option>
+				</select>日～
+				<select name="year_to">
+				<option selected="selected">--</option>
+				</select>年
+				<select name="month_to">
+				<option selected="selected">--</option>
+				</select>月
+				<select name="day_to">
+				<option selected="selected">--</option>
+				</select>日
+				</td>
+			</tr>
+			<tr class="fs12n">
+				<td bgcolor="#ffffff">
+				<select name="data">
+				<option selected="selected">選択してください</option>
+				<option value="月別/期間別">月別/期間別</option>
+				<option value="売れ筋商品BEST10">売れ筋商品BEST10</option>
+				<option value="年齢BEST10">年齢BEST10</option>
+				<option value="職業BEST10">職業BEST10</option>
+				<option value="売上内訳（一般/会員）">売上内訳（一般/会員）</option>
+				<option value="商品BEST（一般）">商品BEST（一般）</option>
+				<option value="商品BEST（会員）">商品BEST（会員）</option>
+				</select>
+				</td>
+			</tr>
+		</table>
+		<!--▲検索テーブルここまで-->
+		
+		<br />
+		<input type="button" name="subm" value="この内容で検索する" />
+		</form>
+		
+		<!--▼検索結果表示エリアここから-->
+		<hr noshade size="1" color="#cccccc" />
+		
+		<table width="740" border="0" cellspacing="0" cellpadding="0" summary=" ">
+			<tr><td height="15"></td></tr>
+			<tr class="fs12">
+				<td align="center">保留</td>
+			</tr>
+			<tr><td height="5"></td></tr>
+		</table>
+		<!--▲検索結果表示エリアここまで-->
+		
+		<!--▲MAIN CONTENTS-->
+		</td>
+	</tr>
+</table>
+<!--▲CONTENTS-->
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 18873)
@@ -0,0 +1,79 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form_bloc" id="form_bloc" method="post" action="?" >
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="bloc_id" value="<!--{$bloc_id}-->" />
+  <!--{* ▼ブロック編集ここから *}-->
+  <h2>ブロック編集</h2>
+
+  <!--{if $arrBlocData.tpl_path != '' and $preview == on}-->
+  <h3>プレビュー：</h3>
+  <div id="design-bloc-preview">
+    <!--{include file=$arrBlocData.tpl_path}-->
+  </div>
+  <!--{/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 />
+    <!--{ 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>
+  <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>
+  <table class="list center">
+    <!--{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>
+        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?bloc_id=<!--{$item.bloc_id}-->" ><!--{$item.bloc_name}--></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));" />
+        <input type="hidden" value="<!--{$item.bloc_id}-->" name="del_id<!--{$item.bloc_id}-->" />
+        <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/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>
+  <!--{* ▲ブロック一覧ここまで *}-->
+
+</form>  
Index: branches/version-2_5-dev/data/Smarty/templates/admin/design/upload.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/design/upload.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/upload.tpl	(revision 18873)
@@ -0,0 +1,76 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" method="post" action="?" enctype="multipart/form-data">
+<input type="hidden" name="mode" value="upload" />
+<div id="disign" class="contents-main">
+  <h2><!--{$template_name}--></h2>
+  <table>
+    <!--{assign var=key value="template_code"}-->
+    <tr>
+      <th>テンプレートコード</th>
+      <td>
+        <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+        <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+      </td>
+    </tr>
+    <!--{assign var=key value="template_name"}-->
+    <tr>
+      <th>テンプレート名</th>
+      <td>
+        <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+        <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" />
+      </td>
+    </tr>
+    <!--{assign var=key value="template_file"}-->
+    <tr>
+      <th>テンプレートファイル<br /><span class="attention">※ファイル形式は.tar/.tar.gzのみ</span></th>
+      <td>
+        <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+        <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr.template_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> />
+      </td>
+    </tr>
+  </table>
+
+  <div class="btn"><button type="submit"><span>アップロード</span></button></div>
+
+</div>
+</form>
+
+<script type="text/javascript">
+function ChangeImage(strUrl)
+{
+  document.main_img.src=strUrl;
+}
+
+// モードとキーを指定してSUBMITを行う。
+function lfnModeSubmit(mode) {
+  if(!window.confirm('登録しても宜しいですか?')){
+    return false;
+  }
+  document.form1['mode'].value = mode;
+  return true;
+}
+
+
+</script>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/index.tpl	(revision 18873)
@@ -0,0 +1,295 @@
+<script type="text/javascript">
+
+function doPreview(){
+    document.form1.mode.value="preview"
+    document.form1.target = "_blank";
+    document.form1.submit();
+}
+function fnTargetSelf(){
+    document.form1.target = "_self";
+}
+
+</script>
+
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/ui.core.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/ui.sortable.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/layout_design.js"></script>
+
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="page_id" value="<!--{$page_id}-->" />
+<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">
+        <table id="design-layout-used" class="design-layout">
+            <tr>
+                <th colspan="3">&lt;head&gt;</td>
+            </tr>
+            <tr>
+                <!-- ★☆★ HEADタグ内テーブル ☆★☆ -->
+                <td colspan="3" id="HeadNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "HeadNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!-- ★☆★ Headタグ内テーブル ☆★☆ -->
+            </tr>
+            <tr>
+                <th colspan="3">&lt;/head&gt;</td>
+            </tr>
+            <tr>
+                <!-- ★☆★ ヘッダより上部ナビテーブル ☆★☆ -->
+                <td colspan="3" id="HeaderTopNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "HeaderTopNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label>
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!-- ★☆★ ヘッダより上部ナビテーブル ☆★☆ -->
+            </tr>
+            <tr>
+                <th colspan="3" id="layout-header">ヘッダー部</td>
+            </tr>
+            <tr>
+                <!-- ★☆★ 上部ナビテーブル ☆★☆ -->
+                <td colspan="3" id="TopNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "TopNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!-- ★☆★ 上部ナビテーブル ☆★☆ -->
+            </tr>
+            <tr>
+                <!--{* 左ナビテーブルここから *}-->
+                <td rowspan="3" id="LeftNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "LeftNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!--{* 左ナビテーブルここまで *}-->
+                <!--{* メイン上部テーブルここから *}-->
+                <td id="MainHead" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "MainHead"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!--{* メイン上部テーブルここまで *}-->
+                <!--{* 右ナビここから *}-->
+                <td rowspan="3" id="RightNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "RightNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!--{* 右ナビここまで *}-->
+            </tr>
+            <!--{* メインここから *}-->
+            <tr>
+                <th id="layout-main">メイン</td>
+            </tr>
+            <!--{* メインここまで *}-->
+            <!--{* メイン下部ここから *}-->
+            <tr>
+                <td id="MainFoot" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "MainFoot"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+            </tr>
+            <tr>
+            <!--{* メイン下部ここまで *}-->
+                 <!-- ★☆★ 下部ナビテーブル ☆★☆ -->
+                <td colspan="3" id="BottomNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "BottomNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!-- ★☆★ 下部ナビテーブル ☆★☆ --> 
+            </tr>
+            <tr>
+                <th colspan="3" id="layout-footer">フッター部</td>
+            </tr>
+            <tr>
+                <!-- ★☆★ フッタより下部ナビテーブル ☆★☆ -->
+                <td colspan="3" id="FooterBottomNavi" class="ui-sortable">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "FooterBottomNavi"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}--> />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+                <!-- ★☆★ フッタより下部ナビテーブル ☆★☆ -->
+            </tr>
+        </table>
+        <div class="btn">
+            <button type='button' name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','confirm','','');"><span>登録する</span></button>
+            <button type='button' name='preview' onclick="doPreview();"<!--{if $page_id == "0" or $exists_page == "0" }--> DISABLED<!--{/if}-->><span>プレビュー</span></button>
+        </div>
+    </div>
+    <!--{* ▲レイアウトここまで *}-->
+
+    <!--{* ▼未使用ブロックここから *}-->
+    <div style="float: left; width: 25%;" align="center">
+        <table id="design-layout-unused" class="design-layout">
+            <tr>
+                <th>未使用ブロック</th>
+            </tr>
+            <tr>
+                <td id="Unused" class="ui-sortable" style="width: 145px;">
+                    <!--{assign var="firstflg" value=false}-->
+                    <!--{foreach key=key item=item from=$tpl_arrBloc name="bloc_loop"}-->
+                        <!--{if $item.target_id == "Unused"}-->
+                            <div class="sort<!--{if !$firstflg}--> first<!--{/if}-->">
+                                <input type="hidden" class="name" name="name_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.name}-->" />
+                                <input type="hidden" class="id" name="id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_id}-->" />
+                                <input type="hidden" class="target-id" name="target_id_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.target_id}-->" />
+                                <input type="hidden" class="top" name="top_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="<!--{$item.bloc_row}-->" />
+                                <!--{$item.name}-->
+                                <label class="anywherecheck">(<input type="checkbox" class="anywhere" name="anywhere_<!--{$smarty.foreach.bloc_loop.iteration}-->" value="1" <!--{$item.anywhere_selected}-->    />全ページ)</label> 
+                            </div>
+                            <!--{assign var="firstflg" value=true}-->
+                        <!--{/if}-->
+                    <!--{/foreach}-->
+                </td>
+            </tr>
+        </table>
+        <div class="btn"><button type='button' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_bloc','','');"><span>ブロックを新規入力</span></button></div>
+    </div>
+    <!--{* ▲未使用ブロックここまで *}-->
+    <!--▲レイアウト編集　ここまで-->
+
+    <!--▼ページ一覧　ここから-->
+    <h2 style="clear: both;">編集可能ページ一覧</h2>
+    <table class="list center">
+        <tr>
+            <th>名称</th>
+            <th><strong>レイアウト</strong></th>
+            <th>ページ詳細</th>
+            <th>削除</th>
+        </tr>
+    <!--{foreach key=key item=item from=$arrEditPage}-->
+        <tr style="background-color:<!--{if $item.page_id == $page_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
+            <td>
+                <!--{$item.page_name}-->
+            </td>
+            <td>
+                <a href="?page_id=<!--{$item.page_id}-->" ><strong>編集</strong></a>
+            </td>
+            <td>
+                <!--{if $item.filename|strlen >= 1}-->
+                    <a href="main_edit.php?page_id=<!--{$item.page_id}-->">編集</a>
+                <!--{/if}-->
+            </td>
+            <td>
+                <!--{if $item.edit_flg == 1}-->
+                    <a href="?" onclick="fnTargetSelf(); fnFormModeSubmit('form1','delete','','');">削除</a>
+                <!--{/if}-->
+            </td>
+        </tr>
+    <!--{/foreach}-->
+    </table>
+    <div class="btn addnew">
+        <button type='button' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>ページを新規入力</span></button>
+    </div>
+    <!--▲ページ一覧　ここまで-->
+</div>
+</form>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/subnavi.tpl	(revision 18873)
@@ -0,0 +1,32 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<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}-->"><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"><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"><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"><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"><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"><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"><span>テンプレート追加</span></a></li>
+</ul>
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 18873)
@@ -0,0 +1,95 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form_css" method="post" action="?" >
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="area_row" value="<!--{$area_row}-->" />
+<input type="hidden" name="old_css_name" value="<!--{$old_css_name}-->" />
+<div id="design" class="contents-main">
+  <h2>CSS編集</h2>
+
+  <!--▼CSS編集　ここから-->
+  <table class="form">
+    <tr>
+      <th>CSSファイル名</th>
+      <td>
+        <!--{ if $arrErr.css_name != "" }--><span class="attention"><!--{$arrErr.css_name}--></span><br /><!--{/if}-->
+        <input type="text" name="css_name" value="<!--{$css_name}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.css_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />.css<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>CSS内容</th>
+      <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>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    <button type="submit" onclick="fnFormModeSubmit('form_css','confirm','','');"><span>この内容で登録する</span></button>
+  </div>
+  <!--▲CSS編集　ここまで-->
+
+  <!--▼CSSファイル一覧　ここから-->
+  <h2>編集可能CSSファイル</h2>
+  <table class="list center" id="design-css-list">
+    <tr>
+      <th class="name">ファイル名</th>
+      <th class="action">&nbsp;</th>
+    </tr>
+    <!--{if count($arrCSSList) > 0}-->
+    <!--{foreach key=key item=item from=$arrCSSList}-->
+    <tr>
+      <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>
+      </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>
+      </td>
+    </tr>
+    <!--{/foreach}-->
+    <!--{else}-->
+    <tr>
+      <td colspan="2">CSSファイルが存在しません。</td>
+    </tr>
+    <!--{/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ファイル一覧　ここまで-->
+
+</div>
+</form>
+
+<script type="text/javascript">
+  function ChangeSize(button, TextArea, Max, Min, row_tmp){
+    if(TextArea.rows <= Min){
+      TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
+    }else{
+      TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
+    }
+  }
+</script>
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 18873)
@@ -0,0 +1,111 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{*
+
+XXX: ヘッダーとフッターでwrapの設定が違うのは疑問。それぞれの良し悪しはともかく、統一を。
+
+*}-->
+<div id="design" class="contents-main">
+  <!--{* ▼ヘッダー編集ここから *}-->
+  <h2>ヘッダー編集</h2>
+  <!--{* プレビューここから *}-->
+  <!--{ if $header_prev == "on"}-->
+  <dic id="design-header-preview">
+    <!--{if $browser_type == 1 }-->
+      <div style="zoom:0.8"><!--{include file="`$smarty.const.HTML_PATH`user_data/include/preview/header.tpl"}--></div>
+    <!--{ else }-->
+      <span class="attention"><strong>プレビューはIEでのみ表示されます。</strong></span>
+    <!--{ /if }-->
+  </div>
+  <!--{ /if }-->
+  <!--{* プレビューここまで *}-->
+    
+  <form name="form_header" id="form_header" method="post" action="?" >
+  <input type="hidden" name="mode" value="" />
+  <input type="hidden" name="division" value="header" />
+  <input type="hidden" name="header_row" value="<!--{$header_row}-->" />
+  <input type="hidden" name="browser_type" value="" />
+    <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>
+    </div>
+    <div class="btn">
+      <button type='button' name='subm' onclick="fnFormModeSubmit('form_header','confirm','','');"><span>登録</span></button>
+      <button type='button' name='preview' onclick="lfnSetBrowser('form_header', 'browser_type'); fnFormModeSubmit('form_header','preview','','');"><span>プレビュー</span></button>
+    </div>
+  </form>
+  <!--{* ▲ヘッダー編集ここまで *}-->
+
+  <!--{* ▼フッター編集ここから *}-->
+  <h2>フッター編集</h2>
+  <!--{ if $footer_prev == "on"}-->
+  <div id="design-footer-preview">
+    <!--{if $browser_type == 1 }-->
+      <div style="zoom:0.8"><!--{include file="`$smarty.const.HTML_PATH`/user_data/include/preview/footer.tpl"}--></div>
+    <!--{ else }-->
+      <span class="attention"><strong>プレビューはIEでのみ表示されます。</strong></span>
+    <!--{ /if }-->
+  </div>
+  <!--{ /if }-->
+
+  <form name="form_footer" id="form_footer" method="post" action="?" >
+  <input type="hidden" name="mode" value="" />
+  <input type="hidden" name="division" value="footer" />
+  <input type="hidden" name="footer_row" value=<!--{$footer_row}--> />
+  <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>
+    <div class="btn">
+      <button type='button' name='subm' onclick="fnFormModeSubmit('form_footer','confirm','','');"><span>登録</span></button>
+      <button type='button' name='preview' onclick="lfnSetBrowser('form_footer', 'browser_type'); fnFormModeSubmit('form_footer','preview','','');"><span>プレビュー</span></button>
+    </div>
+  </form>
+  <!--{* ▲フッター編集ここまで *}-->
+
+<script type="text/javascript">
+  /* テキストエリアの大きさを変更する */
+  function ChangeSize(button, TextArea, Max, Min, row_tmp){
+    if(TextArea.rows <= Min){
+      TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
+    }else{
+      TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
+    }
+  }
+  
+  /* ブラウザの種類をセットする */
+  function lfnSetBrowser(form, item){
+    browser_type = 0;
+    if(navigator.userAgent.indexOf("MSIE") >= 0){
+        browser_type = 1;
+    }
+    else if(navigator.userAgent.indexOf("Gecko/") >= 0){
+        browser_type = 2;
+    }
+    
+    document[form][item].value=browser_type;
+  }
+
+</script>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/design/main_edit.tpl	(revision 18873)
@@ -0,0 +1,129 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+function doPreview(){
+  document.form_edit.mode.value="preview"
+  document.form_edit.target = "_blank";
+  document.form_edit.submit();
+}
+
+function fnTargetSelf(){
+  document.form_edit.target = "_self";
+}
+
+browser_type = 0;
+if(navigator.userAgent.indexOf("MSIE") >= 0){
+    browser_type = 1;
+}
+else if(navigator.userAgent.indexOf("Mozilla") >= 0){
+    browser_type = 2;
+}
+//-->
+</script>
+
+
+<form name="form_edit" id="form_edit" method="post" action="?" >
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="page_id" value="<!--{$page_id}-->" />
+
+  <!--{if $arrErr.page_id_err != ""}-->
+  <div class="message">
+    <span class="attention"><!--{$arrErr.page_id_err}--></span>
+  </div>
+  <!--{/if}-->
+  <!--{ if $arrErr.page_name != "" }-->
+  <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}-->
+      <!--{$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 />
+
+  <label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" <!--{$arrPageData.header_chk}--> />共通のヘッダーを使用する</label>&nbsp;
+  <label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" <!--{$arrPageData.footer_chk}--> />共通のフッターを使用する</label>
+  <div>
+    <textarea name="tpl_data" rows=<!--{$text_row}--> style="width: 100%;"><!--{$arrPageData.tpl_data|escape|smarty:nodefaults}--></textarea>
+    <input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
+  </div>
+  <div class="btn">
+    <button type="button" onClick="ChangeSize(this, tpl_data, 50, 13, html_area_row)"><span>大きくする</span></button>
+  </div>
+
+  <div class="btn">
+    <button type='button' name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','confirm','','');"><span>登録する</span></button>
+    <button type='button' name='preview' onclick="doPreview(); "><span>プレビュー</span></button>
+  </div>
+
+
+  <h2>編集可能ページ一覧</h2>
+  <table class="list center">
+    <tr>
+      <th>名称</th>
+      <th>レイアウト</th>
+      <th><strong>ページ詳細</strong></th>
+      <th>削除</th>
+    </tr>
+    <!--{foreach key=key item=item from=$arrPageList}-->
+    <tr style="<!--{if $item.page_id == $page_id}-->background-color: <!--{$smarty.const.SELECT_RGB}-->;<!--{/if}-->">
+      <td>
+        <!--{$item.page_name}-->
+      </td>
+      <td>
+        <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->?page_id=<!--{$item.page_id}-->" >編集</a>
+      </td>
+      <td>
+        <!--{if $item.filename|strlen >= 1}-->
+          <a href="?page_id=<!--{$item.page_id}-->"><strong>編集</strong></a>
+        <!--{/if}-->
+      </td>
+      <td>
+        <!--{if $item.edit_flg == 1}-->
+          <a href="?" onclick="fnTargetSelf(); fnFormModeSubmit('form_edit','delete','page_id',this.name.substr(3));">削除</a>
+          <input type="hidden" value="<!--{$item.page_id}-->" name="del_id<!--{$item.page_id}-->" />
+        <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/foreach}-->
+  </table>
+  <div class="btn addnew">
+    <button type='button' onclick="location.href='http://<!--{$smarty.server.HTTP_HOST}--><!--{$smarty.server.PHP_SELF|escape}-->'"><span>ページを新規入力</span></button>
+  </div>
+
+</form>
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 18873)
@@ -0,0 +1,70 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript"><!--
+function submitRegister() {
+  var form = document.form1;
+  var msg  = "テンプレートを変更します。";
+
+  if (window.confirm(msg)) {
+    form['mode'].value = 'register';
+    form.submit();
+  }
+}
+// -->
+</script>
+
+<form name="form1" method="post" action="?">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="template_code_temp" value="" />
+<input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
+<div id="design" class="contents-main">
+  <h2>テンプレート設定</h2>
+  <p>
+    テンプレートを選択し、「この内容で登録する」ボタンを押すと、<br />
+    選択したテンプレートへデザインを変更することが出来ます。
+  </p>
+  <table class="list center">
+    <tr>
+      <th>選択</th>
+      <th>名前</th>
+      <th>保存先</th>
+      <th>ダウンロード</th>
+      <th>削除</th>
+    </tr>
+    <!--{foreach from=$templates item=tpl}-->
+    <!--{assign var=tplcode value=$tpl.template_code}-->
+    <tr class="center">
+      <td><input type="radio" name="template_code" value="<!--{$tplcode|escape}-->" <!--{if $tplcode == $tpl_select}-->checked<!--{/if}--> /></td>
+      <td class="left"><!--{$tpl.template_name|escape}--></td>
+      <td class="left">data/Smarty/templates/<!--{$tplcode|escape}-->/</td>
+      <td><span class="icon_confirm"><a href="#" onClick="fnModeSubmit('download','template_code_temp','<!--{$tplcode}-->');return false;">ダウンロード</a></span></td>
+      <td><span class="icon_delete"><a href="#" onClick="fnModeSubmit('delete','template_code_temp','<!--{$tplcode}-->');return false;">削除</a></span></td>
+    </tr>
+    <!--{/foreach}-->
+  </table>
+  <div class="btn">
+    <button type="submit" onclick="submitRegister();return false;"><span>この内容で登録する</span></button>
+  </div>
+</div>
+</form>
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 18873)
@@ -0,0 +1,78 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript"><!--
+function confirmSubmit(mode, msg) {
+  var form = document.form1;
+  form['mode'].value = mode;
+  if (window.confirm(msg)) {
+    form.submit();
+  } else {
+    form['mode'].value = '';
+  }
+}
+//-->
+</script>
+
+<form name="form1" method="post" action="?" enctype="multipart/form-data">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="uniqid" value="<!--{$uniqid}-->" />
+<div id="disign" class="contents-main">
+  <h2>アップロード</h2>
+  <p>
+    テンプレートパッケージのアップロードを行います。<br />
+    アップロードしたパッケージは、「テンプレート設定」で選択できるようになります。
+  </p>
+  <table>
+    <!--{assign var=key value="template_code"}-->
+    <tr>
+      <th>テンプレートコード</td>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
+      </td>
+    </tr>
+    <!--{assign var=key value="template_name"}-->
+    <tr>
+      <th>テンプレート名</td>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54">
+      </td>
+    </tr>
+    <!--{assign var=key value="template_file"}-->
+    <tr>
+      <th>テンプレートファイル<br/>
+        <span class="attention"><span class="fs14n">※ファイル形式は.tar/.tar.gzのみ</span></span>
+      </td>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <input type="file" name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" class="box54" size="64" <!--{if $arrErr[$key]}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    <button type="submit" onClick="fnModeSubmit('upload', '', '');return false;"><span>アップロード</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/mail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/mail.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/mail.tpl	(revision 18873)
@@ -0,0 +1,93 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="order_id" value="<!--{$tpl_order_id}-->" />
+<!--{foreach key=key item=item from=$arrSearchHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<div id="order" class="contents-main">
+  <h2>メール配信</h2>
+  <table class="list">
+    <tr>
+      <th>処理日</th>
+      <th>通知メール</th>
+      <th>件名</th>
+    </tr>
+    <!--{section name=cnt loop=$arrMailHistory}-->
+    <tr class="center">
+      <td><!--{$arrMailHistory[cnt].send_date|sfDispDBDate|escape}--></td>
+      <!--{assign var=key value="`$arrMailHistory[cnt].template_id`"}-->
+      <td><!--{$arrMAILTEMPLATE[$key]|escape}--></td>
+      <td><a href="?" onclick="win02('./mail_view.php?send_id=<!--{$arrMailHistory[cnt].send_id}-->','mail_view','650','800'); return false;"><!--{$arrMailHistory[cnt].subject|escape}--></a></td>
+    </tr>
+    <!--{/section}-->
+  </table>
+
+  <table class="form">
+    <tr>
+      <th>テンプレート<span class="attention"> *</span></th>
+      <td>
+        <!--{assign var=key value="template_id"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <select name="template_id" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="fnModeSubmit('change', '', '');">
+        <option value="" selected="selected">選択してください</option>
+        <!--{html_options options=$arrMAILTEMPLATE selected=$arrForm[$key].value|escape}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>メールタイトル<span class="attention"> *</span></th>
+      <td>
+        <!--{assign var=key value="subject"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" />
+      </td>
+    </tr>
+    <tr>
+      <th>ヘッダー</th>
+      <td>
+        <!--{assign var=key value="header"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <textarea  name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="75" rows="12" class="area75"><!--{$arrForm[$key].value|escape}--></textarea>
+      </td>
+    </tr>
+    <tr>
+      <td colspan="2" class="center">動的データ挿入部分</td>
+    </tr>
+    <tr>
+      <th>フッター</th>
+      <td>
+        <!--{assign var=key value="footer"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <textarea  name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="75" rows="12" class="area75"><!--{$arrForm[$key].value|escape}--></textarea>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    <button type="button" onclick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_ORDER}-->'); fnModeSubmit('search','',''); return false;"><span>検索結果へ戻る</span></button>
+    <button type="submit"><span>送信内容を確認</span></button>
+  </div>
+</div>
+</form>
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 18873)
@@ -0,0 +1,166 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="POST" action="?" >
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="status" value="<!--{if $arrForm.status == ""}-->1<!--{else}--><!--{$arrForm.status}--><!--{/if}-->" />
+<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" >
+<input type="hidden" name="order_id" value="" />
+<div id="order" class="contents-main">
+  <h2>抽出条件</h2>
+    <!--{foreach key=key item=item from=$arrORDERSTATUS}-->
+      <a
+        style="padding-right: 1em;"
+        <!--{if $key != $SelectedStatus}-->
+          href="#"
+          onclick="document.form1.search_pageno.value='1'; fnModeSubmit('search','status','<!--{$key}-->' );"
+        <!--{/if}-->
+      ><!--{$item}--></a>
+    <!--{/foreach}-->
+  <h2>編集</h2>
+  <!--{* 登録テーブルここから *}-->
+  <!--{if $tpl_linemax > 0 }-->
+  <div>
+    <select name="change_status">
+      <option value="" selected="selected" style="<!--{$Errormes|sfGetErrorColor}-->" >選択してください</option>
+      <!--{foreach key=key item=item from=$arrORDERSTATUS}-->
+      <!--{if $key ne $SelectedStatus}-->
+      <option value="<!--{$key}-->" ><!--{$item}--></option>
+      <!--{/if}-->
+      <!--{/foreach}-->
+      <option value="delete">削除</option>
+    </select>
+    <button type="button" onclick="fnSelectCheckSubmit();"><span>移動</span></button>
+  </div>
+  <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->もしくは、削除に変更時には、在庫数を手動で戻してください。</span><br />
+
+  <p>
+    <!--{$tpl_linemax}-->件が該当しました。
+    <!--{$tpl_strnavi}-->
+  </p>
+
+  <div class="btn">
+    <button type="button" onclick="fnBoxChecked(true);"><span>全て選択</span></button>
+    <button type="button" onclick="fnBoxChecked(false);"><span>全て解除</span></button>
+  </div>
+
+  <table class="list center">
+    <tr>
+      <th>注文番号</th>
+      <th>受注日</th>
+      <th>顧客名</th>
+      <th>支払方法</th>
+      <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><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>
+      <td><!--{$arrStatus[cnt].order_name01|escape}--><!--{$arrStatus[cnt].order_name02|escape}--></td>
+      <!--{assign var=payment_id value=`$arrStatus[cnt].payment_id`}-->
+      <td><!--{$arrPayment[$payment_id]|escape}--></td>
+      <td class="right"><!--{$arrStatus[cnt].total|number_format}--></td>
+      <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}-->
+  </table>
+  <input type="hidden" name="move[]" value="" />
+
+  <div class="btn">
+    <button type="button" onclick="fnBoxChecked(true);"><span>全て選択</span></button>
+    <button type="button" onclick="fnBoxChecked(false);"><span>全て解除</span></button>
+  </div>
+
+  <p><!--{$tpl_strnavi}--></p>
+
+  <!--{elseif $arrStatus != "" & $tpl_linemax == 0}-->
+  <div class="message">
+    該当するデータはありません。
+  </div>
+  <!--{/if}-->
+
+  <!--{* 登録テーブルここまで *}-->
+</div>
+</form>
+
+
+<script type="text/javascript">
+<!--
+  function fnSelectCheckSubmit(){
+
+    var selectflag = 0;
+    var fm = document.form1;
+
+    if(fm.change_status.options[document.form1.change_status.selectedIndex].value == ""){
+    selectflag = 1;
+    }
+
+    if(selectflag == 1){
+      alert('セレクトボックスが選択されていません');
+      return false;
+    }
+    var i;
+    var checkflag = 0;
+    var max = fm["move[]"].length;
+
+    if(max) {
+      for (i=0;i<max;i++){
+        if(fm["move[]"][i].checked == true){
+          checkflag = 1;
+        }
+      }
+    } else {
+      if(fm["move[]"].checked == true) {
+        checkflag = 1;
+      }
+    }
+
+    if(checkflag == 0){
+      alert('チェックボックスが選択されていません');
+      return false;
+    }
+
+    if(selectflag == 0 && checkflag == 1){
+    document.form1.mode.value = 'update';
+    document.form1.submit();
+    }
+  }
+
+  function fnBoxChecked(check){
+    var count;
+    var fm = document.form1;
+    var max = fm["move[]"].length;
+    for(count=0; count<max; count++){
+      fm["move[]"][count].checked = check;
+    }
+  }
+
+//-->
+</script>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl	(revision 18873)
@@ -0,0 +1,495 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+    function fnEdit(customer_id) {
+        document.form1.action = '<!--{$smarty.const.URL_DIR}-->admin/customer/edit.php';
+        document.form1.mode.value = "edit"
+        document.form1['edit_customer_id'].value = customer_id;
+        document.form1.submit();
+        return false;
+    }
+
+    function fnCopyFromOrderData() {
+        df = document.form1;
+
+        df.deliv_name01.value = df.order_name01.value;
+        df.deliv_name02.value = df.order_name02.value;
+        df.deliv_kana01.value = df.order_kana01.value;
+        df.deliv_kana02.value = df.order_kana02.value;
+        df.deliv_zip01.value = df.order_zip01.value;
+        df.deliv_zip02.value = df.order_zip02.value;
+        df.deliv_tel01.value = df.order_tel01.value;
+        df.deliv_tel02.value = df.order_tel02.value;
+        df.deliv_tel03.value = df.order_tel03.value;
+        df.deliv_pref.value = df.order_pref.value;
+        df.deliv_addr01.value = df.order_addr01.value;
+        df.deliv_addr02.value = df.order_addr02.value;
+    }
+
+//-->
+</script>
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="<!--{$tpl_mode|default:"edit"}-->" />
+<input type="hidden" name="order_id" value="<!--{$tpl_order_id}-->" />
+<input type="hidden" name="edit_customer_id" value="" />
+<input type="hidden" name="anchor_key" value="" />
+<input type="hidden" id="add_product_id" name="add_product_id" value="" />
+<input type="hidden" id="add_product_class_id" name="add_product_class_id" value="" />
+<input type="hidden" id="edit_product_id" name="edit_product_id" value="" />
+<input type="hidden" id="edit_product_class_id" name="edit_product_class_id" value="" />
+<input type="hidden" id="no" name="no" value="" />
+<input type="hidden" id="delete_no" name="delete_no" value="" />
+
+<div id="order" class="contents-main">
+    <!--{* ペイジェントモジュール連携用 *}-->
+    <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_paygent/paygent_order.tpl}-->
+    <!--{if file_exists($path)}-->
+        <!--{include file=$path}-->
+    <!--{/if}-->
+
+                        <!--{* GMOPG連携用 *}-->
+                        <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_gmopg/templates/order_edit.tpl}-->
+                        <!--{if file_exists($path)}-->
+                            <!--{include file=$path}-->
+                        <!--{/if}-->
+
+                        <!--{* SPS連携用 *}-->
+                        <!--{assign var=sps_path value=`$smarty.const.MODULE_PATH`mdl_sps/templates/sps_request.tpl}-->
+                        <!--{if file_exists($sps_path) && $paymentType[0].module_code == $smarty.const.MDL_SPS_CODE}-->
+                            <!--{include file=$sps_path}-->
+                        <!--{/if}-->
+
+                        <!--{* ペイジェントモジュール連携用 *}-->
+                        <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_paygent/paygent_order.tpl}-->
+                        <!--{if file_exists($path)}-->
+                            <!--{include file=$path}-->
+                        <!--{/if}-->
+
+    <!--▼お客様情報ここから-->
+    <table class="form">
+        <!--{if $tpl_mode != 'add'}-->
+        <tr>
+            <th>帳票出力</th>
+            <td><a href="./" onClick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票を出力するにはこちらをクリックして下さい。</a></td>
+        </tr>
+        <!--{/if}-->
+        <tr>
+            <th>注文番号</th>
+            <td><!--{$arrForm.order_id.value}--></td>
+        </tr>
+        <tr>
+            <th>受注日</th>
+            <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td>
+            <input type="hidden" name="create_date" value="<!--{$arrForm.create_date.value}-->" />
+        </tr>
+        <tr>
+            <th>対応状況</th>
+            <td>
+                <!--{assign var=key value="status"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="">選択してください</option>
+                    <!--{html_options options=$arrORDERSTATUS selected=$arrForm[$key].value}-->
+                </select><br />
+                <!--{if $smarty.get.mode != 'add'}-->
+                    <span class="attention">※ <!--{$arrORDERSTATUS[$smarty.const.ORDER_CANCEL]}-->に変更時には、在庫数を手動で戻してください。</span>
+                <!--{/if}-->
+            </td>
+        </tr>
+        <tr>
+            <th>入金日</th>
+            <td><!--{$arrForm.payment_date.value|sfDispDBDate|default:"未入金"}--></td>
+        </tr>
+        <tr>
+            <th>発送日</th>
+            <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"}--></td>
+        </tr>
+    </table>
+
+    <!--{foreach key=key item=item from=$arrSearchHidden}-->
+    <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+    <!--{/foreach}-->
+    <h2>お客様情報
+        <!--{if $tpl_mode == 'add'}-->
+            <input type="button" name="address_input" value="顧客検索" onclick="fnOpenWindow('<!--{$smarty.const.SITE_URL}-->admin/customer/search_customer.php','search','500','650'); return false;" />
+        <!--{/if}-->
+    </h2>
+    <table class="form">
+        <tr>
+            <th>顧客ID</th>
+            <td>
+                <!--{if $arrForm.customer_id.value > 0}-->
+                    <!--{$arrForm.customer_id.value}-->
+                    <input type="hidden" name="customer_id" value="<!--{$arrForm.customer_id.value}-->" />
+                <!--{else}-->
+                   (非会員)
+                <!--{/if}-->
+            </td>
+        </tr>
+        <tr>
+            <th>顧客名</th>
+            <td>
+                <!--{assign var=key1 value="order_name01"}-->
+                <!--{assign var=key2 value="order_name02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>顧客名(カナ)</th>
+            <td>
+                <!--{assign var=key1 value="order_kana01"}-->
+                <!--{assign var=key2 value="order_kana02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>メールアドレス</th>
+            <td>
+                <!--{assign var=key1 value="order_email"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="30" class="box30" />
+            </td>
+        </tr>
+        <tr>
+            <th>TEL</th>
+            <td>
+                <!--{assign var=key1 value="order_tel01"}-->
+                <!--{assign var=key2 value="order_tel02"}-->
+                <!--{assign var=key3 value="order_tel03"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <span class="attention"><!--{$arrErr[$key3]}--></span>
+                <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+                <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
+                <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+            </td>
+        </tr>
+        <tr>
+            <th>住所</th>
+            <td>
+                <!--{assign var=key1 value="order_zip01"}-->
+                <!--{assign var=key2 value="order_zip02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                〒
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                 -
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
+                <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01');" /><br />
+                <!--{assign var=key value="order_pref"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">都道府県を選択</option>
+                    <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+                </select><br />
+                <!--{assign var=key value="order_addr01"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
+                <!--{assign var=key value="order_addr02"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+            </td>
+        </tr>
+        <tr>
+            <th>備考</th>
+            <td><!--{$arrForm.message.value|escape|nl2br}--></td>
+        </tr>
+        <tr>
+            <th>現在ポイント</th>
+            <td>
+                <!--{if $arrForm.customer_id > 0}-->
+                    <!--{$arrForm.point.value|number_format}-->
+                     pt
+                <!--{else}-->
+                    (非会員)
+            <!--{/if}-->
+            </td>
+        </tr>
+    </table>
+    <!--▲お客様情報ここまで-->
+
+    <!--▼お届け先情報ここから-->
+    <h2>お届け先情報
+        <input type="button" name="input_from_order_data" value="上記お客様情報をコピー" onclick="fnCopyFromOrderData();" />
+    </h2>
+    <table class="form">
+        <tr>
+            <th>お名前</th>
+            <td>
+                <!--{assign var=key1 value="deliv_name01"}-->
+                <!--{assign var=key2 value="deliv_name02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>お名前(カナ)</th>
+            <td>
+                <!--{assign var=key1 value="deliv_kana01"}-->
+                <!--{assign var=key2 value="deliv_kana02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>TEL</th>
+            <td>
+                <!--{assign var=key1 value="deliv_tel01"}-->
+                <!--{assign var=key2 value="deliv_tel02"}-->
+                <!--{assign var=key3 value="deliv_tel03"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <span class="attention"><!--{$arrErr[$key3]}--></span>
+                <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+                <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
+                <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+            </td>
+        </tr>
+        <tr>
+            <th>住所</th>
+            <td>
+                <!--{assign var=key1 value="deliv_zip01"}-->
+                <!--{assign var=key2 value="deliv_zip02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                〒
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                 -
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
+                <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01');" /><br />
+                <!--{assign var=key value="deliv_pref"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">都道府県を選択</option>
+                    <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+                </select><br />
+                <!--{assign var=key value="deliv_addr01"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
+                <!--{assign var=key value="deliv_addr02"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+            </td>
+        </tr>
+    </table>
+    <!--▲お届け先情報ここまで-->
+
+    <!--▼受注商品情報ここから-->
+    <h2 id="order_products">
+        <a name="order_products">受注商品情報</a>
+        <input type="button" name="cheek" value="計算結果の確認" onclick="fnModeSubmit('cheek','anchor_key','order_products');" />
+        <input type="button" name="add_product" value="商品の追加" onclick="win03('<!--{$smarty.const.URL_DIR}-->admin/order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+    </h2>
+    <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
+        <span class="attention"><!--{$arrErr.product_id}--></span>
+        <span class="attention"><!--{$arrErr.quantity}--></span>
+        <span class="attention"><!--{$arrErr.price}--></span>
+    <!--{/if}-->
+    <table class="list" id="order-edit-products">
+        <tr>
+            <th class="id">商品コード</th>
+            <th class="name">商品名/規格1/規格2</th>
+            <th class="price">単価</th>
+            <th class="qty">数量</th>
+            <th class="price">税込み価格</th>
+            <th class="price">小計</th>
+        </tr>
+        <!--{section name=cnt loop=$arrForm.quantity.value}-->
+        <!--{assign var=key value="`$smarty.section.cnt.index`"}-->
+        <tr>
+            <td>
+                <!--{$arrForm.product_code.value[$key]|escape}-->
+                <input type="hidden" name="product_code[<!--{$key}-->]" value="<!--{$arrForm.product_code.value[$key]}-->" id="product_code_<!--{$key}-->" />
+            </td>
+            <td>
+                <!--{$arrForm.product_name.value[$key]|escape}-->/<!--{$arrForm.classcategory_name1.value[$key]|escape|default:"(なし)"}-->/<!--{$arrForm.classcategory_name2.value[$key]|escape|default:"(なし)"}-->
+                <input type="hidden" name="product_name[<!--{$key}-->]" value="<!--{$arrForm.product_name.value[$key]}-->" id="product_name_<!--{$key}-->" />
+                <input type="hidden" name="classcategory_name1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name1.value[$key]}-->" id="classcategory_name1_<!--{$key}-->" />
+                <input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
+                <br />
+                <input type="button" name="change" value="変更" onclick="win03('<!--{$smarty.const.URL_DIR}-->admin/order/product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+                <!--{if $product_count > 1}-->
+                    <input type="button" name="delete" value="削除" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');" />
+                <!--{/if}-->
+            <input type="hidden" name="product_id[<!--{$key}-->]" value="<!--{$arrForm.product_id.value[$key]}-->" id="product_id_<!--{$key}-->" />
+            <input type="hidden" name="product_class_id[<!--{$key}-->]" value="<!--{$arrForm.product_class_id.value[$key]}-->" id="product_class_id_<!--{$key}-->" />
+            <input type="hidden" name="point_rate[<!--{$key}-->]" value="<!--{$arrForm.point_rate.value[$key]}-->" id="point_rate_<!--{$key}-->" />
+            </td>
+            <td align="center"><input type="text" name="price[<!--{$key}-->]" value="<!--{$arrForm.price.value[$key]|escape}-->" size="6" class="box6" maxlength="<!--{$arrForm.price.length}-->" id="price_<!--{$key}-->"/> 円</td>
+            <td align="center"><input type="text" name="quantity[<!--{$key}-->]" value="<!--{$arrForm.quantity.value[$key]|escape}-->" size="3" class="box3" maxlength="<!--{$arrForm.quantity.length}-->"/></td>
+            <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
+            <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
+            <td><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</td>
+            <td><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+        </tr>
+        <!--{/section}-->
+        <tr>
+            <th colspan="5" class="right">小計</th>
+            <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">値引</th>
+            <td class="right">
+                <!--{assign var=key value="discount"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">送料</th>
+            <td class="right">
+                <!--{assign var=key value="deliv_fee"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">手数料</th>
+            <td class="right">
+                <!--{assign var=key value="charge"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">合計</th>
+            <td class="right">
+                <span class="attention"><!--{$arrErr.total}--></span>
+                <!--{$arrForm.total.value|number_format}--> 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">お支払い合計</th>
+            <td class="right">
+                <span class="attention"><!--{$arrErr.payment_total}--></span>
+                <!--{$arrForm.payment_total.value|number_format}-->
+                 円
+            </td>
+        </tr>
+        <!--{if $smarty.const.USE_POINT !== false}-->
+            <tr>
+                <th colspan="5" class="right">使用ポイント</th>
+                <td class="right">
+                    <!--{assign var=key value="use_point"}-->
+                    <span class="attention"><!--{$arrErr[$key]}--></span>
+                    <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape|default:0}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                     pt
+                </td>
+            </tr>
+            <!--{if $arrForm.birth_point.value > 0}-->
+            <tr>
+                <th colspan="5" class="right">お誕生日ポイント</th>
+                <td class="right">
+                    <!--{$arrForm.birth_point.value|number_format}-->
+                     pt
+                </td>
+            </tr>
+            <!--{/if}-->
+            <tr>
+                <th colspan="5" class="right">加算ポイント</th>
+                <td class="right">
+                    <!--{$arrForm.add_point.value|number_format|default:0}-->
+                     pt
+                </td>
+            </tr>
+        <!--{/if}-->
+    </table>
+
+    <table class="form">
+        <tr>
+            <th>お支払方法<br /><span class="attention">(お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</span></th>
+            <td>
+                <!--{assign var=key value="payment_id"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="fnModeSubmit('payment','anchor_key','order_products');">
+                    <option value="" selected="">選択してください</option>
+                    <!--{html_options options=$arrPayment selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
+
+        <!--{if $arrForm.payment_info|@count > 0}-->
+        <tr>
+            <th><!--{$arrForm.payment_type}-->情報</th>
+            <td>
+                <!--{foreach key=key item=item from=$arrForm.payment_info}-->
+                <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
+                <!--{/foreach}-->
+            </td>
+        </tr>
+        <!--{/if}-->
+
+        <tr>
+            <th>お届け時間</th>
+            <td>
+                <!--{assign var=key value="deliv_time_id"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="0">指定無し</option>
+                    <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>お届け日</th>
+            <td>
+                <!--{assign var=key value="deliv_date"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input
+                    name="<!--{$key|escape}-->"
+                    value="<!--{$arrForm[$key].value|escape}-->"
+                    style="<!--{$arrErr[$key]|sfGetErrorColor}-->"
+                    size="30"
+                    maxlength="<!--{$arrForm[$key].length}-->"
+                >
+            </td>
+        </tr>
+        <tr>
+            <th>メモ</th>
+            <td>
+                <!--{assign var=key value="note"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea></td>
+            </td>
+        </tr>
+    </table>
+    <!--▲受注商品情報ここまで-->
+
+    <div class="btn">
+        <!--{if count($arrSearchHidden) > 0}-->
+        <button type="button" onclick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_ORDER}-->'); fnModeSubmit('search','',''); return false;"><span>検索画面に戻る</span></button>
+        <!--{/if}-->
+        <button type="submit" onclick="return fnConfirm();"><span>この内容で登録する</span></button>
+    </div>
+
+</div>
+</form>
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 18873)
@@ -0,0 +1,378 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+    function fnSelectCheckSubmit(action){
+
+        var fm = document.form1;
+        
+        if (!fm["pdf_order_id[]"]) {
+            return false;
+        }
+        
+        var checkflag = false;
+        var max = fm["pdf_order_id[]"].length;
+        
+        if (max) {
+            for (var i=0; i<max; i++) {
+                if(fm["pdf_order_id[]"][i].checked == true){
+                    checkflag = true;
+                }
+            }
+        } else {
+            if(fm["pdf_order_id[]"].checked == true) {
+                checkflag = true;
+            }
+        }
+
+        if(!checkflag){
+            alert('チェックボックスが選択されていません');
+            return false;
+        }
+        
+        fnOpenPdfSettingPage(action);
+    }
+
+    function fnOpenPdfSettingPage(action){
+        var fm = document.form1;
+        var WIN;
+        WIN = window.open("about:blank", "pdf", "width=500,height=600,scrollbars=yes,resizable=yes,toolbar=no,location=no,directories=no,status=no");
+        
+        // 退避
+        tmpTarget = fm.target;
+        tmpMode = fm.mode.value;
+        tmpAction = fm.action;
+        
+        fm.target = "pdf";
+        fm.mode.value = 'pdf';
+        fm.action = action;
+        fm.submit();
+        WIN.focus();
+        
+        // 復元
+        fm.target = tmpTarget;
+        fm.mode.value = tmpMode;
+        fm.action = tmpAction;
+    }
+    
+    function fnBoxChecked(check){
+        var fm = document.form1;
+        var max = fm["pdf_order_id[]"].length;
+        if (max) {
+            for (var i=0; i<max; i++) {
+                fm["pdf_order_id[]"][i].checked = check;
+            }
+        } else {
+            fm["pdf_order_id[]"].checked = check;
+        }
+    }
+    
+//-->
+</script>
+<div id="order" class="contents-main">
+<form name="search_form" id="search_form" method="post" action="?">
+<input type="hidden" name="mode" value="search" />
+    <h2>検索条件設定</h2>
+    <!--{* 検索条件設定テーブルここから *}-->
+    <table>
+        <tr>
+            <th>注文番号</th>
+            <td>
+                <!--{assign var=key1 value="search_order_id1"}-->
+                <!--{assign var=key2 value="search_order_id2"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                ～ 
+                <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>
+                <!--{assign var=key value="search_order_status"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                <option value="">選択してください</option>
+                <!--{html_options options=$arrORDERSTATUS selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>顧客名</th>
+            <td>
+            <!--{assign var=key value="search_order_name"}-->
+            <span class="attention"><!--{$arrErr[$key]}--></span>
+            <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>
+            <!--{assign var=key value="search_order_kana"}-->
+            <span class="attention"><!--{$arrErr[$key]}--></span>
+            <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>
+                <!--{assign var=key value="search_order_email"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <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>
+                <!--{assign var=key value="search_order_tel"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <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>
+                <span class="attention"><!--{$arrErr.search_sbirthyear}--></span>
+                <span class="attention"><!--{$arrErr.search_ebirthyear}--></span>
+                <select name="search_sbirthyear" style="<!--{$arrErr.search_sbirthyear|sfGetErrorColor}-->">
+                <option value="">----</option>
+                <!--{html_options options=$arrBirthYear selected=$arrForm.search_sbirthyear.value}-->
+                </select>年
+                <select name="search_sbirthmonth" style="<!--{$arrErr.search_sbirthyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrMonth selected=$arrForm.search_sbirthmonth.value}-->
+                </select>月
+                <select name="search_sbirthday" style="<!--{$arrErr.search_sbirthyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrDay selected=$arrForm.search_sbirthday.value}-->
+                </select>日～
+                <select name="search_ebirthyear" style="<!--{$arrErr.search_ebirthyear|sfGetErrorColor}-->">
+                <option value="">----</option>
+                <!--{html_options options=$arrBirthYear selected=$arrForm.search_ebirthyear.value}-->
+                </select>年
+                <select name="search_ebirthmonth" style="<!--{$arrErr.search_ebirthyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrMonth selected=$arrForm.search_ebirthmonth.value}-->
+                </select>月
+                <select name="search_ebirthday" style="<!--{$arrErr.search_ebirthyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrDay selected=$arrForm.search_ebirthday.value}-->
+                </select>日
+            </td>
+        </tr>
+        <tr>
+            <th>性別</th>
+            <td>
+            <!--{assign var=key value="search_order_sex"}-->
+            <span class="attention"><!--{$arrErr[$key]}--></span>
+            <!--{html_checkboxes name="$key" options=$arrSex selected=$arrForm[$key].value}-->
+            </td>
+        </tr>
+        <tr>
+            <th>支払方法</th>
+            <td>
+            <!--{assign var=key value="search_payment_id"}-->
+            <span class="attention"><!--{$arrErr[$key]|escape}--></span>
+            <!--{html_checkboxes name="$key" options=$arrPayment|escape selected=$arrForm[$key].value}-->
+            </td>
+        </tr>
+        <tr>
+            <th>受注日</th>
+            <td>
+                <!--{if $arrErr.search_sorderyear}--><span class="attention"><!--{$arrErr.search_sorderyear}--></span><!--{/if}-->
+                <!--{if $arrErr.search_eorderyear}--><span class="attention"><!--{$arrErr.search_eorderyear}--></span><!--{/if}-->
+                <select name="search_sorderyear" style="<!--{$arrErr.search_sorderyear|sfGetErrorColor}-->">
+                <option value="">----</option>
+                <!--{html_options options=$arrRegistYear selected=$arrForm.search_sorderyear.value}-->
+                </select>年
+                <select name="search_sordermonth" style="<!--{$arrErr.search_sorderyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrMonth selected=$arrForm.search_sordermonth.value}-->
+                </select>月
+                <select name="search_sorderday" style="<!--{$arrErr.search_sorderyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrDay selected=$arrForm.search_sorderday.value}-->
+                </select>日～
+                <select name="search_eorderyear" style="<!--{$arrErr.search_eorderyear|sfGetErrorColor}-->">
+                <option value="">----</option>
+                <!--{html_options options=$arrRegistYear selected=$arrForm.search_eorderyear.value}-->
+                </select>年
+                <select name="search_eordermonth" style="<!--{$arrErr.search_eorderyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrMonth selected=$arrForm.search_eordermonth.value}-->
+                </select>月
+                <select name="search_eorderday" style="<!--{$arrErr.search_eorderyear|sfGetErrorColor}-->">
+                <option value="">--</option>
+                <!--{html_options options=$arrDay selected=$arrForm.search_eorderday.value}-->
+                </select>日
+            </td>
+        </tr>
+        <tr>
+            <th>更新日</th>
+            <td>
+                <!--{if $arrErr.search_supdateyear}--><span class="attention"><!--{$arrErr.search_supdateyear}--></span><!--{/if}-->
+                <!--{if $arrErr.search_eupdateyear}--><span class="attention"><!--{$arrErr.search_eupdateyear}--></span><!--{/if}-->
+                <select name="search_supdateyear" style="<!--{$arrErr.search_supdateyear|sfGetErrorColor}-->">
+                    <option value="">----</option>
+                    <!--{html_options options=$arrRegistYear selected=$arrForm.search_supdateyear.value}-->
+                </select>年
+                <select name="search_supdatemonth" style="<!--{$arrErr.search_supdateyear|sfGetErrorColor}-->">
+                    <option value="">--</option>
+                    <!--{html_options options=$arrMonth selected=$arrForm.search_supdatemonth.value}-->
+                </select>月
+                <select name="search_supdateday" style="<!--{$arrErr.search_supdateyear|sfGetErrorColor}-->">
+                    <option value="">--</option>
+                    <!--{html_options options=$arrDay selected=$arrForm.search_supdateday.value}-->
+                </select>日～
+                <select name="search_eupdateyear" style="<!--{$arrErr.search_eupdateyear|sfGetErrorColor}-->">
+                    <option value="">----</option>
+                    <!--{html_options options=$arrRegistYear selected=$arrForm.search_eupdateyear.value}-->
+                </select>年
+                <select name="search_eupdatemonth" style="<!--{$arrErr.search_eupdateyear|sfGetErrorColor}-->">
+                    <option value="">--</option>
+                    <!--{html_options options=$arrMonth selected=$arrForm.search_eupdatemonth.value}-->
+                </select>月
+                <select name="search_eupdateday" style="<!--{$arrErr.search_eupdateyear|sfGetErrorColor}-->">
+                    <option value="">--</option>
+                    <!--{html_options options=$arrDay selected=$arrForm.search_eupdateday.value}-->
+                </select>日
+            </td>
+        </tr>
+        <tr>
+            <th>購入金額</th>
+            <td>
+                <!--{assign var=key1 value="search_total1"}-->
+                <!--{assign var=key2 value="search_total2"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                円 ～ 
+                <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>
+                <!--{assign var=key value="search_product_name"}-->
+                <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="6" class="box30" />
+            </td>
+        </tr>
+    </table>
+
+    <div>
+        検索結果表示件数
+        <!--{assign var=key value="search_page_max"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <select name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+        <!--{html_options options=$arrPageMax selected=$arrForm[$key].value}-->
+        </select> 件
+        <button type="submit"><span>この条件で検索する</span></button>
+    </div>
+    <!--検索条件設定テーブルここまで-->
+</form>
+
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete') }-->
+
+<!--★★検索結果一覧★★-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="search" />
+<input type="hidden" name="order_id" value="" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+    <h2>検索結果一覧</h2>
+　<p>
+        <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="fnSelectCheckSubmit('pdf.php');"><span>PDF一括出力</span></button>
+    </p>
+    <!--{include file=$tpl_pager}-->
+
+    <!--{if count($arrResults) > 0}-->
+
+    <!--{* 検索結果表示テーブル *}-->
+    <table class="list">
+        <!--{* ペイジェントモジュール連携用 *}-->
+        <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_paygent/paygent_order_index.tpl}-->
+        <!--{if file_exists($path)}-->
+            <!--{include file=$path}-->
+        <!--{else}-->
+        <tr>
+            <th>受注日</th>
+            <th>注文番号</th>
+            <th>顧客名</th>
+            <th>支払方法</th>
+            <th>購入金額(円)</th>
+            <th>全商品発送日</th>
+            <th>対応状況</th>
+            <th>
+                帳票<br />
+                <button type="button" onclick="fnBoxChecked(true);">全て選択</button>
+                <button type="button" onclick="fnBoxChecked(false);">全て解除</button>
+            </th>
+            <th>編集</th>
+            <th>メール</th>
+            <th>削除</th>
+        </tr>
+
+        <!--{section name=cnt loop=$arrResults}-->
+        <!--{assign var=status value="`$arrResults[cnt].status`"}-->
+        <tr style="background:<!--{$arrORDERSTATUS_COLOR[$status]}-->;">
+            <td class="center"><!--{$arrResults[cnt].create_date|sfDispDBDate}--></td>
+            <td class="center"><!--{$arrResults[cnt].order_id}--></td>
+            <td><!--{$arrResults[cnt].order_name01|escape}--> <!--{$arrResults[cnt].order_name02|escape}--></td>
+            <!--{assign var=payment_id value="`$arrResults[cnt].payment_id`"}-->
+            <td class="center"><!--{$arrPayment[$payment_id]}--></td>
+            <td class="right"><!--{$arrResults[cnt].total|number_format}--></td>
+            <td class="center"><!--{$arrResults[cnt].commit_date|sfDispDBDate|default:"未発送"}--></td>
+            <td class="center"><!--{$arrORDERSTATUS[$status]}--></td>
+            <td class="center">
+                <input type="checkbox" name="pdf_order_id[]" value="<!--{$arrResults[cnt].order_id}-->" id="pdf_order_id_<!--{$arrResults[cnt].order_id}-->"/><label for="pdf_order_id_<!--{$arrResults[cnt].order_id}-->">一括出力</label>&nbsp;
+                <a href="./" onClick="win02('pdf.php?order_id=<!--{$arrResults[cnt].order_id}-->','pdf_input','500','650'); return false;"><span class="icon_class">個別出力</span></a>
+            </td>
+            <td class="center"><a href="?" onclick="fnChangeAction('<!--{$smarty.const.URL_ORDER_EDIT}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_edit">編集</span></a></td>
+            <td class="center">
+                <!--{if $arrResults[cnt].order_email|strlen >= 1}-->
+                    <a href="?" onclick="fnChangeAction('<!--{$smarty.const.URL_ORDER_MAIL}-->'); fnModeSubmit('pre_edit', 'order_id', '<!--{$arrResults[cnt].order_id}-->'); return false;"><span class="icon_mail">通知</span></a>
+                <!--{/if}-->
+            </td>
+            <td class="center"><a href="?" onclick="fnModeSubmit('delete_order', 'order_id', <!--{$arrResults[cnt].order_id}-->); return false;"><span class="icon_delete">削除</span></a></td>
+        </tr>
+        <!--{/section}-->
+        <!--{/if}-->
+    </table>
+    <!--{* 検索結果表示テーブル *}-->
+
+    <!--{/if}-->
+
+</form>
+<!--{/if}-->
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/subnavi.tpl	(revision 18873)
@@ -0,0 +1,34 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+    <li id="navi-order-index"
+        class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'index'}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/order/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>受注管理</span></a></li>
+    <li id="navi-order-add"
+        class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'add'}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/order/edit.php?mode=add"><span>新規受注入力</span></a></li>
+    <li id="navi-order-status"
+        class="<!--{if $tpl_mainno == 'order' && $tpl_subno == 'status'}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/order/status.php"><span>ステータス管理</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/pdf_input.tpl	(revision 18873)
@@ -0,0 +1,131 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+
+function lfPopwinSubmit(formName) {
+  win02('about:blank','pdf','1000','900');
+  document[formName].target = "pdf";
+  document[formName].submit();
+  return false;
+}
+//-->
+</script>
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="confirm" />
+<!--{foreach from=$arrForm.order_id item=order_id}-->
+    <input type="hidden" name="order_id[]" value="<!--{$order_id}-->">
+<!--{/foreach}-->
+<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+
+  <h2><!--コンテンツタイトル-->帳票の作成</h2>
+
+  <table class="form">
+    <tr>
+      <th>注文番号</th>
+      <td><!--{$arrForm.order_id|@join:', '}--></td>
+    </tr>
+    <tr>
+      <th>発行日<span class="attention">※</span></th>
+      <td><!--{if $arrErr.year}--><span class="attention"><!--{$arrErr.year}--></span><!--{/if}-->
+        <select name="year">
+        <!--{html_options options=$arrYear selected=$arrForm.year}-->
+        </select>年
+        <select name="month">
+        <!--{html_options options=$arrMonth selected=$arrForm.month}-->
+        </select>月
+        <select name="day">
+        <!--{html_options options=$arrDay selected=$arrForm.day}-->
+        </select>日
+      </td>
+    </tr>
+    <tr>
+      <th>帳票の種類</th>
+      <td><!--{if $arrErr.download}--><span class="attention"><!--{$arrErr.download}--></span><!--{/if}-->
+        <select name="type">
+        <!--{html_options options=$arrType selected=$arrForm.type}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>ダウンロード方法</th>
+      <td><!--{if $arrErr.download}--><span class="attention"><!--{$arrErr.download}--></span><!--{/if}-->
+        <select name="download">
+        <!--{html_options options=$arrDownload selected=$arrForm.download}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>帳票タイトル</th>
+      <td><!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
+        <input type="text" name="title" size="40" value="<!--{$arrForm.title}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+        <span style="font-size: 80%;">※未入力時はデフォルトのタイトルが表示されます。</span><br />
+      </td>
+    </tr>
+    <tr>
+      <th>帳票メッセージ</th>
+      <td><!--{if $arrErr.msg1}--><span class="attention"><!--{$arrErr.msg1}--></span><!--{/if}-->
+        1行目：<input type="text" name="msg1" size="40" value="<!--{$arrForm.msg1}-->" maxlength="<!--{$smarty.const.STEXT_LEN*3/5}-->"/><br />
+        <!--{if $arrErr.msg2}--><span class="attention"><!--{$arrErr.msg1}--></span><!--{/if}-->
+        2行目：<input type="text" name="msg2" size="40" value="<!--{$arrForm.msg2}-->" maxlength="<!--{$smarty.const.STEXT_LEN*3/5}-->"/><br />
+        <!--{if $arrErr.msg3}--><span class="attention"><!--{$arrErr.msg3}--></span><!--{/if}-->
+        3行目：<input type="text" name="msg3" size="40" value="<!--{$arrForm.msg3}-->" maxlength="<!--{$smarty.const.STEXT_LEN*3/5}-->"/><br />
+        <span style="font-size: 80%;">※未入力時はデフォルトのメッセージが表示されます。</span><br />
+      </td>
+    </tr>
+    <tr>
+      <th>備考</th>
+      <td>
+        1行目：<input type="text" name="etc1" size="40" value="" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+        <!--{if $arrErr.etc2}--><span class="attention"><!--{$arrErr.msg1}--></span><!--{/if}-->
+        2行目：<input type="text" name="etc2" size="40" value="" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+        <!--{if $arrErr.etc3}--><span class="attention"><!--{$arrErr.msg3}--></span><!--{/if}-->
+        3行目：<input type="text" name="etc3" size="40" value="" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/><br />
+        <span style="font-size: 80%;">※未入力時は表示されません。</span><br />
+      </td>
+    </tr>
+    <!--{if $smarty.const.USE_POINT !== false}-->
+      <tr>
+        <th>ポイント表記</th>
+        <td>
+          <input type="radio" name="disp_point" value="1" checked="checked" />する　<input type="radio" name="disp_point" value="0" />しない<br />
+          <span style="font-size: 80%;">※「する」を選択されても、お客様が非会員の場合は表示されません。</span>
+        </td>
+      </tr>
+    <!--{else}-->
+      <input type="hidden" name="disp_point" value="0" />
+    <!--{/if}-->
+  </table>
+
+  <div class="btn">
+    <button type="button" onclick="return lfPopwinSubmit('form1');"><span>この内容で作成する</span></button>
+  </div>
+
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_view.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_view.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_view.tpl	(revision 18873)
@@ -0,0 +1,37 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<table class="form">
+  <tr>
+    <th>件名</th>
+    <td><!--{$tpl_subject|escape}--></td>
+  </tr>
+  <tr>
+    <th>本文</th>
+    <td><!--{$tpl_body|escape|nl2br}--></td>
+  </tr>
+</table>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/disp.tpl	(revision 18873)
@@ -0,0 +1,286 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<h2>受注詳細</h2>
+
+<table class="form">
+    <tr>
+        <th>対応状況</th>
+        <td>
+            <!--{if $arrForm.delete.value == 1}-->削除済み
+            <!--{else}-->
+            <!--{assign var=status value=`$arrForm.status.value`}-->
+            <!--{$arrORDERSTATUS[$status]}-->
+            <!--{/if}-->
+        </td>
+    </tr>
+    <tr>
+        <th>入金日</th>
+        <td><!--{$arrForm.payment_date.value|sfDispDBDate|default:"未入金"}--></td>
+    </tr>
+    <tr>
+        <th>発送日</th>
+        <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"}--></td>
+    </tr>
+</table>
+
+<h3>お客様情報</h3>
+<table class="form">
+    <tr>
+        <th>注文番号</th>
+        <td><!--{$arrForm.order_id.value}--></td>
+    </tr>
+    <tr>
+        <th>受注日</th>
+        <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td>
+    </tr>
+    <tr>
+        <th>顧客ID</th>
+        <td>
+        <!--{if $arrForm.customer_id.value > 0}-->
+            <!--{$arrForm.customer_id.value}-->
+        <!--{else}-->
+            (非会員)
+        <!--{/if}-->
+        </td>
+    </tr>
+    <tr>
+        <th>顧客名</th>
+        <td><!--{$arrForm.order_name01.value|escape}--> <!--{$arrForm.order_name02.value|escape}--></td>
+    </tr>
+    <tr>
+        <th>顧客名(カナ)</th>
+        <td><!--{$arrForm.order_kana01.value|escape}--> <!--{$arrForm.order_kana02.value|escape}--></td>
+    </tr>
+    <tr>
+        <th>メールアドレス</th>
+        <td><a href="mailto:<!--{$arrForm.order_email.value|escape}-->"><!--{$arrForm.order_email.value|escape}--></a></td>
+    </tr>
+    <tr>
+        <th>TEL</th>
+        <td><!--{$arrForm.order_tel01.value}-->-<!--{$arrForm.order_tel02.value}-->-<!--{$arrForm.order_tel03.value}--></td>
+    </tr>
+    <tr>
+        <th>住所</th>
+        <td>
+            〒<!--{$arrForm.order_zip01.value}-->-<!--{$arrForm.order_zip02.value}--><br />
+            <!--{assign var=key value=$arrForm.order_pref.value}-->
+            <!--{$arrPref[$key]}--><!--{$arrForm.order_addr01.value}--><!--{$arrForm.order_addr02.value}-->
+        </td>
+    </tr>
+    <tr>
+        <th>備考</th>
+        <td><!--{$arrForm.message.value|escape|nl2br}--></td>
+    </tr>
+</table>
+
+<!--▼お届け先情報ここから-->
+<h3>お届け先情報</h3>
+<table class="form">
+    <tr>
+        <th>お名前</th>
+        <td>
+            <!--{assign var=key1 value="deliv_name01"}-->
+            <!--{assign var=key2 value="deliv_name02"}-->
+            <!--{$arrForm[$key1].value|escape}-->
+            <!--{$arrForm[$key2].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>お名前(カナ)</th>
+        <td>
+            <!--{assign var=key1 value="deliv_kana01"}-->
+            <!--{assign var=key2 value="deliv_kana02"}-->
+            <!--{$arrForm[$key1].value|escape}-->
+            <!--{$arrForm[$key2].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>郵便番号</th>
+        <td>
+            <!--{assign var=key1 value="deliv_zip01"}-->
+            <!--{assign var=key2 value="deliv_zip02"}-->
+            〒<!--{$arrForm[$key1].value|escape}-->-<!--{$arrForm[$key2].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>TEL</th>
+        <td>
+            <!--{assign var=key1 value="deliv_tel01"}-->
+            <!--{assign var=key2 value="deliv_tel02"}-->
+            <!--{assign var=key3 value="deliv_tel03"}-->
+            <!--{$arrForm[$key1].value|escape}-->-<!--{$arrForm[$key2].value|escape}-->-<!--{$arrForm[$key3].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>住所</th>
+        <td>
+            <!--{assign var=pref value=`$arrForm.deliv_pref.value`}-->
+            <!--{$arrPref[$pref]}-->
+            <!--{assign var=key value="deliv_addr01"}-->
+            <!--{$arrForm[$key].value|escape}-->
+            <!--{assign var=key value="deliv_addr02"}-->
+            <!--{$arrForm[$key].value|escape}-->
+        </td>
+    </tr>
+</table>
+<!--▲お届け先情報ここまで-->
+
+<h3>受注商品情報</h3>
+<table class="list">
+    <tr>
+        <th class="id">商品コード</th>
+        <th class="name">商品名/規格1/規格2</th>
+        <th class="price">単価</th>
+        <th class="qty">数量</th>
+        <th class="price">小計</th>
+    </tr>
+    <!--{section name=cnt loop=$arrForm.quantity.value}-->
+    <!--{assign var=key value="`$smarty.section.cnt.index`"}-->
+    <tr>
+        <td><!--{$arrForm.product_code.value[$key]|escape}--></td>
+        <td><!--{$arrForm.product_name.value[$key]|escape}-->/<!--{$arrForm.classcategory_name1.value[$key]|escape|default:"(なし)"}-->/<!--{$arrForm.classcategory_name2.value[$key]|escape|default:"(なし)"}--></td>
+        <td class="right"><!--{if $arrForm.price.value[$key] != 0}--><!--{$arrForm.price.value[$key]|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
+        <td class="center"><!--{$arrForm.quantity.value[$key]|escape}--></td>
+        <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
+        <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
+        <td class="right"><!--{if $price != 0}--><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
+    </tr>
+    <!--{/section}-->
+    <tr>
+        <th colspan="4" class="right">小計</th>
+        <td align="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">ポイント値引き</th>
+        <td align="right"><!--{assign var=point_discount value="`$arrForm.use_point.value*$smarty.const.POINT_VALUE`"}--><!--{$point_discount|number_format}-->円</td>
+    </tr>
+    <!--{assign var=discount value="`$arrForm.discount.value`"}-->
+    <!--{if $discount != "" && $discount > 0}-->
+                         <tr>
+        <th colspan="4" class="right">値引き</th>
+        <td align="right"><!--{$discount|number_format}-->円</td>
+    </tr>
+    <!--{/if}-->
+    <tr>
+        <th colspan="4" class="right">送料</th>
+        <td align="right"><!--{assign var=key value="deliv_fee"}--><!--{$arrForm[$key].value|escape|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">手数料</th>
+        <td align="right"><!--{assign var=key value="charge"}-->
+    <span class="attention"><!--{$arrErr[$key]}--></span><!--{$arrForm[$key].value|escape|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">合計</th>
+        <td align="right"><!--{$arrForm.total.value|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">お支払い合計</th>
+        <td align="right"><!--{$arrForm.payment_total.value|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">使用ポイント</th>
+        <td align="right"><!--{assign var=key value="use_point"}--><!--{if $arrForm[$key].value != ""}--><!--{$arrForm[$key].value|number_format}--><!--{else}-->0<!--{/if}--> pt</td>
+    </tr>
+    <!--{if $arrForm.birth_point.value > 0}-->
+    <tr>
+        <th colspan="4" class="right">お誕生日ポイント</th>
+        <td align="right">
+        <!--{$arrForm.birth_point.value|number_format}-->
+         pt</td>
+    </tr>
+    <!--{/if}-->
+    <tr>
+        <th colspan="4" class="right">加算ポイント</th>
+        <td align="right">
+        <!--{$arrForm.add_point.value|default:0|number_format}-->
+         pt</td>
+    </tr>
+    <tr>
+        <!--{if $arrForm.customer_id.value > 0}-->
+        <th colspan="4" class="right">現在ポイント</th>
+        <td align="right">
+        <!--{$arrForm.point.value|number_format}-->
+         pt</td>
+        <!--{else}-->
+        <th colspan="4" class="right">現在ポイント</th><td align="center">(なし)</td>
+        <!--{/if}-->
+    </tr>
+    <!--{*
+    <tr>
+        <th colspan="4" class="right">反映後ポイント (ポイントの変更は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。)</th>
+        <td align="right">
+            <span class="attention"><!--{$arrErr.total_point}--></span>
+            <!--{$arrForm.total_point.value|number_format}-->
+             pt
+        </td>
+    </tr>
+    *}-->
+</table>
+
+<table class="form">
+    <tr>
+        <th>お支払方法</th>
+        <td>
+            <!--{assign var=payment_id value="`$arrForm.payment_id.value`"}-->
+            <!--{$arrPayment[$payment_id]|escape}-->
+        </td>
+    </tr>
+    <!--{if $arrForm.payment_info.value|@count > 0}-->
+    <tr>
+        <th><!--{$arrForm.payment_typ.valuee}-->情報</th>
+        <td>
+            <!--{foreach key=key item=item from=$arrForm.payment_info.value}-->
+            <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
+            <!--{/foreach}-->
+        </td>
+    </tr>
+    <!--{/if}-->
+    <tr>
+        <th>お届け時間</th>
+        <td>
+            <!--{assign var=deliv_time_id value="`$arrForm.deliv_time_id.value`"}-->
+            <!--{$arrDelivTime[$deliv_time_id]|default:"指定なし"}-->
+        </td>
+    </tr>
+    <tr>
+        <th>お届け日</th>
+        <td>
+            <!--{assign var=key value="deliv_date"}-->
+            <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+            <!--{$arrForm[$key].value|default:"指定なし"}-->
+        </td>
+    </tr>
+    <tr>
+        <th>メモ</th>
+        <td>
+            <!--{assign var=key value="note"}-->
+            <!--{$arrForm[$key].value|escape|nl2br}-->
+        </td>
+    </tr>
+</table>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_confirm.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/mail_confirm.tpl	(revision 18873)
@@ -0,0 +1,52 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="send" />
+<input type="hidden" name="order_id" value="<!--{$tpl_order_id}-->" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<!--{foreach key=key item=item from=$arrSearchHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<div id="order" class="contents-main">
+  <h2>メール配信</h2>
+
+  <table class="form">
+    <tr>
+      <th>件名</th>
+      <td><!--{$tpl_subject|escape}--></td>
+    </tr>
+    <tr>
+      <th>本文</th>
+      <td><!--{$tpl_body|escape|nl2br}--></td>
+    </tr>
+  </table>
+
+  <div class="btn">
+    <button type="button" onclick="fnModeSubmit('return', '', '');"><span>前のページへ戻る</span></button>
+    <button type="submit" onclick="return confirm('この内容でメールを送信しても宜しいですか');"><span>メール送信</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/order/product_select.tpl	(revision 18873)
@@ -0,0 +1,224 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+
+function func_submit(product_id, class_name1, class_name2) {
+  var err_text = '';
+  var fm = window.opener.document.form1;
+  var fm1 = window.opener.document;
+  var class1 = "classcategory_id" + product_id + "_1";
+  var class2 = "classcategory_id" + product_id + "_2";
+
+  var class1_id = document.getElementById(class1).value;
+  var class2_id = document.getElementById(class2).value;
+
+  <!--{if $tpl_no != ''}-->
+  var opner_product_id = 'edit_product_id';
+  var opner_classcategory_id1 = 'edit_classcategory_id1';
+  var opner_classcategory_id2 = 'edit_classcategory_id2';
+  fm1.getElementById("no").value = <!--{$tpl_no}-->;
+  <!--{else}-->
+  var opner_product_id = 'add_product_id';
+  var opner_classcategory_id1 = 'add_classcategory_id1';
+  var opner_classcategory_id2 = 'add_classcategory_id2';
+  <!--{/if}-->
+
+  if (document.getElementById(class1).type == 'select-one' && class1_id == '') {
+    err_text = class_name1 + "を選択してください。\n";
+  }
+  if (document.getElementById(class2).type == 'select-one' && class2_id == '') {
+    err_text = err_text + class_name2 + "を選択してください。\n";
+  }
+  if (err_text != '') {
+    alert(err_text);
+    return false;
+  }
+
+  fm1.getElementById(opner_product_id).value = product_id;
+  if (class1_id != '') {
+    fm1.getElementById(opner_classcategory_id1).value = class1_id;
+  }
+  if (class2_id != '') {
+    fm1.getElementById(opner_classcategory_id2).value = class2_id;
+  }
+
+  fm.mode.value = 'select_product_detail';
+  fm.anchor_key.value = 'order_products';
+  fm.submit();
+  window.close();
+
+  return true;
+}
+//-->
+</script>
+
+<script type="text/javascript">//<![CDATA[
+// セレクトボックスに項目を割り当てる。
+function lnSetSelect(name1, name2, id, val) {
+        sele1 = document.form1[name1];
+        sele2 = document.form1[name2];
+        lists = eval('lists' + id);
+        vals = eval('vals' + id);
+
+        if(sele1 && sele2) {
+                index = sele1.selectedIndex;
+
+                // セレクトボックスのクリア
+                count = sele2.options.length;
+                for(i = count; i >= 0; i--) {
+                        sele2.options[i] = null;
+                }
+
+                // セレクトボックスに値を割り当てる
+                len = lists[index].length;
+                for(i = 0; i < len; i++) {
+                        sele2.options[i] = new Option(lists[index][i], vals[index][i]);
+                        if(val != "" && vals[index][i] == val) {
+                                sele2.options[i].selected = true;
+                        }
+                }
+        }
+}
+//]]>
+</script>
+
+
+<script type="text/javascript">//<![CDATA[
+    <!--{$tpl_javascript}-->
+//]]>
+</script>
+
+<!--▼検索フォーム-->
+<form name="form1" id="form1" method="post" action="<!--{$smarty.server.REQUEST_URI|escape}-->">
+<input name="mode" type="hidden" value="search" />
+<input name="anchor_key" type="hidden" value="" />
+<input name="search_pageno" type="hidden" value="" />
+<input name="no" type="hidden" value="<!--{$tpl_no}-->" />
+<table class="form">
+  <tr>
+    <th>カテゴリ</th>
+    <td>
+      <select name="search_category_id">
+        <option value="" selected="selected">選択してください</option>
+        <!--{html_options options=$arrCatList selected=$arrForm.search_category_id}-->
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <th>商品名</th>
+    <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
+  </tr>
+  <tr>
+    <th>商品コード</th>
+    <td><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code}-->" size="35" class="box35" /></td>
+  </tr>
+</table>
+<div class="btn">
+  <button type="submit"><span>検索を開始</span></button>
+</div>
+
+<!--▼検索結果表示-->
+<!--{if $tpl_linemax}-->
+<p>
+  <!--{$tpl_linemax}-->件が該当しました。
+  <!--{$tpl_strnavi}-->
+</p>
+
+<!--▼検索後表示部分-->
+<table class="list">
+  <tr>
+    <th class="image">商品画像</th>
+    <th class="id">商品コード</th>
+    <th class="name">商品名</th>
+    <th class="action">決定</th>
+  </tr>
+  <!--{section name=cnt loop=$arrProducts}-->
+  <!--{assign var=id value=$arrProducts[cnt].product_id}-->
+  <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+  <tr>
+    <td class="center">
+      <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->" />
+    </td>  
+    <td>
+      <!--{assign var=codemin value=`$arrProducts[cnt].product_code_min`}-->
+      <!--{assign var=codemax value=`$arrProducts[cnt].product_code_max`}-->
+      <!--{* 商品コード *}-->
+      <!--{if $codemin != $codemax}-->
+        <!--{$codemin|escape}-->～<!--{$codemax|escape}-->
+      <!--{else}-->
+        <!--{$codemin|escape}-->
+      <!--{/if}-->
+    </td>
+    <td>
+      <!--{$arrProducts[cnt].name|escape}-->
+
+      <!--{assign var=class1 value=classcategory_id`$id`_1}-->
+      <!--{assign var=class2 value=classcategory_id`$id`_2}-->
+      <!--{if $tpl_classcat_find1[$id]}-->
+      <dt><!--{$tpl_class_name1[$id]|escape}-->：</dt>
+      <dd>
+        <select name="<!--{$class1}-->" id="<!--{$class1}-->" style="<!--{$arrErr[$class1]|sfGetErrorColor}-->"  <!--{if $tpl_classcat_find2[$id]}--> onchange="lnSetSelect('<!--{$class1}-->', '<!--{$class2}-->', '<!--{$id}-->','');"<!--{/if}-->>
+          <option value="">選択してください</option>
+          <!--{html_options options=$arrClassCat1[$id] selected=$arrForm[$class1]}-->
+        </select>
+        <!--{if $arrErr[$class1] != ""}-->
+        <br /><span class="attention">※ <!--{$tpl_class_name1[$id]}-->を入力して下さい。</span>
+        <!--{/if}-->
+      </dd>
+      <!--{else}-->
+      <input type="hidden" name="<!--{$class1}-->" id="<!--{$class1}-->" value="" />
+      <!--{/if}-->
+      <!--{if $tpl_classcat_find2[$id]}-->
+      <dt><!--{$tpl_class_name2[$id]|escape}-->：</dt>
+      <dd>
+        <select name="<!--{$class2}-->" id="<!--{$class2}-->" style="<!--{$arrErr[$class2]|sfGetErrorColor}-->">
+          <option value="">選択してください</option>
+        </select>
+        <!--{if $arrErr[$class2] != ""}-->
+        <br /><span class="attention">※ <!--{$tpl_class_name2[$id]}-->を入力して下さい。</span>
+        <!--{/if}-->
+      </dd>
+      <!--{else}-->
+      <input type="hidden" name="<!--{$class2}-->" id="<!--{$class2}-->" value="" />
+      <!--{/if}-->
+    </td>
+    <td class="center"><a href="" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->')">決定</a></td>
+  </tr>
+  <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+  <!--{sectionelse}-->
+  <tr>
+    <td colspan="4">商品が登録されていません</td>
+  </tr>  
+  <!--{/section}-->
+  </table>
+<!--{/if}-->
+<!--▲検索結果表示-->
+
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login_error.tpl	(revision 18873)
@@ -0,0 +1,33 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{* ▼CONTENTS *}-->
+<div id="login-error">
+  <div class="message">
+    <!--{$tpl_error}-->
+  </div>
+  <div class="btn">
+    <button type="submit" onclick="location.href='<!--{$smarty.const.URL_LOGIN}-->';"><span>ログインページにページに戻る</span></button>
+  </div>
+</div>
+<!--{* ▲CONTENTS *}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login_frame.tpl	(revision 18873)
@@ -0,0 +1,47 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->">
+<meta http-equiv="content-script-type" content="text/javascript">
+<meta http-equiv="content-style-type" content="text/css">
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<title>管理機能</title>
+</head>
+
+<body>
+<!--{$GLOBAL_ERR}-->
+<noscript>
+  <p>JavaScript を有効にしてご利用下さい.</p>
+</noscript>
+<div id="login">
+
+<!--{include file=$tpl_mainpage}-->
+
+</div>
+</body>
+</html>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_header.tpl	(revision 18873)
@@ -0,0 +1,51 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
+
+<head>
+<meta http-equiv="content-type" content="application/xhtml+xml; charset=<!--{$smarty.const.CHAR_CODE}-->" />
+<meta http-equiv="content-script-type" content="text/javascript" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/css.js"></script>
+<!--{if $tpl_javascript != ""}-->
+<script type="text/javascript">//<![CDATA[
+    <!--{$tpl_javascript}-->
+//]]>
+</script>
+<!--{/if}-->
+<!--{include file='css/contents.tpl'}-->
+<title><!--{$smarty.const.ADMIN_TITLE}--> <!--{$tpl_subtitle}--></title>
+</head>
+
+<body id="popup"<!--{if $tpl_onload || $tpl_start}--> onLoad="<!--{$tpl_onload}--> <!--{$tpl_start}-->"<!--{/if}-->>
+<noscript>
+  <p>JavaScript を有効にしてご利用下さい.</p>
+</noscript>
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 18873)
@@ -0,0 +1,88 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script language="JavaScript">
+<!--
+function lfnCheckSubmit(){
+  
+  fm = document.form1;
+  var err = '';
+  
+  if ( ! fm["subject"].value ){
+    err += 'Subjectを入力して下さい。';
+  }
+  if ( ! fm["body"].value ){
+    if ( err ) err += '
+';
+    err += '本文を入力して下さい。';
+  }
+  if ( err ){
+    alert(err);
+    return false;
+  } else {
+    if(window.confirm('内容を登録しても宜しいですか')){
+      return true;
+    }else{
+      return false;
+    }
+  }
+}
+//-->
+</script>
+
+
+<form name="form1" id="form1" method="post" action="?" onSubmit="return lfnCheckSubmit();">
+<input type="hidden" name="mode" value="<!--{$mode}-->" />
+<input type="hidden" name="template_id" value="<!--{$arrForm.template_id}-->" />
+<div id="mail" class="contents-main">
+  <h2>配信内容設定：<!--{$title}--></h2>
+  <table class="form">
+    <tr>
+      <th>メール形式<span class="attention"> *</span></th>
+      <td>
+        <span <!--{if $arrErr.mail_method}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{html_radios name="mail_method" options=$arrMagazineType separator="&nbsp;" selected=$arrForm.mail_method}--></span>
+        <!--{if $arrErr.mail_method}--><br /><span class="attention"><!--{$arrErr.mail_method}--></span><!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>Subject<span class="attention"> *</span></th>
+      <td>
+        <input type="text" name="subject" size="65" class="box65" <!--{if $arrErr.subject}--><!--{sfSetErrorStyle}--><!--{/if}--> value="<!--{$arrForm.subject|escape}-->" />
+        <!--{if $arrErr.subject}--><br /><span class="attention"><!--{$arrErr.subject}--></span><!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</th>
+      <td>
+        <textarea name="body" cols="90" rows="40" class="area90" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.body|escape}--></textarea>
+        <!--{if $arrErr.body}--><br /><span class="attention"><!--{$arrErr.body}--></span><!--{/if}-->
+      </td>
+    </tr>
+  </table>
+  <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 18873)
@@ -0,0 +1,55 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<div id="mail" class="contents-main">
+  <h2>テンプレート</h2>
+  <table class="list center">
+    <tr>
+      <th>作成日</th>
+      <th>subject</th>
+      <th>メール形式</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>プレビュー</th>
+    </tr>
+    <!--{section name=data loop=$list_data}-->
+    <tr>
+      <td><!--{$list_data[data].disp_date|escape|date_format:'%Y/%m/%d'}--></td>
+      <td class="left"><!--{$list_data[data].subject|escape}--></td>
+      <!--{assign var=type value=$list_data[data].mail_method|escape}-->
+      <td><!--{$arrMagazineType[$type]}--></td>
+      <td><!--{if $list_data[data].mail_method eq 3}--><a href="./htmlmail.php?mode=edit&template_id=<!--{$list_data[data].template_id}-->"><!--{else}--><a href="./template_input.php?mode=edit&template_id=<!--{$list_data[data].template_id}-->"><!--{/if}-->編集</a></td>
+      <td><a href="" onclick="fnDelete('<!--{$smarty.server.PHP_SELF|escape}-->?mode=delete&id=<!--{$list_data[data].template_id}-->'); return false;">削除</a></td>
+      <td><!--{if $list_data[data].mail_method eq 3}--><a href="" onclick="win03('./preview.php?method=template&id=<!--{$list_data[data].template_id}-->','preview','650','700'); return false;" target="_blank"><!--{else}--><a href="" onclick="win03('./preview.php?id=<!--{$list_data[data].template_id}-->','preview','650','700'); return false;" target="_blank"><!--{/if}-->プレビュー</a></td>
+    </tr>
+    <!--{/section}-->
+  </table>
+
+  <div class="btn addnew">
+    <button type="button" onclick="location.href='./template_input.php'"><span>テンプレートを新規入力</span></button>
+    <!-- ＨＴＭＬ作成ウィザードは保留 (次期開発)
+    <button type="button" onclick="location.href='./htmlmail.php'"><span>HTMLテンプレート作成ウィザード</span></button>
+    -->
+  </div>
+</div>
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 18873)
@@ -0,0 +1,75 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<!--{foreach key=key item=val from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$val|escape}-->" />
+<!--{/foreach}-->
+<div id="mail" class="contents-main">
+  <h2>配信設定：配信内容設定</h2>
+  <table class="form">
+    <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
+    <tr>
+      <th>配信時間設定<span class="attention"> *</span></th>
+      <td>
+      <!--{$list_data.send_year}-->年<!--{$list_data.send_month}-->月<!--{$list_data.send_day}-->日
+      <!--{$list_data.send_hour}-->時<!--{$list_data.send_minutes}-->分
+      </td>
+    </tr>
+    <!--{/if}-->
+    <!--▼インクルードここから-->
+    <!--{if $list_data.template_id}-->
+    <tr>
+      <th>Subject<span class="attention"> *</span></th>
+      <td><!--{$list_data.subject|escape}--></td>
+    </tr>
+    <!--{if $list_data.mail_method ne 2}-->
+    <tr>
+      <td colspan="2"><a href="#" onClick="return document.form2.submit();">HTMLで確認</a></td>
+    </tr>
+    <!--{/if}-->
+    <!--{if $smarty.post.template_mode ne "html_template"}-->
+    <tr>
+      <th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</th>
+      <td><!--{$list_data.body|escape|nl2br}--></td>
+    </tr>
+    <!--{/if}-->
+    <!--{/if}-->
+    <!--▲インクルードここまで-->
+  </table>
+
+  <div class="btn">
+    <button type="button" name="subm02" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' )"><span>テンプレート設定画面へ戻る</span></button>
+    <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
+    <button type="button" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span>配信を予約する</span></button>
+    <!--{else}-->
+    <button type="button" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span>配信する</span></button>
+    <!--{/if}-->
+  </div>
+</div>
+<input type="hidden" name="mode" value="template">
+</form>
+<form name="form2" id="form2" method="post" action="./preview.php" target="_blank">
+  <input type="hidden" name="subject" value="<!--{$list_data.subject|escape}-->" />
+  <input type="hidden" name="body" value="<!--{$list_data.body|escape}-->" />
+</form>
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 18873)
@@ -0,0 +1,94 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<!--{foreach key=key item=val from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$val|escape}-->" />
+<!--{/foreach}-->
+<div id="mail" class="contents-main">
+  <h2>配信設定：配信内容設定</h2>
+  <table class="form">
+    <tr>
+      <th>テンプレート選択<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.template_id}--><span class="attention"><!--{$arrErr.template_id}--></span><!--{/if}-->
+        <select name="template_id" onchange="return fnInsertValAndSubmit( document.form1, 'mode', 'template', '' ) " style="<!--{$arrErr.template_id|sfGetErrorColor}-->">
+        <option value="" selected="selected">選択してください</option>
+        <!--{html_options options=$arrTemplate selected=$list_data.template_id}-->
+        </select>
+      </td>
+    </tr>
+    
+    <!--{* バッチモードの場合のみ表示 *}-->
+    <!--{if $smarty.const.MELMAGA_BATCH_MODE}-->
+    <tr>
+      <th>配信時間設定<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.send_year || $arrErr.send_month || $arrErr.send_day || $arrErr.send_hour || $arrErr.send_minutes}--><span class="attention"><!--{$arrErr.send_year}--><!--{$arrErr.send_month}--><!--{$arrErr.send_day}--><!--{$arrErr.send_hour}--><!--{$arrErr.send_minutes}--></span><br /><!--{/if}-->
+        <select name="send_year" style="<!--{$arrErr.send_year|sfGetErrorColor}-->">
+        <!--{html_options options=$arrYear selected=$arrNowDate.year}-->
+        </select>年
+        <select name="send_month" style="<!--{$arrErr.send_month|sfGetErrorColor}-->">
+        <!--{html_options options=$objDate->getMonth() selected=$arrNowDate.month}-->
+        </select>月
+        <select name="send_day" style="<!--{$arrErr.send_day|sfGetErrorColor}-->">
+        <!--{html_options options=$objDate->getDay() selected=$arrNowDate.day}-->
+        </select>日
+        <select name="send_hour" style="<!--{$arrErr.send_hour|sfGetErrorColor}-->">
+        <!--{html_options options=$objDate->getHour() selected=$arrNowDate.hour}-->
+        </select>時
+        <select name="send_minutes" style="<!--{$arrErr.send_minutes|sfGetErrorColor}-->">
+        <!--{html_options options=$objDate->getMinutesInterval() selected=$arrNowDate.minutes}-->
+        </select>分
+      </td>
+    </tr>
+    <!--{/if}-->
+  </table>
+
+  <!--{if $list_data.template_id}-->
+  <table class="form">
+    <tr>
+      <th>Subject<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.subject}--><span class="attention"><!--{$arrErr.subject}--></span><!--{/if}-->
+        <input type="text" name="subject" size="65" class="box65" <!--{if $arrErr.subject}--><!--{sfSetErrorStyle}--><!--{/if}--> value="<!--{$list_data.subject|escape}-->" />
+      </td>
+    </tr>
+    <tr>
+      <th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</th>
+      <td>
+        <!--{if $arrErr.body}--><span class="attention"><!--{$arrErr.body}--></span><!--{/if}-->
+        <textarea name="body" cols="90" rows="40" class="area90" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$list_data.body|escape}--></textarea>
+      </td>
+    </tr>
+  </table>
+  <!--{/if}-->
+
+  <div class="btn">
+    <button type="button" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'back', '' )"><span>検索画面に戻る</span></button>
+    <button type="submit" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_confirm', '' )" ><span>確認ページへ</span></button>
+  </div>
+</div>
+<input type="hidden" name="mode" value="template" />
+<input type="hidden" name="mail_method" value="<!--{$list_data.mail_method}-->" />
+</form>
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 18873)
@@ -0,0 +1,67 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="search_pageno" value="" />
+<input type="hidden" name="mode" value="" />
+<div id="mail" class="contents-main">
+    <table class="list center">
+        <tr>
+            <th>配信開始時刻</th>
+            <th>配信終了時刻</th>
+            <th>Subject</th>
+            <th>プレビュー</th>
+            <th>配信条件</th>
+            <th>配信総数</th>
+            <th>配信済数</th>
+            <th>配信失敗数</th>
+            <th>未配信数</th>
+            <th>再試行</th>
+            <th>削除</th>
+        </tr>
+        <!--{section name=cnt loop=$arrDataList}-->
+        <tr>
+            <td><!--{$arrDataList[cnt].start_date|sfDispDBDate|escape}--></td>
+            <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="#" 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>
+            <td><!--{$arrDataList[cnt].count_sent|escape}--></td>
+            <td style="<!--{if $arrDataList[cnt].count_error >= 1}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                <!--{$arrDataList[cnt].count_error|escape}-->
+            </td>
+            <td style="<!--{if $arrDataList[cnt].count_unsent >= 1}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                <!--{$arrDataList[cnt].count_unsent|escape}-->
+            </td>
+            <td>
+                <!--{if $arrDataList[cnt].count_error >= 1 || $arrDataList[cnt].count_unsent >= 1}-->
+                    <a href="sendmail.php?mode=now&amp;send_id=<!--{$arrDataList[cnt].send_id|escape}-->&amp;retry=yes" onclick="return window.confirm('未配信と配信失敗となった宛先に再送信を試みますか?');">実行</a>
+                <!--{/if}-->
+            </td>
+            <td><a href="?mode=delete&send_id=<!--{$arrDataList[cnt].send_id|escape}-->" onclick="return window.confirm('配信履歴を削除しても宜しいでしょうか');">削除</a></td>
+        </tr>
+        <!--{/section}-->
+    </table>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/preview.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/preview.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/preview.tpl	(revision 18873)
@@ -0,0 +1,24 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{if $escape_flag eq 1}--><!--{$body|escape|nl2br}--><!--{else}--><!--{$body}--><!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_complete.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/template_complete.tpl	(revision 18873)
@@ -0,0 +1,33 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="./product_class.php">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="product_id" value="" />
+<div id="mail" class="contents-main">
+  <div class="message">
+    テンプレートの登録・編集が完了しました<br />
+    <a href="./template.php">テンプレート一覧に戻る</a>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl	(revision 18873)
@@ -0,0 +1,146 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+//-->
+</script>
+</head>
+
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="search" />
+<div id="mail" class="contents-main">
+  <h2>配信条件</h2>
+
+  <table class="form">
+    <tr>
+      <th>顧客名</th>
+      <td><!--{$list_data.name|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>顧客名(カナ)</th>
+      <td width="249"><!--{$list_data.kana|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>都道府県</th>
+      <td><!--{$list_data.pref_disp|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>TEL</th>
+      <td width="249"><!--{$list_data.tel|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>性別</th>
+      <td><!--{$list_data.sex_disp|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>誕生月</th>
+      <td width="249"><!--{if $list_data.birth_month}--><!--{$list_data.birth_month|escape}-->月<!--{else}-->(未指定)<!--{/if}--></td>        
+    </tr>
+    <tr>
+      <th>配信形式</th>
+      <td><!--{$list_data.htmlmail_disp|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>購入回数</th>
+      <td>
+        <!--{if $list_data.buy_times_from == null}-->(未指定)<!--{else}--><!--{$list_data.buy_times_from|escape}-->回<!--{/if}--> ～ 
+        <!--{if $list_data.buy_times_to == null}-->(未指定)<!--{else}--><!--{$list_data.buy_times_to|escape}-->回<!--{/if}-->
+      </td>
+    </tr>
+    <!--{*非会員は選択できない
+    <tr>
+      <th>種別</th>
+      <td>
+      <!--{$list_data.customer|escape|default:"すべて"}-->
+      </td>
+    </tr>
+    *}-->
+    <tr>
+      <th>購入商品コード</th>
+      <td><!--{$list_data.buy_product_code|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>購入金額</th>
+      <td>
+        <!--{if $list_data.buy_total_from == null}-->(未指定)<!--{else}--><!--{$list_data.buy_total_from|escape}-->円<!--{/if}--> ～ 
+        <!--{if $list_data.buy_total_to == null}-->(未指定)<!--{else}--><!--{$list_data.buy_total_to|escape}-->円<!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>メールアドレス</th>
+      <td><!--{$list_data.email|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>職業</th>
+      <td><!--{$list_data.job_disp|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>生年月日</th>
+      <td>
+      <!--{if $list_data.b_start_year}-->
+        <!--{$list_data.b_start_year}-->年<!--{$list_data.b_start_month}-->月<!--{$list_data.b_start_day}-->日&nbsp;?&nbsp;<!--{$list_data.b_end_year}-->年<!--{$list_data.b_end_month}-->月<!--{$list_data.b_end_day}-->日
+      <!--{else}-->(未指定)<!--{/if}-->
+      </td>
+    </tr>  
+    <tr>
+      <th>登録日</th>
+      <td>
+      <!--{if $list_data.start_year}-->
+        <!--{$list_data.start_year}-->年<!--{$list_data.start_month}-->月<!--{$list_data.start_day}-->日&nbsp;?&nbsp;<!--{$list_data.end_year}-->年<!--{$list_data.end_month}-->月<!--{$list_data.end_day}-->日
+      <!--{else}-->(未指定)<!--{/if}-->
+      </td>
+    </tr>      
+    <tr>
+      <th>最終購入日</th>
+      <td>
+      <!--{if $list_data.buy_start_year}-->
+        <!--{$list_data.buy_start_year}-->年<!--{$list_data.buy_start_month}-->月<!--{$list_data.buy_start_day}-->日&nbsp;?&nbsp;<!--{$list_data.buy_end_year}-->年<!--{$list_data.buy_end_month}-->月<!--{$list_data.buy_end_day}-->日
+      <!--{else}-->(未指定)<!--{/if}-->  
+      </td>
+    </tr>
+    <tr>
+      <th>購入商品名</th>
+      <td><!--{$list_data.buy_product_name|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>カテゴリ</th>
+      <td><!--{$list_data.category_name|escape|default:"(未指定)"}--></td>
+    </tr>
+    <tr>
+      <th>キャンペーン</th>
+      <td><!--{$arrCampaignList[$list_data.campaign_id]|escape|default:"(未指定)"}--></td>
+    </tr>
+  </table>
+
+  <div class="btn">
+    <button type="button" onclick="window.close();"><span>ウインドウを閉じる</span></button>
+  </div>
+</div>
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl	(revision 18873)
@@ -0,0 +1,349 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA    02111-1307, USA.
+ */
+*}-->
+<div id="mail" class="contents-main">
+<form name="form_search" id="form_search" method="post" action="?">
+<input type="hidden" name="mode" value="search" />
+    <h2>配信先検索条件設定</h2>
+
+    <!--{* 検索条件設定テーブルここから *}-->
+    <table>
+        <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="<!--{$list_data.name|escape}-->" size="30" class="box30" style="<!--{$arrErr.name|sfGetErrorColor}-->" />
+            </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="<!--{$list_data.kana|escape}-->" size="30" class="box30" style="<!--{$arrErr.kana|sfGetErrorColor}-->" />
+            </td>
+        </tr>
+        <tr>
+            <th>都道府県</th>
+            <td>
+                <!--{if $arrErr.pref}--><span class="attention"><!--{$arrErr.pref}--></span><br /><!--{/if}-->
+                <select name="pref">
+                    <option value="" selected="selected" style="<!--{$arrErr.pref|sfGetErrorColor}-->">都道府県を選択</option>
+                    <!--{html_options options=$arrPref selected=$list_data.pref}-->
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>TEL</th>
+            <td>
+                <!--{if $arrErr.tel}--><span class="attention"><!--{$arrErr.tel}--></span><br /><!--{/if}-->
+                <input type="text" name="tel" maxlength="<!--{$smarty.const.TEL_LEN}-->" value="<!--{$list_data.tel|escape}-->" size="30" class="box30" style="<!--{$arrErr.tel|sfGetErrorColor}-->" />
+            </td>
+        </tr>
+        <tr>
+            <th>性別</th>
+            <td>
+                <!--{html_checkboxes_ex name="sex" options=$arrSex separator="&nbsp;" selected=$list_data.sex}-->
+            </td>
+        </tr>
+        <tr>
+            <th>誕生月</th>
+            <td>
+                <!--{if $arrErr.birth_month}--><span class="attention"><!--{$arrErr.birth_month}--></span><br /><!--{/if}-->
+                <select name="birth_month" style="<!--{$arrErr.birth_month|sfGetErrorColor}-->" >
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.birth_month|escape}-->
+                </select>月
+            </td>
+        </tr>
+        <tr>
+            <th>配信形式</th>
+            <td>
+                <!--{if $arrErr.htmlmail}--><span class="attention"><!--{$arrErr.htmlmail}--></span><br /><!--{/if}-->
+                <!--{html_radios name="htmlmail" options=$arrHtmlmail separator="&nbsp;" selected=$list_data.htmlmail}-->
+            </td>
+        </tr>
+        <tr>
+            <th>購入商品コード</th>
+            <td>
+                <!--{if $arrErr.buy_product_code}--><span class="attention"><!--{$arrErr.buy_product_code}--></span><!--{/if}-->
+                <input type="text" name="buy_product_code" value="<!--{$list_data.buy_product_code}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{$arrErr.buy_product_code|sfGetErrorColor}-->" />
+            </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="<!--{$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>
+                <!--{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="<!--{$list_data.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="<!--{$list_data.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>
+            <!--{html_checkboxes name="customer" options=$arrCustomerType separator="&nbsp;" selected=$list_data.customer}-->
+            </td>
+        </tr>
+        *}-->
+        <tr>
+            <th>メールアドレス</th>
+            <td>
+                <!--{if $arrErr.email}--><span class="attention"><!--{$arrErr.email}--></span><!--{/if}-->
+                <span style="<!--{$arrErr.email|sfGetErrorColor}-->">
+                <input type="text" name="email" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$list_data.email|escape}-->" size="60" class="box60" style="<!--{$arrErr.email|sfGetErrorColor}-->"/>
+                </span>
+            </td>
+        </tr>
+        
+        <tr>
+            <th>携帯メールアドレス</th>
+            <td>
+                <!--{if $arrErr.email_mobile}--><span class="attention"><!--{$arrErr.email_mobile}--></span><!--{/if}-->
+                <span style="<!--{$arrErr.email_mobile|sfGetErrorColor}-->">
+                <input type="text" name="email_mobile" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$list_data.email_mobile|escape}-->" size="60" class="box60" style="<!--{$arrErr.email_mobile|sfGetErrorColor}-->"/>
+                </span>
+            </td>
+        </tr>
+        
+        <tr>
+            <th>配信メールアドレス種別</th>
+            <td>
+                <!--{html_radios name="mail_type" options=$arrMailType separator="<br />" selected=$list_data.mail_type}-->
+            </td>
+        </tr>
+        
+        <tr>
+            <th>職業</th>
+            <td>
+                <!--{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>
+                <!--{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}-->">
+                    <option value="" selected="selected">----</option>
+                    <!--{html_options options=$objDate->getYear($smarty.const.BIRTH_YEAR) selected=$list_data.b_start_year}-->
+                </select>年
+                <select name="b_start_month" style="<!--{$arrErr.b_start_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.b_start_month}-->
+                </select>月
+                <select name="b_start_day" style="<!--{$arrErr.b_start_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getDay() selected=$list_data.b_start_day}-->
+                </select>日&nbsp;～&nbsp;
+                <select name="b_end_year" style="<!--{$arrErr.b_end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">----</option>
+                    <!--{html_options options=$objDate->getYear($smarty.const.BIRTH_YEAR) selected=$list_data.b_end_year}-->
+                </select>年
+                <select name="b_end_month" style="<!--{$arrErr.b_end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.b_end_month}-->
+                </select>月
+                <select name="b_end_day" style="<!--{$arrErr.b_end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getDay() selected=$list_data.b_end_day}-->
+                </select>日
+            </td>
+        </tr>
+        <tr>
+            <th>登録日</th>
+            <td>
+                <!--{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}-->">
+                    <option value="" selected="selected">----</option>
+                    <!--{html_options options=$objDate->getYear($smarty.const.RELEASE_YEAR) selected=$list_data.start_year}-->
+                </select>年
+                <select name="start_month" style="<!--{$arrErr.start_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.start_month}-->
+                </select>月
+                <select name="start_day" style="<!--{$arrErr.start_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getDay() selected=$list_data.start_day}-->
+                </select>日&nbsp;～&nbsp;
+                <select name="end_year" style="<!--{$arrErr.end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">----</option>
+                    <!--{html_options options=$objDate->getYear($smarty.const.RELEASE_YEAR) selected=$list_data.end_year}-->
+                </select>年
+                <select name="end_month" style="<!--{$arrErr.end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.end_month}-->
+                </select>月
+                <select name="end_day" style="<!--{$arrErr.end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getDay() selected=$list_data.end_day}-->
+                </select>日
+            </td>
+        </tr>
+        <tr>
+            <th>最終購入日</th>
+            <td>
+                <!--{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}-->">
+                    <option value="" selected="selected">----</option>
+                    <!--{html_options options=$objDate->getYear($smarty.const.RELEASE_YEAR) selected=$list_data.buy_start_year}-->
+                </select>年
+                <select name="buy_start_month" style="<!--{$arrErr.buy_start_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.buy_start_month}-->
+                </select>月
+                <select name="buy_start_day" style="<!--{$arrErr.buy_start_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getDay() selected=$list_data.buy_start_day}-->
+                </select>日&nbsp;～&nbsp;
+                <select name="buy_end_year" style="<!--{$arrErr.buy_end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">----</option>
+                    <!--{html_options options=$objDate->getYear($smarty.const.RELEASE_YEAR) selected=$list_data.buy_end_year}-->
+                </select>年
+                <select name="buy_end_month" style="<!--{$arrErr.buy_end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getMonth() selected=$list_data.buy_end_month}-->
+                </select>月
+                <select name="buy_end_day" style="<!--{$arrErr.buy_end_year|sfGetErrorColor}-->">
+                    <option value="" selected="selected">--</option>
+                    <!--{html_options options=$objDate->getDay() selected=$list_data.buy_end_day}-->
+                </select>日
+            </td>
+        </tr>
+        
+        <tr>
+            <th>購入商品名</th>
+            <td>
+                <!--{if $arrErr.buy_product_name}--><span class="attention"><!--{$arrErr.buy_product_name}--></span><!--{/if}-->
+                <span style="<!--{$arrErr.buy_product_name|sfGetErrorColor}-->">
+                <input type="text" name="buy_product_name" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$list_data.buy_product_name|escape}-->" size="30" class="box30" style="<!--{$arrErr.buy_product_name|sfGetErrorColor}-->" />
+                </span>
+            </td>
+        </tr>
+        <tr>
+            <th>カテゴリ</th>
+            <td>
+                <select name="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                    <option value="">選択してください</option>
+                    <!--{html_options options=$arrCatList selected=$list_data.category_id}-->
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>キャンペーン</th>
+            <td>
+                <select name="campaign_id" style="<!--{if $arrErr.campaign_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+                    <option value="">選択してください</option>
+                    <!--{html_options options=$arrCampaignList selected=$list_data.campaign_id}-->
+                </select>
+            </td>
+        </tr>
+    </table>
+    <!--{* 検索条件設定テーブルここまで *}-->
+
+    <div class="btn">
+        <button type="submit"><span>この条件で検索する</span></button>
+    </div>
+</form>
+
+
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'back') }-->
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
+<input type="hidden" name="result_email" value="" />
+<!--{foreach key=key item=val from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$val|escape}-->" />
+<!--{/foreach}-->
+
+    <h2>検索結果一覧</h2>
+    <p>
+        <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
+        <!--{if $smarty.const.ADMIN_MODE == '1'}-->
+            <button type="button" onclick="fnModeSubmit('delete_all','','');"><span>検索結果をすべて削除</span></button>
+        <!--{/if}-->
+        <!--{if $tpl_linemax > 0}-->
+            <button type="submit" onclick="document.form1['mode'].value='input';"><span>配信内容を設定する</span></button>
+        <!--{/if}-->
+    </p>
+    <!--{include file=$tpl_pager}-->
+
+    <!--{if count($arrResults) > 0}-->
+
+    <!--検索結果表示テーブル-->
+    <table class="list">
+        <tr>
+            <th>#</th>
+            <th>会員番号</th>
+            <th>注文番号</th>
+            <th>名前</th>
+            <th>メールアドレス</th>
+            <th>希望配信</th>
+            <th>登録日</th>
+            <th>削除</th>
+        </tr>
+        <!--{section name=i loop=$arrResults}-->
+        <tr>
+            <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">
+                <!--{foreach key=key item=val from=$arrCustomerOrderId[$key]}-->
+                <a href="#" onclick="fnOpenWindow('../order/edit.php?order_id=<!--{$val}-->','order_disp','800','900'); return false;" ><!--{$val}--></a><br />
+                <!--{foreachelse}-->
+                -
+                <!--{/foreach}-->
+            </td>
+
+            <td><!--{$arrResults[i].name01|escape}--> <!--{$arrResults[i].name02|escape}--></td>
+            <td><!--{$arrResults[i].email|escape}--></td>
+            <!--{assign var="key" value="`$arrResults[i].mailmaga_flg`"}-->
+            <td class="center"><!--{$arrMAILMAGATYPE[$key]}--></td>
+            <td><!--{$arrResults[i].create_date|sfDispDBDate}--></td>
+            <!--{if $arrResults[i].customer_id != ""}-->
+            <td class="center">-</td>
+            <!--{else}-->
+            <td class="center"><a href="?" onclick="fnFormModeSubmit('form1','delete','result_email','<!--{$arrResults[i].email|escape}-->'); return false;">削除</a></td>
+            <!--{/if}-->
+        </tr>
+        <!--{/section}-->
+    </table>
+    <!--検索結果表示テーブル-->
+    <!--{/if}-->
+
+</form>
+
+<!--{/if}-->
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/input_complete.tpl	(revision 18873)
@@ -0,0 +1,54 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<!--{foreach key=key item=val from=$arrHidden}-->  
+<input type="hidden" name="<!--{$key}-->" value="<!--{$val|escape}-->" />
+<!--{/foreach}-->
+<input type="hidden" name="mode" value="template" />
+<div id="mail" class="contents-main">
+  <h2>配信設定：配信内容設定</h2>
+  <div class="message">
+    メール配信設定が完了しました。指定時刻にメール配信が始まります。<br />
+    配信履歴にて配信履歴がご覧いただけます。<br />
+    <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->">→続けて設定する</a>
+  </div>
+  <div class="btn">
+    <button type="button" name="subm02" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_back', '' )"><span>テンプレート設定画面へ戻る</span></button>
+  　<button type="button" name="subm03" onClick="return fnInsertValAndSubmit( document.form1, 'mode', 'regist_complete', '' )" <!--{$list_data.template_id|sfGetEnabled}-->><span>配信を予約する</span></button>
+  </div>
+</div>
+</form>
+
+<form name="form2" id="form2" method="post" action="./preview.php" target="_blank">
+<input type="hidden" name="subject" value="<!--{$list_data.subject|escape}-->" />
+<input type="hidden" name="body" value="<!--{$list_data.body|escape}-->" />
+<div id="mail2" class="contents-main">
+  <h2>HTMLメール作成</h2>
+  <div class="message">
+    メール配信設定が完了しました。指定時刻にメール配信が始まります。<br />
+    配信履歴にて配信履歴がご覧いただけます。<br />
+    <a href="./<!--{$smarty.const.DIR_INDEX_URL}-->">→続けて設定する</a>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/subnavi.tpl	(revision 18873)
@@ -0,0 +1,28 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-mail-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/mail/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>配信内容設定</span></a></li>
+<li<!--{if $tpl_subno == 'template'}--> class="on"<!--{/if}--> id="navi-mail-template"><a href="<!--{$smarty.const.URL_DIR}-->admin/mail/template.php"><span>テンプレート設定</span></a></li>
+<li<!--{if $tpl_subno == 'history'}--> class="on"<!--{/if}--> id="navi-mail-history"><a href="<!--{$smarty.const.URL_DIR}-->admin/mail/history.php"><span>配信履歴</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/page_job.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/page_job.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/page_job.tpl	(revision 18873)
@@ -0,0 +1,60 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<table id="total-job" class="list">
+    <tr>
+        <th>順位</th>
+        <th>職業</th>
+        <th>購入件数</th>
+        <th>購入合計</th>
+        <th>購入平均</th>
+    </tr>
+
+    <!--{section name=cnt loop=$arrResults}-->
+    <!--{* 色分け判定 *}-->
+    <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+    <!--{if $type == 0}-->
+        <!--{* 偶数行 *}-->
+        <!--{assign var=color value="even"}-->
+    <!--{else}-->
+        <!--{* 奇数行 *}-->
+        <!--{assign var=color value="odd"}-->
+    <!--{/if}-->
+
+    <tr class="<!--{$color}-->">
+        <td class="center"><!--{*順位*}--><!--{$smarty.section.cnt.iteration}--></td>
+        <td class="center"><!--{*職業*}--><!--{$arrResults[cnt].job_name}--></td>
+        <td class="right"><!--{*購入件数*}--><!--{$arrResults[cnt].order_count}-->件</td>
+        <td class="right"><!--{*購入合計*}--><!--{$arrResults[cnt].total|number_format}-->円</td>
+        <td class="right"><!--{*購入平均*}--><!--{$arrResults[cnt].total_average|number_format}-->円</td>
+    </tr>
+    <!--{/section}-->
+
+    <tr>
+        <th>順位</span></th>
+        <th>職業</span></th>
+        <th>購入件数</span></th>
+        <th>購入合計</span></th>
+        <th>購入平均</span></th>
+    </tr>
+</table>
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 18873)
@@ -0,0 +1,143 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<div id="total" class="contents-main">
+<!--{* 検索条件設定テーブルここから *}-->
+<table summary="検索条件設定テーブル" class="input-form form">
+  <tr>
+    <th>月度集計</th>
+    <td>
+      <form name="search_form1" id="search_form1" method="post" action="?">
+        <input type="hidden" name="mode" value="search" />
+        <input type="hidden" name="form" value="1" />
+        <input type="hidden" name="page" value="<!--{$arrForm.page.value}-->" />
+        <input type="hidden" name="type" value="<!--{$smarty.post.type}-->" />
+        <!--{if $arrErr.search_startyear_m || $arrErr.search_endyear_m}-->
+        <span class="attention"><!--{$arrErr.search_startyear_m}--></span>
+        <span class="attention"><!--{$arrErr.search_endyear_m}--></span>
+        <!--{/if}-->
+        <select name="search_startyear_m"  style="<!--{$arrErr.search_startyear_m|sfGetErrorColor}-->">
+        <!--{html_options options=$arrYear selected=$arrForm.search_startyear_m.value}-->
+        </select>年
+        <select name="search_startmonth_m" style="<!--{$arrErr.search_startyear_m|sfGetErrorColor}-->">
+        <!--{html_options options=$arrMonth selected=$arrForm.search_startmonth_m.value}-->
+        </select>月度 (<!--{if $smarty.const.CLOSE_DAY == 31}-->末<!--{else}--><!--{$smarty.const.CLOSE_DAY}--><!--{/if}-->日締め)
+        <input type="submit" name="subm" value="月度で集計する" />
+      </form>
+    </td>
+  </tr>
+  <tr>
+    <th>期間集計</th>
+    <td>
+      <form name="search_form2" id="search_form2" method="post" action="?">
+        <input type="hidden" name="mode" value="search" />
+        <input type="hidden" name="form" value="2" />
+        <input type="hidden" name="page" value="<!--{$arrForm.page.value}-->" />
+        <input type="hidden" name="type" value="<!--{$smarty.post.type}-->" />
+        <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
+        <span class="attention"><!--{$arrErr.search_startyear}--></span>
+        <span class="attention"><!--{$arrErr.search_endyear}--></span>
+        <!--{/if}-->
+        <select name="search_startyear"  style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+        <option value="">----</option>
+        <!--{html_options options=$arrYear selected=$arrForm.search_startyear.value}-->
+        </select>年
+        <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrMonth selected=$arrForm.search_startmonth.value}-->
+        </select>月
+        <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrDay selected=$arrForm.search_startday.value}-->
+        </select>日～
+        <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+        <option value="">----</option>
+        <!--{html_options options=$arrYear selected=$arrForm.search_endyear.value}-->
+        </select>年
+        <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrMonth selected=$arrForm.search_endmonth.value}-->
+        </select>月
+        <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrDay selected=$arrForm.search_endday.value}-->
+        </select>日
+      　<input type="submit" name="subm" value="期間で集計する" />
+      </form>
+    </td>
+  </tr>
+</table>
+<!--{* 検索条件設定テーブルここまで *}-->
+
+
+<!--{* 検索結果一覧ここから *}-->
+<!--{if count($arrResults) > 0}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="search" />
+<input type="hidden" name="type" value="<!--{$arrForm.type.value}-->" />
+<input type="hidden" name="page" value="<!--{$arrForm.page.value}-->" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->  
+
+  <!--検索結果表示テーブル-->
+  <h2><!--{include file=$tpl_graphsubtitle}--></h2>
+
+  <div class="btn">
+    <button type="button" onclick="fnModeSubmit('csv','','');"><span>検索結果をCSVダウンロード</span></button>
+  </div>
+
+  <!--{* グラフ表示 *}-->
+    <!--{if $install_GD}-->
+    <div id="graph-image">
+      <!--{* <img src="<!--{$tpl_image}-->?<!--{$cashtime}-->" alt="グラフ"> *}-->
+      <img src="<!--{$smarty.server.PHP_SELF|escape}-->?draw_image=true&amp;type=<!--{$smarty.post.type}-->&amp;mode=search&amp;page=<!--{$smarty.post.page}-->&search_startyear_m=<!--{$smarty.post.search_startyear_m}-->&search_startmonth_m=<!--{$smarty.post.search_startmonth_m}-->&search_startyear=<!--{$smarty.post.search_startyear}-->&search_startmonth=<!--{$smarty.post.search_startmonth}-->&search_startday=<!--{$smarty.post.search_startday}-->&search_endyear=<!--{$smarty.post.search_endyear}-->&search_endmonth=<!--{$smarty.post.search_endmonth}-->&search_endday=<!--{$smarty.post.search_endday}-->" alt="グラフ" />
+    </div>
+    <!--{/if}-->
+  <!--{* グラフ表示 *}-->
+
+  <!--{* ▼検索結果テーブルここから *}-->
+  <!--{include file=$tpl_page_type}-->
+  <!--{* ▲検索結果テーブルここまで *}-->
+  <!--検索結果表示テーブル-->
+</form>
+<!--{else}-->
+  <!--{if $smarty.post.mode == 'search'}-->
+  <form name="form1" id="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="search" />
+  <input type="hidden" name="type" value="<!--{$arrForm.type.value}-->" />
+  <input type="hidden" name="page" value="<!--{$arrForm.page.value}-->" />
+  <!--{foreach key=key item=item from=$arrHidden}-->
+  <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+  <!--{/foreach}-->  
+  <!--検索結果表示テーブル-->
+  <h2><!--{include file=$tpl_graphsubtitle}--></h2>
+  <div class="message">
+    該当するデータはありません。
+  </div>
+  <!--検索結果表示テーブル-->
+  </form>
+  <!--{/if}-->
+<!--{/if}-->
+<!--{* 検索結果一覧ここまで *}-->
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/subnavi.tpl	(revision 18873)
@@ -0,0 +1,40 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+    <li id="navi-total-term"
+        class="<!--{if ($tpl_mainno == 'total' && ($arrForm.page.value == 'term' || $arrForm.page.value == ''))}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=term"><span>期間別集計</span></a></li>
+    <li id="navi-total-products"
+        class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'products')}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=products"><span>商品別集計</span></a></li>
+    <li id="navi-total-age"
+        class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'age')}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=age"><span>年代別集計</span></a></li>
+    <li id="navi-total-job"
+        class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'job')}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=job"><span>職業別集計</span></a></li>
+    <li id="navi-total-member"
+        class="<!--{if ($tpl_mainno == 'total' && $arrForm.page.value == 'member')}-->on<!--{/if}-->"
+    ><a href="<!--{$smarty.const.URL_DIR}-->admin/total/<!--{$smarty.const.DIR_INDEX_URL}-->?page=member"><span>会員別集計</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/page_age.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/page_age.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/page_age.tpl	(revision 18873)
@@ -0,0 +1,57 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<table id="total-age" class="list">
+  <tr>
+    <th>年齢</th>
+    <th>購入件数</th>
+    <th>購入合計</th>
+    <th>購入平均</th>
+  </tr>
+  
+  <!--{section name=cnt loop=$arrResults}-->
+  <!--{* 色分け判定 *}-->
+  <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+  <!--{if $type == 0}-->
+    <!--{* 偶数行 *}-->
+    <!--{assign var=color value="even"}-->
+  <!--{else}-->
+    <!--{* 奇数行 *}-->
+    <!--{assign var=color value="odd"}-->
+  <!--{/if}-->
+
+  <tr class="<!--{$color}-->">
+    <td class="center"><!--{*年齢*}--><!--{$arrResults[cnt].age_name}--></td>
+    <td class="right"><!--{*購入件数*}--><!--{$arrResults[cnt].order_count}-->件</td>
+    <td class="right"><!--{*購入合計*}--><!--{$arrResults[cnt].total|number_format}-->円</td>
+    <td class="right"><!--{*購入平均*}--><!--{$arrResults[cnt].total_average|number_format}-->円</td>
+  </tr>
+  <!--{/section}-->
+  
+  <tr>
+    <th>年齢</th>
+    <th>購入件数</th>
+    <th>購入合計</th>
+    <th>購入平均</th>
+  </tr>
+</table>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/subtitle.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/subtitle.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/subtitle.tpl	(revision 18873)
@@ -0,0 +1,119 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{if $arrForm.page.value == "term" || $arrForm.page.value == ""}-->
+  <strong>期間別集計</strong>&nbsp;（
+  <!--{if $smarty.post.type == 'day' || $smarty.post.type == ''}-->
+  <span class="over">日別</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'day');">日別</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'month'}-->
+  <span class="over">月別</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'month');">月別</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'year'}-->
+  <span class="over">年別</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'year');">年別</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'wday'}-->
+  <span class="over">曜日別</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'wday');">曜日別</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'hour'}-->
+  <span class="over">時間別</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'hour');">時間別</a>&nbsp;
+  <!--{/if}-->
+  ）
+<!--{/if}-->
+
+<!--{if $arrForm.page.value == "products"}-->
+  <strong>商品別集計</strong>&nbsp;（
+  <!--{if $smarty.post.type == 'all' || $smarty.post.type == ''}-->
+  <span class="over">全体</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'all');">全体</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'member'}-->
+  <span class="over">会員</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'member');">会員</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'nonmember'}-->
+  <span class="over">非会員</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'nonmember');">非会員</a>&nbsp;
+  <!--{/if}-->
+  ）
+<!--{/if}-->
+
+<!--{if $arrForm.page.value == "age"}-->
+  <strong>年代別集計</strong>&nbsp;（
+  <!--{if $smarty.post.type == 'all' || $smarty.post.type == ''}-->
+  <span class="over">全体</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'all');">全体</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'member'}-->
+  <span class="over">会員</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'member');">会員</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'nonmember'}-->
+  <span class="over">非会員</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'nonmember');">非会員</a>&nbsp;
+  <!--{/if}-->
+  ）
+<!--{/if}-->
+
+<!--{if $arrForm.page.value == "job"}-->
+  <strong>職業別集計</strong>&nbsp;（
+  <span class="over">全体</span>
+  ）
+  <!--{*（
+  <!--{if $smarty.post.type == 'all' || $smarty.post.type == ''}-->
+  <span class="over">全体</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'all');">全体</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'member'}-->
+  <span class="over">会員</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'member');">会員</a>&nbsp;
+  <!--{/if}-->
+  <!--{if $smarty.post.type == 'nonmember'}-->
+  <span class="over">非会員</span>&nbsp;
+  <!--{else}-->
+  <a href="?" onclick="document.form1.mode.value='search'; return fnSetFormSubmit('form1', 'type', 'nonmember');">非会員</a>&nbsp;
+  <!--{/if}-->
+  ）*}-->
+<!--{/if}-->
+
+<!--{if $arrForm.page.value == "member"}-->
+  <strong>会員別集計</strong>
+<!--{/if}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/page_products.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/page_products.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/page_products.tpl	(revision 18873)
@@ -0,0 +1,66 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<table id="total-products" class="list">
+  <tr>
+    <th>順位</th>
+    <th>商品コード</th>
+    <th>商品名</th>
+    <th>購入件数</th>
+    <th>点数</th>
+    <th>単価</th>
+    <th>金額</th>
+  </tr>
+  
+  <!--{section name=cnt loop=$arrResults}-->
+  <!--{* 色分け判定 *}-->
+  <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+  <!--{if $type == 0}-->
+    <!--{* 偶数行 *}-->
+    <!--{assign var=color value="even"}-->
+  <!--{else}-->
+    <!--{* 奇数行 *}-->
+    <!--{assign var=color value="odd"}-->
+  <!--{/if}-->
+
+  <tr class="<!--{$color}-->">
+    <td class="center"><!--{*順位*}--><!--{$smarty.section.cnt.iteration}--></td>
+    <td class="right"><!--{*商品コード*}--><!--{$arrResults[cnt].product_code|escape}--></td>
+    <td class="left"><!--{*商品名*}--><!--{$arrResults[cnt].product_name|sfCutString:40|escape}--></td>
+    <td class="right"><!--{*購入件数*}--><!--{$arrResults[cnt].order_count}-->件</td>
+    <td class="right"><!--{*点数*}--><!--{$arrResults[cnt].products_count}--></td>
+    <td class="right"><!--{*単価*}--><!--{$arrResults[cnt].price|number_format}-->円</td>
+    <td class="right"><!--{*金額*}--><!--{$arrResults[cnt].total|number_format}-->円</td>
+  </tr>
+  <!--{/section}-->
+  
+  <tr>
+    <th>順位</th>
+    <th>商品コード</th>
+    <th>商品名</th>
+    <th>購入件数</th>
+    <th>点数</th>
+    <th>単価</th>
+    <th>金額</th>
+  </tr>
+</table>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/page_member.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/page_member.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/page_member.tpl	(revision 18873)
@@ -0,0 +1,57 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<table id="total-member" class="list">
+  <tr>
+    <th>区分</th>
+    <th>購入件数</th>
+    <th>購入合計</th>
+    <th>購入平均</th>
+  </tr>
+  
+  <!--{section name=cnt loop=$arrResults}-->
+  <!--{* 色分け判定 *}-->
+  <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+  <!--{if $type == 0}-->
+    <!--{* 偶数行 *}-->
+    <!--{assign var=color value="even"}-->
+  <!--{else}-->
+    <!--{* 奇数行 *}-->
+    <!--{assign var=color value="odd"}-->
+  <!--{/if}-->
+
+  <tr class="<!--{$color}-->">
+    <td class="center"><!--{*区分*}--><!--{$arrResults[cnt].member_name}--></td>
+    <td class="right"><!--{*購入件数*}--><!--{$arrResults[cnt].order_count}-->件</td>
+    <td class="right"><!--{*購入合計*}--><!--{$arrResults[cnt].total|number_format}-->円</td>
+    <td class="right"><!--{*購入平均*}--><!--{$arrResults[cnt].total_average|number_format}-->円</td>
+  </tr>
+  <!--{/section}-->
+  
+  <tr>
+    <th>区分</th>
+    <th>購入件数</th>
+    <th>購入合計</th>
+    <th>購入平均</th>
+  </tr>
+</table>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/total/page_term.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/total/page_term.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/total/page_term.tpl	(revision 18873)
@@ -0,0 +1,88 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<table id="total-term" class="list">
+  <tr>
+    <th>期間</th>
+    <th>購入件数</th>
+    <th>男性</th>
+    <th>女性</th>
+    <th>男性(会員)</th>
+    <th>男性<br />(非会員)</th>
+    <th>女性(会員)</th>
+    <th>女性<br />(非会員)</th>
+    <th>購入合計</th>
+    <th>購入平均</th>
+  </tr>
+  
+  <!--{section name=cnt loop=$arrResults}-->
+  <!--{* 色分け判定 *}-->
+  <!--{if !$smarty.section.cnt.last}-->
+    <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+    <!--{if $type == 0}-->
+      <!--{* 偶数行 *}-->
+      <!--{assign var=color value="even"}-->
+    <!--{else}-->
+      <!--{* 奇数行 *}-->
+      <!--{assign var=color value="odd"}-->
+    <!--{/if}-->
+  <!--{else}-->
+    <!--{* 最終行 *}-->
+    <!--{assign var=color value="last"}-->
+  <!--{/if}-->
+  
+  
+  <tr class="<!--{$color}-->">
+    <!--{assign var=wday value="`$arrResults[cnt].wday`"}-->
+    
+    <!--{if !$smarty.section.cnt.last}-->
+      <td class="center"><!--{*期間*}--><!--{$arrResults[cnt][$keyname]}--><!--{if $keyname == "key_day"}-->(<!--{$arrWDAY[$wday]}-->)<!--{/if}--><!--{$tpl_tail}--></td>
+    <!--{else}-->
+      <td class="center"><!--{*期間*}-->合計</td>
+    <!--{/if}-->
+    
+    <td class="right"><!--{*購入件数*}--><!--{$arrResults[cnt].total_order}-->件</td>
+    <td class="right"><!--{*男性*}--><!--{$arrResults[cnt].men}--></td>
+    <td class="right"><!--{*女性*}--><!--{$arrResults[cnt].women}--></td>
+    <td class="right"><!--{*男性(会員)*}--><!--{$arrResults[cnt].men_member}--></td>
+    <td class="right"><!--{*男性(非会員)*}--><!--{$arrResults[cnt].men_nonmember}--></td>
+    <td class="right"><!--{*女性(会員)*}--><!--{$arrResults[cnt].women_member}--></td>
+    <td class="right"><!--{*女性(非会員)*}--><!--{$arrResults[cnt].women_nonmember}--></td>
+    <td class="right"><!--{*購入合計*}--><!--{$arrResults[cnt].total|number_format}-->円</td>
+    <td class="right"><!--{*購入平均*}--><!--{$arrResults[cnt].total_average|number_format}-->円</td>
+  </tr>
+  <!--{/section}-->
+  
+  <tr>
+    <th>期間</th>
+    <th>購入件数</th>
+    <th>男性</th>
+    <th>女性</th>
+    <th>男性(会員)</th>
+    <th>男性<br />(非会員)</th>
+    <th>女性(会員)</th>
+    <th>女性<br />(非会員)</th>
+    <th>購入合計</th>
+    <th>購入平均</th>
+  </tr>
+</table>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/index.tpl	(revision 18873)
@@ -0,0 +1,73 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+<div id="system" class="contents-main">
+  <div class="paging">
+    <!--▼ページ送り-->
+    <!--{$tpl_strnavi}-->
+    <!--▲ページ送り-->
+  </div>
+  
+  <!--▼メンバー一覧ここから-->
+  <table class="list">
+    <tr>
+      <th>権限</th>
+      <th>名前</th>
+      <th>所属</th>
+      <th>稼動</th>
+      <th>非稼動</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=data loop=$list_data}--><!--▼メンバー<!--{$smarty.section.data.iteration}-->-->
+    <tr>
+      <!--{assign var="auth" value=$list_data[data].authority}--><td><!--{$arrAUTHORITY[$auth]|escape}--></td>
+      <td><!--{$list_data[data].name|escape}--></td>
+      <td><!--{$list_data[data].department|escape}--></td>
+      <td align="center"><!--{if $list_data[data].work eq 1}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="稼動" onclick="fnChangeRadio(this.name, 1, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" checked /><!--{else}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="稼動" onclick="fnChangeRadio(this.name, 1, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);"/><!--{/if}--></td>
+      <td align="center"><!--{if $list_data[data].work eq 0}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="非稼動"  onclick="fnChangeRadio(this.name, 0, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" checked /><!--{else}--><input type="radio" name="radio<!--{$smarty.section.data.iteration}-->" value="非稼動" onclick="fnChangeRadio(this.name, 0, <!--{$list_data[data].member_id}-->, <!--{$tpl_disppage}-->);" <!--{if $workmax <= 1 }-->disabled<!--{/if}-->  /><!--{/if}--></td>
+      <td align="center"><a href="#" onClick="win01('./input.php?id=<!--{$list_data[data].member_id}-->&amp;pageno=<!--{$tpl_disppage}-->','member_edit','500','420'); return false;">編集</a></td>
+      <td align="center"><!--{if $workmax > 1 }--><a href="#" onClick="fnDeleteMember(<!--{$list_data[data].member_id}-->,<!--{$tpl_disppage}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
+      <td align="center">
+      <!--{$tpl_nomove}-->
+      <!--{if !($smarty.section.data.first && $tpl_disppage eq 1) }--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&move=up&pageno=<!--{$tpl_disppage}-->">上へ</a><!--{/if}-->
+      <!--{if !($smarty.section.data.last && $tpl_disppage eq $tpl_pagemax) }--><a href="./rank.php?id=<!--{$list_data[data].member_id}-->&move=down&pageno=<!--{$tpl_disppage}-->">下へ</a><!--{/if}-->
+      </td>
+    </tr>
+    <!--▲メンバー<!--{$smarty.section.data.iteration}-->-->
+    <!--{/section}-->
+  </table>
+
+  <div class="paging">
+    <!--▼ページ送り-->
+    <!--{$tpl_strnavi}-->
+    <!--▲ページ送り-->
+  </div>
+
+  <div class="btn addnew">
+    <button type="button" onclick="win01('./input.php','input','500','420');"><span>メンバーを新規入力</span></button>
+  </div>
+</div>
+</form>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/subnavi.tpl	(revision 18873)
@@ -0,0 +1,31 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-system-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>メンバー管理</span></a></li>
+<li<!--{if $tpl_subno == 'bkup'}--> class="on"<!--{/if}--> id="navi-system-bkup"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/bkup.php"><span>バックアップ管理</span></a></li>
+<li<!--{if $tpl_subno == 'parameter'}--> class="on"<!--{/if}--> id="navi-system-parameter"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/parameter.php"><span>パラメータ設定</span></a></li>
+<li<!--{if $tpl_subno == 'masterdata'}--> class="on"<!--{/if}--> id="navi-system-masterdata"><a href="<!--{$smarty.const.URL_DIR}-->admin/system/masterdata.php"><span>マスタデータ管理</span></a></li>
+<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_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>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/input.tpl	(revision 18873)
@@ -0,0 +1,90 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+//-->
+</script>
+
+<form name="form1" id="form1" method="post" action="" onsubmit="return fnRegistMember();">
+<input type="hidden" name="mode" value="<!--{$tpl_mode|escape}-->">
+<input type="hidden" name="member_id" value="<!--{$tpl_member_id|escape}-->">
+<input type="hidden" name="pageno" value="<!--{$tpl_pageno|escape}-->">
+<input type="hidden" name="old_login_id" value="<!--{$tpl_old_login_id|escape}-->">
+<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid|escape}-->">
+<h2>メンバー登録/編集</h2>
+
+<table>
+  <tr>
+    <th>名前</th>
+    <td>
+      <!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
+      <input type="text" name="name" size="30" class="box30" value="<!--{$arrForm.name}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+      <span class="attention">※必須入力</span>
+    </td>
+  </tr>
+  <tr>
+    <th>所属</th>
+    <td>
+      <!--{if $arrErr.department}--><span class="attention"><!--{$arrErr.department}--></span><!--{/if}-->
+      <input type="text" name="department" size="30" class="box30" value="<!--{$arrForm.department}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+    </td>
+  </tr>
+  <tr>
+    <th>ログインＩＤ</th>
+    <td>
+      <!--{if $arrErr.login_id}--><span class="attention"><!--{$arrErr.login_id}--></span><!--{/if}-->
+      <input type="text" name="login_id" size="20" class="box20"  value="<!--{$arrForm.login_id}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
+      <span class="attention">※必須入力</span><br />
+      ※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字
+    </td>
+  </tr>
+  <tr>
+    <th>パスワード</th>
+    <td>
+      <!--{if $arrErr.password}--><span class="attention"><!--{$arrErr.password}--></span><!--{/if}-->
+      <input type="password" name="password" size="20" class="box20" value="<!--{$arrForm.password}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
+      <span class="attention">※必須入力</span><br />
+      ※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->～<!--{$smarty.const.ID_MAX_LEN}-->文字
+  </td>
+  </tr>
+  <tr>
+    <th>権限</th>
+    <td>
+      <!--{if $arrErr.authority}--><span class="attention"><!--{$arrErr.authority}--></span><!--{/if}-->
+      <select name="authority">
+        <option value="">選択してください</option>
+        <!--{html_options options=$arrAUTHORITY selected=$arrForm.authority}-->
+      </select>
+      <span class="attention">※必須入力</span>
+    </td>
+  </tr>
+</table>
+
+<div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/update_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/update_confirm.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/update_confirm.tpl	(revision 18873)
@@ -0,0 +1,43 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+FTPの接続が成功しました。<br/>
+以下のフォルダに、インストールファイルを一時的に格納します。</br>
+<!--{$local_save_dir}--><br/>
+親ディレクトリに書き込み権限を与えてください。</br>
+また、次の情報に注意して、インストールしてください</br>
+
+<!--{section name=cnt loop=$arrFile}-->
+	<!--{if $arrFile[cnt].main_file != ""}-->
+		・<!--{$arrFile[cnt].main_file|escape}-->を書き込みます。</br>親ディレクトリに書き込み権限を与えてください。</br>
+	<!--{/if}-->
+	<!--{if $arrFile[cnt].sql_file != ""}-->
+		・テーブル<!--{$arrFile[cnt].sql_file}-->を再構築しますので、ご注意ください。</br>データは自動的にバックアップを取ります</br>
+	<!--{/if}-->
+<!--{/section}-->
+
+<form name="form1" method="post" action="?">
+<input type="hidden" name="mode" value="install">
+<input type="hidden" name="update_id" value="<!--{$smarty.post.update_id}-->">
+<input type="button" name="back" value="戻る" onclick="location.href='./update.php'";>　<input type="submit" value="インストール">
+</form1>
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 18873)
@@ -0,0 +1,59 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<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>
+
+  <table class="form">
+    <tr>
+      <th>定数名</th>
+      <th>パラメータ値</th>
+    </tr>
+<!--{section name=cnt loop=$arrKeys}-->
+    <tr>
+      <th>
+      <!--{$arrKeys[cnt]|escape}-->
+      </th>
+      <td>
+        <div style="font-size: 80%; color: #666666"><!--{$arrComments[cnt]|escape}--></div>
+        <div>
+          <!--{assign var=key value=$arrKeys[cnt]}-->
+          <input type="text" name="<!--{$arrKeys[cnt]|escape}-->" value="<!--{$arrValues[cnt]|escape}-->" style="width: 370px; <!--{if $arrErr.$key != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+          <!--{if $arrErr.$key}-->
+          <span class="attention"><!--{$arrErr.$key}--></span>
+          <!--{/if}-->
+        </div>
+      </td>
+    </tr>
+<!--{/section}-->
+  </table>
+
+  <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/system/bkup.tpl	(revision 18873)
@@ -0,0 +1,96 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="" onsubmit="return false;">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="list_name" value="" />
+<div id="system" class="contents-main">
+    <h2>バックアップ作成</h2>
+    <ul>
+        <li>データベースのバックアップを行います。</li>
+        <li>テンプレートファイル等はバックアップされません。</li>
+    </ul>                                        
+    <table class="form">
+        <tr>
+            <th>バックアップ名<span class="attention"> *</span></th>
+            <td>
+                <!--{if $arrErr.bkup_name}-->
+                <span class="attention"><!--{$arrErr.bkup_name}--></span>
+                <!--{/if}-->
+                <input type="text" name="bkup_name" value="<!--{$arrForm.bkup_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.bkup_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> ime-mode: disabled;" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+            </td>
+        </tr>
+        <tr>
+            <th>バックアップメモ</th>
+            <td>
+                <!--{if $arrErr.bkup_memo}-->
+                <span class="attention"><!--{$arrErr.bkup_memo}--></span>
+                <!--{/if}-->
+                <textarea name="bkup_memo" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" cols="60" rows="5" class="area60" style="<!--{if $arrErr.bkup_memo != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{$arrForm.bkup_memo|escape}--></textarea>
+                <span class="attention"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
+            </td>
+        </tr>
+    </table>
+
+    <div class="btn"><button type="button" name="cre_bkup" onClick="document.body.style.cursor = 'wait'; form1.mode.value='bkup'; submit();"><span>バックアップデータを作成する</span></button></div>
+
+    <h2>バックアップ一覧</h2>
+    <!--{* 一覧が存在する場合のみ表示する *}-->
+    <!--{if count($arrBkupList) > 0 }-->
+    <table class="list">
+        <tr>
+            <th>バックアップ名</th>
+            <th>バックアップメモ</th>
+            <th>作成日</th>
+            <th>リストア</th>
+            <th>ダウンロード</th>
+            <th>削除</th>
+        </tr>
+        <!--{section name=cnt loop=$arrBkupList}-->
+        <tr>
+            <td ><!--{$arrBkupList[cnt].bkup_name}--></td>
+            <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="fnModeSubmit('delete','list_name','<!--{$arrBkupList[cnt].bkup_name}-->');">delete</a>
+            </td>
+        </tr>
+        <!--{/section}-->
+    </table>
+    <!--{/if}-->
+
+    
+    <!--{if $restore_msg != ""}-->
+    <h2>実行結果</h2>
+    <div class="message">
+        <!--{if $restore_err == false}-->
+        <div class="btn"><button type="button" name="restore_config" onClick="document.body.style.cursor = 'wait'; form1.mode.value='restore_config'; form1.list_name.value='<!--{$restore_name}-->'; submit();"><span>テーブル構成を無視してリストアする</span></button></div>
+        <!--{/if}-->
+        <!--{$restore_msg}-->
+    </div>
+    <!--{/if}-->
+    
+</div>
+</form>
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 18873)
@@ -0,0 +1,40 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+
+<h2>EC-CUBE ログ</h2>
+<p>直近の<!--{$line_max}-->行</p>
+<table class="list log">
+    <tr>
+        <th>日時</th>
+        <th>パス</th>
+        <th>内容</th>
+    </tr>
+    <!--{foreach from=$tpl_ec_log item=line}-->
+        <tr>
+            <td class="date"><!--{$line.date|escape}--></td>
+            <td class="path"><!--{$line.path|escape}--></td>
+            <td class="body"><!--{$line.body|escape|nl2br}--></td>
+        </tr>
+    <!--{/foreach}-->
+</table>
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 18873)
@@ -0,0 +1,40 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+
+<h2>システム情報</h2>
+<table border="0" cellspacing="1" cellpadding="8" summary=" ">
+    <!--{foreach from=$arrSystemInfo item=info}-->
+    <tr>
+        <th>
+        <!--{$info.title|escape}-->
+        </td>
+        <td>
+        <!--{$info.value|escape|nl2br}-->
+        </td>
+    </tr>
+    <!--{/foreach}-->
+</table>
+
+<h2>PHP情報</h2>
+<iframe src="?mode=info" height="500" frameborder="0" style="width: 100%;"></iframe>
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 18873)
@@ -0,0 +1,74 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<div id="basis" class="contents-main">
+  <form name="form1" id="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="show" />
+  <div id="basis-masterdata-select">
+    <select name="master_data_name" id="master_data_name">
+    <!--{html_options output=$arrMasterDataName values=$arrMasterDataName selected=$masterDataName}-->
+    </select>
+    <button type="submit"><span>選択</span></button>
+  </div>
+  </form>
+
+  <!--{if $smarty.post.mode == 'show'}-->
+
+  <form name="form2" id="form2" method="post" action="?">
+  <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>
+  <!--{if $errorMessage != ""}-->
+  <div class="message">
+    <span class="attention"><!--{$errorMessage}--></span>
+  </div>
+  <!--{/if}-->
+
+  <table class="form">
+    <!--{foreach from=$arrMasterData item=val key=key}-->
+    <tr>
+      <th>ID：<input type="text" name="id[]" value="<!--{$key|escape}-->" size="6" /></th>
+      <td>値：<input type="text" name="name[]" value="<!--{$val|escape}-->" style="" size="60" class="box60" /></td>
+    </tr>
+    <!--{/foreach}-->
+  </table>
+
+  <h2>追加のデータ</h2>
+  <table class="form">
+    <tr>
+      <th>ID：<input type="text" name="id[]" size="6" /></th>
+      <td>値：<input type="text" name="name[]" style="" size="60" class="box60" /></td>
+    </tr>
+  </table>
+  <div class="btn"><button type="submit" onClick="return document.form2.submit()"><span>この内容で登録する</span></button></div>
+
+  </form>
+  <!--{/if}-->
+
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/home.tpl	(revision 18873)
@@ -0,0 +1,205 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{* ▼CONTENTS *}-->
+<div id="home">
+
+    <!--{* お知らせここから *}-->
+    <div id="home-info">
+        <!--{foreach item=info from=$arrInfo}-->
+        <dl class="home-info-item">
+            <dt class="date"><!--{$info.disp_date|sfDispDBDate:false|escape}--></dt>
+            <dt class="title"><!--{$info.title}--></dt>
+            <dd class="body"><!--{$info.body}--></dd>
+        </dl>
+        <!--{/foreach}-->
+    </div>
+    <!--{* お知らせここまで *}-->
+
+    <!--{* メインエリア *}-->
+    <div id="home-main">
+    <form name="form1" method="post" action="#">
+
+            <!--{* システム情報ここから *}-->
+            <h2>システム情報</h2>
+            <table summary="システム情報" class="shop-info">
+                <tr>
+                    <th>EC-CUBEバージョン</td>
+                    <td><!--{$smarty.const.ECCUBE_VERSION}--></td>
+                </tr>
+                <tr>
+                    <th>PHPバージョン</td>
+                    <td><!--{$php_version}--></td>
+                </tr>
+                <tr>
+                    <th>DBバージョン</td>
+                    <td><!--{$db_version}--></td>
+                </tr>
+                <tr>
+                    <th>詳細</td>
+                    <td><a href="<!--{$smarty.const.URL_DIR}-->admin/system/system.php">システム設定＞システム情報</a></td>
+                </tr>
+            </table>
+            <!--{* システム情報ここまで *}-->
+            
+            <!--{* ショップの状況ここから *}-->
+            <h2>ショップの状況</h2>
+            <table summary="ショップの状況" class="shop-info">
+                <tr>
+                    <th>現在の会員数</td>
+                    <td><!--{$customer_cnt|default:"0"|number_format}-->名</td>
+                </tr>
+                <tr>
+                    <th>昨日の売上高</td>
+                    <td><!--{$order_yesterday_amount|default:"0"|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th>昨日の売上件数</td>
+                    <td><!--{$order_yesterday_cnt|default:"0"|number_format}-->件</td>
+                </tr>
+                <tr>
+                    <th><span>今月の売上高</span><span>(昨日まで) </span></td>
+                    <td><!--{$order_month_amount|default:"0"|number_format}-->円</td>
+                </tr>
+                <tr>
+                    <th><span>今月の売上件数 </span><span>(昨日まで) </span></td>
+                    <td><!--{$order_month_cnt|default:"0"|number_format}-->件</td>
+                </tr>
+                <tr>
+                    <th>昨日のレビュー書き込み数</td>
+                    <td><!--{$review_yesterday_cnt|default:"0"}-->件</td>
+                </tr>
+                <tr>
+                    <th>顧客の保持ポイント合計</td>
+                    <td><!--{$customer_point|default:"0"}-->pt</td>
+                </tr>
+                <tr>
+                    <th>レビュー書き込み非表示数</td>
+                    <td><!--{$review_nondisp_cnt|default:"0"}-->件</td>
+                </tr>
+                <tr>
+                    <th>品切れ商品</td>
+                    <td>
+                    <!--{section name=i loop=$arrSoldout}-->
+                    <!--{$arrSoldout[i].product_id}-->:<!--{$arrSoldout[i].name|escape}--><br />
+                    <!--{/section}-->
+                    </td>
+                </tr>
+            </table>
+            <!--{* ショップの状況ここまで *}-->
+
+            <!--{* 新規受付一覧ここから *}-->
+            <h2>新規受付一覧</h2>
+            <table summary="新規受付一覧" id="home-order">
+                <tr>
+                    <th>受注日</th>
+                    <th>顧客名</th>
+                    <th>購入商品</th>
+                    <th>支払方法</th>
+                    <th>購入金額(円)</th>
+                </tr>
+                <!--{section name=i loop=$arrNewOrder}-->
+                <tr>
+                    <td><!--{$arrNewOrder[i].create_date}--></td>
+                    <td><!--{$arrNewOrder[i].name01|escape}--> <!--{$arrNewOrder[i].name02|escape}--></td>
+                    <td><!--{$arrNewOrder[i].product_name|escape}--></td>
+                    <td><!--{$arrNewOrder[i].payment_method|escape}--></td>
+                    <td class="right"><!--{$arrNewOrder[i].total|number_format}-->円</td>
+                </tr>
+                <!--{/section}-->
+            </table>
+            <!--{* 新規受付一覧ここまで *}-->
+
+    </form>
+    </div>
+    <!--{* メインエリア *}-->
+
+</div>
+<!--{* ▲CONTENTS *}-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_footer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_footer.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/admin_popup_footer.tpl	(revision 18873)
@@ -0,0 +1,25 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+</body>
+</html>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/css/contents.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/css/contents.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/css/contents.tpl	(revision 18873)
@@ -0,0 +1,154 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<style type="text/css">
+.mainbg {
+  background: #fff url(<!--{$TPL_DIR}-->img/contents/main_bg.jpg);
+  background-repeat: repeat-x;
+}
+
+.infobg {
+  background: #fff url(<!--{$TPL_DIR}-->img/contents/home_bg.jpg);
+  background-repeat: no-repeat;
+  background-color: #e3e3e3;
+}
+
+.navi a{
+  background: url(<!--{$TPL_DIR}-->img/contents/navi_bar.gif);
+  background-repeat: repeat-y;
+  background-color: #636469;
+  width:140px;
+  padding: 10px 5px 10px 12px;
+  color:#ffffff;
+  text-decoration:none;
+  display:block ;
+}
+
+.navi-on a{
+  background: url(<!--{$TPL_DIR}-->img/contents/navi_bar.gif);
+  background-repeat: repeat-y;
+  background-color: #a5a5a5;
+  width:140px;
+  padding: 10px 5px 10px 12px;
+  color:#000000;
+  text-decoration:none;
+  display:block;
+}
+
+.icon_edit{
+  background: url(<!--{$TPL_DIR}-->img/contents/icon_edit.jpg);
+  background-repeat: no-repeat;
+  padding: 0 0 0 15px;
+}
+
+.icon_mail {
+  background: url(<!--{$TPL_DIR}-->img/contents/icon_mail.jpg);
+  background-repeat: no-repeat;
+  padding: 0 0 0 15px;
+}
+
+.icon_delete {
+  background: url(<!--{$TPL_DIR}-->img/contents/icon_delete.jpg);
+  background-repeat: no-repeat;
+  padding: 0 0 0 15px;
+}
+
+.icon_copy {
+  background: url(<!--{$TPL_DIR}-->img/contents/icon_copy.jpg);
+  background-repeat: no-repeat;
+  padding: 0 0 0 15px;
+}
+
+.icon_class {
+  background: url(<!--{$TPL_DIR}-->img/contents/icon_class.jpg);
+  background-repeat: no-repeat;
+  padding: 0 0 0 15px;
+}
+
+.icon_confirm {
+  background: url(<!--{$TPL_DIR}-->img/contents/icon_confirm.jpg);
+  background-repeat: no-repeat;
+  padding: 0 0 0 15px;
+}
+
+.number a{
+  background: url(<!--{$TPL_DIR}-->img/contents/number_bg.jpg);
+  background-repeat: repeat-x;
+  background-color: #505468;
+  padding-top: 3px;
+  padding-bottom: 5px;
+  padding-left: 8px;
+  padding-right: 8px;
+  color:#ffffff;
+  font-size: 65%;
+  line-height: 160%;
+  font-weight: bold;
+  text-decoration:none;
+}
+
+.number a:hover{
+  background: url(<!--{$TPL_DIR}-->img/contents/number_bg_on.jpg);
+  background-repeat: repeat-x;
+  background-color: #f7c600;
+  padding-top: 3px;
+  padding-bottom: 5px;
+  padding-left: 8px;
+  padding-right: 8px;
+  color:#ffffff;
+  font-size: 65%;
+  line-height: 160%;
+  font-weight: bold;
+  text-decoration:none;
+}
+
+.number-on a{
+  padding-top: 3px;
+  padding-bottom: 5px;
+  padding-left: 8px;
+  padding-right: 8px;
+  background: url(<!--{$TPL_DIR}-->img/contents/number_bg_on.jpg);
+  background-repeat: repeat-x;
+  background-color: #f7c600;
+  color:#ffffff;
+  font-size: 65%;
+  line-height: 160%;
+  font-weight: bold;
+  text-decoration:none;
+  
+}
+
+.number-on a:hover{
+  background: url(<!--{$TPL_DIR}-->img/contents/number_bg_on.jpg);
+  background-repeat: repeat-x;
+  background-color: #f7c600;
+  padding-top: 3px;
+  padding-bottom: 5px;
+  padding-left: 8px;
+  padding-right: 8px;
+  color:#ffffff;
+  font-size: 65%;
+  line-height: 160%;
+  font-weight: bold;
+  text-decoration:none;
+}
+</style>
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 18873)
@@ -0,0 +1,61 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="register" />
+<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+<div id="ownersstore" class="contents-main">
+
+  <h2>詳細</h2>
+  
+  <table class="form">
+    <tr>
+      <th>モジュール名</th>
+      <td><!--{$arrLogDetail.module_name|escape}--></td>
+    </tr>
+    <tr>
+      <th>ステータス</th>
+      <td><!--{if $arrLogDetail.error_flg}-->失敗<!--{else}-->成功<!--{/if}--></td>
+    </tr>
+    <tr>
+      <th>日時</th>
+      <td><!--{$arrLogDetail.update_date|sfDispDBDate|escape}--></td>
+    </tr>
+    <tr>
+      <th>バックアップパス</th>
+      <td><!--{$arrLogDetail.buckup_path|wordwrap:100:"
+":true|escape|nl2br}--></td>
+    </tr>
+    <tr>
+      <th>詳細</th>
+      <td>
+      <!--{$arrLogDetail.error|wordwrap:100:"
+":true|escape|nl2br}-->
+      <!--{$arrLogDetail.ok|wordwrap:100:"
+":true|escape|nl2br}-->
+      </td>
+    </tr>
+  </table>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/index.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/index.tpl	(revision 18873)
@@ -0,0 +1,47 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{*
+オーナーズストア通信処理用のjsとcssを読み込む
+onclickなどで
+OwnersStore.download();やOwnersStore.products_list();を呼び出すことで
+配信サーバとの通信処理を行う
+
+購入商品一覧はid="ownersstore_products_list"に出力される
+
+*}-->
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/thickbox.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/ownersstore.js.php"></script>
+
+<form name="form1" id="form1" method="post" action="?">
+<div id="ownersstore" class="contents-main">
+
+  <!--購入商品一覧ここから-->
+  <div id="ownersstore_products_list"></div>
+  <!--購入商品一覧ここまで-->
+  
+  <div class="btn">
+    <button type="button" onclick="OwnersStore.products_list();return false;"><span>購入商品一覧を取得する</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/subnavi.tpl	(revision 18873)
@@ -0,0 +1,31 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+    <li id="navi-ownersstore-index" class="<!--{if $tpl_subno == 'index'}-->on<!--{/if}-->">
+        <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>購入商品一覧</span></a></li>
+    <li id="navi-ownersstore-settings" class="<!--{if $tpl_subno == 'settings'}-->on<!--{/if}-->">
+        <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/settings.php"><span>認証キー設定</span></a></li>
+    <li id="navi-ownersstore-log" class="<!--{if $tpl_subno == 'log'}-->on<!--{/if}-->">
+        <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/log.php"><span>ログ管理</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/products_list.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/products_list.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/ownersstore/products_list.tpl	(revision 18873)
@@ -0,0 +1,98 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<table id="ownersstore-products-list" class="list center">
+    <tr>
+        <th>ロゴ</th>
+        <th>商品名</th>
+        <th>導入バージョン</th>
+        <th>インストール</th>
+        <th>設定</th>
+        <th>購入ステータス</th>
+    </tr>
+<!--{foreach from=$arrProducts item=product name=products_list_loop}-->
+    <tr>
+        <td>
+            <a href="<!--{$smarty.const.OSTORE_URL}-->products/detail.php?product_id=<!--{$product.product_id|escape}-->" target="_blank">
+                <img src="<!--{$smarty.const.OSTORE_SSLURL}-->resize.php?image=<!--{$product.main_list_image|escape}-->&width=50&height=50" /></a>
+        </td>
+        <td>
+            <p>
+                <a href="<!--{$smarty.const.OSTORE_URL}-->products/detail.php?product_id=<!--{$product.product_id|escape}-->" target="_blank">
+                    <!--{$product.name}--></a>
+            </p>
+            <p>Version.<!--{$product.version|default:"--"}-->　<!--{$product.last_update_date|sfDispDBDate:false|escape}--></p>
+        </td>
+        <td>
+          <div id="ownersstore_version<!--{$product.product_id|escape}-->">
+            <!--{$product.installed_version|default:"--"|escape}-->
+          </div>
+        </td>
+        
+        <!--{* ダウンロード対象商品なら各種ボタンを表示する *}-->
+        <!--{if $product.download_flg}-->
+        
+        <td>
+            <div id="ownersstore_download<!--{$product.product_id|escape}-->">
+            <!--{* 新バージョンが公開している場合 はアップデートボタン表示 *}-->
+            <!--{if $product.version_up_flg}-->
+                <span class="icon_confirm">
+                <a href="#" onclick="OwnersStore.download(<!--{$product.product_id|escape}-->);return false;">アップデート</a>
+                </span>
+            <!--{* それ以外ならダウンロードボタン表示 *}-->
+            <!--{else}-->
+                <span class="icon_confirm">
+                <a href="#" onclick="OwnersStore.download(<!--{$product.product_id|escape}-->);return false;">ダウンロード</a>
+                </span>
+            <!--{/if}-->
+            </div>
+        </td>
+            
+        <td>
+            <!--{* インストール済みなら設定ボタン表示 *}-->
+            <!--{if $product.installed_flg}-->
+                <span class="icon_confirm">
+                <a href="#" onclick="win02('../load_module_config.php?module_id=<!--{$product.product_id}-->', 'load', 600, 400);return false;">
+                   設定</a>
+                </span>
+            <!--{else}-->
+                <div id='ownersstore_settings<!--{$product.product_id|escape}-->' style="display:none">
+                <span class="icon_confirm">
+                <a href="#" onclick="win02('../load_module_config.php?module_id=<!--{$product.product_id}-->', 'load', 600, 400);return false;">
+                   設定</a>
+                </span>
+                </div>
+                <div id='ownersstore_settings_default<!--{$product.product_id|escape}-->' style="display:bloc">--</div>
+            <!--{/if}-->
+        </td>
+
+        <!--{else}-->
+        
+        <td>--</td>
+        <td>--</td>
+        <!--{/if}-->
+        
+        <td><!--{$product.status|escape|nl2br}--></td>
+    </tr>
+<!--{/foreach}-->
+</table>
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 18873)
@@ -0,0 +1,50 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="register" />
+<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+<div id="ownersstore" class="contents-main">
+
+  <!--入力項目ここから-->
+  <p><span class="attention">※認証キーは<a href="<!--{$smarty.const.OSTORE_URL}-->" target="_blank">EC-CUBEオーナーズストア</a>で取得できます。</span></p>
+  <table class="form">
+    <tr>
+      <th>認証キーの設定</th>
+      <td>
+        <!--{assign var="key" value="public_key"}-->
+        <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+        <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key]|escape}--></textarea>
+      </td>
+    </tr>
+  </table>
+  <!--入力項目ここまで-->
+  
+  <!--登録ボタンここから-->
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+  <!--登録ボタンここまで-->
+  
+</div>
+</form>
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 18873)
@@ -0,0 +1,52 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="register" />
+<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
+<div id="ownersstore" class="contents-main">
+
+  <table class="list center">
+    <tr>
+      <th>モジュール名</th>
+      <th>ステータス</th>
+      <th>日時</th>
+      <th>詳細</th>
+      <!--{*<th>復元</th>*}-->
+    </tr>
+  <!--{foreach from=$arrInstallLogs item=log name=log_loop}-->
+    <tr>
+      <td><!--{$log.module_name|escape}--></td>
+      <td><!--{if $log.error_flg}-->失敗<!--{else}-->成功<!--{/if}--></td>
+      <td class="left"><!--{$log.update_date|sfDispDBDate|escape}--></td>
+      <td>
+          <a href="<!--{$smarty.const.URL_DIR}-->admin/ownersstore/log.php?mode=detail&amp;log_id=<!--{$log.log_id}-->">
+          詳細</a>
+      </td>
+      <!--{*<td><!--{$log.log_id}--></td>*}-->
+    </tr>
+  <!--{/foreach}-->
+  </table>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl	(revision 18873)
@@ -0,0 +1,154 @@
+<!--{printXMLDeclaration}--><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="ja" xml:lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->" />
+<meta http-equiv="content-script-type" content="text/javascript" />
+<meta http-equiv="content-style-type" content="text/css" />
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_file_manager.css" type="text/css" media="all" />
+<script type="text/javascript" src="http://www.google.com/jsapi?key=xxx"></script>
+<script type="text/javascript">//<![CDATA[
+    google.load("maps", "3", {other_params:'sensor=false'});
+//]]>
+</script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/site.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/file_manager.js"></script>
+<title><!--{$smarty.const.ADMIN_TITLE}--></title>
+<script type="text/javascript">
+<!--
+<!--{$tpl_javascript}-->
+//-->
+</script>
+
+</head>
+
+<body onload="preLoadImg('<!--{$TPL_DIR}-->'); <!--{$tpl_onload}-->" class="<!--{if strlen($tpl_authority) >= 1}-->authority_<!--{$tpl_authority}--><!--{/if}-->">
+<!--{$GLOBAL_ERR}-->
+<noscript>
+  <p>JavaScript を有効にしてご利用下さい.</p>
+</noscript>
+
+<div id="container">
+<a name="top"></a>
+
+<!--{if $smarty.const.ADMIN_MODE == '1'}-->
+<div id="admin-mode-on">ADMIN_MODE ON</div>
+<!--{/if}-->
+
+<!--{* ▼HEADER *}-->
+<div id="header">
+  <div id="logo"><a href="<!--{$smarty.const.URL_DIR}-->admin/home.php"><img src="<!--{$TPL_DIR}-->img/admin/header/logo.jpg" width="230" height="50" alt="EC CUBE" /></a></div>
+  <ul id="sites">
+    <li><a href="<!--{$smarty.const.URL_HOME}-->"><span>MAIN PAGE</span></a></li>
+    <li><a href="<!--{$smarty.const.SITE_URL}--><!--{$smarty.const.DIR_INDEX_URL}-->" target="_blank"><span>SITE CHECK</span></a></li>
+  </ul>
+  <p>
+    WELCOME!&nbsp;<span><!--{* ログイン名 *}--><!--{$smarty.session.login_name|escape}--></span>&nbsp;様&nbsp;
+    <a href="<!--{$smarty.const.URL_LOGOUT}-->">LOGOUT</a>
+  </p>
+</div>
+<!--{* ▲HEADER *}-->
+<!--{* ▼NAVI *}-->
+<ul id="navi">
+    <li id="navi-basis" class="<!--{if $tpl_mainno eq "basis"}-->on<!--{/if}-->">
+        <a><span>基本情報管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`basis/subnavi.tpl"}-->
+    </li>
+    <li id="navi-products" class="<!--{if $tpl_mainno eq "products"}-->on<!--{/if}-->">
+        <a><span>商品管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`products/subnavi.tpl"}-->
+    </li>
+    <li id="navi-customer" class="<!--{if $tpl_mainno eq "customer"}-->on<!--{/if}-->">
+        <a><span>顧客管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`customer/subnavi.tpl"}-->
+    </li>
+    <li id="navi-order" class="<!--{if $tpl_mainno eq "order"}-->on<!--{/if}-->">
+        <a><span>受注管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`order/subnavi.tpl"}-->
+    </li>
+    <li id="navi-total" class="<!--{if $tpl_mainno eq "total"}-->on<!--{/if}-->">
+        <a><span>売上集計</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`total/subnavi.tpl"}-->
+    </li>
+    <li id="navi-mail" class="<!--{if $tpl_mainno eq "mail"}-->on<!--{/if}-->">
+        <a><span>メルマガ管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`mail/subnavi.tpl"}-->
+    </li>
+    <li id="navi-contents" class="<!--{if $tpl_mainno eq "contents"}-->on<!--{/if}-->">
+        <a><span>コンテンツ管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`contents/subnavi.tpl"}-->
+    </li>
+    <li id="navi-design" class="<!--{if $tpl_mainno eq "design"}-->on<!--{/if}-->">
+        <a><span>デザイン管理</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`design/subnavi.tpl"}-->
+    </li>
+    <li id="navi-system" class="<!--{if $tpl_mainno eq "system"}-->on<!--{/if}-->">
+        <a><span>システム設定</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`system/subnavi.tpl"}-->
+    </li>
+    <li id="navi-ownersstore" class="<!--{if $tpl_mainno eq "ownersstore"}-->on<!--{/if}-->">
+        <a><span>OWNERS STORE</span></a>
+        <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`ownersstore/subnavi.tpl"}-->
+    </li>
+    <!--{if "DEBUG_LOAD_PLUGIN"|defined && $smarty.const.DEBUG_LOAD_PLUGIN}-->
+        <li id="navi-plugin" class="<!--{if $tpl_mainno eq "plugin"}-->on<!--{/if}-->">
+            <a><span>プラグイン</span></a>
+            <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`plugin/subnavi.tpl"}-->
+        </li>
+    <!--{/if}-->
+</ul>
+<div style="clear: both;"></div>
+<!--{* ▲NAVI *}-->
+
+<!--{if $smarty.server.PHP_SELF != $smarty.const.URL_HOME && $tpl_subtitle}-->
+<h1><!--{$tpl_subtitle}--></h1>
+<!--{/if}-->
+
+<!--{* ▼CONTENTS *}-->
+<div id="contents" class="clear-block">
+  <!--{include file=$tpl_mainpage}-->
+</div>
+<!--{* ▲CONTENTS *}-->
+
+<!--{* ▼FOOTER *}-->
+<div id="footer">
+  <div id="topagetop">
+    <a href="#top">GO TO PAGE TOP</a>
+  </div>
+  <div id="copyright">
+    Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+  </div>
+</div>
+<!--{* ▲FOOTER *}-->
+
+</div>
+</body>
+</html>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/pager.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/pager.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/pager.tpl	(revision 18873)
@@ -0,0 +1,9 @@
+<!--{* ★ ページャここから ★ *}-->
+<div class="pager">
+  <ul>
+  <!--{foreach from=$arrPagenavi.arrPageno key="key" item="item"}-->
+    <li<!--{if $arrPagenavi.now_page == $item}--> class="on"<!--{/if}-->><a href=<!--{$smarty.server.PHP_SELF|escape}--> onclick="fnNaviSearchPage(<!--{$item}-->, '<!--{$arrPagenavi.mode}-->'); return false;"><span><!--{$item}--></span></a></li>
+  <!--{/foreach}-->
+  </ul>
+</div>
+<!--{* ★ ページャここまで ★ *}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql_view.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql_view.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql_view.tpl	(revision 18873)
@@ -0,0 +1,43 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<table class="form">
+  <tr>
+    <th>SQL文</th>
+    <td><!--{$sql|escape|nl2br}--></td>
+  </tr>
+  <tr>
+    <th>エラー内容</th>
+    <td>
+      <!--{if $sqlerr != "" }-->
+        <!--{$sqlerr|escape|nl2br}-->
+      <!--{else}-->
+        エラーはありません
+      <!--{/if}-->
+    </td>
+  </tr>
+</table>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
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 18873)
@@ -0,0 +1,221 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+
+function func_regist(url) {
+  res = confirm('この内容で<!--{if $edit_mode eq "on"}-->編集<!--{else}-->登録<!--{/if}-->しても宜しいですか？');
+  if(res == true) {
+    document.form1.mode.value = 'regist';
+    document.form1.submit();
+    return false;
+  }
+  return false;
+}
+
+function func_edit(news_id) {
+  document.form1.mode.value = "search";
+  document.form1.news_id.value = news_id;
+  document.form1.submit();
+}
+
+function func_del(news_id) {
+  res = confirm('この新着情報を削除しても宜しいですか？');
+  if(res == true) {
+    document.form1.mode.value = "delete";
+    document.form1.news_id.value = news_id;
+    document.form1.submit();
+  }
+  return false;
+}
+
+function func_rankMove(term,news_id) {
+  document.form1.mode.value = "move";
+  document.form1.news_id.value = news_id;
+  document.form1.term.value = term;
+  document.form1.submit();
+}
+
+function moving(news_id,rank, max_rank) {
+
+  var val;
+  var ml;
+  var len;
+
+  ml = document.move;
+  len = document.move.elements.length;
+  j = 0;
+  for( var i = 0 ; i < len ; i++) {
+      if ( ml.elements[i].name == 'position' && ml.elements[i].value != "" ) {
+      val = ml.elements[i].value;
+      j ++;
+      }
+  }
+
+  if ( j > 1) {
+    alert( '移動順位は１つだけ入力してください。' );
+    return false;
+  } else if( ! val ) {
+    alert( '移動順位を入力してください。' );
+    return false;
+  } else if( val.length > 4){
+    alert( '移動順位は4桁以内で入力してください。' );
+    return false;
+  } else if( val.match(/[0-9]+/g) != val){
+    alert( '移動順位は数字で入力してください。' );
+    return false;
+  } else if( val == rank ){
+    alert( '移動させる番号が重複しています。' );
+    return false;
+  } else if( val == 0 ){
+    alert( '移動順位は0以上で入力してください。' );
+    return false;
+  } else if( val > max_rank ){
+    alert( '入力された順位は、登録数の最大値を超えています。' );
+    return false;
+  } else {
+    ml.moveposition.value = val;
+    ml.rank.value = rank;
+    ml.news_id.value = news_id;
+    ml.submit();
+    return false;
+  }
+}
+
+//-->
+</script>
+
+
+<div id="admin-contents" class="contents-main">
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="news_id" value="<!--{$arrForm.news_id|escape}-->" />
+<input type="hidden" name="term" value="" />
+  <h2>新規登録</h2>
+  <!--{* ▼登録テーブルここから *}-->
+  <table>
+    <tr>
+      <th>日付<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.year || $arrErr.month || $arrErr.day}--><span class="attention"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></span><!--{/if}-->
+        <select name="year" <!--{if $arrErr.year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.year}-->
+        </select>年
+        <select name="month" <!--{if $arrErr.month}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.month}-->
+        </select>月
+        <select name="day" <!--{if $arrErr.day}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.day}-->
+        </select>日
+      </td>
+    </tr>
+    <tr>
+      <th>タイトル<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.news_title}--><span class="attention"><!--{$arrErr.news_title}--></span><!--{/if}-->
+        <textarea name="news_title" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" <!--{if $arrErr.news_title}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->><!--{$arrForm.news_title|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>URL</th>
+      <td>
+        <span class="attention"><!--{$arrErr.news_url}--></span>
+        <input type="text" name="news_url" size="60" class="box60"  value="<!--{$arrForm.news_url|escape}-->" <!--{if $arrErr.news_url}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> maxlength="<!--{$smarty.const.URL_LEN}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.URL_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>リンク</th>
+      <td><label><input type="checkbox" name="link_method" value="2" <!--{if $arrForm.link_method eq 2}--> checked <!--{/if}--> /> 別ウィンドウで開く</label></td>
+    </tr>
+    <tr>
+      <th>本文作成</th>
+      <td>
+        <!--{if $arrErr.news_comment}--><span class="attention"><!--{$arrErr.news_comment}--></span><!--{/if}-->
+        <textarea name="news_comment" cols="60" rows="8" wrap="soft" class="area60" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" style="background-color:<!--{if $arrErr.news_comment}--><!--{$smarty.const.ERR_COLOR|escape}--><!--{/if}-->"><!--{$arrForm.news_comment|escape}--></textarea><br />
+        <span class="attention"> (上限3000文字)</span>
+      </td>
+    </tr>
+  </table>
+  <!--{* ▲登録テーブルここまで *}-->
+
+  <div class="btn"><button type="submit" onclick="return func_regist();"><span>この内容で登録する</span></button></div>
+</form>
+
+  <h2>登録済み新着情報</h2>
+  <!--{if $arrErr.moveposition}-->
+  <p><span class="attention"><!--{$arrErr.moveposition}--></span></p>
+  <!--{/if}-->
+  <!--{* ▼一覧表示エリアここから *}-->
+  <form name="move" id="move" method="post" action="?">
+  <input type="hidden" name="mode" value="moveRankSet" />
+  <input type="hidden" name="term" value="setposition" />
+  <input type="hidden" name="news_id" value="" />
+  <input type="hidden" name="moveposition" value="" />
+  <input type="hidden" name="rank" value="" />
+  <table class="list">
+    <tr>
+      <th>順位</th>
+      <th>日付</th>
+      <th>タイトル</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=data loop=$list_data}-->
+    <tr style="background:<!--{if $list_data[data].news_id eq $news_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;" class="center">
+      <!--{assign var=db_rank value="`$list_data[data].rank`"}-->
+      <!--{assign var=rank value="`$line_max-$db_rank+1`"}-->
+      <td><!--{$rank|escape}--></td>
+      <td><!--{$list_data[data].cast_news_date|date_format:"%Y/%m/%d"}--></td>
+      <td class="left">
+        <!--{if $list_data[data].link_method eq 1 && $list_data[data].news_url != ""}--><a href="<!--{$list_data[data].news_url|escape}-->" ><!--{$list_data[data].news_title|escape|nl2br}--></a>
+        <!--{elseif $list_data[data].link_method eq 1 && $list_data[data].news_url == ""}--><!--{$list_data[data].news_title|escape|nl2br}-->
+        <!--{elseif $list_data[data].link_method eq 2 && $list_data[data].news_url != ""}--><a href="<!--{$list_data[data].news_url|escape}-->" target="_blank" ><!--{$list_data[data].news_title|escape|nl2br}--></a>
+        <!--{else}--><!--{$list_data[data].news_title|escape|nl2br}-->
+        <!--{/if}-->
+      </td>
+      <td><a href="#" onclick="return func_edit('<!--{$list_data[data].news_id|escape}-->');">編集</a></td>
+      <td><a href="#" onclick="return func_del('<!--{$list_data[data].news_id|escape}-->');">削除</a></td>
+      <td>
+      <!--{if count($list_data) != 1}-->
+      <input type="text" name="pos-<!--{$list_data[data].news_id|escape}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnFormModeSubmit('move', 'moveRankSet','news_id', '<!--{$list_data[data].news_id|escape}-->'); return false;">移動</a><br />
+      <!--{/if}-->
+      <!--{if $list_data[data].rank ne $max_rank}--><a href="#" onclick="return func_rankMove('up', '<!--{$list_data[data].news_id|escape}-->', '<!--{$max_rank|escape}-->');">上へ</a><!--{/if}-->　<!--{if $list_data[data].rank ne 1}--><a href="#" onclick="return func_rankMove('down', '<!--{$list_data[data].news_id|escape}-->', '<!--{$max_rank|escape}-->');">下へ</a><!--{/if}-->
+      </td>
+    </tr>
+    <!--{sectionelse}-->
+    <tr class="center">
+      <td colspan="6">現在データはありません。</td>
+    </tr>
+    <!--{/section}-->
+  </table>
+  </form>
+  <!--{* ▲一覧表示エリアここまで *}-->
+
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/subnavi.tpl	(revision 18873)
@@ -0,0 +1,37 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-contents-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>新着情報管理</span></a></li>
+<li<!--{if $tpl_subno == 'recommend'}--> class="on"<!--{/if}--> id="navi-contents-recommend"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/recommend.php"><span>おすすめ商品管理</span></a></li>
+<li<!--{if $tpl_subno == 'file'}--> class="on"<!--{/if}--> id="navi-contents-file"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/file_manager.php"><span>ファイル管理</span></a></li>
+<li<!--{if $tpl_subno == 'csv'}--> class="on"<!--{/if}--> id="navi-contents-csv"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php"><span>CSV出力項目設定</span></a>
+  <ul id="navi-csv-sub" class="level2">
+  <li<!--{if $tpl_subno_csv == 'product'}--> class="on"<!--{/if}--> id="navi-csv-product"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=product"><span>商品管理</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'customer'}--> class="on"<!--{/if}--> id="navi-csv-customer"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=customer"><span>顧客管理</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'order'}--> class="on"<!--{/if}--> id="navi-csv-order"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=order"><span>受注管理</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'category'}--> class="on"<!--{/if}--> id="navi-csv-category"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv.php?tpl_subno_csv=category"><span>カテゴリ</span></a></li>
+  <li<!--{if $tpl_subno_csv == 'csv_sql'}--> class="on"<!--{/if}--> id="navi-csv-sql"><a href="<!--{$smarty.const.URL_DIR}-->admin/contents/csv_sql.php"><span>高度な設定</span></a></li>
+  </ul>
+</li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign_design.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign_design.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign_design.tpl	(revision 18873)
@@ -0,0 +1,97 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?" >
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="campaign_id" value="<!--{$arrForm.campaign_id}-->" />
+<input type="hidden" name="status" value="<!--{$arrForm.status}-->" />
+<input type="hidden" name="header_row" value="" />
+<input type="hidden" name="contents_row" value="" />
+<input type="hidden" name="footer_row" value="" />
+<div id="admin-contents" class="contents-main">
+  <h2><!--{$tpl_campaign_title}--></h2>
+
+  <!--{* ▼ヘッダー編集ここから *}-->
+  <h3>ヘッダー編集</h3>
+  <div id="campaign-design-header">
+    <textarea name="header" cols="90" rows="<!--{$header_row}-->"><!--{$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>
+    </div>
+  </div>
+  <!--{* ▲ヘッダー編集ここまで *}-->
+
+  <!--{* ▼コンテンツ編集ここから *}-->
+  <h3>コンテンツ編集</h3>
+  <div id="campaign-design-contents">
+    <textarea name="contents" cols="90" rows="<!--{$contents_row}-->"><!--{$contents_data|smarty:nodefaults}--></textarea>
+    <div class="btn">
+      <button type="button" onclick="win03('./campaign_create_tag.php?campaign_id=<!--{$arrForm.campaign_id}-->', 'search', '550', '500');"><span>商品設定</span></button>
+      <button type="button" onClick="ChangeSize(this, contents, 50, 13, contents_row)"><span><!--{if $contents_row > 13}-->小さくする<!--{else}-->大きくする<!--{/if}--></span></button>
+    </div>
+  </div>
+  <!--{* ▲コンテンツ編集ここまで *}-->
+
+  <!--{* ▼フッター編集ここから *}-->
+  <h3>フッター編集</h3>
+  <div id="campaign-design-footer">
+    <textarea name="footer" cols="90" rows="<!--{$footer_row}-->"><!--{$footer_data|smarty:nodefaults}--></textarea>
+    <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>
+  <!--{* ▲フッター編集ここまで *}-->
+
+  <div class="btn">
+    <button type="button" onclick="fnFormModeSubmit('form1', 'return', '', ''); return false;"><span>一覧ページへ戻る</span></button>
+    <button type="button" onclick="fnFormModeSubmit('form1', 'regist', '', ''); return false;"><span>登録する</span></button>
+    <button type="button" onclick="fnFormModeSubmit('form1', 'preview', '', ''); return false;"><span>プレビュー</span></button>
+  </div>
+
+</div>
+</form>
+
+<script type="text/javascript">
+  /* テキストエリアの大きさを変更する */
+  function ChangeSize(button, TextArea, Max, Min, row_tmp){
+    if(TextArea.rows <= Min){
+      TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
+    }else{
+      TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
+    }
+  }
+  
+  /* ブラウザの種類をセットする */
+  function lfnSetBrowser(form, item){
+    browser_type = 0;
+    if(navigator.userAgent.indexOf("MSIE") >= 0){
+        browser_type = 1;
+    }
+    else if(navigator.userAgent.indexOf("Gecko/") >= 0){
+        browser_type = 2;
+    }
+    
+    document[form][item].value=browser_type;
+  }
+
+</script>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/file_manager.tpl	(revision 18873)
@@ -0,0 +1,100 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" method="post" action="?"  enctype="multipart/form-data">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="now_file" value="<!--{$tpl_now_dir}-->" />
+<input type="hidden" name="tree_select_file" value="" />
+<input type="hidden" name="tree_status" value="" />
+<input type="hidden" name="select_file" value="" />
+<div id="admin-contents" class="contents-main">
+<div id="contents-filemanager-tree">
+  ディレクトリ
+  <div id="tree"></div>
+</div>
+<div id="contents-filemanager-nowdir">
+  <div id="now_dir">
+    <img src="<!--{$TPL_DIR}-->img/admin/contents/folder_open.gif" alt="フォルダ">
+    &nbsp;<!--{$tpl_now_file}-->
+  </div>
+  <div id="file_view">
+    <table id="contents-filemanager-filelist" class="list">
+      <tr>
+        <th>ファイル名</th>
+        <th>サイズ</th>
+        <th>更新日付</th>
+      </tr>
+      <!--{if !$tpl_is_top_dir}-->
+      <tr id="parent_dir" onclick="fnSetFormVal('form1', 'select_file', '<!--{$tpl_parent_dir|escape}-->');fnSelectFile('parent_dir', '#808080');" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$tpl_parent_dir|escape}-->', true, '<!--{$tpl_now_dir|escape}-->', true)" style="" onMouseOver="fnChangeBgColor('parent_dir', '#808080');" onMouseOut="fnChangeBgColor('parent_dir', '');">
+        <td>
+          <img src="<!--{$TPL_DIR}-->img/admin/contents/folder_parent.gif" alt="フォルダ">&nbsp;..
+        </td>
+        <td class="right">&nbsp;</td>
+        <td>&nbsp;</td>
+      </tr>
+      <!--{/if}-->
+      <!--{section name=cnt loop=$arrFileList}-->
+      <!--{assign var="id" value="select_file`$smarty.section.cnt.index`"}-->
+      <tr id="<!--{$id}-->" onclick="fnSetFormVal('form1', 'select_file', '<!--{$arrFileList[cnt].file_path|escape}-->');fnSelectFile('<!--{$id}-->', '#808080');" onDblClick="setTreeStatus('tree_status');fnDbClick(arrTree, '<!--{$arrFileList[cnt].file_path|escape}-->', <!--{if $arrFileList[cnt].is_dir|escape}-->true<!--{else}-->false<!--{/if}-->, '<!--{$tpl_now_dir|escape}-->', false)" style="" onMouseOver="fnChangeBgColor('<!--{$id}-->', '#808080');" onMouseOut="fnChangeBgColor('<!--{$id}-->', '');">
+        <td>
+          <!--{if $arrFileList[cnt].is_dir}-->
+          <img src="<!--{$TPL_DIR}-->img/admin/contents/folder_close.gif" alt="フォルダ">
+          <!--{else}-->
+          <img src="<!--{$TPL_DIR}-->img/admin/contents/file.gif">
+          <!--{/if}-->
+          <!--{$arrFileList[cnt].file_name|escape}-->
+        </td>
+        <td class="right"><!--{$arrFileList[cnt].file_size|number_format}--></td>
+        <td><!--{$arrFileList[cnt].file_time|escape}--></td>
+      </tr>
+      <!--{/section}-->
+    </table>
+  </div>
+  <div class="btn">
+    <button type="button" onclick="setTreeStatus('tree_status');fnModeSubmit('view','',''); return false;"><span>表示</span></button>
+    <button type="button" onclick="setTreeStatus('tree_status');fnModeSubmit('download','',''); return false;"><span>ダウンロード</span></button>
+    <button type="button" onclick="setTreeStatus('tree_status');fnModeSubmit('delete','',''); return false;"><span>削除</span></button>
+  </div>
+</div>
+<div id="contents-filemanager-action">
+  <p>現在のディレクトリ&nbsp;：&nbsp;<!--{$tpl_now_dir|sfTrimURL}-->/</p>
+  <table class="form">
+    <tr>
+      <th>ファイルのアップロード</th>
+      <td>
+        <!--{if $arrErr.upload_file}--><span class="attention"><!--{$arrErr.upload_file}--></span><!--{/if}-->
+        <input type="file" name="upload_file" size="64" <!--{if $arrErr.upload_file}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->><input type="button" onclick="setTreeStatus('tree_status');fnModeSubmit('upload','',''); return false;" value="アップロード" />
+      </td>
+    </tr>
+    <tr>
+      <th>フォルダ作成</th>
+      <td>
+        <!--{if $arrErr.create_file}--><span class="attention"><!--{$arrErr.create_file}--></span><!--{/if}-->
+        <input type="text" name="create_file" value="" style="width:336px;<!--{if $arrErr.create_file}--> background-color:<!--{$smarty.const.ERR_COLOR|escape}--><!--{/if}-->"><input type="button" onclick="setTreeStatus('tree_status');fnModeSubmit('create','',''); return false;" value="作成" />
+      </td>
+    </tr>
+  </table>
+</div>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv_sql.tpl	(revision 18873)
@@ -0,0 +1,126 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+// リストボックスのサイズ変更
+function ChangeSize(button, TextArea, Max, Min, row_tmp){
+  if(TextArea.rows <= Min){
+    TextArea.rows=Max; button.value="小さくする"; row_tmp.value=Max;
+  }else{
+    TextArea.rows =Min; button.value="大きくする"; row_tmp.value=Min;
+  }
+}
+
+// SQL確認画面起動
+function doPreview(){
+  document.form1.mode.value="preview"
+  document.form1.target = "_blank";
+  document.form1.submit();
+}
+
+// formのターゲットを自分に戻す
+function fnTargetSelf(){
+  document.form1.target = "_self";
+}
+
+//-->
+</script>
+
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="sql_id" value="<!--{$sql_id}-->" />
+<input type="hidden" name="csv_output_id" value="" />
+<input type="hidden" name="selectTable" value="" />
+<div id="admin-contents" class="contents-main">
+  <h2>SQL一覧</h2>
+
+  <!--{if $arrSqlList}-->
+  <table id="contents-csv-sqllist" class="list center">
+    <!--{ foreach key=key item=item from=$arrSqlList }-->
+    <tr style="background-color:<!--{if $item.sql_id == $sql_id}--><!--{$smarty.const.SELECT_RGB}--><!--{else}-->#ffffff<!--{/if}-->;">
+      <td>
+        <a href="<!--{$smarty.server.PHP_SELF|escape}-->?sql_id=<!--{$item.sql_id}-->" ><!--{$item.sql_name}--></a>
+      </td>
+      <td>
+        <div class="btn">
+          <button type='button' name='csv' onclick="fnTargetSelf(); fnFormModeSubmit('form1','csv_output','csv_output_id',<!--{$item.sql_id}-->);"><span>CSV出力</span></button>
+          <button type='button' name='del' onclick="fnTargetSelf(); fnFormModeSubmit('form1','delete','sql_id',<!--{$item.sql_id}-->);"><span>削除</span></button>
+        </div>
+      </td>
+    </tr>
+    <!--{ /foreach }-->
+  </table>
+  <!--{/if}-->
+
+  <div class="btn addnew">
+    <button type='button' name='subm' onclick="fnTargetSelf(); fnFormModeSubmit('form1','new_page','','');"><span>SQLを新規入力</span></button>
+  </div>
+
+
+  <h2>SQL設定</h2>
+  <table id="contents-csv-sqlset" class="form">
+    <tr>
+      <th>名称<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.sql_name}--></span>
+        <input type="text" name="sql_name" value="<!--{$arrSqlData.sql_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th align="center">SQL文<br /> (SELECTは記述しないでください。)<span class="attention"> *</span></td>
+      <td align="left">
+        <span class="attention"><!--{$arrErr.csv_sql}--></span>
+        <div>
+          <textarea name="csv_sql" cols=75 rows=30 align="left" wrap=off style="<!--{if $arrErr.csv_sql != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"><!--{$arrSqlData.csv_sql}--></textarea>
+        </div>
+      </td>
+    </tr>
+  </table>
+
+  <div class="btn">
+    <button type="submit" name="subm" onClick="mode.value='confirm'; fnTargetSelf();"><span>この内容で登録する</span></button>
+    <button type="submit" name="subm" onClick="doPreview(); return false;"><span>構文エラーを確認する</span></button>
+  </div>
+
+
+  <div id="contents-csv-sqltbl">
+    <h3>テーブル一覧</h3>
+    <select name="arrTableList[]" size="20" style="width:325px; height:300px;" onChange="mode.value=''; selectTable.value=this.value; submit();" onDblClick="csv_sql.value = csv_sql.value +' , ' + this.value;">
+      <!--{html_options options=$arrTableList selected=$selectTable}-->
+    </select>
+  </div>
+  <div id="contents-csv-sqlcol">
+    <h3>項目一覧</h3>
+    <select name="arrColList[]" size="20" style="width:325px; height:300px;" onDblClick="csv_sql.value = csv_sql.value +' , ' + this.value;">
+      <!--{html_options options=$arrColList}-->
+    </select>
+  </div>
+
+</div>
+</form>
+
+
+</script>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/csv.tpl	(revision 18873)
@@ -0,0 +1,59 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.multiselect2side/css/jquery.multiselect2side.css" type="text/css" media="screen" />
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.multiselect2side/js/jquery.multiselect2side.js" ></script>
+<script type="text/javascript">
+<!--
+$().ready(function() {
+    $('#output_list').multiselect2side({
+        selectedPosition: 'left',
+        moveOptions: true,
+        labelsx: '出力項目一覧',
+        labeldx: '出力可能項目一覧'
+    });
+    // multiselect2side の初期選択を解除
+    $('.ms2side__div select').val(null);
+    // [Sort] ボタンは混乱防止のため非表示
+    // FIXME 選択・非選択のボタンと比べて、位置ズレしている
+    $('.ms2side__div .SelSort').hide();
+});
+//-->
+</script>
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="confirm" />
+<input type="hidden" name="tpl_subno_csv" value="<!--{$tpl_subno_csv}-->" />
+<div id="admin-contents" class="contents-main">
+    <h2><!--{$SubnaviName}--></h2>
+    <div>
+        <span class="attention"><!--{$arrErr.output_list}--></span>
+        <select multiple name="output_list[]" style="<!--{$arrErr.output_list|sfGetErrorColor}-->;" id="output_list" size="20">
+            <!--{html_options options=$arrOptions selected=$arrSelected}-->
+        </select>
+    </div>
+
+    <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend.tpl	(revision 18873)
@@ -0,0 +1,113 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+function lfnCheckSubmit( fm ){
+  
+  var err = '';
+  /*
+  if ( ! fm["title"].value ){
+    err += '見出しコメントを入力して下さい。';
+  }
+  */
+  if ( ! fm["comment"].value ){
+    if ( err ) err += '';
+    err += 'コメントを入力して下さい。';
+  }
+  if ( err ){
+    alert(err);
+    return false;
+  } else {
+    if(window.confirm('内容を登録しても宜しいですか')){
+      return true;
+    }
+  }
+}
+
+function lfnCheckSetItem( rank ){
+  var flag = true;
+  var checkRank = '<!--{$checkRank}-->';
+  if ( checkRank ){
+    if ( rank != checkRank ){
+      if( ! window.confirm('さきほど選択した<!--{$checkRank}-->位の情報は破棄されます。宜しいでしょうか')){
+        flag = false;
+      }
+    } 
+  }
+  
+  if ( flag ){
+    win03('./recommend_search.php?rank=' + rank,'search','500','500');
+  }
+}
+
+//-->
+</script>
+
+<div id="admin-contents" class="contents-main">
+  <table class="list center" id="recommend-table">
+    <tr>
+      <th>#</th>
+      <th>画像</th>
+      <th>商品名</th>
+      <th>削除</th>
+      <th>変更</th>
+      <th>コメント</th>
+    </tr>
+    <!--{section name=cnt loop=$tpl_disp_max}-->
+    <!--▼おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
+    <tr>
+      <th><!--{$smarty.section.cnt.iteration}--></th>
+      <td>
+        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+          <img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$arrItems[$smarty.section.cnt.iteration].main_list_image|sfNoImageMainList|escape}-->" alt="<!--{$arrItems[$smarty.section.cnt.iteration].name|escape}-->" />
+        <!--{/if}-->
+      </td>
+      <td><!--{$arrItems[$smarty.section.cnt.iteration].name|escape}--></td>
+      <td>
+        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+        <a href="#" onClick="return fnInsertValAndSubmit( document.form<!--{$smarty.section.cnt.iteration}-->, 'mode', 'delete', '削除します。宜しいですか' )">削除</a>
+        <!--{/if}-->
+      </td>
+      <td>
+        <a href="#" onclick="lfnCheckSetItem('<!--{$smarty.section.cnt.iteration}-->'); return false;" target="_blank">
+          <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->商品変更<!--{else}-->商品選択<!--{/if}--></a>
+      </td>
+      <td>
+        <form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
+        <input type="hidden" name="mode" value="regist" />
+        <input type="hidden" name="product_id" value="<!--{$arrItems[$smarty.section.cnt.iteration].product_id|escape}-->" />
+        <input type="hidden" name="category_id" value="<!--{$category_id|escape}-->" />
+        <input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|escape}-->" />
+        <span class="attention"><!--{$arrErr[$smarty.section.cnt.iteration].comment}--></span>
+        <textarea name="comment" cols="45" rows="4" style="width: 337px; height: 82px; <!--{$arrErr[$smarty.section.cnt.iteration].comment|sfGetErrorColor}-->" <!--{$arrItems[$smarty.section.cnt.iteration].product_id|sfGetEnabled}-->><!--{$arrItems[$smarty.section.cnt.iteration].comment}--></textarea>
+        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}-->
+        <br /><button type="submit" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span>登録する</span></button>
+        <!--{/if}-->
+        </form>
+      </td>
+    </tr>
+  <!--▲おすすめ商品<!--{$smarty.section.cnt.iteration}-->-->
+  <!--{/section}-->
+  </table>
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign_create_tag.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign_create_tag.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign_create_tag.tpl	(revision 18873)
@@ -0,0 +1,97 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<form name="form1" id="form1" method="post" action="<!--{$smarty.server.REQUEST_URI|escape}-->">
+<input name="mode" type="hidden" value="search" />
+<input name="anchor_key" type="hidden" value="" />
+<input name="search_pageno" type="hidden" value="" />
+<input type="hidden" name="product_id" value="" />
+
+<!--{if $tpl_create_tag != ""}-->
+<h2>生成タグ</h2>
+<textarea name="" cols="45" rows="18" class="area40" readonly><!--{$tpl_create_tag}--></textarea>
+<div class="btn"><button type="button" onClick="history.back()"><span>検索結果へ戻る</span></button></div>
+
+<!--{* タグ表示の時以下を表示しない *}-->
+<!--{else}-->
+<table class="form">
+  <tr>
+    <th>カテゴリ</th>
+    <td>
+      <select name="search_category_id">
+        <option value="" selected="selected">選択してください</option>
+        <!--{html_options options=$arrCatList selected=$arrForm.search_category_id}-->
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <th>商品ID</th>
+    <td><input type="text" name="search_product_id" value="<!--{$arrForm.search_product_id}-->" size="35" class="box35" /></td>
+  </tr>
+  <tr>
+    <th>商品名</th>
+    <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
+  </tr>
+</table>
+<div class="btn"><button type="submit"><span>検索を開始</span></button></div>
+
+<!--{* ▼検索結果表示 *}-->
+<!--{if $tpl_linemax}-->
+<p><!--{$tpl_linemax}-->件が該当しました。</p>
+<!--{$tpl_strnavi}-->
+    
+<table class="list">
+  <tr>
+    <th>商品画像</th>
+    <th>商品ID</th>
+    <th>商品名</th>
+    <th>決定</th>
+  </tr>
+  <!--{section name=cnt loop=$arrProducts}-->
+  <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+  <tr>
+    <td class="center">
+      <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->" />
+    </td>  
+    <td><!--{$arrProducts[cnt].product_code|escape|default:"-"}--></td>
+    <td><!--{$arrProducts[cnt].name|escape}--></td>
+    <td class="center"><a href="#" onClick="fnFormModeSubmit('form1', 'view', 'product_id', '<!--{$arrProducts[cnt].product_id}-->'); return false;">決定</a></td>
+  </tr>
+  <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+  <!--{sectionelse}-->
+  <tr>
+    <td colspan="4">商品が登録されていません</td>
+  </tr>  
+  <!--{/section}-->
+</table>
+<!--{/if}-->
+<!--{* ▲検索結果表示 *}-->
+
+<!--{/if}-->
+<!--{* タグ表示しないここまで *}-->
+
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/campaign.tpl	(revision 18873)
@@ -0,0 +1,175 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+// カートに商品を入れるにチェックが入っているかチェック
+function fnIsCartOn(){
+    if (document.form1.cart_flg.checked <!--{if $is_update}-->|| <!--{$arrForm.cart_flg}--><!--{/if}-->){
+    document.form1.deliv_free_flg.disabled = false;
+    } else {
+    document.form1.deliv_free_flg.disabled = true;    
+    }
+}
+//-->
+</script>
+
+<div id="admin-contents" class="contents-main">
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="campaign_id" value="<!--{$campaign_id}-->" />
+<input type="hidden" name="is_update" value="<!--{$is_update}-->" />
+<!--{if $is_update}-->
+<input type="hidden" name="cart_flg" value="<!--{$arrForm.cart_flg}-->" />
+<!--{/if}-->
+  <h2>キャンペーンページ登録</h2>
+  <!--{if $arrErr.campaign_template_path || $arrErr.campaign_path}-->
+  <div class="message">
+    <span class="attention"><!--{$arrErr.campaign_template_path}--><!--{$arrErr.campaign_path}--></span>
+  </div>
+  <!--{/if}-->
+
+  <table class="form">
+    <tr>
+      <th>キャンペーン名<span class="attention"> *</span></td>
+      <td>
+        <!--{if $arrErr.campaign_name}--><span class="attention"><!--{$arrErr.campaign_name}--></span><!--{/if}-->
+        <input type="text" name="campaign_name" size="60" class="box60" value="<!--{$arrForm.campaign_name|escape}-->" <!--{if $arrErr.campaign_name}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+      </td>
+    </tr>
+    <tr>
+      <th>キャンペーン期間<span class="attention"> *</span></td>
+      <td>
+        <!--{if $arrErr.start_year || $arrErr.start_month || $arrErr.start_day}--><span class="attention"><!--{$arrErr.start_year}--><!--{$arrErr.start_month}--><!--{$arrErr.start_day}--></span><!--{/if}-->
+        開始日時：
+        <select name="start_year" <!--{if $arrErr.start_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.start_year}-->
+        </select>年
+        <select name="start_month" <!--{if $arrErr.start_month || $arrErr.start_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.start_month}-->
+        </select>月
+        <select name="start_day" <!--{if $arrErr.start_day || $arrErr.start_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.start_day}-->
+        </select>日
+        <select name="start_hour" <!--{if $arrErr.start_hour || $arrErr.start_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrHour selected=$arrForm.start_hour}-->
+        </select>時
+        <select name="start_minute" <!--{if $arrErr.start_minute || $arrErr.start_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrMinutes selected=$arrForm.start_minute}-->
+        </select>分<br />
+        <span class="attention"><!--{$arrErr.end_year}--><!--{$arrErr.end_month}--><!--{$arrErr.end_day}--></span>  
+        停止日時：
+        <select name="end_year" <!--{if $arrErr.end_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.end_year}-->
+        </select>年
+        <select name="end_month" <!--{if $arrErr.end_month || $arrErr.end_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.end_month}-->
+        </select>月
+        <select name="end_day" <!--{if $arrErr.end_day || $arrErr.end_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.end_day}-->
+        </select>日
+        <select name="end_hour" <!--{if $arrErr.end_hour || $arrErr.end_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrHour selected=$arrForm.end_hour}-->
+        </select>時
+        <select name="end_minute" <!--{if $arrErr.end_minute || $arrErr.end_year}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}-->>
+          <option value="" selected>--</option>
+          <!--{html_options options=$arrMinutes selected=$arrForm.end_minute}-->
+        </select>分
+      </td>
+    </tr>
+    <tr>
+      <th>ディレクトリ名<span class="attention"> *</span></td>
+      <td>
+        <!--{if $arrErr.directory_name}--><span class="attention"><!--{$arrErr.directory_name}--></span><!--{/if}-->
+        <input type="text" name="directory_name" size="60" class="box60"  value="<!--{$arrForm.directory_name|escape}-->" <!--{if $arrErr.directory_name}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> maxlength="<!--{$smarty.const.STEXT_LEN}-->"/></span><br/>
+        <span>※<!--{$smarty.const.SITE_URL}--><!--{$smarty.const.CAMPAIGN_DIR}-->入力したディレクリ名/ でアクセス出来るようになります。</span>
+      </td>
+    </tr>
+    <tr>
+      <th>申込数制御</td>
+      <td>
+        <!--{if $arrErr.limit_count}--><span class="attention"><!--{$arrErr.limit_count}--></span><!--{/if}-->
+        <input type="text" name="limit_count" size="54" class="box6"  value="<!--{$arrForm.limit_count|escape}-->" <!--{if $arrErr.limit_count}-->style="background-color:<!--{$smarty.const.ERR_COLOR|escape}-->"<!--{/if}--> maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>&nbsp;件で終了ページに切り替え
+      </td>
+    </tr>
+    <tr>
+      <th>重複申込制御</td>
+      <td><input type="checkbox" name="orverlapping_flg" id="orverlapping_flg" value="1" <!--{if $arrForm.orverlapping_flg eq 1}--> checked <!--{/if}--> ><label for="orverlapping_flg">重複申込を制御する</label></td>
+    </tr>
+    <tr>
+      <th>カートに商品を入れる</td>
+      <td><input type="checkbox" onclick="fnIsCartOn()" name="cart_flg" id="cart_flg" value="1" <!--{if $arrForm.cart_flg eq 1}--> checked <!--{/if}--> <!--{if $is_update}-->disabled<!--{/if}-->><label for="cart_flg">カートに商品を入れるようにする</label></td>
+    </tr>
+    <tr>
+      <th>送料無料設定</td>
+      <td><input type="checkbox" name="deliv_free_flg" id="deliv_free_flg" value="1" <!--{if $arrForm.deliv_free_flg eq 1}--> checked <!--{/if}--> ><label for="deliv_free_flg">送料無料</label></td>
+    </tr>
+  </table>
+  <!--▲登録テーブルここまで-->
+
+  <div class="btn"><button type="button" onclick="fnFormModeSubmit('form1', 'regist', '', '');"><span>この内容で登録する</span></button></div>
+
+
+  <h2>キャンペーン一覧</h2>
+
+  <table class="list">
+    <tr>
+      <th rowspan="2">キャンペーン名</th>
+      <th rowspan="2">申込人数</th>
+      <th colspan="2">デザイン設定</th>
+      <th rowspan="2">編集</th>
+      <th rowspan="2">削除</th>
+      <th rowspan="2">CSV</th>
+    </tr>
+    <tr>
+      <th>キャンペーン中</th>
+      <th>キャンペーン終了</th>
+    </tr>
+    <!--{section name=cnt loop=$arrCampaign}-->
+    <tr class="center">
+      <td><!--{$arrCampaign[cnt].campaign_name}--></td>
+      <td><!--{$arrCampaign[cnt].total_count}--></td>
+      <td><a href="<!--{$smarty.const.URL_CAMPAIGN_DESIGN}-->?campaign_id=<!--{$arrCampaign[cnt].campaign_id}-->&status=active">設定</a></td>
+      <td><a href="<!--{$smarty.const.URL_CAMPAIGN_DESIGN}-->?campaign_id=<!--{$arrCampaign[cnt].campaign_id}-->&status=end">設定</a></td>
+      <!--{if $arrCampaign[cnt].campaign_id != $arrForm.campaign_id}-->
+      <td><a href="javascript:fnFormModeSubmit('form1', 'update', 'campaign_id', '<!--{$arrCampaign[cnt].campaign_id}-->')">編集</a></td>
+      <!--{else}-->
+      <td>編集</td>
+      <!--{/if}-->
+      <td><a href="javascript:fnFormModeSubmit('form1', 'delete', 'campaign_id', '<!--{$arrCampaign[cnt].campaign_id}-->')">削除</a></td>
+      <td><a href="javascript:fnFormModeSubmit('form1', 'csv', 'campaign_id', '<!--{$arrCampaign[cnt].campaign_id}-->')">CSV</a></td>
+    </tr>
+    <!--{/section}-->
+  </table>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/inquiry.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/inquiry.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/inquiry.tpl	(revision 18873)
@@ -0,0 +1,189 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+    function func_check() {
+        res = confirm('登録します。宜しいですか？');
+        if( res == true ) {
+            return true;
+        }
+        return false;
+    }
+        
+        
+    function func_disp( no ){
+
+        ml = document.form1.elements['question[' + no + '][kind]'];
+        len = ml.length;
+
+        optd = $("#Q" + no + "-option");
+        nmth = $("#Q" + no + "-name").children("th");
+        var flag = 0;
+        
+        for( i = 0; i < len ; i++) {
+            
+                if ( ml[i].checked ){
+                    if ( (ml[i].value == 3) || (ml[i].value == 4) ) {
+                        optd.show();
+                        nmth.attr("rowspan", "3");
+                    } else {
+                        optd.hide();
+                        nmth.attr("rowspan", "2");
+                    }
+                    flag = 1;
+                } 
+        
+        }
+
+        if ( flag == 0 ){
+            optd.hide();
+            nmth.attr("rowspan", "2");
+        }
+        
+    }
+    
+    function delete_check() {
+        res = confirm('アンケートを削除しても宜しいですか？');
+        if(res == true) {
+            return true;
+        }
+        return false;
+    }
+// -->
+</script>
+
+<div id="admin-contents" class="contents-main">
+<form name="form1" method="post" action="?mode=regist" onSubmit="return func_check(); false;">
+<input type="hidden" name="question_id" value="<!--{$QUESTION_ID}-->" />
+    <h2><!--{if $QUESTION_ID}-->修正<!--{else}-->新規<!--{/if}-->登録</h2>
+    <!--{if $MESSAGE != ""}-->
+    <div class="message"><span class="attention"><!--{$MESSAGE}--></span></div>
+    <!--{/if}-->
+
+    <table>
+        <tr>
+            <th>稼働・非稼働<span class="attention">*</span></th>
+            <td>
+                <span <!--{if $ERROR.active}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                <!--{html_radios name="active" options=$arrActive selected=$smarty.post.active}-->
+                </span>
+                <!--{if $ERROR.active}--><br /><span class="attention"><!--{$ERROR.active}--></span><!--{/if}-->
+            </td>
+        </tr>
+        <tr>
+            <th>アンケートタイトル<span class="attention">*</span></th>
+            <td>
+                <input type="text" name="title" size="70" class="box70" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.title|escape}-->" <!--{if $ERROR.title}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                <!--{if $ERROR.title}--><br /><span class="attention"><!--{$ERROR.title}--></span><!--{/if}-->
+            </td>
+        </tr>
+        <tr>
+            <th>アンケート内容<span class="attention">*</span></th>
+            <td>
+                <textarea name="contents" cols="60" rows="4" class="area60" wrap="physical" <!--{if $ERROR.contents}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$smarty.post.contents}--></textarea>
+                <!--{if $ERROR.contents}--><br /><span class="attention"><!--{$ERROR.contents}--></span><!--{/if}-->
+            </td>
+        </tr>
+        <!--{section name=question loop=$cnt_question}-->
+            <!--{assign var=index value=$smarty.section.question.index}-->
+            <tr id="Q<!--{$smarty.section.question.index|escape}-->-name">
+                <th rowspan="3">質問<!--{$smarty.section.question.iteration}--><!--{if $smarty.section.question.iteration eq 1}--><span class="attention">*</span><!--{/if}--></th>
+                <td>
+                    <input type="text" name="question[<!--{$index|escape}-->][name]" size="70" class="box70" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$index].name|escape}-->" <!--{if $ERROR.question[$index].name}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                    <!--{if $ERROR.question[$index].name}--><br /><span class="attention"><!--{$ERROR.question[$index].name}--></span><!--{/if}-->
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <span style=background-color:"<!--{$ERROR_COLOR.question[$index].kind}-->">
+                    <!--{html_radios_ex onClick="func_disp(`$index`)" name="question[`$index`][kind]" options="$arrQuestion" selected="`$smarty.post.question[$index].kind`"}-->
+                    </span>
+                    <!--{if $ERROR.question[$index].kind}--><br><span class="red"><!--{$ERROR.question[$index].kind}--></span><!--{/if}-->
+                </td>
+            </tr>
+            <!--{* ▼回答 *}-->
+            <tr id="Q<!--{$index|escape}-->-option">
+                <td>
+                    <!--{section name=option loop=4 start=0 max=7}-->
+                        <div>
+                            <!--{assign var=option_index1 value=$smarty.section.option.index*2}-->
+                            <!--{assign var=option_index2 value=$option_index1+1}-->
+                            <!--{assign var=num1 value=$option_index1+1}-->
+                            <!--{assign var=num2 value=$option_index2+1}-->
+                            <!--{assign var=error1 value=$ERROR.question[$index].option[$option_index1]}-->
+                            <!--{assign var=error2 value=$ERROR.question[$index].option[$option_index2]}-->
+                            <!--{* 回答エラー *}-->
+                            <!--{if $error1}--><span class="red"><!--{$error1}--></span><br /><!--{/if}-->
+                            <!--{if $error2}--><span class="red"><!--{$error2}--></span><br /><!--{/if}-->
+                            <!--{* 回答フォーム *}-->
+                            <!--{$num1}--> <input type="text" name="question[<!--{$index|escape}-->][option][<!--{$option_index1|escape}-->]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$index].option[$option_index1]|escape}-->" <!--{if $error1}--><!--{sfSetErrorStyle}--><!--{/if}-->>　
+                            <!--{$num2}--> <input type="text" name="question[<!--{$index|escape}-->][option][<!--{$option_index2|escape}-->]" size="40" class="box40" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$smarty.post.question[$index].option[$option_index2]|escape}-->" <!--{if $error2}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                        </div>
+                    <!--{/section}-->
+                </td>
+            </tr>
+            <!--{* ▲回答 *}-->
+        <!--{/section}-->
+    </table>
+
+    <div class="btn">
+        <button type="submit"><span>登録する</span></button>
+        <button type="reset"><span>内容をクリア</span></button>
+    </div>
+</form>
+
+<form name="form2" method="post" action="?">
+    <h2>登録済みアンケート</h2>
+    <table class="list center">
+        <tr>
+            <th>編集</th>
+            <th>登録日</th>
+            <th>アンケートタイトル</th>
+            <th>ページ参照</th>
+            <th>結果取得</th>
+            <th>削除</th>
+        </tr>
+        <!--{section name=data loop=$list_data}-->
+        <tr <!--{if $list_data[data].question_id eq $smarty.request.question_id}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+            <td class="main"><a href="<!--{$smarty.server.PHP_SELF|escape}-->?question_id=<!--{$list_data[data].question_id}-->">編集</a></td>
+            <td><!--{$list_data[data].disp_date}--></td>
+            <td class="left"><!--{$list_data[data].question_name|escape}--></td>
+            <td><a href="<!--{$smarty.const.SITE_URL}-->inquiry/<!--{$smarty.const.DIR_INDEX_URL}-->?question_id=<!--{$list_data[data].question_id}-->" target="_blank">参照</a></td>
+            <td><a href="<!--{$smarty.server.PHP_SELF|escape}-->?mode=csv&amp;question_id=<!--{$list_data[data].question_id}-->">download</a></td>
+            <td><a href="<!--{$smarty.server.PHP_SELF|escape}-->?mode=delete&amp;question_id=<!--{$list_data[data].question_id}-->" onClick="return delete_check()">削除</a></td>
+        </tr>
+        <!--{/section}-->
+    </table>
+</form>
+
+</div>
+
+<script type="text/javascript">
+<!--
+    <!--{section name=question loop=$cnt_question}-->
+        func_disp(<!--{$smarty.section.question.index}-->);
+    <!--{/section}-->
+//-->
+</script>
+
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/page_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/page_edit.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/page_edit.tpl	(revision 18873)
@@ -0,0 +1,62 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+<div id="" class="contents-main">
+  <h2>ページ編集</h2>
+  <table>
+    <tr >
+      <th width="200">ページ選択<span class="attention"> *</span></td>
+      <td width="507">
+      <!--{assign var=key value="page"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" onchange="fnModeSubmit('select','','');">
+      <option value="">選択してください</option>
+      <!--{html_options options=$arrPageList selected=$arrForm[$key].value}-->
+      </select>
+      </td>
+    </tr>
+  </table>
+          
+  <table>
+    <tr><td colspan="3"><img src="<!--{$TPL_DIR}-->img/contents/main_bar.jpg" height="10" alt=""></td></tr>
+  </table>
+            
+  <table>
+    <!--{assign var=key value="template"}-->
+    <tr>
+      <th colspan="2">テンプレート<span class="attention">（上限<!--{$arrForm[$key].length}-->文字）</span></td>
+    </tr>
+    <tr>
+      <td colspan="2">
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$key}-->" cols="90" rows="40" class="area90" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea>
+      </td>
+    </tr>
+  </table>
+
+            <input type="button" name="subm1" onclick="fnModeSubmit('preview','','');" value="プレビュー" />
+            <button type="submit"><span>この内容で登録する</span></button>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/contents/recomend_search.tpl	(revision 18873)
@@ -0,0 +1,97 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+
+function func_submit( id ){
+  var fm = window.opener.document.form<!--{$smarty.get.rank}-->;
+  fm.product_id.value = id;
+  fm.mode.value = 'set_item';
+  fm.rank.value = '<!--{$smarty.get.rank}-->';
+  fm.submit();
+  window.close();
+  return false;
+}
+//-->
+</script>
+
+<!--▼検索フォーム-->
+<form name="form1" id="form1" method="post" action="<!--{$smarty.server.REQUEST_URI|escape}-->">
+<input name="mode" type="hidden" value="search" />
+<input name="search_pageno" type="hidden" value="" />
+  <table class="form">
+    <tr>
+      <th>カテゴリ</th>
+      <td>
+        <select name="search_category_id">
+        <option value="" selected="selected">選択してください</option>
+        <!--{html_options options=$arrCatList selected=$arrForm.search_category_id}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>商品名</th>
+      <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
+    </tr>
+  </table>
+  <div class="btn"><button type="submit"><span>検索を開始</span></button>
+
+  <!--{* ▼検索結果表示 *}-->
+  <!--{if $tpl_linemax}-->
+  <p><!--{$tpl_linemax}-->件が該当しました。</p>
+  <!--{$tpl_strnavi}-->
+    
+  <table class="list">
+    <tr>
+      <th>商品画像</th>
+      <th>商品コード</th>
+      <th>商品名</th>
+      <th>決定</th>
+    </tr>
+    <!--{section name=cnt loop=$arrProducts}-->
+    <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+    <tr>
+      <td class="center">
+        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="" />
+      </td>
+      <td><!--{$arrProducts[cnt].product_code|escape|default:"-"}--></td>
+      <td><!--{$arrProducts[cnt].name|escape}--></td>
+      <td class="center"><a href="" onClick="return func_submit(<!--{$arrProducts[cnt].product_id}-->)">決定</a></td>
+    </tr>
+    <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+    <!--{sectionelse}-->
+    <tr>
+      <td colspan="4">商品が登録されていません</td>
+    </tr>  
+    <!--{/section}-->
+  </table>
+  <!--{/if}-->
+  <!--{* ▲検索結果表示 *}-->
+
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/install.tpl	(revision 18873)
@@ -0,0 +1,30 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+    <div class="contents-main">
+        <h2>結果</h2>
+        <div><!--{$tpl_result|escape|nl2br}--></div>
+        <div><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/index.tpl	(revision 18873)
@@ -0,0 +1,78 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+    <div class="contents-main">
+        <h2>インストール済みのプラグイン</h2>
+        <!--{foreach from="$arrInstalledPlugin" item="plugin" key="path" name="installedPlugin"}-->
+            <!--{if $smarty.foreach.installedPlugin.first}-->
+                <table>
+                    <tr>
+                        <th>プラグイン名</th>
+                        <th>ディレクトリ名</th>
+                        <th>バージョン</th>
+                        <th>著作者</th>
+                        <th>実行</th>
+                    </tr>
+            <!--{/if}-->
+            <tr>
+                <td><!--{$plugin.info.name|escape}--></td>
+                <td><!--{$plugin.path|escape}--></td>
+                <td><!--{$plugin.info.version|escape}--></td>
+                <td><!--{$plugin.info.auther|escape}--></td>
+                <td><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/uninstall.php?path=<!--{$plugin.path|escape}-->">アンインストール</a></td>
+            </tr>
+            <!--{if $smarty.foreach.installedPlugin.last}-->
+                </table>
+            <!--{/if}-->
+        <!--{foreachelse}-->
+            該当するプラグインはありません。
+        <!--{/foreach}-->
+
+        <h2>インストールされていないプラグイン</h2>
+        <!--{foreach from="$arrInstallablePlugin" item="plugin" key="path" name="installablePlugin"}-->
+            <!--{if $smarty.foreach.installablePlugin.first}-->
+                <table>
+                    <tr>
+                        <th>プラグイン名</th>
+                        <th>ディレクトリ名</th>
+                        <th>バージョン</th>
+                        <th>著作者</th>
+                        <th>実行</th>
+                    </tr>
+            <!--{/if}-->
+            <tr>
+                <td><!--{$plugin.info.name|escape}--></td>
+                <td><!--{$plugin.path|escape}--></td>
+                <td><!--{$plugin.info.version|escape}--></td>
+                <td><!--{$plugin.info.auther|escape}--></td>
+                <td><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/install.php?path=<!--{$plugin.path|escape}-->">インストール</a></td>
+            </tr>
+            <!--{if $smarty.foreach.installablePlugin.last}-->
+                </table>
+            <!--{/if}-->
+        <!--{foreachelse}-->
+            該当するプラグインはありません。
+        <!--{/foreach}-->
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/subnavi.tpl	(revision 18873)
@@ -0,0 +1,29 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+    <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-plugin-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>プラグイン管理</span></a></li>
+    <!--{foreach from=$smarty.env.pluginsXml->plugin item="plugin"}-->
+        <li<!--{if $tpl_subno == $plugin->path}--> class="on"<!--{/if}--> id="navi-plugin-<!--{$plugin->path|escape}-->"><a href="<!--{$smarty.const.PLUGIN_URL}--><!--{$plugin->path|escape}-->/admin/<!--{$smarty.const.DIR_INDEX_URL}-->"><span><!--{$plugin->name|escape}--></span></a></li>
+    <!--{/foreach}-->
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/plugin/uninstall.tpl	(revision 18873)
@@ -0,0 +1,30 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+    <div class="contents-main">
+        <h2>結果</h2>
+        <div><!--{$tpl_result|escape|nl2br}--></div>
+        <div><a href="<!--{$smarty.const.URL_DIR}-->admin/plugin/<!--{$smarty.const.DIR_INDEX_URL}-->">→ プラグイン管理へ</a><div>
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/kiyaku.tpl	(revision 18873)
@@ -0,0 +1,86 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="kiyaku_id" value="<!--{$tpl_kiyaku_id}-->" />
+<div id="basis" class="contents-main">
+  <table class="form">
+    <tr>
+      <th>規約タイトル<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.kiyaku_title}--></span>
+        <input type="text" name="kiyaku_title" value="<!--{$arrForm.kiyaku_title|escape}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+        <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>規約内容<span class="attention"> *</span></th>
+      <td>
+      <span class="attention"><!--{$arrErr.kiyaku_text}--></span>
+      <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" cols="60" rows="8" class="area60" style="" ><!--{$arrForm.kiyaku_text|escape}--></textarea>
+      <span class="attention"> (上限<!--{$smarty.const.MLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+  </table>
+  <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+
+  <table class="list">
+    <tr>
+      <th>規約タイトル</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrKiyaku}-->
+    <tr style="background:<!--{if $tpl_class_id != $arrKiyaku[cnt].kiyaku_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;">
+    <!--{assign var=kiyaku_id value=$arrKiyaku[cnt].kiyaku_id}-->
+      <td><!--{* 規格名 *}--><!--{$arrKiyaku[cnt].kiyaku_title|escape}--></td>
+      <td align="center">
+        <!--{if $tpl_kiyaku_id != $arrKiyaku[cnt].kiyaku_id}-->
+        <a href="?" onclick="fnModeSubmit('pre_edit', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">編集</a>
+        <!--{else}-->
+        編集中
+        <!--{/if}-->
+      </td>
+      <td align="center">
+        <!--{if $arrClassCatCount[$class_id] > 0}-->
+        -
+        <!--{else}-->
+        <a href="?" onclick="fnModeSubmit('delete', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">削除</a>
+        <!--{/if}-->
+      </td>
+      <td align="center">
+        <!--{if $smarty.section.cnt.iteration != 1}-->
+        <a href="?" onclick="fnModeSubmit('up', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">上へ</a>
+        <!--{/if}-->
+        <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+        <a href="?" onclick="fnModeSubmit('down', 'kiyaku_id', <!--{$arrKiyaku[cnt].kiyaku_id}-->); return false;">下へ</a>
+        <!--{/if}-->
+      </td>
+    </tr>
+<!--{/section}-->
+  </table>
+
+</div>
+</form>    
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl	(revision 18873)
@@ -0,0 +1,69 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="payment_id" value="<!--{$tpl_payment_id}-->" />
+<div id="basis" class="contents-main">
+  <table class="list">
+    <tr>
+      <th>ID</th>
+      <th>支払方法</th>
+      <th>手数料（円）</th>
+      <th>利用条件</th>
+      <th>配送サービス</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrPaymentListFree}-->
+    <tr>
+      <td><!--{$arrPaymentListFree[cnt].payment_id|escape}--></td>
+      <td><!--{$arrPaymentListFree[cnt].payment_method|escape}--></td>
+      <!--{if $arrPaymentListFree[cnt].charge_flg == 2}-->
+        <td align="center">-</td>
+      <!--{else}-->
+        <td align="right"><!--{$arrPaymentListFree[cnt].charge|escape|number_format}--></td>
+      <!--{/if}-->
+      <td align="center">
+        <!--{if $arrPaymentListFree[cnt].rule > 0}--><!--{$arrPaymentListFree[cnt].rule|escape|number_format}--><!--{else}-->0<!--{/if}-->円
+        <!--{if $arrPaymentListFree[cnt].upper_rule > 0}-->～<!--{$arrPaymentListFree[cnt].upper_rule|escape|number_format}-->円<!--{elseif $arrPaymentListFree[cnt].upper_rule == "0"}--><!--{else}-->～無制限<!--{/if}-->
+      <td><!--{assign var=key value="`$arrPaymentListFree[cnt].deliv_id`"}--><!--{$arrDelivList[$key]|default:"未登録"}--></td>
+      <td align="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="win03('./payment_input.php?mode=pre_edit&amp;payment_id=<!--{$arrPaymentListFree[cnt].payment_id}-->','payment_input','530','400'); return false;">編集</a><!--{else}-->-<!--{/if}--></td>
+      <td align="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnModeSubmit('delete', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
+      <td align="center">
+      <!--{if $smarty.section.cnt.iteration != 1}-->
+      <a href="?" onclick="fnModeSubmit('up','payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">上へ</a>
+      <!--{/if}-->
+      <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+      <a href="?" onclick="fnModeSubmit('down','payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">下へ</a>
+      <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+  <div class="btn addnew">
+    <button type="button" name="subm2" onclick="win03('./payment_input.php','payment_input','550','400');"><span>支払方法を新規入力</span></button>
+  </div>
+</div>
+</form>
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 18873)
@@ -0,0 +1,49 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<div id="basis" class="contents-main">
+  <table class="list">
+    <tr>
+      <th>管理タイトル/管理内容</th>
+      <th>選択項目</th>
+      <th>編集</th>
+    </tr>
+    <!--{section name=cnt loop=$arrControlList}-->
+    <tr>
+      <td><strong><!--{$arrControlList[cnt].control_title|escape}--></strong><br /><!--{$arrControlList[cnt].control_text|escape}--></td>
+      <td align="center">
+        <form name="form<!--{$smarty.section.cnt.index}-->" id="form<!--{$smarty.section.cnt.index}-->" method="post" action="?">
+        <input type="hidden" name="mode" value="edit" />
+        <input type="hidden" name="control_id" value="<!--{$arrControlList[cnt].control_id}-->" />
+        <select name="control_flg" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+          <!--{html_options options=$arrControlList[cnt].control_area selected=$arrControlList[cnt].control_flg.value}-->
+        </select>
+        </form>
+      </td>
+      <td align="center">
+        <div class="btn"><button type="submit" onclick="document.form<!--{$smarty.section.cnt.index}-->.submit();"><span>編集</span></button></div>
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	(revision 18873)
@@ -0,0 +1,121 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+<input type="hidden" name="mode" value="edit" />
+<!--{assign var=key value="deliv_id"}-->
+<input type="hidden" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" />
+<div id="basis" class="contents-main">
+  <h2>配送業者登録</h2>
+
+  <table>
+    <tr>
+      <th>配送業者名<span class="attention"> *</span></td>
+      <td colspan="3">
+      <!--{assign var=key value="name"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" /></td>
+    </tr>
+    <tr>
+      <th>名称<span class="attention"> *</span></td>
+      <td colspan="3">
+      <!--{assign var=key value="service_name"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" /></td>
+    </tr>
+    <tr>
+      <th>伝票No.URL</td>
+      <td colspan="3">
+      <!--{assign var=key value="confirm_url"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="30" class="box30" /></td>
+    </tr>
+    <!--{section name=cnt loop=$smarty.const.DELIVTIME_MAX}-->
+    <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+    <!--{assign var=keyno value="`$smarty.section.cnt.iteration`"}-->
+    <!--{assign var=key value="deliv_time`$smarty.section.cnt.iteration`"}-->
+    <!--{assign var=key_next value="deliv_time`$smarty.section.cnt.iteration+1`"}-->
+    <!--{if $type == 0}-->
+      <!--{if $arrErr[$key] != "" || $arrErr[$key_next] != ""}-->
+      <tr>
+        <td colspan="4"><span class="attention"><!--{$arrErr[$key]}--><!--{$arrErr[$key_next]}--></span></td>
+      </tr>    
+      <!--{/if}-->
+      <tr>
+      <th>お届け時間<!--{$keyno}--></td>
+      <!--{if $smarty.section.cnt.last}-->
+      <!--{assign var=colspan value="3"}-->  
+      <!--{else}-->
+      <!--{assign var=colspan value="1"}-->
+      <!--{/if}-->
+      <td colspan="<!--{$colspan}-->">
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="20" class="box20" /></td>
+    <!--{else}-->
+      <th>お届け時間<!--{$keyno}--></td>
+      <td><input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" size="20" class="box20" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /> </td>
+      </tr>
+    <!--{/if}-->
+    <!--{/section}-->
+
+  </table>
+  
+  <!--{if $smarty.const.INPUT_DELIV_FEE}-->
+  <h2>配送料登録</h2>
+  <p>※全国一律送料 <input type="text" name="fee_all" class="box10" /> 円に設定する　<button type="button" onclick="fnSetDelivFee(<!--{$smarty.const.DELIVFEE_MAX}-->);"><span>反映</span></button></p>
+  <table>
+    <!--{section name=cnt loop=$smarty.const.DELIVFEE_MAX}-->
+    <!--{assign var=type value="`$smarty.section.cnt.index%2`"}-->
+    <!--{assign var=keyno value="`$smarty.section.cnt.iteration`"}-->
+    <!--{assign var=key value="fee`$smarty.section.cnt.iteration`"}-->
+    <!--{assign var=key_next value="fee`$smarty.section.cnt.iteration+1`"}-->
+  
+    <!--{if $type == 0}-->
+      <!--{if $arrErr[$key] != "" || $arrErr[$key_next] != ""}-->
+      <tr>
+        <td colspan="4"><span class="attention"><!--{$arrErr[$key]}--><!--{$arrErr[$key_next]}--></span></td>
+      </tr>    
+      <!--{/if}-->
+      <tr>
+      <th><!--{$arrPref[$keyno]}--></td>
+      <!--{if $smarty.section.cnt.last}-->
+      <!--{assign var=colspan value="3"}-->  
+      <!--{else}-->
+      <!--{assign var=colspan value="1"}-->
+      <!--{/if}-->
+      <td width="247" colspan="<!--{$colspan}-->">
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" size="20" class="box20" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /> 円</td>
+    <!--{else}-->
+      <th><!--{$arrPref[$keyno]}--></td>
+      <td width="248"><input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" size="20" class="box20" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /> 円</td>
+      </tr>
+    <!--{/if}-->
+    <!--{/section}-->
+  </table>
+  <!--{/if}-->
+
+  <div class="btn">
+    <button type="button" onclick="location.href='./delivery.php';"><span>前のページに戻る</span></button>
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+</div>
+</form>
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 18873)
@@ -0,0 +1,117 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+var flag = 0;
+
+function setFlag(){
+  flag = 1;
+}
+function checkFlagAndSubmit(){
+  if ( flag == 1 ){
+    if( confirm("内容が変更されています。続行すれば変更内容は破棄されます。宜しいでしょうか？") ){
+      fnSetvalAndSubmit( 'form1', 'mode', 'id_set' );
+    } else {
+      return false;
+    }
+  } else {
+    fnSetvalAndSubmit( 'form1', 'mode', 'id_set' );
+  }
+}
+
+//-->
+</script>
+
+
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="regist" />
+<div id="basis" class="contents-main">
+  <table>
+    <tr>
+      <th>テンプレート<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="template_id"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <select name="template_id" onChange="return checkFlagAndSubmit();" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+      <option value="" selected="selected">選択してください</option>
+      <!--{html_options options=$arrMailTEMPLATE selected=$arrForm[$key]}-->
+      </select>
+      </td>
+    </tr>
+    <tr>
+      <th>メールタイトル<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="subject"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <input type="text" name="subject" value="<!--{$arrForm[$key]|escape}-->" onChange="setFlag();" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+      </td>
+    </tr>
+    <tr>
+      <th>ヘッダー</th>
+      <td>
+      <!--{assign var=key value="header"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <textarea name="header" 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">
+        <button type="button" onclick="fnCharCount('form1','header','cnt_header');"><span>文字数カウント</span></button>
+        <br />今までに入力したのは
+        <input type="text" name="cnt_header" size="4" class="box4" readonly = true style="text-align:right" />
+        文字です。
+      </div>
+      </td>
+    </tr>
+    <tr>
+      <th colspan="2" align="center">動的データ挿入部分</th>
+    </tr>
+    <tr>
+      <th>フッター</th>
+      <td>
+      <!--{assign var=key value="footer"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <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">
+        <button type="button" onclick="fnCharCount('form1','footer','cnt_footer');"><span>文字数カウント</span></button>
+        <br />今までに入力したのは
+        <input type="text" name="cnt_footer" size="4" class="box4" readonly = true style="text-align:right" />
+        文字です。
+      </div>
+      </td>
+    </tr>
+  </table>
+
+  <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+</div>
+</form>
+
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery.tpl	(revision 18873)
@@ -0,0 +1,59 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="deliv_id" value="" />
+<div id="basis" class="contents-main">
+  <h2>配送業者登録</h2>
+
+  <table class="list">
+    <tr>
+      <th>配送業者</th>
+      <th>名称</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrDelivList}-->
+      <tr>
+        <td><!--{$arrDelivList[cnt].name|escape}--></td>
+        <td><!--{$arrDelivList[cnt].service_name|escape}--></td>
+        <td align="center"><a href="?" onclick="fnChangeAction('./delivery_input.php'); fnModeSubmit('pre_edit', 'deliv_id', <!--{$arrDelivList[cnt].deliv_id}-->); return false;">編集</a></td>
+        <td align="center"><a href="?" onclick="fnModeSubmit('delete', 'deliv_id', <!--{$arrDelivList[cnt].deliv_id}-->); return false;">削除</a></td>
+        <td align="center">
+        <!--{if $smarty.section.cnt.iteration != 1}-->
+        <a href="?" onclick="fnModeSubmit('up','deliv_id', '<!--{$arrDelivList[cnt].deliv_id}-->'); return false;">上へ</a>
+        <!--{/if}-->
+        <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+        <a href="?" onclick="fnModeSubmit('down','deliv_id', '<!--{$arrDelivList[cnt].deliv_id}-->'); return false;">下へ</a>
+        <!--{/if}-->
+        </td>
+      </tr>
+    <!--{/section}-->
+  </table>
+  <div class="btn addnew">
+    <button type="button" name="subm2" onclick="fnChangeAction('./delivery_input.php'); fnModeSubmit('pre_edit','','');"><span>配送業者<!--{if $smarty.const.INPUT_DELIV_FEE}-->・配送料<!--{/if}-->を新規入力</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/tradelaw.tpl	(revision 18873)
@@ -0,0 +1,183 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+<input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
+<div id="basis" class="contents-main">
+  <table class="form">
+    <tr>
+      <th>販売業者<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_company"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>運営責任者<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_manager"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>郵便番号<span class="attention"> *</span></th>
+      <td> 
+      <!--{assign var=key1 value="law_zip01"}-->
+      <!--{assign var=key2 value="law_zip02"}-->
+      <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
+      <span class="attention"><!--{$arrErr[$key1]}--></span>
+      <span class="attention"><!--{$arrErr[$key2]}--></span>
+      <!--{/if}-->
+      〒
+      <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box6" />
+       - 
+      <input type="text"  name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" />
+      <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'law_zip01', 'law_zip02', 'law_pref', 'law_addr01');" />
+      </td>
+    </tr>
+    <tr>
+      <th>所在地<span class="attention"> *</span></th>
+      <td>
+          <!--{assign var=key value="law_pref"}-->
+          <!--{if $arrErr[$key]}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <!--{/if}-->
+          <select name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+          <option value="" selected="selected">都道府県を選択</option>
+          <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+          </select><br />
+          <!--{assign var=key value="law_addr01"}-->
+          <!--{if $arrErr[$key]}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <!--{/if}-->
+          <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+          <br />
+          <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
+          <!--{assign var=key value="law_addr02"}-->
+          <!--{if $arrErr[$key]}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <!--{/if}-->
+          <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+          <br />
+          <!--{$smarty.const.SAMPLE_ADDRESS2}-->
+      </td>
+    </tr>
+    <tr>
+      <th>TEL<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key1 value="law_tel01"}-->
+      <!--{assign var=key2 value="law_tel02"}-->
+      <!--{assign var=key3 value="law_tel03"}-->
+      <!--{if $arrErr[$key1] || $arrErr[$key2] || $arrErr[$key3]}-->
+      <span class="attention"><!--{$arrErr[$key1]}--></span>
+      <span class="attention"><!--{$arrErr[$key2]}--></span>
+      <span class="attention"><!--{$arrErr[$key3]}--></span>
+      <!--{/if}-->
+      <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+      <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" /> - 
+      <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+      </td>
+    </tr>
+    <tr>
+      <th>FAX</th>
+      <td>
+      <!--{assign var=key1 value="law_fax01"}-->
+      <!--{assign var=key2 value="law_fax02"}-->
+      <!--{assign var=key3 value="law_fax03"}-->
+      <!--{if $arrErr[$key1] || $arrErr[$key2] || $arrErr[$key3]}-->
+      <span class="attention"><!--{$arrErr[$key1]}--></span>
+      <span class="attention"><!--{$arrErr[$key2]}--></span>
+      <span class="attention"><!--{$arrErr[$key3]}--></span>
+      <!--{/if}-->
+      <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+      <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+      <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+      </td>
+    </tr>
+    <tr>
+      <th>メールアドレス<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_email"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>URL<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_url"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>商品代金以外の必要料金<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_term01"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>注文方法<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_term02"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>支払方法<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_term03"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>支払期限<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_term04"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>引き渡し時期<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_term05"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+    <tr>
+      <th>返品・交換について<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="law_term06"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+    </tr>
+  </table>
+
+  <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/seo.tpl	(revision 18873)
@@ -0,0 +1,68 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?" onSubmit="return window.confirm('登録しても宜しいですか');">
+<input type="hidden" name="mode" value="confirm">
+<input type="hidden" name="page_id" value="" />
+<div id="basis" class="contents-main">
+  <!--{if count($arrPageData) > 0 }-->
+    <!--{foreach name=page key=key item=item from=$arrPageData}-->
+    <input type="hidden" name="disp_flg<!--{$item.page_id}-->" value="<!--{$disp_flg[$item.page_id]}-->" />
+    <!-- <!--{$item.page_name}--> ここから -->
+    <h2><!--{$item.page_name}--> <!--{$item.url}--><a href="#" id="switch<!--{$item.page_id}-->" style="float:right " onClick="fnDispChange('disp<!--{$item.page_id}-->', 'switch<!--{$item.page_id}-->', 'disp_flg<!--{$item.page_id}-->');"><!--{if $disp_flg[$item.page_id] == ""}--> &gt;&gt; 非表示<!--{else}--> << 表示<!--{/if}--></a></h2>
+    
+    <div id="disp<!--{$item.page_id}-->" style="display:<!--{$disp_flg[$item.page_id]}-->">
+      <table>
+        <tr>
+          <th>メタタグ:Author</th>
+          <td>
+          <span class="attention"><!--{$arrErr[$item.page_id].author}--></span>
+          <input type="text" name="meta[<!--{$item.page_id}-->][author]" value="<!--{$item.author|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style='<!--{if $arrErr[$item.page_id].author != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->' /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></td>
+        </tr>
+        <tr>
+          <th>メタタグ:Description</th>
+          <td>
+          <span class="attention"><!--{$arrErr[$item.page_id].description}--></span>
+          <input type="text" name="meta[<!--{$item.page_id}-->][description]" value="<!--{$item.description|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style='<!--{if $arrErr[$item.page_id].description != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->' /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></td>
+        </tr>
+        <tr>
+          <th>メタタグ:Keywords</th>
+          <td>
+          <span class="attention"><!--{$arrErr[$item.page_id].keyword}--></span>
+          <input type="text" name="meta[<!--{$item.page_id}-->][keyword]" value="<!--{$item.keyword|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style='<!--{if $arrErr[$item.page_id].keyword != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->' /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></td>
+        </tr>
+      </table>
+    
+      <div class="btn"><button type="submit" onclick="document.form1.page_id.value = <!--{$item.page_id}-->;"><span>この内容で登録する</span></button></div>
+    
+    </div>
+    <!-- <!--{$item.page_name}--> ここまで -->
+    <!--{/foreach}-->
+  <!--{else}-->
+    <div class="no-data">
+          表示するデータがありません
+    </div>
+  <!--{/if}-->
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/index.tpl	(revision 18873)
@@ -0,0 +1,316 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.mousewheel-3.0.2.pack.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.pack.js"></script>
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->jquery.fancybox/jquery.fancybox-1.3.1.css" type="text/css" media="screen" />
+<script type="text/javascript">//<![CDATA[
+$(function() {
+    var geocoder = new google.maps.Geocoder();
+
+    $("#codeAddress").click(function() {
+        var result = true;
+        var address = $("#addr01").val() + $("#addr02").val();
+        if (geocoder && address) {
+            geocoder.geocode({'address': address}, function (results, status) {
+                if (status == google.maps.GeocoderStatus.OK) {
+                    latlng = results[0].geometry.location;
+                    $("#latitude").val(latlng.lat());
+                    $("#longitude").val(latlng.lng());
+                 } else {
+                     alert('住所の場所が見つかりません');
+                 }
+            });
+        } else {
+            alert('住所の場所が見つかりません');
+        }
+    });
+
+    $("a#mapAddress").fancybox({onStart: function() {
+        var lat = $("#latitude").val();
+        var lng = $("#longitude").val();
+
+        var latlng;
+        if (lat && lng) {
+            latlng = new google.maps.LatLng(lat, lng);
+        } else {
+            var address = $("#addr01").val() + $("#addr02").val();
+            if (geocoder) {
+                geocoder.geocode({'address': address}, function(results, status) {
+                    if (status == google.maps.GeocoderStatus.OK) {
+                        latlng = results[0].geometry.location;
+                     }
+                });
+            }
+        }
+
+        if (!latlng) {
+            // 座標が取得できない場合は北緯35度東経135度から取得
+            latlng = new google.maps.LatLng(35, 135);
+        }
+
+        var mapOptions = {zoom: 15,
+                          center: latlng,
+                          mapTypeId: google.maps.MapTypeId.ROADMAP};
+        var map = new google.maps.Map($("#maps").get(0), mapOptions);
+        var marker = new google.maps.Marker({map: map, position: latlng});
+        marker.setDraggable(true);
+
+        // TODO Maker のダブルクリックにも対応したい
+        $("#inputPoint").click(function() {
+            latlng = marker.getPosition();
+            $("#latitude").val(latlng.lat());
+            $("#longitude").val(latlng.lng());
+            $.fancybox.close();
+        });
+    }});
+});
+//]]>
+</script>
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
+<!--{* ▼登録テーブルここから *}-->
+<div id="basis" class="contents-main">
+
+  <h2>基本情報</h2>
+  <table summary="基本情報" id="basis-index-basis">
+    <tr>
+      <th>会社名</th>
+      <td>
+        <span class="attention"><!--{$arrErr.company_name}--></span>
+        <input type="text" name="company_name" value="<!--{$arrForm.company_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.company_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>会社名(カナ)</th>
+      <td>
+        <span class="attention"><!--{$arrErr.company_kana}--></span>
+        <input type="text" name="company_kana" value="<!--{$arrForm.company_kana|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.company_kana != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>店名<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.shop_name}--></span>
+        <input type="text" name="shop_name" value="<!--{$arrForm.shop_name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.shop_name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>店名(カナ)</th>
+      <td>
+        <span class="attention"><!--{$arrErr.shop_kana}--></span>
+        <input type="text" name="shop_kana" value="<!--{$arrForm.shop_kana|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.shop_kana != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>店名(英語表記)</th>
+      <td>
+        <span class="attention"><!--{$arrErr.shop_name_eng}--></span>
+        <input type="text" name="shop_name_eng" value="<!--{$arrForm.shop_name_eng|escape}-->" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.shop_name_eng != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>郵便番号<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.zip01}--></span>
+        <span class="attention"><!--{$arrErr.zip02}--></span>
+        〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|escape}-->" maxlength="3" size="6" class="box6" style="<!--{if $arrErr.zip01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|escape}-->" maxlength="4"  size="6" class="box6" style="<!--{if $arrErr.zip02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01');" />
+      </td>
+    </tr>
+    <tr>
+      <th>SHOP住所<span class="attention"> *</span></th>
+      <td>
+        <p>
+          <span class="attention"><!--{$arrErr.pref}--></span>
+          <select name="pref" style="<!--{if $arrErr.pref != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" >
+            <option value="" selected="selected">都道府県を選択</option>
+            <!--{html_options options=$arrPref selected=$arrForm.pref}-->
+          </select>
+        </p>
+        <p>
+          <span class="attention"><!--{$arrErr.addr01}--></span>
+          <input type="text" name="addr01" value="<!--{$arrForm.addr01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.addr01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="addr01" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span><br />
+          <!--{$smarty.const.SAMPLE_ADDRESS1}-->
+        </p>
+        <p>
+          <span class="attention"><!--{$arrErr.addr02}--></span>
+          <input type="text" name="addr02" value="<!--{$arrForm.addr02|escape}-->"  maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.addr02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="addr02" /><span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span><br />
+          <!--{$smarty.const.SAMPLE_ADDRESS2}-->
+        </p>
+      </td>
+    </tr>
+    <tr>
+      <th>TEL</th>
+      <td>
+        <span class="attention"><!--{$arrErr.tel01}--></span>
+        <input type="text" name="tel01" value="<!--{$arrForm.tel01}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> -
+        <input type="text" name="tel02" value="<!--{$arrForm.tel02}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> -
+        <input type="text" name="tel03" value="<!--{$arrForm.tel03}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.tel01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+      </td>
+    </tr>
+    <tr>
+      <th>FAX</th>
+      <td>
+        <span class="attention"><!--{$arrErr.fax01}--></span>
+        <input type="text" name="fax01" value="<!--{$arrForm.fax01}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> -
+        <input type="text" name="fax02" value="<!--{$arrForm.fax02}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> -
+        <input type="text" name="fax03" value="<!--{$arrForm.fax03}-->" maxlength="6" size="6" class="box6" style="<!--{if $arrErr.fax03 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+      </td>
+    </tr>
+    <tr>
+      <th>店舗営業時間</th>
+      <td>
+        <span class="attention"><!--{$arrErr.business_hour}--></span>
+        <input type="text" name="business_hour" value="<!--{$arrForm.business_hour|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.business_hour != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>商品注文受付<br />メールアドレス<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.email01}--></span>
+        <input type="text" name="email01" value="<!--{$arrForm.email01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.email01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>問い合わせ受付<br />メールアドレス<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.email02}--></span>
+        <input type="text" name="email02" value="<!--{$arrForm.email02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.email02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>メール送信元<br />メールアドレス<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.email03}--></span>
+        <input type="text" name="email03" value="<!--{$arrForm.email03|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.email03 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>送信エラー受付<br />メールアドレス<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.email04}--></span>
+        <input type="text" name="email04" value="<!--{$arrForm.email04|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="60" class="box60" style="<!--{if $arrErr.email04 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>取扱商品</th>
+      <td>
+        <!--{assign var=key value="good_traded"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key]|escape}--></textarea>
+        <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>メッセージ</th>
+      <td>
+        <!--{assign var=key value="message"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key]|escape}--></textarea>
+        <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+  </table>
+
+  <h2>定休日設定</h2>
+  <table id="basis-index-holiday">
+    <tr>
+      <th>定休日</th>
+      <td>
+        <span class="attention"><!--{$arrErr.regular_holiday_ids}--></span>
+        <!--{html_checkboxes name="regular_holiday_ids" options=$arrRegularHoliday selected=$arrForm.regular_holiday_ids}-->
+      </td>
+    </tr>
+  </table>
+
+  <h2>SHOP機能</h2>
+  <table id="basis-index-func">
+    <tr>
+      <th>消費税率<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.tax}--></span>
+        <input type="text" name="tax" value="<!--{$arrForm.tax|escape}-->" maxlength="<!--{$smarty.const.PERCENTAGE_LEN}-->" size="6" class="box6" style="<!--{if $arrErr.tax != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> ％
+      </td>
+    </tr>
+    <tr>
+      <th>課税規則<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.tax_rule}--></span>
+        <!--{html_radios name="tax_rule" options=$arrTAXRULE selected=$arrForm.tax_rule}-->
+      </td>
+    </tr>
+    <tr>
+      <th>送料無料条件</th>
+      <td>
+        <span class="attention"><!--{$arrErr.free_rule}--></span>
+        <input type="text" name="free_rule" value="<!--{$arrForm.free_rule|escape}-->" maxlength="<!--{$smarty.const.PRICE_LEN}-->" size="6" class="box6" style="<!--{if $arrErr.free_rule != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> 円以上購入時無料
+      </td>
+    </tr>
+    <tr>
+      <th>ダウンロード可能日数</th>
+      <td>
+        <span class="attention"><!--{$arrErr.downloadable_days}--></span>
+        <input type="text" name="downloadable_days" value="<!--{$arrForm.downloadable_days|escape}-->" maxlength="<!--{$smarty.const.DAYS_LEN}-->" size="6" class="box6" style="<!--{if $arrErr.downloadable_days != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" /> 日間有効
+        <input type="checkbox" name="downloadable_days_unlimited" value="1" <!--{if $arrForm.downloadable_days_unlimited == "1"}-->checked<!--{/if}--> onclick="fnCheckLimit('downloadable_days', 'downloadable_days_unlimited', '<!--{$smarty.const.DISABLED_RGB}-->');"/>無制限
+      </td>
+    </tr>
+  </table>
+
+  <h2>地図設定</h2>
+  <table id="basis-index-func">
+    <tr>
+      <th>緯度/経度情報</th>
+      <td>
+        <span class="attention"><!--{$arrErr.latitude}--></span>
+        <span class="attention"><!--{$arrErr.longitude}--></span>
+        緯度: <input type="text" name="latitude" value="<!--{$arrForm.latitude|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{if $arrErr.latitude != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="latitude" />
+        経度: <input type="text" name="longitude" value="<!--{$arrForm.longitude|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{if $arrErr.longitude != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" id="longitude" />
+        <input type="button" name="codeAddress" id="codeAddress" value="住所より自動取得" />
+        <a href="#maparea" id="mapAddress">地図で設定</a>
+      </td>
+    </tr>
+ </table>
+
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+</div>
+<div style="display: none">
+  <div id="maparea">
+    <div id="maps" style="width: 300px; height: 300px"></div>
+    <input type="button" id="inputPoint" value="この位置を入力" />
+  </div>
+</div>
+<!--{* ▲登録テーブルここまで *}-->
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/subnavi.tpl	(revision 18873)
@@ -0,0 +1,36 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-basis-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>SHOPマスタ</span></a></li>
+<li<!--{if $tpl_subno == 'tradelaw'}--> class="on"<!--{/if}--> id="navi-basis-tradelaw"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/tradelaw.php"><span>特定商取引法</span></a></li>
+<li<!--{if $tpl_subno == 'delivery'}--> class="on"<!--{/if}--> id="navi-basis-delivery"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/delivery.php"><span>配送設定</span></a></li>
+<li<!--{if $tpl_subno == 'payment'}--> class="on"<!--{/if}--> id="navi-basis-payment"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/payment.php"><span>支払方法設定</span></a></li>
+<li<!--{if $tpl_subno == 'point'}--> class="on"<!--{/if}--> id="navi-basis-point"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/point.php"><span>ポイント設定</span></a></li>
+<li<!--{if $tpl_subno == 'mail'}--> class="on"<!--{/if}--> id="navi-basis-mail"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/mail.php"><span>メール設定</span></a></li>
+<li<!--{if $tpl_subno == 'seo'}--> class="on"<!--{/if}--> id="navi-basis-seo"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/seo.php"><span>SEO管理</span></a></li>
+<li<!--{if $tpl_subno == 'kiyaku'}--> class="on"<!--{/if}--> id="navi-basis-kiyaku"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/kiyaku.php"><span>会員規約設定</span></a></li>
+<li<!--{if $tpl_subno == 'zip_install'}--> class="on"<!--{/if}--> id="navi-basis-zip"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/zip_install.php"><span>郵便番号DB登録</span></a></li>
+<li<!--{if $tpl_subno == 'control'}--> class="on"<!--{/if}--> id="navi-basis-control"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/control.php"><span>サイト管理設定</span></a></li>
+<li<!--{if $tpl_subno == 'holiday'}--> class="on"<!--{/if}--> id="navi-basis-holiday"><a href="<!--{$smarty.const.URL_DIR}-->admin/basis/holiday.php"><span>定休日管理</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/zip_install.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/zip_install.tpl	(revision 18873)
@@ -0,0 +1,61 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{if $tpl_mode|strlen == 0 || $arrErr|@count >= 1}-->
+    <style type="text/css">
+        .item {
+            margin-top: 1em;
+        }
+    </style>
+    <form name="form1" id="form1" method="get" action="?" onsubmit="return false;">
+        <input type="hidden" name="mode" value="">
+        <p>郵便番号CSVには <!--{$tpl_line|escape}--> 行のデータがあります。</p>
+        <p>郵便番号DBには <!--{$tpl_count_mtb_zip|escape}--> 行のデータがあります。</p>
+        <!--{if $tpl_count_mtb_zip == 0}-->
+            <p class="attention">登録を行なってください。</p>
+        <!--{elseif $tpl_line <> $tpl_count_mtb_zip}-->
+            <p class="attention">行数に差異があります。登録に異常がある恐れがあります。</p>
+        <!--{/if}-->
+
+        <div style="margin: 1em 0;">
+            <p>通常は、[自動登録] を利用してください。<br />
+                ただし、タイムアウトしてしまう環境では、タイムアウトした後に [手動登録] を正常に完了するまで繰り返してください。</p>
+        </div>
+
+        <div class="item">
+            <button type="button" onclick="fnModeSubmit('auto', '', '');">自動登録</button><br />
+            全ての郵便番号を削除してから、登録しなおします。タイムアウトした場合、元の状態に戻ります。
+        </div>
+        <div class="item">
+            <button type="button" onclick="fnModeSubmit('delete', '', '');">手動削除</button><br />
+            全ての郵便番号を削除します。再登録するまで、住所自動入力は機能しなくなります。
+        </div>
+        <div class="item">
+            <button type="button" onclick="fnModeSubmit('manual', '', '');">手動登録</button>
+            開始行: <input type="text" name="startRowNum" value="<!--{$arrForm.startRowNum|default:$tpl_count_mtb_zip+1|escape}-->" size="8"><span class="attention"><!--{$arrErr.startRowNum}--></span><br />
+            指定した行数から郵便番号を登録します。タイムアウトした場合、直前まで登録されます。
+        </div>
+    </form>
+<!--{else}-->
+    <iframe src="?mode=<!--{$tpl_mode|escape}-->&amp;exec=yes&amp;startRowNum=<!--{$arrForm.startRowNum|escape}-->" name="progress" height="200" width="750" frameborder="0"></iframe>
+<!--{/if}-->
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 18873)
@@ -0,0 +1,105 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="holiday_id" value="<!--{$tpl_holiday_id}-->" />
+<div id="basis" class="contents-main">
+  <h2>定休日登録</h2>
+
+  <table class="form">
+    <tr>
+      <th>タイトル<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
+        <input type="text" name="title" value="<!--{$arrForm.title|escape}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+        <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>日付<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.date || $arrErr.month || $arrErr.day}-->
+        <span class="attention"><!--{$arrErr.date}--></span>
+        <span class="attention"><!--{$arrErr.month}--></span>
+        <span class="attention"><!--{$arrErr.day}--></span>
+        <!--{/if}-->
+        <select name="month" style="<!--{$arrErr.month|sfGetErrorColor}-->">
+          <option value="">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.month}-->
+        </select>月
+        <select name="day" style="<!--{$arrErr.day|sfGetErrorColor}-->">
+          <option value="">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.day}-->
+        </select>日
+        <br />
+        <span class="attention">振替え休日は自動設定されないので、振替え先の日付を設定してください。</span>
+      </td>
+    </tr>
+  </table>
+
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+
+  <table class="list">
+    <tr>
+      <th>タイトル</th>
+      <th>日付</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrHoliday}-->
+    <tr style="background:<!--{if $tpl_class_id != $arrHoliday[cnt].holiday_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;">
+      <!--{assign var=holiday_id value=$arrHoliday[cnt].holiday_id}-->
+      <td><!--{$arrHoliday[cnt].title|escape}--></td>
+      <td><!--{$arrHoliday[cnt].month|escape}-->月<!--{$arrHoliday[cnt].day|escape}-->日</td>
+      <td class="center">
+        <!--{if $tpl_holiday_id != $arrHoliday[cnt].holiday_id}-->
+        <a href="?" onclick="fnModeSubmit('pre_edit', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">編集</a>
+        <!--{else}-->
+        編集中
+        <!--{/if}-->
+      </td>
+      <td class="center">
+        <!--{if $arrClassCatCount[$class_id] > 0}-->
+        -
+        <!--{else}-->
+        <a href="?" onclick="fnModeSubmit('delete', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;">削除</a>
+        <!--{/if}-->
+      </td>
+      <td class="center">
+        <!--{if $smarty.section.cnt.iteration != 1}-->
+        <a href="?" onclick="fnModeSubmit('up', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />上へ</a>
+        <!--{/if}-->
+        <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+        <a href="?" onclick="fnModeSubmit('down', 'holiday_id', <!--{$arrHoliday[cnt].holiday_id}-->); return false;" />下へ</a>
+        <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/point.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/point.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/point.tpl	(revision 18873)
@@ -0,0 +1,52 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="point_form" id="point_form" method="post" action="">
+<input type="hidden" name="mode" value="<!--{$tpl_mode}-->" />
+<div id="basis" class="contents-main">
+  <table>
+    <tr>
+      <th>ポイント付与率<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="point_rate"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="6" class="box6" />
+      ％　小数点以下切り捨て</td>
+    </tr>
+    <tr>
+      <th>会員登録時付与ポイント<span class="attention"> *</span></th>
+      <td>
+      <!--{assign var=key value="welcome_point"}-->
+      <!--{if $arrErr[$key]}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <!--{/if}-->
+      <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="6" class="box6" />
+       pt</td>
+    </tr>
+  </table>
+
+  <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl	(revision 18873)
@@ -0,0 +1,109 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+//-->
+</script>
+
+<form name="form1" id="form1" method="post" action="" enctype="multipart/form-data">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="payment_id" value="<!--{$tpl_payment_id}-->" />
+<input type="hidden" name="image_key" value="" />
+<input type="hidden" name="fix" value="<!--{$arrForm.fix.value}-->" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<input type="hidden" name="charge_flg" value="<!--{$charge_flg}-->" />
+  <h2>支払方法登録・編集</h2>
+  
+    <table class="form">
+      <tr>
+        <th>支払方法<span class="attention"> *</span></th>
+        <td>
+          <!--{assign var=key value="payment_method"}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" size="30" class="box30" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th>手数料<span class="attention"> *</span></th>
+        <td>
+          <!--{if $charge_flg == 2}-->
+          設定できません
+          <!--{else}-->
+          <!--{assign var=key value="charge"}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|escape}-->" size="10" class="box10" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+           円
+          <!--{/if}-->
+        </td>
+      </tr>
+      <tr>
+        <th>利用条件(円)</th>
+        <td>
+          <!--{assign var=key_from value="rule"}-->
+          <!--{assign var=key_to value="upper_rule"}-->
+          <span class="attention"><!--{$arrErr[$key_from]}--></span>
+          <span class="attention"><!--{$arrErr[$key_to]}--></span>
+          <input type="text" name="<!--{$arrForm[$key_from].keyname}-->" value="<!--{$arrForm[$key_from].value|escape}-->" size="10" class="box10" maxlength="<!--{$arrForm[$key_from].length}-->" style="<!--{$arrErr[$key_from]|sfGetErrorColor}-->" />
+           円
+           ～ 
+          <input type="text" name="<!--{$arrForm[$key_to].keyname}-->" value="<!--{$arrForm[$key_to].value|escape}-->" size="10" class="box10" maxlength="<!--{$arrForm[$key_to].length}-->" style="<!--{$arrErr[$key_to]|sfGetErrorColor}-->" />
+           円
+        </td>
+      </tr>
+      <tr>
+        <th>配送サービス<span class="attention"> *</span></th>
+        <td>
+          <!--{assign var=key value="deliv_id"}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <select name="deliv_id" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+          <option value="" />指定しない</option>
+          <!--{html_options options=$arrDelivList selected=$arrForm[$key].value}-->
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <th>ロゴ画像</th>
+        <td>
+          <!--{assign var=key value="payment_image"}-->
+          <span class="attention"><!--{$arrErr[$key]}--></span>
+          <!--{if $arrFile[$key].filepath != ""}-->
+          <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->">　<a href="" onclick="fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+          <!--{/if}-->
+          <input type="file" name="<!--{$key}-->" size="25" class="box25" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+          <input type="button" name="btn" onclick="fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+        </td>
+      </tr>
+    </table>
+  
+  <div class="btn"><button type="submit"><span>この内容で登録する</span></button></div>
+  
+</div>
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_confirm.tpl	(revision 18873)
@@ -0,0 +1,137 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+
+function func_return(){
+    document.form1.mode.value = "return";
+    document.form1.submit();
+}
+
+//-->
+</script>
+
+
+<form name="form1" id="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="complete" />
+    <!--{foreach from=$arrForm key=key item=item}-->
+        <!--{if $key ne "mode" && $key ne "subm"}-->
+            <input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->" />
+        <!--{/if}-->
+    <!--{/foreach}-->
+    <!-- 検索条件の保持 -->
+    <!--{foreach from=$arrSearchData key="key" item="item"}-->
+        <!--{if $key ne "job" && $key ne "sex"}--><input type="hidden" name="search_data[<!--{$key|escape}-->]" value="<!--{$item|escape}-->"><!--{/if}-->
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.job key="key" item="item"}-->
+        <input type="hidden" name="search_data[job][]" value=<!--{$item}--> />
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.sex key="key" item="item"}-->
+        <input type="hidden" name="search_data[sex][]" value=<!--{$item}--> />
+    <!--{/foreach}-->
+    <div id="customer" class="contents-main">
+        <h2>顧客編集</h2>
+        <table class="form">
+            <tr>
+                <th>顧客ID<span class="attention"> *</span></th>
+                <td><!--{$arrForm.customer_id|escape}--></td>
+            </tr>
+            <tr>
+                <th>会員状態<span class="attention"> *</span></th>
+                <td><!--{if $arrForm.status == 1}-->仮会員<!--{else}-->本会員<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>お名前<span class="attention"> *</span></th>
+                <td><!--{$arrForm.name01|escape}--><!--{$arrForm.name02|escape}-->　様</td>
+            </tr>
+            <tr>
+                <th>お名前(フリガナ)<span class="attention"> *</span></th>
+                <td><!--{$arrForm.kana01|escape}--><!--{$arrForm.kana02|escape}-->　様</td>
+            </tr>
+            <tr>
+                <th>郵便番号<span class="attention"> *</span></th>
+                <td>〒 <!--{$arrForm.zip01|escape}--> - <!--{$arrForm.zip02|escape}--></td>
+            </tr>
+            <tr>
+                <th>ご住所<span class="attention"> *</span></td>
+                <td><!--{$arrPref[$arrForm.pref]|escape}--><!--{$arrForm.addr01|escape}--><!--{$arrForm.addr02|escape}--></td>
+            </tr>
+            <tr>
+                <th>メールアドレス<span class="attention"> *</span></th>
+                <td><!--{$arrForm.email|escape}--></td>
+            </tr>
+            <tr>
+                <th>携帯メールアドレス</th>
+                <td><!--{$arrForm.email_mobile|escape}--></td>
+            </tr>
+            <tr>
+                <th>お電話番号<span class="attention"> *</span></th>
+                <td><!--{$arrForm.tel01|escape}--> - <!--{$arrForm.tel02|escape}--> - <!--{$arrForm.tel03|escape}--></td>
+            </tr>
+            <tr>
+                <th>FAX</th>
+                <td><!--{if strlen($arrForm.fax01) > 0}--><!--{$arrForm.fax01|escape}--> - <!--{$arrForm.fax02|escape}--> - <!--{$arrForm.fax03|escape}--><!--{else}-->未登録<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>ご性別<span class="attention"> *</span></th>
+                <td><!--{$arrSex[$arrForm.sex]|escape}--></td>
+            </tr>
+            <tr>
+                <th>ご職業</th>
+                <td><!--{$arrJob[$arrForm.job]|escape|default:"未登録"}--></td>
+            </tr>
+            <tr>
+                <th>生年月日</th>
+                <td><!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|escape}-->年<!--{$arrForm.month|escape}-->月<!--{$arrForm.day|escape}-->日<!--{else}-->未登録<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>パスワード<span class="attention"> *</span></th>
+                <td><!--{$passlen}--></td>
+            </tr>
+            <tr>
+                <th>パスワードを忘れたときのヒント<span class="attention"> *</span></th>
+                <td>
+                    質問： <!--{$arrReminder[$arrForm.reminder]|escape}--><br />
+                    答え： <!--{$arrForm.reminder_answer|escape}-->
+                </td>
+            </tr>
+            <tr>
+                <th>メールマガジン<span class="attention"> *</span></th>
+                <td><!--{if $arrForm.mailmaga_flg eq 1}-->HTML<!--{elseif $arrForm.mailmaga_flg eq 2}-->テキスト<!--{else}-->希望しない<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>SHOP用メモ</th>
+                <td><!--{$arrForm.note|escape|nl2br|default:"未登録"}--></td>
+            </tr>
+            <tr>
+                <th>所持ポイント</td>
+                <td><!--{$arrForm.point|escape|default:"0"}--> pt</td>
+            </tr>
+        </table>
+        <div class="btn">
+            <button type="button" onclick="func_return(); return false;"><span>編集画面に戻る</span></button>
+            <button type="submit"><span>この内容で登録する</span></button>
+        </div>
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit.tpl	(revision 18873)
@@ -0,0 +1,275 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+
+    function fnReturn() {
+        document.form_search.action = './<!--{$smarty.const.DIR_INDEX_URL}-->';
+        document.form_search.submit();
+        return false;
+    }
+
+    function fnOrderidSubmit(order_id, order_id_value) {
+        if(order_id != "" && order_id_value != "") {
+            document.form2[order_id].value = order_id_value;
+        }
+        document.form2.action = '../order/edit.php';
+        document.form2.submit();
+    }
+
+//-->
+</script>
+
+<form name="form_search" method="post" action="">
+    <input type="hidden" name="mode" value="search" />
+    <!--{foreach from=$arrSearchData key="key" item="item"}-->
+        <!--{if $key ne "customer_id" && $key ne "mode" && $key ne "del_mode" && $key ne "edit_customer_id" && $key ne "del_customer_id" && $key ne "csv_mode" && $key ne "job" && $key ne "sex"}--><input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->"><!--{/if}-->
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.job key="key" item="item"}-->
+        <input type="hidden" name="job[]" value="<!--{$item}-->" />
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.sex key="key" item="item"}-->
+        <input type="hidden" name="sex[]" value="<!--{$item}-->" />
+    <!--{/foreach}-->
+</form>
+
+<form name="form1" id="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="confirm" />
+    <input type="hidden" name="edit_email" value="<!--{$tpl_edit_email}-->" />
+    <input type="hidden" name="customer_id" value="<!--{$list_data.customer_id|escape}-->" />
+
+    <!-- 検索条件の保持 -->
+    <!--{foreach from=$arrSearchData key="key" item="item"}-->
+        <!--{if $key ne "job" && $key ne "sex"}--><input type="hidden" name="search_data[<!--{$key|escape}-->]" value="<!--{$item|escape}-->"><!--{/if}-->
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.job key="key" item="item"}-->
+        <input type="hidden" name="search_data[job][]" value="<!--{$item}-->" />
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.sex key="key" item="item"}-->
+        <input type="hidden" name="search_data[sex][]" value="<!--{$item}-->" />
+    <!--{/foreach}-->
+
+    <div id="customer" class="contents-main">
+        <h2>顧客編集</h2>
+        <table class="form">
+            <tr>
+                <th>顧客ID<span class="attention"> *</span></th>
+                <td><!--{$list_data.customer_id|escape}--></td>
+            </tr>
+            <tr>
+                <th>会員状態<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.status}--></span>
+                    <input type="radio" name="status"value=1 id="no_mem" <!--{if $list_data.status == 1}--> checked="checked" <!--{/if}--> <!--{if $list_data.status == 2}-->disabled<!--{/if}-->><label for="no_mem">仮会員</label>
+                    <input type="radio" name="status"value=2 id="mem"<!--{if $list_data.status == 2}--> checked="checked" <!--{/if}-->><label for="mem">本会員</label>
+                </td>
+            </tr>
+            <tr>
+                <th>お名前<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></span>
+                    <input type="text" name="name01" value="<!--{$list_data.name01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.name01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;&nbsp;<input type="text" name="name02" value="<!--{$list_data.name02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.name02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>お名前(フリガナ)<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
+                    <input type="text" name="kana01" value="<!--{$list_data.kana01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;&nbsp;<input type="text" name="kana02" value="<!--{$list_data.kana02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>郵便番号<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
+                    〒 <input type="text" name="zip01" value="<!--{$list_data.zip01|escape}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$list_data.zip02|escape}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                    <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01');" />
+                </td>
+            </tr>
+            <tr>
+                <th>ご住所<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
+                    <select name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                        <option value="" selected="selected">都道府県を選択</option>
+                        <!--{html_options options=$arrPref selected=$list_data.pref}-->
+                    </select>
+                    <input type="text" name="addr01" value="<!--{$list_data.addr01|escape}-->" size="60" class="box60" <!--{if $arrErr.addr01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+                    <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
+                    <input type="text" name="addr02" value="<!--{$list_data.addr02|escape}-->" size="60" class="box60" <!--{if $arrErr.addr02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+                    <!--{$smarty.const.SAMPLE_ADDRESS2}-->
+                </td>
+            </tr>
+            <tr>
+                <th>メールアドレス<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.email}--></span>
+                    <input type="text" name="email" value="<!--{$list_data.email|escape}-->" size="60" class="box60" <!--{if $arrErr.email != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>携帯メールアドレス</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.email_mobile}--></span>
+                    <input type="text" name="email_mobile" value="<!--{$list_data.email_mobile|escape}-->" size="60" class="box60" <!--{if $arrErr.email_mobile != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>電話番号<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
+                    <input type="text" name="tel01" value="<!--{$list_data.tel01|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="tel02" value="<!--{$list_data.tel02|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != "" || $arrErr.tel02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="tel03" value="<!--{$list_data.tel03|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != "" || $arrErr.tel03 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>FAX</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.fax01}--><!--{$arrErr.fax02}--><!--{$arrErr.fax03}--></span>
+                    <input type="text" name="fax01" value="<!--{$list_data.fax01|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="fax02" value="<!--{$list_data.fax02|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != "" || $arrErr.tel02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="fax03" value="<!--{$list_data.fax03|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != "" || $arrErr.fax03 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>ご性別<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.sex}--></span>
+                    <span <!--{if $arrErr.sex != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                        <!--{html_radios name="sex" options=$arrSex separator=" " selected=$list_data.sex}-->
+                    </span>
+                </td>
+            </tr>
+            <tr>
+                <th>ご職業</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.job}--></span>
+                    <select name="job" <!--{if $arrErr.job != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                    <option value="" selected="selected">選択してください</option>
+                    <!--{html_options options=$arrJob selected=$list_data.job}-->
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <th>生年月日</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.year}--></span>
+                    <select name="year" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">------</option>
+                        <!--{html_options options=$arrYear selected=$list_data.year}-->
+                    </select>年
+                    <select name="month" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">----</option>
+                        <!--{html_options options=$arrMonth selected=$list_data.month}-->
+                    </select>月
+                    <select name="day" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">----</option>
+                        <!--{html_options options=$arrDay selected=$list_data.day"}-->
+                    </select>日
+                </td>
+            </tr>
+            <tr>
+                <th>パスワード<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.password}--></span>
+                    <input type="password" name="password" value="<!--{$list_data.password|escape}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字（記号不可）
+                </td>
+            </tr>
+            <tr>
+                <th>パスワードを忘れたときのヒント<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
+                    質問： 
+                    <select name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">選択してください</option>
+                        <!--{html_options options=$arrReminder selected=$list_data.reminder}-->
+                    </select><br />
+                    答え： 
+                    <input type="text" name="reminder_answer" value="<!--{$list_data.reminder_answer|escape}-->" size="30" class="box30" <!--{if $arrErr.reminder_answer != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>メールマガジン<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.mailmaga_flg}--></span>
+                    <input type="radio" name="mailmaga_flg" value="1" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 1 or $list_data.mailmaga_flg eq 4}-->checked<!--{/if}--> />HTML　
+                    <input type="radio" name="mailmaga_flg" value="2" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 2 or $list_data.mailmaga_flg eq 5}-->checked<!--{/if}--> />テキスト　
+                    <input type="radio" name="mailmaga_flg" value="3" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq "" or $list_data.mailmaga_flg eq 3 or $list_data.mailmaga_flg eq 6}-->checked<!--{/if}--> />希望しない
+                </td>
+            </tr>
+            <tr>
+                <th>SHOP用メモ</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.note}--></span>
+                    <textarea name="note" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" <!--{if $arrErr.note != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> cols="60" rows="8" class="area60"><!--{$list_data.note|escape}--></textarea>
+                </td>
+            </tr>
+            <tr>
+                <th>所持ポイント</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.point}--></span>
+                    <input type="text" name="point" value="<!--{$list_data.point|escape}-->" maxlength="<!--{$smarty.const.TEL_LEN}-->" <!--{if $arrErr.point != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> size="6" class="box6" <!--{if $arrErr.point != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> pt
+                </td>
+            </tr>
+        </table>
+
+        <div class="btn">
+            <button type="button" onclick="return fnReturn();"><span>検索画面に戻る</span></button>
+            <button type="submit"><span>確認ページへ</span></button>
+        </div>
+
+        <input type="hidden" name="order_id" value="" />
+        <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->">
+        <input type="hidden" name="edit_customer_id" value="<!--{$edit_customer_id}-->" >
+
+        <h2>購入履歴一覧</h2>
+        <p><span class="attention"><!--購入履歴一覧--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。</p>
+
+        <!--{include file=$tpl_pager}-->
+
+        <!--{if $tpl_linemax > 0}-->
+            <!--{* 購入履歴一覧表示テーブル *}-->
+            <table class="list">
+                <tr>
+                    <th>日付</th>
+                    <th>注文番号</th>
+                    <th>購入金額</th>
+                    <th>発送日</th>
+                    <th>支払方法</th>
+                </tr>
+                <!--{section name=cnt loop=$arrPurchaseHistory}-->
+                <tr class="center">
+                    <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>
+                    <!--{assign var=payment_id value="`$arrPurchaseHistory[cnt].payment_id`"}-->
+                    <td><!--{$arrPayment[$payment_id]|escape}--></td>
+                </tr>
+                <!--{/section}-->
+            </table>
+            <!--{* 購入履歴一覧表示テーブル *}-->
+        <!--{else}-->
+            <div class="message">購入履歴はありません。</div>
+        <!--{/if}-->
+
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/search_customer.tpl	(revision 18873)
@@ -0,0 +1,150 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA    02111-1307, USA.
+ */
+*}-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->">
+<meta http-equiv="content-script-type" content="text/javascript">
+<meta http-equiv="content-style-type" content="text/css">
+<link rel="stylesheet" href="<!--{$TPL_DIR}-->css/admin_contents.css" type="text/css" media="all" />
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/css.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/navi.js"></script>
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/admin.js"></script>
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+
+function func_submit(customer_id){
+    var fm = window.opener.document.form1;
+    fm.edit_customer_id.value = customer_id;
+    fm.mode.value = 'search_customer';
+    fm.submit();
+    window.close();
+    return false;
+}
+//-->
+</script>
+
+<title>管理機能</title>
+</head>
+
+<body bgcolor="#ffffff" text="#494E5F" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="preLoadImg('<!--{$TPL_DIR}-->')">
+<!--{$GLOBAL_ERR}-->
+<noscript>
+<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}-->admin/css/common.css" type="text/css" >
+</noscript>
+
+<!--▼CONTENTS-->
+<div align="center">
+　
+<!--▼検索フォーム-->
+<form name="form1" id="form1" method="post" action="<!--{$smarty.server.REQUEST_URI|escape}-->">
+<input name="mode" type="hidden" value="search">
+<input name="search_pageno" type="hidden" value="">
+<input name="customer_id" type="hidden" value="">
+<table bgcolor="#cccccc" width="420" border="0" cellspacing="1" cellpadding="5" summary=" ">
+    <tr class="fs12n">
+        <td bgcolor="#f0f0f0" width="100">顧客ID</td>
+        <td bgcolor="#ffffff" width="287" colspan="2">
+            <!--{if $arrErr.search_customer_id}--><span class="red12"><!--{$arrErr.search_customer_id}--></span><!--{/if}-->
+            <input type="text" name="search_customer_id" value="<!--{$arrForm.search_customer_id|escape}-->" size="40" class="box40" style="<!--{$arrErr.search_customer_id|sfGetErrorColor}-->"/>
+        </td>
+    </tr>
+    <tr class="fs12n">
+        <td bgcolor="#f0f0f0">顧客名</td>
+        <td bgcolor="#ffffff">
+            <!--{if $arrErr.search_name01}--><span class="red12"><!--{$arrErr.search_name01}--></span><!--{/if}-->
+            <!--{if $arrErr.search_name02}--><span class="red12"><!--{$arrErr.search_name02}--></span><!--{/if}-->
+            姓&nbsp;&nbsp;<input type="text" name="search_name01" value="<!--{$arrForm.search_name01|escape}-->" size="15" class="box15" style="<!--{$arrErr.search_name01|sfGetErrorColor}-->"/>
+            &nbsp;名&nbsp;&nbsp;<input type="text" name="search_name02" value="<!--{$arrForm.search_name02|escape}-->" size="15" class="box15" style="<!--{$arrErr.search_name02|sfGetErrorColor}-->"/>
+        </td>
+    </tr>
+    <tr class="fs12n">
+        <td bgcolor="#f0f0f0">顧客名(カナ)</td>
+        <td bgcolor="#ffffff">
+            <!--{if $arrErr.search_kana01}--><span class="red12"><!--{$arrErr.search_kana01}--></span><!--{/if}-->
+            <!--{if $arrErr.search_kana02}--><span class="red12"><!--{$arrErr.search_kana02}--></span><!--{/if}-->
+            セイ<input type="text" name="search_kana01" value="<!--{$arrForm.search_kana01|escape}-->" size="15" class="box15" style="<!--{$arrErr.search_kana01|sfGetErrorColor}-->"/>
+                                                メイ&nbsp;<input type="text" name="search_kana02" value="<!--{$arrForm.search_kana02|escape}-->" size="15" class="box15" style="<!--{$arrErr.search_kana02|sfGetErrorColor}-->"/>
+        </td>
+    </tr>
+</table>
+
+<br />
+<input type="submit" name="subm" value="検索を開始" />
+<br />
+<br />
+<!--{if $smarty.post.mode == 'search' }-->
+    <!--▼検索結果表示-->
+    <table width="420" border="0" cellspacing="0" cellpadding="0" summary=" " bgcolor="#FFFFFF">
+        <!--{if $tpl_linemax > 0}-->
+            <tr class="fs12">
+                <td align="left"><!--{$tpl_linemax}-->件が該当しました。	</td>
+            </tr>
+        <!--{/if}-->
+        <tr class="fs12">
+            <td align="center">
+            <!--▼ページナビ-->
+            <!--{$tpl_strnavi}-->
+            <!--▲ページナビ-->
+            </td>
+        </tr>
+        <tr><td height="10"></td></tr>
+    </table>
+
+    <!--▼検索後表示部分-->
+    <table width="420" border="0" cellspacing="1" cellpadding="5" bgcolor="#cccccc">
+        <tr bgcolor="#f0f0f0" align="center" class="fs12">
+            <td>顧客ID</td>
+            <td>顧客名(カナ)</td>
+            <td>TEL</td>
+            <td>決定</td>
+        </tr>
+        <!--{section name=cnt loop=$arrCustomer}-->
+        <!--▼顧客<!--{$smarty.section.cnt.iteration}-->-->
+        <tr bgcolor="#FFFFFF" class="fs12n">
+            <td width="90" align="center">
+            <!--{$arrCustomer[cnt].customer_id|escape}-->
+            </td>
+            <td><!--{$arrCustomer[cnt].name01|escape}--><!--{$arrCustomer[cnt].name02|escape}-->(<!--{$arrCustomer[cnt].kana01|escape}--><!--{$arrCustomer[cnt].kana02|escape}-->)</td>
+            <td><!--{$arrCustomer[cnt].tel01|escape}-->-<!--{$arrCustomer[cnt].tel02|escape}-->-<!--{$arrCustomer[cnt].tel03|escape}--></td>
+            <td align="center"><a href="" onClick="return func_submit(<!--{$arrCustomer[cnt].customer_id}-->)">決定</a></td>
+        </tr>
+        <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+        <!--{sectionelse}-->
+        <tr bgcolor="#FFFFFF" class="fs10n">
+            <td colspan="4">会員情報が存在しません。</td>
+        </tr>
+        <!--{/section}-->
+    </table>
+
+    <!--▲検索結果表示-->
+<!--{/if}-->
+</form>
+
+</div>
+<!--▲CONTENTS-->
+
+</body>
+</html>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/index.tpl	(revision 18873)
@@ -0,0 +1,344 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+
+  function fnCustomerPage(pageno) {
+    document.form1.search_pageno.value = pageno;
+    document.form1.submit();
+  }
+
+  function fnCSVDownload(pageno) {
+    document.form1['csv_mode'].value = 'csv';
+    document.form1.submit();
+    document.form1['csv_mode'].value = '';
+    return false;
+  }
+
+  function fnDelete(customer_id) {
+    if (confirm('この顧客情報を削除しても宜しいですか？')) {
+      document.form1.mode.value = "delete"
+      document.form1['edit_customer_id'].value = customer_id;
+      document.form1.submit();
+      return false;
+    }
+  }
+
+  function fnEdit(customer_id) {
+    document.form1.action = './edit.php';
+    document.form1.mode.value = "edit_search"
+    document.form1['edit_customer_id'].value = customer_id;
+    document.form1.search_pageno.value = 1;
+    document.form1.submit();
+    return false;
+  }
+
+  function fnReSendMail(customer_id) {
+    if (confirm('仮登録メールを再送しても宜しいですか？')) {
+      document.form1.mode.value = "resend_mail"
+      document.form1['edit_customer_id'].value = customer_id;
+      document.form1.submit();
+      return false;
+    }
+  }
+
+  function fnSubmit() {
+    document.form1.submit();
+    return false;
+  }
+//-->
+</script>
+
+
+<div id="customer" class="contents-main">
+<form name="form_search" id="form_search" method="post" action="?">
+<input type="hidden" name="mode" value="search" />
+  <h2>検索条件設定</h2>
+
+  <!--検索条件設定テーブルここから-->
+  <table class="form">
+    <tr>
+      <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>
+        <!--{if $arrErr.pref}--><span class="attention"><!--{$arrErr.pref}--></span><br /><!--{/if}-->
+        <select name="pref">
+          <option value="" selected="selected" <!--{if $arrErr.name}--><!--{sfSetErrorStyle}--><!--{/if}-->>都道府県を選択</option>
+          <!--{html_options options=$arrPref selected=$arrForm.pref}-->
+        </select>
+      </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}-->
+        <select name="birth_month" style="<!--{$arrErr.birth_month|sfGetErrorColor}-->" >
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$objDate->getMonth() selected=$arrForm.birth_month}-->
+        </select>月
+      </td>
+    </tr>
+    <tr>
+      <th>誕生日</th>
+      <td>
+        <!--{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}-->>
+          <option value="" selected="selected">----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.b_start_year}-->
+        </select>年
+        <select name="b_start_month" <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.b_start_month}-->
+        </select>月
+        <select name="b_start_day" <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.b_start_day}-->
+        </select>日～
+        <select name="b_end_year" <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.b_end_year}-->
+        </select>年
+        <select name="b_end_month" <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.b_end_month}-->
+        </select>月
+        <select name="b_end_day" <!--{if $arrErr.b_start_year || $arrErr.b_end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.b_end_day}-->
+        </select>日
+      </td>
+    </tr>
+    <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>
+    </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>
+    </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>
+    </tr>
+    <tr>
+      <th>職業</th>
+      <td><!--{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>
+    </tr>
+    <tr>
+      <th>登録・更新日</th>
+      <td>
+        <!--{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}-->>
+          <option value="" selected="selected">----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.start_year}-->
+        </select>年
+        <select name="start_month" <!--{if $arrErr.start_year || $arrErr.end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.start_month}-->
+        </select>月
+        <select name="start_day" <!--{if $arrErr.start_year || $arrErr.end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.start_day}-->
+        </select>日～
+        <select name="end_year" <!--{if $arrErr.start_year || $arrErr.end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">----</option>
+          <!--{html_options options=$arrYear selected=$arrForm.end_year}-->
+        </select>年
+        <select name="end_month" <!--{if $arrErr.start_year || $arrErr.end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.end_month}-->
+        </select>月
+        <select name="end_day" <!--{if $arrErr.start_year || $arrErr.end_year}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.end_day}-->
+        </select>日
+      </td>
+    </tr>
+    <tr>
+      <th>最終購入日</th>
+      <td>
+        <!--{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}-->">
+          <option value="" selected="selected">----</option>
+          <!--{html_options options=$objDate->getYear($smarty.const.RELEASE_YEAR)  selected=$arrForm.buy_start_year}-->
+        </select>年
+        <select name="buy_start_month" style="<!--{$arrErr.buy_start_year|sfGetErrorColor}-->">
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.buy_start_month}-->
+        </select>月
+        <select name="buy_start_day" style="<!--{$arrErr.buy_start_year|sfGetErrorColor}-->">
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.buy_start_day}-->
+        </select>日～
+        <select name="buy_end_year" style="<!--{$arrErr.buy_end_year|sfGetErrorColor}-->">
+          <option value="" selected="selected">----</option>
+          <!--{html_options options=$objDate->getYear($smarty.const.RELEASE_YEAR)  selected=$arrForm.buy_end_year}-->
+        </select>年
+        <select name="buy_end_month" style="<!--{$arrErr.buy_end_year|sfGetErrorColor}-->">
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrMonth selected=$arrForm.buy_end_month}-->
+        </select>月
+        <select name="buy_end_day" style="<!--{$arrErr.buy_end_year|sfGetErrorColor}-->">
+          <option value="" selected="selected">--</option>
+          <!--{html_options options=$arrDay selected=$arrForm.buy_end_day}-->
+        </select>日
+      </td>
+    </tr>
+    <tr>
+      <th>購入商品名</th>
+      <td>
+        <!--{if $arrErr.buy_product_name}--><span class="attention"><!--{$arrErr.buy_product_name}--></span><!--{/if}-->
+        <span style="<!--{$arrErr.buy_product_name|sfGetErrorColor}-->">
+        <input type="text" name="buy_product_name" maxlength="<!--{$smarty.const.STEXT_LEN}-->" value="<!--{$arrForm.buy_product_name|escape}-->" size="30" class="box30" style="<!--{$arrErr.buy_product_name|sfGetErrorColor}-->"/>
+        </span>
+      </td>
+    </tr>
+    <tr>
+      <th>購入商品コード</th>
+      <td>
+        <!--{if $arrErr.buy_product_code}--><span class="attention"><!--{$arrErr.buy_product_code}--></span><!--{/if}-->
+        <input type="text" name="buy_product_code" value="<!--{$arrForm.buy_product_code}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" style="<!--{$arrErr.buy_product_code|sfGetErrorColor}-->" >
+      </td>
+    </tr>
+    <tr>
+      <th>カテゴリ</th>
+      <td>
+        <select name="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+          <option value="">選択してください</option>
+          <!--{html_options options=$arrCatList selected=$arrForm.category_id}-->
+        </select>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    検索結果表示件数
+    <select name="page_rows">
+      <!--{html_options options=$arrPageRows selected=$arrForm.page_rows}-->
+    </select> 件
+    <button type="submit"><span>この条件で検索する</span></button>
+  </div>
+</form>
+
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'resend_mail') }-->
+
+<!--★★検索結果一覧★★-->
+<form name="form1" id="form1" method="post" action="?">
+<!--{foreach from=$smarty.post key="key" item="item"}-->
+<!--{if $key ne "mode" && $key ne "del_mode" && $key ne "edit_customer_id" && $key ne "del_customer_id" && $key ne "search_pageno" && $key ne "csv_mode" && $key ne "job" && $key ne "sex" && $key ne "status"}--><input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->"><!--{/if}-->
+<!--{/foreach}-->
+<!--{foreach from=$smarty.post.job key="key" item="item"}-->
+<input type="hidden" name="job[]" value=<!--{$item}-->>
+<!--{/foreach}-->
+<!--{foreach from=$smarty.post.sex key="key" item="item"}-->
+<input type="hidden" name="sex[]" value=<!--{$item}-->>
+<!--{/foreach}-->
+<!--{foreach from=$smarty.post.status key="key" item="item"}-->
+<input type="hidden" name="status[]" value=<!--{$item}-->>
+<!--{/foreach}-->
+<input type="hidden" name="mode" value="search" />
+<input type="hidden" name="del_mode" value="" />
+<input type="hidden" name="edit_customer_id" value="" />
+<input type="hidden" name="del_customer_id" value="" />
+<input type="hidden" name="search_pageno" value="<!--{$smarty.post.search_pageno|escape}-->" />
+<input type="hidden" name="csv_mode" value="" />
+
+  <h2>検索結果一覧</h2>
+　<p>
+    <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
+    <!--検索結果-->
+    <!--{if $smarty.const.ADMIN_MODE == '1'}-->
+    <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>
+  <!--{include file=$tpl_pager}-->
+
+  <!--{if count($search_data) > 0}-->
+
+  <!--検索結果表示テーブル-->
+  <table class="list" id="customer-search-result">
+    <tr>
+      <th rowspan="2">種別</th>
+      <th>顧客ID</th>
+      <th rowspan="2">顧客名/(カナ)</th>
+      <th rowspan="2">性別</th>
+      <th>TEL</th>
+      <th rowspan="2">編集</th>
+      <th rowspan="2">削除</th>
+    </tr>
+    <tr>
+      <th>都道府県</th>
+      <th>メールアドレス</th>
+    </tr>
+    <!--{foreach from=$search_data item=row}-->
+      <tr>
+        <td class="center" rowspan="2"><!--{if $row.status eq 1}-->仮<!--{else}-->本<!--{/if}--></td>
+        <td><!--{$row.customer_id|escape}--></td>
+        <td rowspan="2"><!--{$row.name01|escape}--> <!--{$row.name02|escape}-->(<!--{$row.kana01|escape}--> <!--{$row.kana02|escape}-->)</td>
+        <td class="center" rowspan="2"><!--{$arrSex[$row.sex]|escape}--></td>
+        <td><!--{$row.tel01|escape}-->-<!--{$row.tel02|escape}-->-<!--{$row.tel03|escape}--></td>
+        <td class="center" rowspan="2"><span class="icon_edit"><a href="#" onclick="return fnEdit('<!--{$row.customer_id|escape}-->');">編集</a></span></td>
+        <td class="center" rowspan="2"><span class="icon_delete"><a href="#" onclick="return fnDelete('<!--{$row.customer_id|escape}-->');">削除</a></span></td>
+      </tr>
+      <tr>
+        <td><!--{assign var=pref value=$row.pref}--><!--{$arrPref[$pref]}--></td>
+        <td><!--{mailto address=$row.email encode="javascript"}--></a><!--{if $row.status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$row.customer_id|escape}-->');">仮登録メール再送</a><!--{/if}--></td>
+      </tr>
+    <!--{/foreach}-->
+  </table>
+  <!--検索結果表示テーブル-->
+
+  <!--{/if}-->
+</form>
+<!--★★検索結果一覧★★-->
+
+<!--{/if}-->
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl	(revision 18873)
@@ -0,0 +1,26 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-customer-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客マスタ</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_complete.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/edit_complete.tpl	(revision 18873)
@@ -0,0 +1,35 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="complete" />
+<!--{foreach from=$arrForm key=key item=item}-->
+<!--{if $key ne "mode" && $key ne "subm"}-->
+<input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->" />
+<!--{/if}-->
+<!--{/foreach}-->
+<div id="customer" class="contents-main">
+  <h2>顧客編集</h2>
+  <div class="message">登録が完了致しました。</div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv.tpl	(revision 18873)
@@ -0,0 +1,65 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data" onSubmit="winSubmit('','form1', 'upload', 500, 400)">
+<input type="hidden" name="mode" value="csv_upload" />
+<div id="products" class="contents-main">
+  <!--{if $tpl_errtitle != ""}-->
+  <div class="message">
+    <span class="attention"><!--{$tpl_errtitle}--></span><br />
+    <!--{foreach key=key item=item from=$arrCSVErr}-->
+    <span class="attention"><!--{$item}-->
+    <!--{if $key != 'blank'}-->
+    [値：<!--{$arrParam[$key]}-->]
+    <!--{/if}-->
+    </span><br />
+    <!--{/foreach}-->
+  </div>
+  <!--{/if}-->
+
+  <!--▼登録テーブルここから-->
+  <table>
+    <tr>
+      <th>CSVファイル</th>
+      <td>
+        <!--{if $arrErr.csv_file}-->
+        <span class="attention"><!--{$arrErr.csv_file}--></span>
+        <!--{/if}-->
+        <input type="file" name="csv_file" size="60" class="box60" /><span class="attention">(1行目タイトル行)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>登録情報</th>
+      <td>
+        <!--{foreach name=title key=key item=item from=$arrTitle}-->
+        <!--{$smarty.foreach.title.iteration}-->項目：<!--{$item}--><br />
+        <!--{/foreach}-->
+      </td>
+    </tr>
+  </table>
+  <!--▲登録テーブルここまで-->
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+</div>
+</form>  
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/maker.tpl	(revision 18873)
@@ -0,0 +1,81 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="maker_id" value="<!--{$tpl_maker_id}-->" />
+<div id="products" class="contents-main">
+
+  <table class="form">
+    <tr>
+      <th>メーカー名<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
+        <input type="text" name="name" value="<!--{$arrForm.name|escape}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+        <span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+  </table>
+
+  <div class="btn">
+    <input type="image" onMouseover="chgImgImageSubmit('<!--{$TPL_DIR}-->img/contents/btn_regist_on.jpg',this)" onMouseout="chgImgImageSubmit('<!--{$TPL_DIR}-->img/contents/btn_regist.jpg',this)" src="<!--{$TPL_DIR}-->img/contents/btn_regist.jpg" width="123" height="24" alt="この内容で登録する" border="0" name="subm"></td>
+  </div>
+
+  <table class="list">
+    <tr>
+      <th>メーカー</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrMaker}-->
+    <tr style="background:<!--{if $tpl_class_id != $arrMaker[cnt].maker_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;">
+      <!--{assign var=maker_id value=$arrMaker[cnt].maker_id}-->
+      <td><!--{$arrMaker[cnt].name|escape}--></td>
+      <td class="center">
+        <!--{if $tpl_maker_id != $arrMaker[cnt].maker_id}-->
+        <a href="?" onclick="fnModeSubmit('pre_edit', 'maker_id', <!--{$arrMaker[cnt].maker_id}-->); return false;">編集</a>
+        <!--{else}-->
+        編集中
+        <!--{/if}-->
+      </td>
+      <td class="center">
+        <!--{if $arrClassCatCount[$class_id] > 0}-->
+        -
+        <!--{else}-->
+        <a href="?" onclick="fnModeSubmit('delete', 'maker_id', <!--{$arrMaker[cnt].maker_id}-->); return false;">削除</a>
+        <!--{/if}-->
+      </td>
+      <td class="center">
+        <!--{if $smarty.section.cnt.iteration != 1}-->
+        <a href="?" onclick="fnModeSubmit('up', 'maker_id', <!--{$arrMaker[cnt].maker_id}-->); return false;" />上へ</a>
+        <!--{/if}-->
+        <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+        <a href="?" onclick="fnModeSubmit('down', 'maker_id', <!--{$arrMaker[cnt].maker_id}-->); return false;" />下へ</a>
+        <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/review.tpl	(revision 18873)
@@ -0,0 +1,163 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<div id="products" class="contents-main">
+<form name="search_form" method="post" action="?" >
+<input type="hidden" name="mode" value="search" />
+  <h2>検索条件設定</h2>
+
+  <!--検索条件設定テーブルここから-->
+  <table>
+    <tr>
+      <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>
+    </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><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code|escape}-->" size="30" class="box30" /></td>
+    </tr>
+    <tr>
+      <th>性別</th>
+      <!--{assign var=key value=search_sex}-->
+      <td><!--{html_checkboxes name="$key" options=$arrSex selected=$arrForm[$key]}--></td>
+    </tr>
+    <tr>
+      <th>おすすめレベル</th>
+      <td>
+      <!--{assign var=key value=search_recommend_level}-->
+      <select name="<!--{$key}-->">
+      <option value="" selected="selected">選択してください</option>
+      <!--{html_options options=$arrRECOMMEND selected=$arrForm[$key].value}-->
+      </select></td>
+    </tr>
+    <tr>
+      <th>投稿日</th>
+      <td>
+      <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
+      <span class="attention"><!--{$arrErr.search_startyear}--></span>
+      <span class="attention"><!--{$arrErr.search_endyear}--></span>
+      <!--{/if}-->
+      <select name="search_startyear" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+      <option value="">----</option>
+      <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear}-->
+      </select>年
+      <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth}-->
+      </select>月
+      <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrStartDay selected=$arrForm.search_startday}-->
+      </select>日～
+      <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+      <option value="">----</option>
+      <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear}-->
+      </select>年
+      <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth}-->
+      </select>月
+      <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrEndDay selected=$arrForm.search_endday}-->
+      </select>日
+      </td>
+    </tr>
+  </table>
+
+  <div class="btn">
+    検索結果表示件数
+    <!--{assign var=key value="search_page_max"}-->
+    <!--{if $arrErr[$key]}-->
+    <span class="attention"><!--{$arrErr[$key]}--></span>
+    <!--{/if}-->
+    <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+    <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
+    </select> 件
+    <button type="submit"><span>この条件で検索する</span></button>
+  </div>
+</form>  
+
+
+<!--{if $smarty.post.mode == 'search'}-->
+
+<!--★★検索結果一覧★★-->
+<form name="form1" id="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="search" />
+  <input type="hidden" name="review_id" value="" />
+  <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
+  <!--{foreach key=key item=item from=$arrHidden}-->
+  <!--{if $key ne "search_pageno"}-->
+  <input type="hidden" name="<!--{$key}-->" value="<!--{$item}-->" />
+  <!--{/if}-->
+  <!--{/foreach}-->
+  <h2>検索結果一覧</h2>
+  <p>
+    <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>
+  <!--{include file=$tpl_pager}-->
+  
+  <!--{ if $arrReview > 0 & $tpl_linemax > 0 }-->
+  <!--検索結果表示テーブル-->
+  <table id="products-review-result" class="list">
+    <tr>
+      <th>投稿日</th>
+      <th>投稿者名</th>
+      <th>商品名</th>
+      <th>おすすめレベル</th>
+      <th>表示・非表示</th>
+      <th>編集</th>
+      <th>削除</th>
+    </tr>
+
+    <!--{section name=cnt loop=$arrReview}-->
+    <tr>
+      <td><!--{$arrReview[cnt].create_date|sfDispDBDate}--></td>
+      <td><!--{$arrReview[cnt].reviewer_name|escape}--></td>
+      <td><!--{$arrReview[cnt].name|escape}--></td>
+      <!--{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>
+    </tr>
+    <!--{/section}-->
+  </table>
+  <!--検索結果表示テーブル-->
+  <!--{ /if }-->
+</form>
+<!--{ /if }-->
+<!--★★検索結果一覧★★-->
+</div>
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 18873)
@@ -0,0 +1,87 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="classcategory_id" value="<!--{$tpl_classcategory_id}-->" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<div id="products" class="contents-main">
+
+  <table>
+    <tr>
+      <th>規格名</th>
+      <td><!--{$tpl_class_name}--></td>
+    </tr>
+    <tr>
+      <th>分類名<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.name}-->
+        <span class="attention"><!--{$arrErr.name}--></span>
+        <!--{/if}-->
+        <input type="text" name="name" value="<!--{$arrForm.name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="" size="30" class="box30" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+
+  <table class="list">
+    <tr>
+      <th>分類名</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrClassCat}-->
+    <tr style="background:<!--{if $tpl_classcategory_id != $arrClassCat[cnt].classcategory_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;">
+      <td><!--{* 規格名 *}--><!--{$arrClassCat[cnt].name|escape}--></td>
+      <td align="center" >
+      <!--{if $tpl_classcategory_id != $arrClassCat[cnt].classcategory_id}-->
+      <a href="?" onclick="fnModeSubmit('pre_edit','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">編集</a>
+      <!--{else}-->
+      編集中
+      <!--{/if}-->
+      </td>
+      <td align="center">
+      <a href="?" onclick="fnModeSubmit('delete','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">削除</a>
+      </td>
+      <td align="center">
+      <!--{if $smarty.section.cnt.iteration != 1}-->
+      <a href="?" onclick="fnModeSubmit('up','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">上へ</a>
+      <!--{/if}-->
+      <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+      <a href="?" onclick="fnModeSubmit('down','classcategory_id', <!--{$arrClassCat[cnt].classcategory_id}-->); return false;">下へ</a>
+      <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+  <div class="btn">
+    <button type="button" onclick="location.href='./class.php'"><span>前のページに戻る</span></button>
+  </div>
+</div>
+</form>  
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/class.tpl	(revision 18873)
@@ -0,0 +1,85 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="class_id" value="<!--{$tpl_class_id}-->" />
+<div id="products" class="contents-main">
+
+  <table>
+    <tr>
+      <th>規格名<span class="attention"> *</span></th>
+      <td>
+        <!--{if $arrErr.name}-->
+        <span class="attention"><!--{$arrErr.name}--></span>
+        <!--{/if}-->
+        <input type="text" name="name" value="<!--{$arrForm.name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="" size="30" class="box30" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+
+  <table class="list">
+    <tr>
+      <th>規格名 (登録数)</th>
+      <th>分類登録</th>
+      <th>編集</th>
+      <th>削除</th>
+      <th>移動</th>
+    </tr>
+    <!--{section name=cnt loop=$arrClass}-->
+    <tr style="background:<!--{if $tpl_class_id != $arrClass[cnt].class_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;">
+      <!--{assign var=class_id value=$arrClass[cnt].class_id}-->
+      <td><!--{* 規格名 *}--><!--{$arrClass[cnt].name|escape}--> (<!--{$arrClassCatCount[$class_id]|default:0}-->)</td>
+      <td align="center"><a href="<!--{$smarty.const.URL_DIR}-->" onclick="fnClassCatPage(<!--{$arrClass[cnt].class_id}-->); return false;">分類登録</a></td>
+      <td align="center">
+      <!--{if $tpl_class_id != $arrClass[cnt].class_id}-->
+      <a href="?" onclick="fnModeSubmit('pre_edit', 'class_id', <!--{$arrClass[cnt].class_id}-->); return false;">編集</a>
+      <!--{else}-->
+      編集中
+      <!--{/if}-->
+      </td>
+      <td align="center">
+      <!--{if $arrClassCatCount[$class_id] > 0}-->
+      -
+      <!--{else}-->
+      <a href="?" onclick="fnModeSubmit('delete', 'class_id', <!--{$arrClass[cnt].class_id}-->); return false;">削除</a>
+      <!--{/if}-->
+      </td>
+      <td align="center">
+      <!--{if $smarty.section.cnt.iteration != 1}-->
+      <a href="?" onclick="fnModeSubmit('up', 'class_id', <!--{$arrClass[cnt].class_id}-->); return false;">上へ</a>
+      <!--{/if}-->
+      <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+      <a href="?" onclick="fnModeSubmit('down', 'class_id', <!--{$arrClass[cnt].class_id}-->); return false;">下へ</a>
+      <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 18873)
@@ -0,0 +1,169 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<h2>商品規格登録</h2>
+<form name="form1" id="form1" method="post" action="" enctype="multipart/form-data">
+<!--{foreach key=key item=item from=$arrSearchHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
+<input type="hidden" name="pageno" value="<!--{$tpl_pageno}-->" />
+<input type="hidden" name="down_key" value="">
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<div id="products" class="contents-main">
+
+  <table>
+    <tr>
+      <th>商品名</th>
+      <td><!--{$arrForm.product_name|escape}--></td>
+    </tr>
+    <tr>
+      <th>規格1<span class="attention">*</span></th>
+      <td>
+        <!--{if $arrErr.select_class_id1}-->
+        <span class="attention"><!--{$arrErr.select_class_id1}--></span>
+        <!--{/if}-->
+        <select name="select_class_id1">
+          <option value="">選択してください</option>
+          <!--{html_options options=$arrClass selected=$arrForm.select_class_id1}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>規格2</th>
+      <td>
+        <!--{if $arrErr.select_class_id2}-->
+        <span class="attention"><!--{$arrErr.select_class_id2}--></span>
+        <!--{/if}-->
+        <select name="select_class_id2">
+          <option value="">選択してください</option>
+          <!--{html_options options=$arrClass selected=$arrForm.select_class_id2}-->
+        </select>
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    <button type="button" onclick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_TOP}-->'); fnModeSubmit('search','',''); return false;" ><span>検索結果へ戻る</span></button>
+    <button type="button" onclick="fnModeSubmit('disp','','')"><span>表示する</span></button>
+    <!--{if count($arrClassCat) > 0}-->
+    <button type="button" onclick="fnModeSubmit('delete','','');"><span>削除する</span></button>
+    <!--{/if}-->
+  </div>
+
+  <!--{if count($arrClassCat) > 0}-->
+
+  <!--{foreach item=item name=i from=$arrClassCat}-->
+    <!--{if $smarty.foreach.i.first}-->
+      <!--{assign var=cnt value=$smarty.foreach.i.total}-->
+    <!--{/if}-->
+  <!--{/foreach}-->
+
+  <div class="btn">
+    <button type="button" onclick="fnAllCheck(); return false;"><span>全選択</span></button>
+    <button type="button" onclick="fnAllUnCheck(); return false;"><span>全解除</span></button>
+    <button type="button" onclick="fnCopyValue('<!--{$cnt}-->', '<!--{$smarty.const.DISABLED_RGB}-->'); return false;"><span>一行目のデータをコピーする</span></button>
+  </div>
+
+  <!--{assign var=class_id1 value=$arrForm.class_id1}-->
+  <!--{assign var=class_id2 value=$arrForm.class_id2}-->
+  <input type="hidden" name="class_id1" value="<!--{$class_id1}-->" />
+  <input type="hidden" name="class_id2" value="<!--{$class_id2}-->" />
+  <table class="list">
+    <tr>
+      <th>登録</th>
+      <th>規格1(<!--{$arrClass[$class_id1]|default:"未選択"}-->)</th>
+      <th>規格2(<!--{$arrClass[$class_id2]|default:"未選択"}-->)</th>
+      <th>商品コード</th>
+      <th>在庫数<span class="attention">*</span></th>
+      <th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
+      <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
+      <th>実商品・ダウンロード<span class="attention"> *</span></th>
+      <th>ダウンロードファイル名<BR><span class="red"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span></th>
+      <th>ダウンロード商品用ファイルアップロード<BR>登録可能拡張子：<!--{$smarty.const.DOWNLOAD_EXTENSION}-->　(パラメータ DOWNLOAD_EXTENSION)</th>
+    </tr>
+    <!--{section name=cnt loop=$arrClassCat}-->
+    <!--{assign var=key value="error:`$smarty.section.cnt.iteration`"}-->
+    <!--{if $arrErr[$key] != ""}-->
+    <tr>
+      <td colspan="8"><span class="attention"><!--{$arrErr[$key]}--></span></td>
+    </tr>
+    <!--{/if}-->
+    <tr >
+      <!--{assign var=key value="check:`$smarty.section.cnt.iteration`"}-->
+      <td align="center">
+				<!--{assign var=id value="product_class_id:`$smarty.section.cnt.iteration`"}-->
+        <input type="hidden" name="classcategory_id1:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].classcategory_id1}-->" />
+        <input type="hidden" name="classcategory_id2:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].classcategory_id2}-->" />
+        <input type="hidden" name="name1:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].name1}-->" />
+        <input type="hidden" name="name2:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrClassCat[cnt].name2}-->" />
+        <input type="hidden" name="product_class_id:<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrForm[$id]}-->" />
+        <input type="checkbox" name="check:<!--{$smarty.section.cnt.iteration}-->" value="1" <!--{if $arrForm[$key] == 1}-->checked="checked"<!--{/if}-->>
+      </td>
+      <td><!--{$arrClassCat[cnt].name1}--></td>
+      <td><!--{$arrClassCat[cnt].name2}--></td>
+      <!--{assign var=key value="product_code:`$smarty.section.cnt.iteration`"}-->
+      <td align="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.STEXT_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
+      <!--{assign var=key value="stock:`$smarty.section.cnt.iteration`"}-->
+      <!--{assign var=chkkey value="stock_unlimited:`$smarty.section.cnt.iteration`"}-->
+      <td align="center">
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.AMOUNT_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+        <!--{assign var=key value="stock_unlimited:`$smarty.section.cnt.iteration`"}-->
+        <input type="checkbox" name="<!--{$key}-->" value="1" <!--{if $arrForm[$key] == "1"}-->checked<!--{/if}--> onClick="fnCheckStockNoLimit('<!--{$smarty.section.cnt.iteration}-->','<!--{$smarty.const.DISABLED_RGB}-->');"/>無制限
+      </td>
+      <!--{assign var=key value="price01:`$smarty.section.cnt.iteration`"}-->
+      <td align="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
+      <!--{assign var=key value="price02:`$smarty.section.cnt.iteration`"}-->
+      <td align="center"><input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->></td>
+      <td>
+        <!--{assign var=key value="down:`$smarty.section.cnt.iteration`"}-->
+        <input type="radio" name="<!--{$key}-->" value="1" <!--{if $arrForm[$key] == "1"}-->checked<!--{/if}-->/>実商品　
+        <input type="radio" name="<!--{$key}-->" value="2" <!--{if $arrForm[$key] == "2"}-->checked<!--{/if}--> />ダウンロード
+      </td>
+      <td>
+        <!--{assign var=key value="down_filename:`$smarty.section.cnt.iteration`"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key]|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr[$key] != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" size="60" class="box60" />
+      </td>
+      <!--{assign var=key value="down_realfilename:`$smarty.section.cnt.iteration`"}-->
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+          <!--{if $arrForm[$key] != ""}-->
+            <!--{$arrForm[$key]|escape}--><input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key]|escape}-->">
+            <a href="" onclick="fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
+          <!--{/if}-->
+          <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+          <input type="button" name="btn" onclick="fnModeSubmit('upload_down', 'down_key', '<!--{$key}-->')" value="アップロード">
+      </td>
+    </tr>
+    <!--{/section}-->
+  </table>
+
+  <div class="btn"><button type="submit"><span>確認ページへ</span></button></div>
+
+  <!--{/if}-->
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/review_edit.tpl	(revision 18873)
@@ -0,0 +1,103 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="complete" />
+    <input type="hidden" name="review_id" value="<!--{$arrReview.review_id|escape}-->" />
+    <!--{foreach key=key item=item from=$arrSearchHidden}-->
+        <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+    <!--{/foreach}-->
+
+    <div id="products" class="contents-main">
+
+        <!--▼編集テーブルここから-->
+        <table>
+            <tr>
+                <th>商品名</th>
+                <td><!--{$arrReview.name|escape}--></td>
+            </tr>
+            <tr>
+                <th>レビュー表示</th>
+                <td>
+                    <!--{if $arrErr.status}--><span class="attention"><!--{$arrErr.status}--></span><!--{/if}-->
+                    <input type="radio" name="status" value="2" <!--{if $arrReview.status eq 2}-->checked<!--{/if}-->>非表示<!--{if $arrReview.status eq 2 && !$tpl_status_change}--><!--{else}--><input type="radio" name="status" value="1" <!--{if $arrReview.status eq 1}-->checked<!--{/if}-->>表示<!--{/if}-->
+                </td>
+            </tr>
+            <tr>
+                <th>投稿日</th>
+                <td><!--{$arrReview.create_date|sfDispDBDate}--></td>
+            </tr>
+            <tr>
+                <th>投稿者名 <span class="attention">*</span></th>
+                <td>
+                    <!--{if $arrErr.reviewer_name}--><span class="attention"><!--{$arrErr.reviewer_name}--></span><!--{/if}-->
+                    <input type="text" class="box60" name="reviewer_name" value="<!--{$arrReview.reviewer_name|escape}-->" style="<!--{$arrErr.reviewer_name|sfGetErrorColor}-->" size=30>
+                </td>
+            </tr>
+            <tr>
+                <th>投稿者URL</th>
+                <td>
+                    <!--{if $arrErr.reviewer_url}--><span class="attention"><!--{$arrErr.reviewer_url}--></span><!--{/if}-->
+                    <input type="text" class="box60" name="reviewer_url" maxlength="<!--{$smarty.const.URL_LEN}-->" value="<!--{$arrReview.reviewer_url|escape}-->" style="<!--{$arrErr.reviewer_url|sfGetErrorColor}-->" size=30>
+                </td>
+            </tr>
+            <tr>
+                <th>性別</th>
+                <td><!--{html_radios_ex name="sex" options=$arrSex selected=$arrReview.sex}--></td>
+            </tr>
+            <tr>
+                <th>おすすめレベル <span class="attention">*</span></th>
+                <td>
+                    <!--{assign var=key value="recommend_level"}-->
+                    <!--{if $arrErr[$key]}-->
+                    <span class="attention"><!--{$arrErr[$key]}--></span>
+                    <!--{/if}-->
+                    <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" >
+                    <option value="" selected="selected">選択してください</option>
+                    <!--{html_options options=$arrRECOMMEND selected=$arrReview[$key]}-->
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <th>タイトル <span class="attention">*</span></th>
+                <td>
+                    <!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
+                    <input type="text" class="box60" name="title" value="<!--{$arrReview.title|escape}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size=30><span class="attention">
+                </td>
+            </tr>
+            <tr>
+                <th>コメント <span class="attention">*</span></th>
+                <td>
+                    <!--{if $arrErr.comment}--><span class="attention"><!--{$arrErr.comment}--></span><!--{/if}-->
+                    <textarea name="comment" rows="20" cols="60" class="area60" wrap="soft" style="<!--{$arrErr.comment|sfGetErrorColor}-->" ><!--{$arrReview.comment|escape}--></textarea>
+                </td>
+            </tr>
+        </table>
+        <!--▲編集テーブルここまで-->
+
+        <div class="btn">
+            <button type="button" onclick="document.form1.action='./review.php'; fnModeSubmit('search','','');" ><span>検索画面に戻る</span></button>
+            <button type="button" onclick="fnModeSubmit('complete','','');"><span>この内容で登録する</span></button>
+        </div>
+    </div>
+</form>
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 18873)
@@ -0,0 +1,276 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+// URLの表示非表示切り替え
+function lfnDispChange(){
+  inner_id = 'switch';
+
+  cnt = document.form1.item_cnt.value;
+  
+  if($('#disp_url1').css("display") == 'none'){
+    for (i = 1; i <= cnt; i++) {
+      disp_id = 'disp_url'+i;
+      $('#' + disp_id).css("display", "");
+  
+      disp_id = 'disp_cat'+i;
+      $('#' + disp_id).css("display", "none");
+      
+      $('#' + inner_id).html('  URL <a href="#" onClick="lfnDispChange();"> &gt;&gt; カテゴリ表示<\/a>');
+    }
+  }else{
+    for (i = 1; i <= cnt; i++) {
+      disp_id = 'disp_url'+i;
+      $('#' + disp_id).css("display", "none");
+  
+      disp_id = 'disp_cat'+i;
+      $('#' + disp_id).css("display", "");
+      
+      $('#' + inner_id).html('  カテゴリ <a href="#" onClick="lfnDispChange();"> &gt;&gt; URL表示<\/a>');
+    }
+  }
+
+}
+
+</script>
+
+
+<div id="products" class="contents-main">
+<form name="search_form" id="search_form" method="post" action="?">
+  <input type="hidden" name="mode" value="search" />
+  <!--{foreach key=key item=item from=$arrHidden}-->
+  <!--{if $key == 'campaign_id' || $key == 'search_mode'}-->
+  <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+  <!--{/if}-->
+  <!--{/foreach}-->
+  <h2>検索条件設定</h2>
+
+  <!--検索条件設定テーブルここから-->
+  <table>
+    <tr>
+      <th>商品ID</th>
+      <td>
+        <!--{if $arrErr.search_product_id}-->
+        <span class="attention"><!--{$arrErr.search_product_id}--></span>
+        <!--{/if}-->
+        <input type="text" name="search_product_id" value="<!--{$arrForm.search_product_id|escape}-->" size="30" class="box30" style="<!--{$arrErr.search_product_id|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>
+    </tr>
+    <tr>
+      <th>カテゴリ</th>
+      <td>
+        <select name="search_category_id" style="<!--{if $arrErr.search_category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->">
+        <option value="">選択してください</option>
+        <!--{html_options options=$arrCatList selected=$arrForm.search_category_id}-->
+        </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>
+    </tr>
+    <tr>
+      <th>登録・更新日</th>
+      <td>
+        <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
+        <span class="attention"><!--{$arrErr.search_startyear}--></span>
+        <span class="attention"><!--{$arrErr.search_endyear}--></span>
+        <!--{/if}-->
+        <select name="search_startyear" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+        <option value="">----</option>
+        <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear}-->
+        </select>年
+        <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth}-->
+        </select>月
+        <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrStartDay selected=$arrForm.search_startday}-->
+        </select>日～
+        <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+        <option value="">----</option>
+        <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear}-->
+        </select>年
+        <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth}-->
+        </select>月
+        <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+        <option value="">--</option>
+        <!--{html_options options=$arrEndDay selected=$arrForm.search_endday}-->
+        </select>日
+      </td>
+    </tr>
+    <tr>
+      <th>ステータス</th>
+      <td>
+      <!--{html_checkboxes name="search_product_flag" options=$arrSTATUS selected=$arrForm.search_product_flag}-->
+      </td>
+    </tr>
+  </table>
+  <div class="btn">
+    検索結果表示件数
+    <!--{assign var=key value="search_page_max"}-->
+    <!--{if $arrErr[$key]}-->
+    <span class="attention"><!--{$arrErr[$key]}--></span>
+    <!--{/if}-->
+    <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+    <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
+    </select> 件
+    <button type="submit"><span>この条件で検索する</span></button>
+  </div>
+  <!--検索条件設定テーブルここまで-->
+</form>  
+
+
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete')}-->
+
+<!--★★検索結果一覧★★-->
+<form name="form1" id="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="search" />
+  <input type="hidden" name="product_id" value="" />
+  <input type="hidden" name="category_id" value="" />
+  <!--{foreach key=key item=item from=$arrHidden}-->
+  <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+  <!--{/foreach}-->  
+  <h2>検索結果一覧</h2>
+  <p>
+    <span class="attention"><!--検索結果数--><!--{$tpl_linemax}-->件</span>&nbsp;が該当しました。
+    <!--検索結果-->
+    <!--{if $smarty.const.ADMIN_MODE == '1'}-->
+    <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>
+  <!--{include file=$tpl_pager}-->
+
+  <!--{if count($arrProducts) > 0}-->
+  <!--検索結果表示テーブル-->
+  <table class="list" id="products-search-result">
+    <tr>
+      <th rowspan="2">商品ID</th>
+      <th rowspan="2">商品画像</th>
+      <th rowspan="2">商品コード</th>
+      <th rowspan="2">価格(円)</th>
+      <th>商品名</th>
+      <th rowspan="2">在庫</th>
+      <th rowspan="2">種別</th>
+      <th rowspan="2">編集</th>
+      <th rowspan="2">確認</th>
+      <!--{if $smarty.const.OPTION_CLASS_REGIST == 1}-->
+      <th rowspan="2">規格</th>
+      <!--{/if}-->
+      <th rowspan="2">削除</th>
+      <th rowspan="2">複製</th>
+    </tr>
+    <tr>
+      <th><a href="#" onClick="lfnDispChange(); return false;">カテゴリ ⇔ URL</a></th>
+    </tr>
+
+    <!--{section name=cnt loop=$arrProducts}-->
+    <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+    <!--{assign var=status value="`$arrProducts[cnt].status`"}-->
+    <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
+      <td rowspan="2"><!--{$arrProducts[cnt].product_id}--></td>
+      <td 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>
+      <td rowspan="2"><!--{$arrProducts[cnt].product_code_min|escape}-->
+        <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
+          <br />～ <!--{$arrProducts[cnt].product_code_max|escape}-->
+        <!--{/if}-->
+      </td>
+      <!--{* 価格 *}-->
+      <td rowspan="2" class="right">
+        <!--{$arrProducts[cnt].price02_min|number_format}-->
+        <!--{if $arrProducts[cnt].price02_min != $arrProducts[cnt].price02_max}-->
+          <br />～ <!--{$arrProducts[cnt].price02_max|number_format}-->
+        <!--{/if}-->
+      </td>
+      <td><!--{$arrProducts[cnt].name|escape}--></td>
+      <!--{* 在庫 *}-->
+      <!--{* XXX 複数規格でかつ、全ての在庫数量が等しい場合は先頭に「各」と入れたれたら良いと思う。 *}-->
+      <td 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}-->
+          <br />～ <!--{if $arrProducts[cnt].stock_unlimited_max}-->無制限<!--{else}--><!--{$arrProducts[cnt].stock_max|number_format}--><!--{/if}-->
+        <!--{/if}-->
+      </td>
+      <!--{* 表示 *}-->
+      <!--{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>
+      <!--{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>
+      <!--{/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>
+    </tr>
+    <tr style="background:<!--{$arrPRODUCTSTATUS_COLOR[$status]}-->;">
+      <td>
+        <!--{* カテゴリ名 *}-->
+        <div id="disp_cat<!--{$smarty.section.cnt.iteration}-->" style="display:<!--{$cat_flg}-->">
+          <!--{foreach from=$arrProducts[cnt].categories item=category_id name=categories}-->
+            <!--{$arrCatList[$category_id]|sfTrim}-->
+            <!--{if !$smarty.foreach.categories.last}--><br /><!--{/if}-->
+          <!--{/foreach}-->
+        </div>
+
+        <!--{* URL *}-->
+        <div id="disp_url<!--{$smarty.section.cnt.iteration}-->" style="display:none">
+        <!--{$smarty.const.SITE_URL|sfTrimURL}-->/products/detail.php?product_id=<!--{$arrProducts[cnt].product_id}-->
+        </div>
+      </td>
+    </tr>
+    <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+    <!--{/section}-->
+  </table>
+  <input type="hidden" name="item_cnt" value="<!--{$arrProducts|@count}-->" />
+  <!--検索結果表示テーブル-->
+  <!--{/if}-->
+
+</form>
+
+<!--★★検索結果一覧★★-->    
+<!--{/if}-->
+</div>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/subnavi.tpl	(revision 18873)
@@ -0,0 +1,35 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<ul class="level1">
+<li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-products-index"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>商品マスタ</span></a></li>
+<li<!--{if $tpl_subno == 'product'}--> class="on"<!--{/if}--> id="navi-products-product"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/product.php"><span>商品登録</span></a></li>
+<li<!--{if $tpl_subno == 'upload_csv'}--> class="on"<!--{/if}--> id="navi-products-uploadcsv"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/upload_csv.php"><span>商品登録CSV</span></a></li>
+<li<!--{if $tpl_subno == 'class'}--> class="on"<!--{/if}--> id="navi-products-class"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/class.php"><span>規格管理</span></a></li>
+<li<!--{if $tpl_subno == 'category'}--> class="on"<!--{/if}--> id="navi-products-category"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/category.php"><span>カテゴリ管理</span></a></li>
+<li<!--{if $tpl_subno == 'upload_csv_category'}--> class="on"<!--{/if}--> id="navi-products-upload-csv-category"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/upload_csv_category.php"><span>カテゴリ登録CSV</span></a></li>
+<li<!--{if $tpl_subno == 'maker'}--> class="on"<!--{/if}--> id="navi-products-maker"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/maker.php"><span>メーカー管理</span></a></li>
+<li<!--{if $tpl_subno == 'product_rank'}--> class="on"<!--{/if}--> id="navi-products-rank"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/product_rank.php"><span>商品並び替え</span></a></li>
+<li<!--{if $tpl_subno == 'review'}--> class="on"<!--{/if}--> id="navi-products-review"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/review.php"><span>レビュー管理</span></a></li>
+<li<!--{if $tpl_subno == 'trackback'}--> class="on"<!--{/if}--> id="navi-products-trackback"><a href="<!--{$smarty.const.URL_DIR}-->admin/products/trackback.php"><span>トラックバック管理</span></a></li>
+</ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl	(revision 18873)
@@ -0,0 +1,36 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="./product_class.php">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="product_id" value="" />
+  <div class="message">
+    登録が完了致しました。<br />
+    <a href="./product.php">→続けて登録を行う</a><br />
+    <a href="?" onclick="fnModeSubmit('pre_edit', 'product_id', '<!--{$arrForm.product_id}-->'); return false;">→この商品の規格を登録する</a>
+  </div>
+</form>
+<!--{* オペビルダー用 *}-->
+<!--{if "sfViewAdminOpe"|function_exists === TRUE}-->
+<!--{include file=`$smarty.const.MODULE_PATH`mdl_opebuilder/admin_ope_view.tpl}-->
+<!--{/if}-->
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/category.tpl	(revision 18873)
@@ -0,0 +1,170 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript" src="<!--{$TPL_DIR}-->js/jquery.tablednd.js"></script>
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id}-->">
+<input type="hidden" name="category_id" value="<!--{$arrForm.category_id}-->">
+<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>
+  </div>
+
+  <!--{* ▼画面左 *}-->
+  <div id="products-category-left">
+    <a href="?">▼ホーム</a><br />
+    <!--{section name=cnt loop=$arrTree}-->
+      <!--{assign var=level value="`$arrTree[cnt].level`}-->
+
+      <!--{* 上の階層表示の時にdivを閉じる *}-->
+      <!--{assign var=close_cnt value="`$before_level-$level+1`"}-->
+      <!--{if $close_cnt > 0}-->
+        <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+      <!--{/if}-->
+
+      <!--{* スペース繰り返し *}-->
+      <!--{section name=n loop=$level}-->　　<!--{/section}-->
+      
+      <!--{* カテゴリ名表示 *}-->
+      <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+      <!--{if $arrTree[cnt].level != $smarty.const.LEVEL_MAX}-->
+        <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false;">
+        <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+          <img src="<!--{$smarty.const.URL_DIR}-->misc/openf.gif">
+        <!--{else}-->
+          <img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif">
+        <!--{/if}-->
+        <!--{$disp_name|sfCutString:20|escape}--></a><br />
+      <!--{else}-->
+        <img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif">
+        <!--{$disp_name|sfCutString:20|escape}--></a><br />
+      <!--{/if}-->
+
+      <!--{if $arrTree[cnt].display == true}-->
+        <div id="f<!--{$arrTree[cnt].category_id}-->">
+      <!--{else}-->
+        <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+      <!--{/if}-->
+
+      <!--{if $smarty.section.cnt.last}-->
+        <!--{section name=n loop=$level}--></div><!--{/section}-->
+      <!--{/if}-->
+
+      <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+    <!--{/section}-->
+  </div>
+  <!--{* ▲画面左 *}-->
+
+  <!--{* ▼画面右 *}-->
+  <div id="products-category-right">
+    
+    <!--{if $arrErr.category_name}-->
+    <span class="attention"><!--{$arrErr.category_name}--></span>
+    <!--{/if}-->
+    <input type="text" name="category_name" value="<!--{$arrForm.category_name|escape}-->" size="30" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+    <button type="submit" onclick="fnModeSubmit('edit','','');"><span>登録</span></button><span class="attention">（上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
+    
+    <!--{if count($arrList) > 0}-->
+<script type="text/javascript">
+// カテゴリーテーブルのイニシャライズ
+$(document).ready(function() {
+    $("#categoryTable").tableDnD({
+	    onDragClass: "movingHandle",
+        onDrop: function(table, row) {
+            var rows = table.tBodies[0].rows;
+            var keys = row.id;
+
+            for (var i = 0; i < rows.length; i++) {
+                if (row.id == rows[i].id) {
+                    keys += "-" + i;
+                    break;
+                }
+            }
+
+            fnModeSubmit('moveByDnD','keySet', keys);
+        },
+        dragHandle: "dragHandle"
+    });
+
+    $("#categoryTable tr").hover(function() {
+        $(this.cells[0]).addClass('activeHandle');
+    }, function() {
+        $(this.cells[0]).removeClass('activeHandle');
+    });
+});
+</script>
+    <table class="list" id="categoryTable">
+      <tr class="nodrop nodrag">
+	  	<th width="40">移動</th>
+        <th>ID</th>
+        <th>カテゴリ名</th>
+        <th>編集</th>
+        <th>削除</th>
+        <th>移動</th>
+      </tr>
+      <!--{section name=cnt loop=$arrList}-->
+      <tr id="<!--{$arrList[cnt].category_id}-->" style="background:<!--{if $arrForm.category_id != $arrList[cnt].category_id}-->#ffffff<!--{else}--><!--{$smarty.const.SELECT_RGB}--><!--{/if}-->;" align="left">
+        <td class="dragHandle">&sect;</td>
+		<td class="center"><!--{$arrList[cnt].category_id}--></td>
+        <td>
+        <!--{if $arrList[cnt].level != $smarty.const.LEVEL_MAX}-->
+          <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrList[cnt].category_id}-->); return false"><!--{$arrList[cnt].category_name|escape}--></a>
+        <!--{else}-->
+          <!--{$arrList[cnt].category_name|escape}-->
+        <!--{/if}-->
+        </td>
+        <td align="center">
+          <!--{if $arrForm.category_id != $arrList[cnt].category_id}-->
+          <a href="?" onclick="fnModeSubmit('pre_edit', 'category_id', <!--{$arrList[cnt].category_id}-->); return false;">編集</a>
+          <!--{else}-->
+          編集中
+          <!--{/if}-->
+        </td>
+        <td align="center">
+          <a href="?" onclick="fnModeSubmit('delete', 'category_id', <!--{$arrList[cnt].category_id}-->); return false;">削除</a>
+        </td>
+        <td align="center">
+        <!--{* 移動 *}-->
+        <!--{if $smarty.section.cnt.iteration != 1}-->
+        <a href="?" onclick="fnModeSubmit('up','category_id', <!--{$arrList[cnt].category_id}-->); return false;">上へ</a>
+        <!--{/if}-->
+        <!--{if $smarty.section.cnt.iteration != $smarty.section.cnt.last}-->
+        <a href="?" onclick="fnModeSubmit('down','category_id', <!--{$arrList[cnt].category_id}-->); return false;">下へ</a>
+        <!--{/if}-->
+        </td>
+      </tr>
+      <!--{/section}-->
+    </table>
+    <!--{else}-->
+    <p>この階層には、カテゴリが登録されていません。</p>
+    <!--{/if}-->
+  </div>
+  <!--{* ▲画面右 *}-->
+
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_select.tpl	(revision 18873)
@@ -0,0 +1,103 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
+
+<script type="text/javascript">
+<!--
+self.moveTo(20,20);self.focus();
+
+function func_submit( id ){
+  var fm = window.opener.document.form1;
+  fm.recommend_id<!--{$smarty.get.no}-->.value = id;
+  fm.mode.value = 'recommend_select';
+  fm.anchor_key.value = 'recommend_no<!--{$smarty.get.no}-->';
+  fm.submit();
+  window.close();
+  return false;
+}
+//-->
+</script>
+　
+<!--▼検索フォーム-->
+<form name="form1" id="form1" method="post" action="<!--{$smarty.server.REQUEST_URI|escape}-->">
+<input name="mode" type="hidden" value="search" />
+<input name="anchor_key" type="hidden" value="" />
+<input name="search_pageno" type="hidden" value="" />
+<table>
+  <tr>
+    <th>カテゴリ</th>
+    <td>
+      <select name="search_category_id">
+        <option value="" selected="selected">選択してください</option>
+        <!--{html_options options=$arrCatList selected=$arrForm.search_category_id}-->
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <th>商品名</th>
+    <td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
+  </tr>
+</table>
+<div class="btn">
+  <input type="submit" name="subm" value="検索を開始" />
+</div>
+
+<!--▼検索結果表示-->
+<!--{if $tpl_linemax}-->
+<p><!--{$tpl_linemax}-->件が該当しました。</p>
+<!--{* ▼ページナビ *}-->
+<!--{$tpl_strnavi}-->
+<!--{* ▲ページナビ *}-->
+
+<!--{* ▼検索後表示部分 *}-->
+<table class="list">
+  <tr>
+    <th>商品画像</th>
+    <th>商品コード</th>
+    <th>商品名</th>
+    <th>決定</th>
+  </tr>
+  <!--{section name=cnt loop=$arrProducts}-->
+  <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+  <tr>
+    <td align="center">
+      <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->" />
+    </td>  
+    <td><!--{$arrProducts[cnt].product_code|escape|default:"-"}--></td>
+    <td><!--{$arrProducts[cnt].name|escape}--></td>
+    <td align="center"><a href="#" onclick="return func_submit(<!--{$arrProducts[cnt].product_id}-->)">決定</a></td>
+  </tr>
+  <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+  <!--{sectionelse}-->
+  <tr>
+    <td colspan="4">商品が登録されていません</td>
+  </tr>  
+  <!--{/section}-->
+</table>
+<!--{/if}-->
+<!--{* ▲検索結果表示 *}-->
+
+</form>
+
+<!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product.tpl	(revision 18873)
@@ -0,0 +1,469 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+// URLの表示非表示切り替え
+function lfDispSwitch(id){
+  var obj = document.getElementById(id);
+  if (obj.style.display == 'none') {
+    obj.style.display = '';
+  } else {
+    obj.style.display = 'none';
+  }
+}
+
+// セレクトボックスのリストを移動
+// (移動元セレクトボックスID, 移動先セレクトボックスID)
+function fnMoveSelect(select, target) {
+  $('#' + select).children().each(function() {
+    if (this.selected) {
+      $('#' + target).append(this);
+      $(this).attr({selected: false});
+    }
+  });
+  // IE7再描画不具合対策
+  if ($.browser.msie && $.browser.version >= 7) {
+    $('#' + select).hide();
+    $('#' + select).show();
+    $('#' + target).hide();
+    $('#' + target).show();
+  }
+}
+
+// target の子要素を選択状態にする
+function selectAll(target) {
+  $('#' + target).children().attr({selected: true});
+}
+
+</script>
+
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<!--{foreach key=key item=item from=$arrSearchHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="image_key" value="" />
+<input type="hidden" name="down_key" value="">
+<input type="hidden" name="product_id" value="<!--{$arrForm.product_id}-->" />
+<input type="hidden" name="product_class_id" value="<!--{$arrForm.product_class_id}-->" />
+<input type="hidden" name="copy_product_id" value="<!--{$arrForm.copy_product_id}-->" />
+<input type="hidden" name="anchor_key" value="" />
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<div id="products" class="contents-main">
+  <h2><!--コンテンツタイトル-->商品登録</h2>
+
+  <table class="form">
+    <tr>
+      <th>商品ID</th>
+      <td><!--{$arrForm.product_id}--></td>
+    </tr>
+    <tr>
+      <th>商品名<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.name}--></span>
+        <input type="text" name="name" value="<!--{$arrForm.name|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.name != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>商品カテゴリ<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.category_id}--></span>
+        <table class="layout">
+          <tr>
+            <td>
+              <select name="category_id[]" id="category_id" style="<!--{if $arrErr.category_id != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}--> height: 120px; min-width: 200px;" onchange="" size="10" multiple>
+              </select>
+            </td>
+            <td style="padding: 15px;">
+              <input type="button" name="on_select" value="&nbsp;&nbsp;&lt;-&nbsp;登録&nbsp;&nbsp;" onClick="fnMoveSelect('category_id_unselect','category_id')" /><br /><br />
+              <input type="button" name="un_select" value="&nbsp;&nbsp;削除&nbsp;-&gt;&nbsp;&nbsp;" onClick="fnMoveSelect('category_id','category_id_unselect')" />
+            </td>
+            <td>
+              <select name="category_id_unselect[]" id="category_id_unselect" onchange="" size="10" style="height: 120px; min-width: 200px;" multiple>
+                <!--{html_options values=$arrCatVal output=$arrCatOut selected=$arrForm.category_id}-->
+              </select>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <th>公開・非公開<span class="attention"> *</span></th>
+      <td>
+        <input type="radio" name="status" value="1" <!--{if $arrForm.status == "1"}-->checked<!--{/if}--> />公開　
+        <input type="radio" name="status" value="2" <!--{if $arrForm.status == "2"}-->checked<!--{/if}--> />非公開
+      </td>
+    </tr>
+    <tr>
+      <th>商品ステータス</th>
+      <td>
+        <!--{html_checkboxes name="product_status" options=$arrSTATUS selected=$arrForm.product_status}-->
+      </td>
+    </tr>
+    <!--{if $tpl_nonclass == true}-->
+    <tr>
+      <th>実商品・ダウンロード<span class="attention"> *</span></th>
+      <td>
+        <input type="radio" name="down" value="1" <!--{if $arrForm.down == "1"}-->checked<!--{/if}-->/>実商品　
+        <input type="radio" name="down" value="2" <!--{if $arrForm.down == "2"}-->checked<!--{/if}--> />ダウンロード
+      </td>
+    </tr>
+    <tr>
+      <th>ダウンロードファイル名<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.down_filename}--></span>
+        <input type="text" name="down_filename" value="<!--{$arrForm.down_filename|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.down_filename != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}--><!--{/if}-->" size="60" class="box60" />
+        <span class="red"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <!--{assign var=key value="down_file"}-->
+      <th>ダウンロード商品用ファイルアップロード<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--><!--{$arrErr.down_realfilename}--></span>
+          <!--{if $arrForm.down_realfilename != ""}-->
+            <!--{$arrForm.down_realfilename|escape}--><input type="hidden" name="down_realfilename" value="<!--{$arrForm.down_realfilename|escape}-->">
+            <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
+          <!--{/if}-->
+          <input type="file" name="down_file" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+          <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_down', 'down_key', '<!--{$key}-->')" value="アップロード"><BR>登録可能拡張子：<!--{$smarty.const.DOWNLOAD_EXTENSION}-->　(パラメータ DOWNLOAD_EXTENSION)
+      </td>
+    </tr>
+    <tr>
+      <th>商品コード<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.product_code}--></span>
+        <input type="text" name="product_code" value="<!--{$arrForm.product_code|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{if $arrErr.product_code != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" size="60" class="box60" />
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th><!--{$smarty.const.NORMAL_PRICE_TITLE}--></th>
+      <td>
+        <span class="attention"><!--{$arrErr.price01}--></span>
+        <input type="text" name="price01" value="<!--{$arrForm.price01|escape}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" style="<!--{if $arrErr.price01 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>円
+        <span class="attention"> (半角数字で入力)</span>
+      </td>
+    </tr>
+    <tr>
+      <th><!--{$smarty.const.SALE_PRICE_TITLE}--><span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.price02}--></span>
+        <input type="text" name="price02" value="<!--{$arrForm.price02|escape}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" style="<!--{if $arrErr.price02 != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>円
+        <span class="attention"> (半角数字で入力)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>在庫数<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.stock}--></span>
+        <input type="text" name="stock" value="<!--{$arrForm.stock|escape}-->" size="6" class="box6" maxlength="<!--{$smarty.const.AMOUNT_LEN}-->" style="<!--{if $arrErr.stock != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
+        <input type="checkbox" name="stock_unlimited" value="1" <!--{if $arrForm.stock_unlimited == "1"}-->checked<!--{/if}--> onclick="fnCheckStockLimit('<!--{$smarty.const.DISABLED_RGB}-->');"/>無制限
+      </td>
+    </tr>
+    <!--{/if}-->
+
+    <tr>
+      <th>商品送料</th>
+      <td>
+        <span class="attention"><!--{$arrErr.deliv_fee}--></span>
+        <input type="text" name="deliv_fee" value="<!--{$arrForm.deliv_fee|escape}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PRICE_LEN}-->" style="<!--{if $arrErr.deliv_fee != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>円
+        <span class="attention"> (半角数字で入力)</span>
+        <!--{if $smarty.const.OPTION_PRODUCT_DELIV_FEE != 1}--><br /><span class="attention">※現在無効です</span> (パラメータ OPTION_PRODUCT_DELIV_FEE)<!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>ポイント付与率<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.point_rate}--></span>
+        <input type="text" name="point_rate" value="<!--{$arrForm.point_rate|escape|default:$arrInfo.point_rate}-->" size="6" class="box6" maxlength="<!--{$smarty.const.PERCENTAGE_LEN}-->" style="<!--{if $arrErr.point_rate != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>％
+        <span class="attention"> (半角数字で入力)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>発送日目安</th>
+      <td>
+        <span class="attention"><!--{$arrErr.deliv_date_id}--></span>
+        <select name="deliv_date_id" style="<!--{$arrErr.deliv_date_id|sfGetErrorColor}-->">
+          <option value="">選択してください</option>
+          <!--{html_options options=$arrDELIVERYDATE selected=$arrForm.deliv_date_id}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>購入制限</th>
+      <td>
+        <span class="attention"><!--{$arrErr.sale_limit}--></span>
+        <input type="text" name="sale_limit" value="<!--{$arrForm.sale_limit|escape}-->" size="6" class="box6" maxlength="<!--{$smarty.const.AMOUNT_LEN}-->" style="<!--{if $arrErr.sale_limit != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"/>
+        <span class="attention"> (半角数字で入力)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>メーカー</th>
+      <td>
+        <span class="attention"><!--{$arrErr.maker_id}--></span>
+        <select name="maker_id" style="<!--{$arrErr.maker_id|sfGetErrorColor}-->">
+          <option value="">選択してください</option>
+          <!--{html_options options=$arrMaker selected=$arrForm.maker_id}-->
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <th>メーカーURL</th>
+      <td>
+        <span class="attention"><!--{$arrErr.comment1}--></span>
+        <input type="text" name="comment1" value="<!--{$arrForm.comment1|escape}-->" maxlength="<!--{$smarty.const.URL_LEN}-->" size="60" class="box60" style="<!--{$arrErr.comment1|sfGetErrorColor}-->" />
+        <span class="attention"> (上限<!--{$smarty.const.URL_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <!--{*
+    <tr>
+      <th>成分</th>
+      <td>
+        <textarea name="comment2" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.STEXT_LEN}-->"><!--{$arrForm.comment2|escape}--></textarea>
+        <span class="attention"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    *}-->
+    <tr>
+      <th>検索ワード<br />※複数の場合は、カンマ( , )区切りで入力して下さい</th>
+      <td>
+        <span class="attention"><!--{$arrErr.comment3}--></span>
+        <textarea name="comment3" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.comment3|sfGetErrorColor}-->"><!--{$arrForm.comment3|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>備考欄(SHOP専用)</th>
+      <td>
+        <span class="attention"><!--{$arrErr.note}--></span>
+        <textarea name="note" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.note|sfGetErrorColor}-->"><!--{$arrForm.note|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>一覧-メインコメント<span class="attention"> *</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.main_list_comment}--></span>
+        <textarea name="main_list_comment" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{if $arrErr.main_list_comment != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" cols="60" rows="8" class="area60"><!--{$arrForm.main_list_comment|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-メインコメント<span class="attention">(タグ許可)*</span></th>
+      <td>
+        <span class="attention"><!--{$arrErr.main_comment}--></span>
+        <textarea name="main_comment" value="<!--{$arrForm.main_comment|escape}-->" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{if $arrErr.main_comment != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"  cols="60" rows="8" class="area60"><!--{$arrForm.main_comment|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <!--{assign var=key value="main_list_image"}-->
+      <th>一覧-メイン画像<br />[<!--{$smarty.const.SMALL_IMAGE_WIDTH}-->×<!--{$smarty.const.SMALL_IMAGE_HEIGHT}-->]</th>
+      <td>
+        <a name="<!--{$key}-->"></a>
+        <a name="main_image"></a>
+        <a name="main_large_image"></a>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="main_list_image" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    <tr>
+      <!--{assign var=key value="main_image"}-->
+      <th>詳細-メイン画像<br />[<!--{$smarty.const.NORMAL_IMAGE_WIDTH}-->×<!--{$smarty.const.NORMAL_IMAGE_HEIGHT}-->]</th>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="main_image" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    <tr>
+      <!--{assign var=key value="main_large_image"}-->
+      <th>詳細-メイン拡大画像<br />[<!--{$smarty.const.LARGE_IMAGE_WIDTH}-->×<!--{$smarty.const.LARGE_IMAGE_HEIGHT}-->]</th>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    <!--{*　カラー比較画像、商品詳細ファイルは非対応
+    <tr>
+      <th>カラー比較画像<br />[500×500]</th>
+      <td>
+        <!--{assign var=key value="file1"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" width="<!--{$arrFile[$key].width}-->" height="<!--{$arrFile[$key].height}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="<!--{$key}-->" size="50" class="box50" />
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    <tr>
+      <th>商品詳細ファイル</th>
+      <td>
+        <!--{assign var=key value="file2"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <input type="button" name="pdf" value="ファイル確認" onclick="selectAll('category_id'); fnOpenNoMenu('<!--{$arrFile[$key].filepath}-->')"/>
+        <a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="<!--{$key}-->" size="50" class="box50" />
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    *}-->
+  </table>
+
+  <!--{* オペビルダー用 *}-->
+  <!--{if "sfViewAdminOpe"|function_exists === TRUE}-->
+  <!--{include file=`$smarty.const.MODULE_PATH`mdl_opebuilder/admin_ope_view.tpl}-->
+  <!--{/if}-->
+
+  <div class="btn">
+    <button type="button" onclick="selectAll('category_id'); lfDispSwitch('sub_detail');"><span>サブ情報表示/非表示</span></button>
+  </div>
+
+  <!--{if $sub_find == true}-->
+  <div id="sub_detail" style="">
+  <!--{else}-->
+  <div id="sub_detail" style="display:none">
+  <!--{/if}-->
+  <table class="form">
+    <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
+    <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+    <tr>
+      <th>詳細-サブタイトル(<!--{$smarty.section.cnt.iteration}-->)</th>
+      <!--{assign var=key value="sub_title`$smarty.section.cnt.iteration`"}-->
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <input type="text" name="sub_title<!--{$smarty.section.cnt.iteration}-->" value="<!--{$arrForm[$key]|escape}-->" size="60" class="box60" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
+        <span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-サブコメント(<!--{$smarty.section.cnt.iteration}-->)<span class="attention">(タグ許可)</span></th>
+      <!--{assign var=key value="sub_comment`$smarty.section.cnt.iteration`"}-->
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <textarea name="sub_comment<!--{$smarty.section.cnt.iteration}-->" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key]|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <tr>
+      <!--{assign var=key value="sub_image`$smarty.section.cnt.iteration`"}-->
+      <th>詳細-サブ画像(<!--{$smarty.section.cnt.iteration}-->)<br />[<!--{$smarty.const.NORMAL_SUBIMAGE_WIDTH}-->×<!--{$smarty.const.NORMAL_SUBIMAGE_HEIGHT}-->]</th>
+      <td>
+        <a name="<!--{$key}-->"></a>
+        <!--{assign var=largekey value="sub_large_image`$smarty.section.cnt.iteration`"}-->
+        <a name="<!--{$largekey}-->"></a>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    <tr>
+      <!--{assign var=key value="sub_large_image`$smarty.section.cnt.iteration`"}-->
+      <th>詳細-サブ拡大画像(<!--{$smarty.section.cnt.iteration}-->)<br />[<!--{$smarty.const.LARGE_SUBIMAGE_WIDTH}-->×<!--{$smarty.const.LARGE_SUBIMAGE_HEIGHT}-->]</th>
+      <td>
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <!--{if $arrFile[$key].filepath != ""}-->
+        <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" />　<a href="" onclick="selectAll('category_id'); fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+        <!--{/if}-->
+        <input type="file" name="<!--{$key}-->" size="50" class="box50" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"/>
+        <input type="button" name="btn" onclick="selectAll('category_id'); fnModeSubmit('upload_image', 'image_key', '<!--{$key}-->')" value="アップロード" />
+      </td>
+    </tr>
+    <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+    <!--{/section}-->
+  </table>
+  </div>
+
+  <div class="btn">
+    <button type="button" onclick="selectAll('category_id'); lfDispSwitch('recommend_select');"><span>関連商品表示/非表示</span></button>
+  </div>
+
+  <!--{if count($arrRecommend) > 0}-->
+  <div id="recommend_select" style="">
+  <!--{else}-->
+  <div id="recommend_select" style="display:none">
+  <!--{/if}-->
+  <table class="form">
+    <!--{if $smarty.const.OPTION_RECOMMEND == 1}-->
+    <!--▼関連商品-->
+    <!--{section name=cnt loop=$smarty.const.RECOMMEND_PRODUCT_MAX}-->
+    <!--{assign var=recommend_no value="`$smarty.section.cnt.iteration`"}-->
+    <tr>
+      <!--{assign var=key value="recommend_id`$smarty.section.cnt.iteration`"}-->
+      <!--{assign var=anckey value="recommend_no`$smarty.section.cnt.iteration`"}-->
+      <th>関連商品(<!--{$smarty.section.cnt.iteration}-->)<br />
+        <!--{if $arrRecommend[$recommend_no].product_id}-->
+          <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|escape}-->&width=65&height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->" />
+        <!--{/if}-->
+      </th>
+      <td>
+        <a name="<!--{$anckey}-->"></a>
+        <input type="hidden" name="<!--{$key}-->" value="<!--{$arrRecommend[$recommend_no].product_id|escape}-->" />
+        <input type="button" name="change" value="変更" onclick="selectAll('category_id'); win03('./product_select.php?no=<!--{$smarty.section.cnt.iteration}-->', 'search', '500', '500'); " />
+        <!--{assign var=key value="recommend_delete`$smarty.section.cnt.iteration`"}-->
+        <input type="checkbox" name="<!--{$key}-->" value="1" />削除<br />
+        商品コード:<!--{$arrRecommend[$recommend_no].product_code_min}--><br />
+        商品名:<!--{$arrRecommend[$recommend_no].name|escape}--><br />
+        <!--{assign var=key value="recommend_comment`$smarty.section.cnt.iteration`"}-->
+        <span class="attention"><!--{$arrErr[$key]}--></span>
+        <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrRecommend[$recommend_no].comment|escape}--></textarea><br />
+        <span class="attention"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span>
+      </td>
+    </tr>
+    <!--{/section}-->
+    <!--▲関連商品-->
+    <!--{/if}-->
+  </table>
+  </div>
+
+  <div class="btn">
+    <!--{if count($arrSearchHidden) > 0}-->
+    <!--▼検索結果へ戻る-->
+    <button type="button" onClick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_TOP}-->'); fnModeSubmit('search','',''); return false;"><span>検索画面に戻る</span></button>
+    <!--▲検索結果へ戻る-->
+    <!--{/if}-->
+    <button type="submit" onClick="selectAll('category_id')"><span>確認ページへ</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl	(revision 18873)
@@ -0,0 +1,94 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<h2>確認</h2>
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<!--{foreach key=key item=item from=$arrForm}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<!--{foreach key=key item=item from=$arrHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+<div id="products" class="contents-main">
+
+  <!--{if $tpl_check > 0}-->
+  <table class="list">
+    <!--{assign var=class_id1 value=$arrForm.class_id1}-->
+    <!--{assign var=class_id2 value=$arrForm.class_id2}-->
+    <tr>
+      <th>規格1(<!--{$arrClass[$class_id1]|default:"未選択"}-->)</th>
+      <th>規格2(<!--{$arrClass[$class_id2]|default:"未選択"}-->)</th>
+      <th>商品コード</th>
+      <th>在庫数</th>
+      <th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
+      <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)</th>
+      <th>実商品・ダウンロード</th>
+      <th>ダウンロードファイル名</th>
+      <th>ダウンロード商品用ファイルアップロード</th>
+    </tr>
+    <!--{section name=cnt loop=$tpl_count}-->
+    <!--{assign var=key value="check:`$smarty.section.cnt.iteration`"}-->
+    <!--{if $arrForm[$key] == 1}-->
+    <tr>
+      <!--{assign var=key value="name1:`$smarty.section.cnt.iteration`"}-->
+      <td><!--{$arrForm[$key]}--></td>
+      <!--{assign var=key value="name2:`$smarty.section.cnt.iteration`"}-->
+      <td><!--{$arrForm[$key]}--></td>
+      <!--{assign var=key value="product_code:`$smarty.section.cnt.iteration`"}-->
+      <td><!--{$arrForm[$key]}--></td>
+      <!--{assign var=key1 value="stock:`$smarty.section.cnt.iteration`"}-->
+      <!--{assign var=key2 value="stock_unlimited:`$smarty.section.cnt.iteration`"}-->
+      <td class="right">
+      <!--{if $arrForm[$key2] == 1}-->
+        無制限
+      <!--{else}-->
+        <!--{$arrForm[$key1]}-->
+      <!--{/if}-->
+      </td>
+      <!--{assign var=key value="price01:`$smarty.section.cnt.iteration`"}-->
+      <td class="right"><!--{$arrForm[$key]}--></td>
+      <!--{assign var=key value="price02:`$smarty.section.cnt.iteration`"}-->
+      <td class="right"><!--{$arrForm[$key]}--></td>
+      <!--{assign var=key value="down:`$smarty.section.cnt.iteration`"}-->
+      <!--{assign var=inkey value="`$arrForm[$key]`"}-->
+      <td class="right"><!--{$arrDown[$inkey]}--></td>
+      <!--{assign var=key value="down_filename:`$smarty.section.cnt.iteration`"}-->
+      <td class="right"><!--{$arrForm[$key]}--></td>
+      <!--{assign var=key value="down_realfilename:`$smarty.section.cnt.iteration`"}-->
+      <td class="right"><!--{$arrForm[$key]}--></td>
+    </tr>
+    <!--{/if}-->
+    <!--{/section}-->
+  </table>
+  <!--{else}-->
+  <div class="message">規格が選択されていません。</div>
+  <!--{/if}-->
+
+  <div class="btn">
+    <button type="button" onclick="fnModeSubmit('confirm_return','',''); return false"><span>前へ戻る</span></button>
+    <!--{if $tpl_check > 0}-->
+    <button type="submit"><span>この内容で登録する</span></button>
+    <!--{/if}-->
+  </div>
+</div>
+</form>
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 18873)
@@ -0,0 +1,163 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="search_form" method="post" action="?" >
+<input type="hidden" name="mode" value="search" />
+  <h2>検索条件設定</h2>
+
+  <!--検索条件設定テーブルここから-->
+  <table class="form">
+    <tr>
+      <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>
+    </tr>
+    <tr>
+      <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>
+      <select name="search_status" style="<!--{$arrErr.search_status|sfGetErrorColor}-->">
+      <option value="">----</option>
+      <!--{html_options options=$arrTrackBackStatus selected=$arrForm.search_status}-->
+      </select>
+      </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><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code|escape}-->" size="30" class="box30" /></td>
+    </tr>
+    <tr>
+      <th>投稿日</th>
+      <td>
+      <!--{if $arrErr.search_startyear || $arrErr.search_endyear}-->
+      <span class="attention"><!--{$arrErr.search_startyear}--></span>
+      <span class="attention"><!--{$arrErr.search_endyear}--></span>    
+      <!--{/if}-->
+      <select name="search_startyear" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+      <option value="">----</option>
+      <!--{html_options options=$arrStartYear selected=$arrForm.search_startyear}-->
+      </select>年
+      <select name="search_startmonth" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrStartMonth selected=$arrForm.search_startmonth}-->
+      </select>月
+      <select name="search_startday" style="<!--{$arrErr.search_startyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrStartDay selected=$arrForm.search_startday}-->
+      </select>日～
+      <select name="search_endyear" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+      <option value="">----</option>
+      <!--{html_options options=$arrEndYear selected=$arrForm.search_endyear}-->
+      </select>年
+      <select name="search_endmonth" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrEndMonth selected=$arrForm.search_endmonth}-->
+      </select>月
+      <select name="search_endday" style="<!--{$arrErr.search_endyear|sfGetErrorColor}-->">
+      <option value="">--</option>
+      <!--{html_options options=$arrEndDay selected=$arrForm.search_endday}-->
+      </select>日
+      </td>
+    </tr>
+  </table>
+
+  <div>
+    検索結果表示件数
+    <!--{assign var=key value="search_page_max"}-->
+    <!--{if $arrErr[$key]}-->
+    <span class="attention"><!--{$arrErr[$key]}--></span>
+    <!--{/if}-->
+    <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+    <!--{html_options options=$arrPageMax selected=$arrForm.search_page_max}-->
+    </select> 件
+    <button type="submit"><span>この条件で検索する</span></button>
+  </div>
+  <!--検索条件設定テーブルここまで-->
+</form>  
+
+
+<!--{if $smarty.post.mode == 'search'}-->
+
+<!--★★検索結果一覧★★-->
+<form name="form1" id="form1" method="post" action="?">
+  <input type="hidden" name="mode" value="search" />
+  <input type="hidden" name="trackback_id" value="" />
+  <input type="hidden" name="search_pageno" value="<!--{$tpl_pageno}-->" />
+  <!--{foreach key=key item=item from=$arrHidden}-->
+  <!--{if $key ne "search_pageno"}-->
+  <input type="hidden" name="<!--{$key}-->" value="<!--{$item}-->" />
+  <!--{/if}-->
+  <!--{/foreach}-->
+
+  <h2>検索結果一覧</h2>
+  <p>
+    <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>
+  </div>
+  <!--{include file=$tpl_pager}-->
+  
+  <!--{ if $arrTrackback > 0 & $tpl_linemax > 0 }-->
+  <!--{* 検索結果表示テーブル *}-->
+  <table class="list" id="products-trackback-result">
+    <tr>
+      <th>投稿日</th>
+      <th>商品名</th>
+      <th>ブログ名</th>
+      <th>ブログ記事タイトル</th>
+      <th>状態</th>
+      <th>編集</th>
+      <th>削除</th>
+    </tr>
+    
+    <!--{section name=cnt loop=$arrTrackback}-->
+    <tr>
+      <td><!--{$arrTrackback[cnt].create_date|sfDispDBDate}--></td>
+      <td><!--{$arrTrackback[cnt].name|escape}--></td>
+      <td><a href="<!--{$arrTrackback[cnt].url|escape}-->"><!--{$arrTrackback[cnt].blog_name|escape}--></a></td>
+      <td><!--{$arrTrackback[cnt].title|escape}--></td>
+      <td><!--{if $arrTrackback[cnt].status eq 1}-->表示<!--{elseif $arrTrackback[cnt].status eq 2}-->非表示<!--{elseif $arrTrackback[cnt].status eq 3}-->スパム<!--{/if}--></td>
+      <td><button type="button" onclick="fnChangeAction('./trackback_edit.php'); fnModeSubmit('','trackback_id','<!--{$arrTrackback[cnt].trackback_id}-->');"><span>編集</span></button></td>
+      <td><button type="button" onclick="fnModeSubmit('delete','trackback_id','<!--{$arrTrackback[cnt].trackback_id}-->'); return false;"><span>削除</span></button></td>
+    </tr>
+    <!--{/section}-->
+  </table>
+  <!--{* 検索結果表示テーブル *}-->
+  <!--{ /if }-->
+</form>
+<!--{ /if }-->
+<!--★★検索結果一覧★★-->    
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/trackback_edit.tpl	(revision 18873)
@@ -0,0 +1,82 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+?<form name="form1" id="form1" method="post" action="?" >
+<input type="hidden" name="mode" value="complete" />
+<!--{foreach key=key item=item from=$arrTrackback}-->
+<!--{if $key ne "mode"}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/if}-->
+<!--{/foreach}-->
+<!--{foreach key=key item=item from=$arrSearchHidden}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+<!--{/foreach}-->
+
+<div id="products" class="contents-main">
+  <h2>トラックバック設定</h2>
+
+<!--▼編集テーブルここから-->
+<table>
+  <tr>
+    <th>商品名</th>
+    <td><!--{$arrTrackback.name|escape}--></td>
+  </tr>
+  <tr>
+    <th>ブログ名</th>
+    <td><!--{$arrTrackback.blog_name|escape}--></td>
+  </tr>
+  <tr>
+    <th>ブログ記事タイトル</th>
+    <td><!--{$arrTrackback.title|escape}--></td>
+  </tr>
+  <tr>
+    <th>ブログ記事内容</th>
+    <td><!--{$arrTrackback.excerpt|escape}--></td>
+  </tr>
+  <tr>
+    <th>ブログURL</th>
+    <td><!--{$arrTrackback.url|escape}--></td>
+  </tr>
+  <tr>
+    <th>投稿日</th>
+    <td><!--{$arrTrackback.create_date|sfDispDBDate}--></td>
+  </tr>
+  <tr>
+    <th>状態</th>
+    <td>
+    <!--{assign var=key value="status"}-->
+    <span class="attention"><!--{$arrErr.status}--></span>
+    <select name="<!--{$key}-->" style="<!--{$arrErr.status|sfGetErrorColor}-->" >
+    <option value="">選択してください</option>
+    <!--{html_options options=$arrTrackBackStatus selected=$arrTrackback[$key]}-->
+    </select>
+    </td>
+  </tr>
+</table>
+<!--▲編集テーブルここまで-->
+  <div class="btn">
+    <button type="button" onclick="document.form1.action='./trackback.php'; fnModeSubmit('search','','');"><span>検索画面に戻る</span></button>
+    <button type="submit" onclick="fnModeSubmit('complete','','');"><span>この内容で登録する</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_rank.tpl	(revision 18873)
@@ -0,0 +1,134 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+<input type="hidden" name="mode" value="edit" />
+<input type="hidden" name="parent_category_id" value="<!--{$arrForm.parent_category_id}-->" />
+<input type="hidden" name="category_id" value="<!--{$arrForm.category_id}-->" />
+<input type="hidden" name="product_id" value="" />
+<input type="hidden" name="pageno" value="<!--{$tpl_pageno}-->" />
+<div id="products" class="contents-main">
+
+  <!--{* ▼画面左 *}-->
+  <div id="products-rank-left">
+    <a href="?">▼ホーム</a><br />
+    <!--{section name=cnt loop=$arrTree}-->
+      <!--{assign var=level value="`$arrTree[cnt].level`}-->
+      
+      <!--{* 上の階層表示の時にdivを閉じる *}-->
+      <!--{assign var=close_cnt value="`$before_level-$level+1`}-->
+      <!--{if $close_cnt > 0}-->
+        <!--{section name=n loop=$close_cnt}--></div><!--{/section}-->
+      <!--{/if}-->
+                
+      <!--{* スペース繰り返し *}-->
+      <!--{section name=n loop=$level}-->　　<!--{/section}-->
+      
+      <!--{* カテゴリ名表示 *}-->
+      <!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
+      <a href="?" onclick="fnModeSubmit('tree', 'parent_category_id', <!--{$arrTree[cnt].category_id}-->); return false">
+      <!--{if $arrForm.parent_category_id == $arrTree[cnt].category_id}-->
+        <img src="<!--{$smarty.const.URL_DIR}-->misc/openf.gif">
+      <!--{else}-->
+        <img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif">
+      <!--{/if}-->
+      <!--{$disp_name|sfCutString:20|escape}-->(<!--{$arrTree[cnt].product_count|default:0}-->)</a>
+    <br />          
+      <!--{if $arrTree[cnt].display == true}-->
+        <div id="f<!--{$arrTree[cnt].category_id}-->">
+      <!--{else}-->
+        <div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
+      <!--{/if}-->
+      <!--{if $smarty.section.cnt.last}-->
+        <!--{section name=n loop=$level}--></div><!--{/section}-->
+      <!--{/if}-->
+      <!--{assign var=before_level value="`$arrTree[cnt].level`}-->
+    <!--{/section}-->
+  </div>
+  <!--{* ▲画面左 *}-->
+
+  <!--▼画面右-->
+  <div id="products-rank-right">
+  <!--{if count($arrProductsList) > 0}-->
+                    
+    <p><!--{$tpl_linemax}-->件が該当しました。</p>
+    <!--{* ▼ページナビ *}-->
+    <!--{$tpl_strnavi}-->
+    <!--{* ▲ページナビ *}-->
+    
+    <!--{if $smarty.const.ADMIN_MODE == '1'}-->
+        <p class="right"><button type="button" onclick="fnModeSubmit('renumber', '', '');">内部順位再割り当て</button></p>
+    <!--{/if}-->
+    
+    <table class="list">
+      <tr>
+        <th>順位</th>
+        <th>商品コード</th>
+        <th>商品画像</th>
+        <th>商品名</th>
+        <th>移動</th>
+      </tr>
+      <!--{assign var=rank value=$tpl_start_row}-->
+      <!--{section name=cnt loop=$arrProductsList}-->
+        <tr>
+          <!--{assign var=rank value=`$rank+1`}-->
+          <td align="center">
+            <!--{$rank}-->
+            <!--{if $arrProductsList[cnt].status == "2"}--><br />(非公開)<!--{/if}-->
+          </td>
+          <td><!--{from_to from=$arrProductsList[cnt].product_code_min to=$arrProductsList[cnt].product_code_max separator="～<br />"}--></td>
+          <td align="center">
+            <!--{* 商品画像 *}-->
+            <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrProductsList[cnt].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrProducts[cnt].name|escape}-->">
+          </td>
+          <td align="center">
+            <!--{$arrProductsList[cnt].name|escape}-->
+          </td>
+          
+          <td align="center">
+          <!--{* 移動 *}-->
+          <!--{if !(count($arrProductsList) == 1 && $rank == 1)}-->
+          <input type="text" name="pos-<!--{$arrProductsList[cnt].product_id}-->" size="3" class="box3" />番目へ<a href="?" onclick="fnModeSubmit('move','product_id', '<!--{$arrProductsList[cnt].product_id}-->'); return false;">移動</a><br />
+          <!--{/if}-->
+          <!--{if !($smarty.section.cnt.first && $tpl_disppage eq 1) }-->
+          <a href="?" onclick="fnModeSubmit('up','product_id', '<!--{$arrProductsList[cnt].product_id}-->'); return false;">上へ</a>
+          <!--{/if}-->
+          <!--{if !($smarty.section.cnt.last && $tpl_disppage eq $tpl_pagemax) }-->
+          <a href="?" onclick="fnModeSubmit('down','product_id', '<!--{$arrProductsList[cnt].product_id}-->'); return false;">下へ</a>
+          <!--{/if}-->
+          </td>
+        </tr>
+      <!--{/section}-->
+    </table>
+    
+    <!--{* ▼ページナビ *}-->
+    <!--{$tpl_strnavi}-->
+    <!--{* ▲ページナビ *}-->
+  <!--{else}-->
+    <p>カテゴリを選択してください。</p>
+  <!--{/if}-->
+  </div>
+  <!--▲画面右-->
+
+</div>
+</form>    
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/upload_csv_category.tpl	(revision 18873)
@@ -0,0 +1,65 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--★★メインコンテンツ★★-->
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data" onSubmit="winSubmit('','form1', 'upload', 500, 400)">
+<input type="hidden" name="mode" value="csv_upload" />
+<div id="products" class="contents-main">
+  <!--{if $tpl_errtitle != ""}-->
+  <p>
+    <span class="attention"><!--{$tpl_errtitle}--><br />
+    <!--{foreach key=key item=item from=$arrCSVErr}-->
+    <!--{$item}-->
+    <!--{if $key != 'blank'}-->
+    [値：<!--{$arrParam[$key]}-->]
+    <!--{/if}-->
+    <br />
+    <!--{/foreach}-->
+    </span>
+  </p>
+  <!--{/if}-->
+
+  <!--▼登録テーブルここから-->
+  <table class="form">
+    <tr>
+      <th>CSVファイル</th>
+      <td>
+        <!--{if $arrErr.csv_file}--><span class="attention"><!--{$arrErr.csv_file}--></span><!--{/if}-->
+        <input type="file" name="csv_file" size="60" class="box60" /><span class="attention"> (1行目タイトル行)</span>
+      </td>
+    </tr>
+    <tr>
+      <th>登録情報</th>
+      <td>
+        <!--{foreach name=title key=key item=item from=$arrTitle}-->
+        <!--{$smarty.foreach.title.iteration}-->項目：<!--{$item}--><br>
+        <!--{/foreach}-->
+      </td>
+    </tr>
+  </table>
+  <!--▲登録テーブルここまで-->
+  <div class="btn">
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+</div>
+</form>
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 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/confirm.tpl	(revision 18873)
@@ -0,0 +1,286 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<h2>確認</h2>
+<form name="form1" id="form1" method="post" action="?" enctype="multipart/form-data">
+  <!--{foreach key=key item=item from=$arrForm}-->
+    <!--{if $key == 'product_status'}-->
+      <!--{foreach item=statusVal from=$item}-->
+      <input type="hidden" name="<!--{$key}-->[]" value="<!--{$statusVal|escape}-->" />
+      <!--{/foreach}-->
+    <!--{else}-->
+      <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+    <!--{/if}-->
+  <!--{/foreach}-->
+  <div id="products" class="contents-main">
+
+  <table>
+    <tr>
+      <th>商品名</th>
+      <td>
+      <!--{$arrForm.name|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>商品カテゴリ</th>
+      <td>
+      <!--{section name=cnt loop=$arrCategory_id}-->
+        <!--{assign var=key value=$arrCategory_id[cnt]}-->
+        <!--{$arrCatList[$key]|strip|sfTrim}--><br />
+      <!--{/section}-->
+      </td>
+    </tr>
+    <tr>
+      <th>公開・非公開</th>
+      <td>
+      <!--{$arrDISP[$arrForm.status]}-->
+      </td>
+    </tr>
+    <tr>
+      <th>商品ステータス</th>
+      <td>
+      <!--{foreach from=$arrForm.product_status item=status}-->
+        <img src="<!--{$TPL_DIR}--><!--{$arrSTATUS_IMAGE[$status]}-->">
+      <!--{/foreach}-->
+      </td>
+    </tr>
+
+    <!--{if $tpl_nonclass == true}-->
+    <tr>
+      <th>実商品・ダウンロード</th>
+      <td>
+      <!--{$arrDown[$arrForm.down]}-->
+      </td>
+    </tr>
+    <tr>
+      <th>ダウンロードファイル名</th>
+      <td>
+      <!--{$arrForm.down_filename|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>ダウンロード商品用<BR />ファイル</th>
+      <td>
+      <!--{if $arrForm.down_realfilename != ""}-->
+          <!--{$arrForm.down_realfilename|escape}-->
+      <!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>商品コード</th>
+      <td>
+      <!--{$arrForm.product_code|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th><!--{$smarty.const.NORMAL_PRICE_TITLE}--></th>
+      <td>
+      <!--{$arrForm.price01|escape}-->
+      円</td>
+    </tr>
+    <tr>
+      <th><!--{$smarty.const.SALE_PRICE_TITLE}--></th>
+      <td>
+      <!--{$arrForm.price02|escape}-->
+      円</td>
+    </tr>
+    <tr>
+      <th>在庫数</th>
+      <td>
+      <!--{if $arrForm.stock_unlimited == 1}-->
+        無制限
+      <!--{else}-->
+        <!--{$arrForm.stock|escape}-->
+      <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/if}-->
+
+    <tr>
+      <th>商品送料</th>
+      <td>
+        <!--{$arrForm.deliv_fee|escape}-->
+        円</td>
+    </tr>
+    <tr>
+      <th>ポイント付与率</th>
+      <td>
+      <!--{$arrForm.point_rate|escape}-->
+      ％</td>
+    </tr>
+    <tr>
+      <th>発送日目安</th>
+      <td>
+      <!--{$arrDELIVERYDATE[$arrForm.deliv_date_id]|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>購入制限</th>
+      <td>
+        <!--{$arrForm.sale_limit|default:'無制限'|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>メーカー</th>
+      <td>
+        <!--{$arrMaker[$arrForm.maker_id]|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>メーカーURL</th>
+      <td>
+      <!--{$arrForm.comment1|escape|sfPutBR:$smarty.const.LINE_LIMIT_SIZE}-->
+      </td>
+    </tr>
+    <!--{*
+    <tr>
+      <th>成分</th>
+      <td>
+      <!--{$arrForm.comment2|escape}-->
+      </td>
+    </tr>
+    *}-->
+    <tr>
+      <th>検索ワード</th>
+      <td>
+      <!--{$arrForm.comment3|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>備考欄(SHOP専用)</th>
+      <td>
+        <!--{$arrForm.note|escape|nl2br}-->
+      </td>
+    </tr>
+    <tr>
+      <th>一覧-メインコメント</th>
+      <td>
+      <!--{$arrForm.main_list_comment|escape|nl2br}-->
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-メインコメント</th>
+      <td>
+      <!--{$arrForm.main_comment|nl2br_html}-->
+      </td>
+    </tr>
+    <tr>
+      <th>一覧-メイン画像</th>
+      <td>
+      <!--{assign var=key value="main_list_image"}-->
+      <!--{if $arrFile[$key].filepath != ""}-->
+      <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" /><br />
+      <!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-メイン画像</th>
+      <td>
+      <!--{assign var=key value="main_image"}-->
+      <!--{if $arrFile[$key].filepath != ""}-->
+      <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" /><br />
+      <!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-メイン拡大画像</th>
+      <td>
+      <!--{assign var=key value="main_large_image"}-->
+      <!--{if $arrFile[$key].filepath != ""}-->
+      <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" /><br />
+      <!--{/if}-->
+      </td>
+    </tr>
+
+    <!--{* オペビルダー用 *}-->
+    <!--{if "sfViewAdminOpe"|function_exists === TRUE}-->
+    <!--{include file=`$smarty.const.MODULE_PATH`mdl_opebuilder/admin_ope_view.tpl}-->
+    <!--{/if}-->
+
+    <!--{section name=cnt loop=$smarty.const.PRODUCTSUB_MAX}-->
+    <!--▼商品<!--{$smarty.section.cnt.iteration}-->-->
+    <tr>
+      <th>詳細-サブタイトル（<!--{$smarty.section.cnt.iteration}-->）</th>
+      <td>
+      <!--{assign var=key value="sub_title`$smarty.section.cnt.iteration`"}-->
+      <!--{$arrForm[$key]|escape}-->
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-サブコメント（<!--{$smarty.section.cnt.iteration}-->）</th>
+      <td>
+      <!--{assign var=key value="sub_comment`$smarty.section.cnt.iteration`"}-->
+      <!--{$arrForm[$key]|nl2br_html}-->
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-サブ画像（<!--{$smarty.section.cnt.iteration}-->）</th>
+      <td>
+      <!--{assign var=key value="sub_image`$smarty.section.cnt.iteration`"}-->
+      <!--{if $arrFile[$key].filepath != ""}-->
+      <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" /><br />
+      <!--{/if}-->
+      </td>
+    </tr>
+    <tr>
+      <th>詳細-サブ拡大画像（<!--{$smarty.section.cnt.iteration}-->）</th>
+      <td>
+      <!--{assign var=key value="sub_large_image`$smarty.section.cnt.iteration`"}-->
+      <!--{if $arrFile[$key].filepath != ""}-->
+      <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|escape}-->" /><br />
+      <!--{/if}-->
+      </td>
+    </tr>
+    <!--▲商品<!--{$smarty.section.cnt.iteration}-->-->
+    <!--{/section}-->
+
+    <!--{if $smarty.const.OPTION_RECOMMEND == 1}-->
+    <!--▼関連商品-->
+    <!--{section name=cnt loop=$smarty.const.RECOMMEND_PRODUCT_MAX}-->
+    <!--{assign var=recommend_no value="`$smarty.section.cnt.iteration`"}-->
+    <tr>
+      <th>関連商品(<!--{$smarty.section.cnt.iteration}-->)<br />
+      <!--{if $arrRecommend[$recommend_no].product_id|strlen >= 1}-->
+        <img src="<!--{$smarty.const.URL_DIR}-->resize_image.php?image=<!--{$arrRecommend[$recommend_no].main_list_image|sfNoImageMainList|escape}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|escape}-->">
+      <!--{/if}-->
+      </th>
+      <td>
+      <!--{if $arrRecommend[$recommend_no].product_id|strlen >= 1}-->
+        商品コード:<!--{$arrRecommend[$recommend_no].product_code_min}--><br />
+        商品名:<!--{$arrRecommend[$recommend_no].name|escape}--><br />
+        コメント:<br />
+        <!--{$arrRecommend[$recommend_no].comment|escape|nl2br}-->
+      <!--{/if}-->
+      </td>
+    </tr>
+    <!--{/section}-->
+    <!--▲関連商品-->
+    <!--{/if}-->
+  </table>
+
+  <div class="btn">
+    <button type="button" onclick="fnModeSubmit('confirm_return','',''); return false;"><span>前のページに戻る</span></button>
+    <button type="submit"><span>この内容で登録する</span></button>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_complete.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_complete.tpl	(revision 18873)
@@ -0,0 +1,33 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="./product_class.php">
+<input type="hidden" name="mode" value="" />
+<input type="hidden" name="product_id" value="" />
+<div id="products" class="contents-main">
+  <div class="message">
+    登録が完了いたしました。<br />
+    <a href="./product.php">→続けて登録を行う</a>
+  </div>
+</div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl	(revision 18873)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl	(revision 18873)
@@ -0,0 +1,60 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<!--{* ▼CONTENTS *}-->
+<div id="login-main">
+<form name="form1" id="form1" method="post" action="login.php">
+  <h1>EC-CUBE 管理画面</h1>
+  <div id="login-form">
+    <label for="login_id">ID</label>
+    <input type="text" name="login_id" size="20" class="box25" />
+    <label for="password">PASSWORD</label>
+    <input type="password" name="password" size="20" class="box25" />
+    <div class="btn">
+      <button type="submit"><span>LOGIN</span></button>
+    </div>
+  </div>
+  <div id="login-address">Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</div>
+</form>
+</div>
+<!--{* エラーメッセージここから *}-->
+<!--{if $tpl_error}-->
+<div id="loginInputError" style="display:none;">
+  <!--{$tpl_error}-->
+</div>
+<script type="text/javascript">
+<!--
+$(funtion(){
+  tb_show('ERROR!','#TB_inline?height=200&width=400&inlineId=loginInputError','false');
+});
+// -->
+</script>
+<!--{/if}-->
+<!--{* エラーメッセージここまで *}-->
+<!--{* ▲CONTENTS *}-->
+
+<SCRIPT Language="JavaScript">
+<!--
+document.form1.login_id.focus();
+// -->
+</SCRIPT>
Index: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 18871)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql	(revision 18873)
@@ -999,7 +999,7 @@
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TPL_DIR', 'URL_DIR . USER_DIR . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 303, 'SMARTYテンプレート');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_DIR', 'SMARTY_TEMPLATES_DIR . TEMPLATE_NAME . "/"', 304, 'SMARTYテンプレート');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_ADMIN_DIR', 'SMARTY_TEMPLATES_DIR . DEFAULT_TEMPLATE_NAME . "/admin/"', 305, 'SMARTYテンプレート(管理機能)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_ADMIN_DIR', 'SMARTY_TEMPLATES_DIR . "admin/"', 305, 'SMARTYテンプレート(管理機能)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_DIR', 'DATA_PATH . "Smarty/templates_c/" . TEMPLATE_NAME . "/"', 306, 'SMARTYコンパイル');
-INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_ADMIN_DIR', 'COMPILE_DIR . "admin/"', 307, 'SMARTYコンパイル(管理機能)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_ADMIN_DIR', 'DATA_PATH . "Smarty/templates_c/admin/"', 307, 'SMARTYコンパイル(管理機能)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TEMPLATE_FTP_DIR', 'USER_PATH . USER_PACKAGE_DIR . TEMPLATE_NAME . "/"', 308, 'SMARTYテンプレート(FTP許可)');
 INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('COMPILE_FTP_DIR', 'COMPILE_DIR . USER_DIR', 309, 'SMARTYコンパイル(FTP許可)');