Index: /branches/comu-ver2/data/Smarty/templates/default/inquiry/index.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/inquiry/index.tpl	(revision 16821)
+++ /branches/comu-ver2/data/Smarty/templates/default/inquiry/index.tpl	(revision 17097)
@@ -1,190 +1,94 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja">
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 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.
- *}-->
-<head>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.USER_DIR}-->css/common.css" type="text/css">
-<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/site.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
-<title><!--{$arrSiteInfo.shop_name}-->/アンケート　<!--{$QUESTION.title|escape}--></title>
-</head>
-<body bgcolor="#ffffff" text="#555555" link="#0099cc" vlink="#CC0000" alink="#993399" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="アンケート　`$QUESTION.title`"}-->
 
+<div id="inquiry">
+  <h1><!--{$QUESTION.title|escape}--></h1>
 
-<!--▲TITLE-->
-<table width="760" border="0" cellspacing="0" cellpadding="0" summary=" ">
-	<tr>
-		<td height="40" bgcolor="#f6f6f6" align="center">
-		<table width="710" border="0" cellspacing="0" cellpadding="0" summary=" ">
-			<tr>
-				<td height="30" bgcolor="ff0000"><img src="../misc/_.gif" width="7" height="1" alt=""></td>
-				<td height="30"><img src="../misc/_.gif" width="8" height="1" alt=""></td>
-				<td height="30"width="695" class="red"><strong><span class="fs18n"><!--{$QUESTION.title|escape}--></span></strong></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
-	<tr>
-		<td bgcolor="#e2e2e2"><img src="../misc/_.gif" width="10" height="1" alt=""></td>
-	</tr>
-	<tr><td height="10"></td></tr>
-	<tr>
-		<td align="center" valign="top">
-		<table width="600" border="0" cellspacing="0" cellpadding="0" summary=" ">
-			<form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
-			<input type="hidden" name="question_id" value="<!--{$question_id}-->">
-			<tr>
-				<td class="fs12"><!--{$QUESTION.contents|escape|nl2br}-->
-				</td>
-			</tr>
-			<tr><td height="10"></td></tr>
-			<!--{if $errmsg}--><tr><td class="fs12n"><span class="red"><br>入力エラーが発生致しました。各項目のエラーメッセージをご確認の上、正しく入力してください。</span></td></tr><!--{/if}-->	
-			<tr>
-				<td bgcolor="#cccccc">
-				<table width="600" border="0" cellspacing="1" cellpadding="10" summary=" ">
-				<!--{include file=inquiry/inquiry.tpl}-->
-				</table>
-				</td>
-			</tr>
-			<tr><td height="30"></td></tr>
-			<tr>
-				<td class="fs12n"><span class="red">※</span>印は入力必須項目です。</td>
-			</tr>
-			<tr><td height="5"></td></tr>
-			<input type="hidden" name="mode" value="confirm">
-			<tr>
-				<td bgcolor="#cccccc">
-				<table width="600" border="0" cellspacing="1" cellpadding="10">
-					
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>お名前</td>
-						<td class="fs12n"bgcolor="#ffffff" width="407">
-							<span class="red"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></span>
-										<input type="text" name="name01" value="<!--{$arrForm.name01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.name01}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-							&nbsp;&nbsp;<input type="text" name="name02" value="<!--{$arrForm.name02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.name02}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>フリガナ</td>
-						<td class="fs12n" bgcolor="#ffffff" width="407">
-							<span class="red"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
-										<input type="text" name="kana01" value="<!--{$arrForm.kana01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.kana01}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-							&nbsp;&nbsp;<input type="text" name="kana02" value="<!--{$arrForm.kana02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.kana02}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>郵便番号</td>
-						<td bgcolor="#ffffff" width="407">
-						<table width="407" border="0" cellspacing="0" cellpadding="0" summary=" ">
-							<tr>
-								<td class="fs12n" width="267">
-									<span class="red"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
-									〒&nbsp;<input type="text" name="zip01" value="<!--{$arrForm.zip01|escape}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3"  <!--{if $arrErr.zip01}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-										&nbsp;-&nbsp;
-										<input type="text" name="zip02" value="<!--{$arrForm.zip02|escape}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4"  <!--{if $arrErr.zip02}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;<input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;" />
-								</td>								
-							</tr>
-						</table>
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>ご住所</td>
-						<td bgcolor="#ffffff">
-						<table width="407" border="0" cellspacing="0" cellpadding="0" summary=" ">
-							<tr>
-								<td class="fs12n" colspan="2">
-								<span class="red"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
-								<select name="pref" <!--{if $arrErr.pref}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-									<option value="" selected>選択してください</option>
-									<!--{html_options options=$arrPref selected=$arrForm.pref}-->
-								</select>
-								</td>
-							</tr>
-							<tr><td height="5"></td></tr>
-							<tr>
-								<td width="207">
-									<input type="text" name="addr01" value="<!--{$arrForm.addr01|escape}-->" size="35" class="box35" <!--{if $arrErr.addr01}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-								</td>
-								<td width="200"><span class="fs10n">ご住所1（市区町村名）</span></td>
-							</tr>
-							<tr><td height="3"></td></tr>
-							<tr>
-								<td class="fs12n">
-									<input type="text" name="addr02" value="<!--{$arrForm.addr02|escape}-->" size="35" class="box35" <!--{if $arrErr.addr02}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-								</td>
-								<td><span class="fs10n">ご住所2（番地、建物、マンション名）</span><br></td>
-							</tr>
-							<tr>
-								<td><span class="fs10n"><span class="red">住所は必ず2つに分けて入力してください。マンション名は必ず入力してください。</span></span></td>
-							</tr>
-						</table>
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>お電話番号</td>
-						<td class="fs12n" bgcolor="#ffffff" width="407">
-							<span class="red"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
-							<input type="text" name="tel01" value="<!--{$arrForm.tel01|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;-&nbsp;
-							<input type="text" name="tel02" value="<!--{$arrForm.tel02|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel02}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;-&nbsp;
-							<input type="text" name="tel03" value="<!--{$arrForm.tel03|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel03}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>メールアドレス</td>
-						<td bgcolor="#ffffff">
-						<table width="407" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td class="fs12n" colspan="2">
-									<span class="red"><!--{$arrErr.email}--></span>
-									<input type="text" name="email" value="<!--{$arrForm.email|escape}-->" size="35" class="box35" <!--{if $arrErr.email}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-								</td>
-							</tr>
-							<tr><td height="3"></td></tr>
-							<tr>
-								<td class="fs12n" width="227">
-									<span class="red"><!--{$arrErr.email02}--></span>
-									<input type="text" name="email02" value="<!--{$arrForm.email02|escape}-->" size="35" class="box35" <!--{if $arrErr.email02}--><!--{sfSetErrorStyle}--><!--{/if}--> />
-								</td>
-								<td width="180" class="fs10"><span class="red">確認のため2度入力してください。</span></td>
-							</tr>
-						</table>
-						</td>
-					</tr>
-				</table>
-				</td>
-			</tr>
-			<tr><td height="15"></td></tr>
-			<tr>
-				<td align="center"><input type="submit" name="subm1" value="確認ページへ"></td>
-			</tr>
-			</form>
-		</table>
-		<br>			
+  <form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+    <input type="hidden" name="question_id" value="<!--{$question_id}-->" />
+    <input type="hidden" name="mode" value="confirm" />
+    <div id="inquiry-contents"><!--{$QUESTION.contents|escape|nl2br}--></div>
 
-		</td>
-	</tr>
-</table>
+    <!--{if $errmsg}--><p><span class="attention">入力エラーが発生致しました。各項目のエラーメッセージをご確認の上、正しく入力してください。</span></p><!--{/if}-->
+    <table id="inquiry-body">
+    <!--{include file=inquiry/inquiry.tpl}-->
+    </table>
 
-</body>
-</html>
+    <p><span class="attention">※</span>印は入力必須項目です。</p>
+
+    <table id="inquiry-personal">
+      <tr>
+        <th><span class="attention">※</span>お名前</th>
+        <td>
+          <!--{if $arrErr.name01 || $arrErr.name02}-->
+          <span class="attention"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></span>
+          <!--{/if}-->
+          姓&nbsp;<input type="text" name="name01" value="<!--{$arrForm.name01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.name01}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;
+          名&nbsp;<input type="text" name="name02" value="<!--{$arrForm.name02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.name02}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>フリガナ</th>
+        <td>
+          <!--{if $arrErr.kana01 || $arrErr.kana02}-->
+          <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
+          <!--{/if}-->
+          セイ&nbsp;<input type="text" name="kana01" value="<!--{$arrForm.kana01|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.kana01}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;
+          メイ&nbsp;<input type="text" name="kana02" value="<!--{$arrForm.kana02|escape}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="20" class="box20" <!--{if $arrErr.kana02}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>郵便番号</th>
+        <td>
+          <!--{if $arrErr.zip01 || $arrErr.zip02}-->
+          <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
+          <!--{/if}-->
+          〒&nbsp;<input type="text" name="zip01" value="<!--{$arrForm.zip01|escape}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip01}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+          &nbsp;-&nbsp;
+          <input type="text" name="zip02" value="<!--{$arrForm.zip02|escape}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip02}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;
+          <button type="button" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01'); return false;"><span>住所入力</span></button>
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>ご住所</th>
+        <td>
+          <!--{if $arrErr.pref || $arrErr.addr01 || $arrErr.addr02}-->
+          <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
+          <!--{/if}-->
+          <select name="pref" <!--{if $arrErr.pref}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+            <option value="" selected>選択してください</option>
+            <!--{html_options options=$arrPref selected=$arrForm.pref}-->
+          </select><br />
+          <input type="text" name="addr01" value="<!--{$arrForm.addr01|escape}-->" size="35" class="box35" <!--{if $arrErr.addr01}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+          ご住所1（市区町村名）<br />
+          <input type="text" name="addr02" value="<!--{$arrForm.addr02|escape}-->" size="35" class="box35" <!--{if $arrErr.addr02}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+          ご住所2（番地、建物、マンション名）<br />
+          <span class="attention">住所は必ず2つに分けて入力してください。マンション名は必ず入力してください。</span>
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>お電話番号</th>
+        <td>
+          <!--{if $arrErr.tel01 || $arrErr.tel02 || $arrErr.tel03}-->
+          <span class="attention"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
+          <!--{/if}-->
+          <input type="text" name="tel01" value="<!--{$arrForm.tel01|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;-&nbsp;
+          <input type="text" name="tel02" value="<!--{$arrForm.tel02|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel02}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;-&nbsp;
+          <input type="text" name="tel03" value="<!--{$arrForm.tel03|escape}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel03}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>メールアドレス</th>
+        <td>
+          <!--{if $arrErr.email}--><span class="attention"><!--{$arrErr.email}--></span><!--{/if}-->
+          <input type="text" name="email" value="<!--{$arrForm.email|escape}-->" size="35" class="box35" <!--{if $arrErr.email}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+          <!--{if $arrErr.email02}--><span class="attention"><!--{$arrErr.email02}--></span><!--{/if}-->
+          <input type="text" name="email02" value="<!--{$arrForm.email02|escape}-->" size="35" class="box35" <!--{if $arrErr.email02}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+          <span class="attention">確認のため2度入力してください。</span>
+        </td>
+      </tr>
+    </table>
+    <div class="btn"><button type="submit"><span>確認ページへ</span></button></div>
+  </form>
+</div>
+
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: /branches/comu-ver2/data/Smarty/templates/default/inquiry/complete.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/inquiry/complete.tpl	(revision 16821)
+++ /branches/comu-ver2/data/Smarty/templates/default/inquiry/complete.tpl	(revision 17097)
@@ -1,72 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja">
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 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.
- *}-->
-<head>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.USER_DIR}-->css/common.css" type="text/css">
-<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/site.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
-<title><!--{$arrSiteInfo.shop_name}-->/アンケート（完了ページ）</title>
-</head>
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="アンケート　`$QUESTION.title`/完了画面"}-->
 
-<body bgcolor="#ffffff" text="#555555" link="#0099cc" vlink="#CC0000" alink="#993399" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
+<div id="inquiry">
+  <h1><!--{$QUESTION.title|escape}--></h1>
+  <form name="form1" id="form1" method="post" action="">
+    <div class="message">
+      <p>
+        アンケートの送信が完了いたしました。<br />
+        ご協力ありがとうございました。
+      </p>
+      <button type="submit" name="subm1" onClick="window.close()"><span>閉じる</span></button>
+    </div>
+  </form>
+</div>
 
-
-<!--▲TITLE-->
-<table width="760" border="0" cellspacing="0" cellpadding="0" summary=" ">
-	<tr>
-		<td height="40" bgcolor="#f6f6f6" align="center">
-		<table width="710" border="0" cellspacing="0" cellpadding="0" summary=" ">
-			<tr>
-				<td height="30" bgcolor="ff0000"><img src="../misc/_.gif" width="7" height="1" alt=""></td>
-				<td height="30"><img src="../misc/_.gif" width="8" height="1" alt=""></td>
-
-				<td height="30"width="695" class="red"><strong><span class="fs18n">アンケートタイトル</span></strong></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
-	<tr>
-		<td bgcolor="#e2e2e2"><img src="../misc/_.gif" width="10" height="1" alt=""></td>
-	</tr>
-
-	<tr><td height="50"></td></tr>
-	<tr>
-		<td align="center">
-		<table width="500" border="0" cellspacing="1" cellpadding="" summary=" " bgcolor="#cccccc">
-		<form name="form1" id="form1" method="post" action="">
-			<tr>
-				<td bgcolor="#ffffff" height="250" align="center" class="fs12">アンケートの送信が完了いたしました。<br>
-				ご協力ありがとうございました。<br><br><br>
-
-				<input type="submit" name="subm1" value="閉じる" onClick="window.close()"></td>
-			</tr>
-		</form>
-		</table>
-		</td>
-	</tr>	
-</table>
-
-</body>
-</html>
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: /branches/comu-ver2/data/Smarty/templates/default/inquiry/confirm.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/inquiry/confirm.tpl	(revision 16821)
+++ /branches/comu-ver2/data/Smarty/templates/default/inquiry/confirm.tpl	(revision 17097)
@@ -1,194 +1,113 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="ja">
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 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.
- *}-->
-<head>
-<link rel="stylesheet" href="<!--{$smarty.const.URL_DIR}--><!--{$smarty.const.USER_DIR}-->css/common.css" type="text/css">
-<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/site.js"></script>
-<script type="text/javascript" src="<!--{$TPL_DIR}-->js/win_op.js"></script>
-<title><!--{$arrSiteInfo.shop_name}-->/アンケート　<!--{$QUESTION.title|escape}-->/確認画面</title>
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_header.tpl" subtitle="アンケート　`$QUESTION.title`/確認画面"}-->
+
 <script type="text/javascript">
 <!--
-
 function func_return(){
-	document.form1.mode.value = "return";
-	document.form1.submit();
+  document.form1.mode.value = "return";
+  document.form1.submit();
 }
-
 //-->
 </script>
-</head>
-<body bgcolor="#ffffff" text="#555555" link="#0099cc" vlink="#CC0000" alink="#993399" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
+<div id="inquiry">
+  <h1><!--{$QUESTION.title|escape}--></h1>
+  <form name="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
+    <input type="hidden" name="mode" value="regist">
+    <!--{foreach key=key item=item from=$arrHidden}-->
+    <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+    <!--{/foreach}-->
+    <div id="inquiry-contents"><!--{$QUESTION.contents|escape|nl2br}--></div>
+    <!--{if $errmsg}--><p><span class="attention">入力エラーが発生致しました。各項目のエラーメッセージをご確認の上、正しく入力してください。</span></p><!--{/if}-->
+    <table id="inquiry-body">
+      <!--{section name=question loop=$QUESTION.question}-->
+      <!--{if $QUESTION.question[question].kind ne '0' }-->
+      <tr>
+        <th>質問<!--{$smarty.section.question.iteration}-->：<!--{$QUESTION.question[question].name|escape}--></th>
+      </tr>
+      <tr>
+      <!--{if $QUESTION.question[question].kind eq 1}-->
+        <td>
+        <!--{$smarty.post.option[$smarty.section.question.index]|nl2br}-->
+        </td>
+      <!--{elseif $QUESTION.question[question].kind eq 2}-->
+        <td>
+        <!--{$smarty.post.option[$smarty.section.question.index]|escape}-->
+        </td>
+      <!--{elseif $QUESTION.question[question].kind eq 4}-->
+        <td>
+        <!--{lfArray_Search_key_Smarty arr=$QUESTION.question[question].option val=$smarty.post.option[$smarty.section.question.index] }-->
+        </td>
+      <!--{elseif $QUESTION.question[question].kind eq 3}-->
+        <td>
+        <!--{foreach item=sub from=$smarty.post.option[question]}-->  
+          <!--{if strlen($sub) > 0}-->
+            <!--{lfArray_Search_key_Smarty arr=$QUESTION.question[question].option val=$sub }--><br>
+          <!--{/if}-->
+        <!--{/foreach}-->
+        </td>
+      <!--{/if}-->
+      </tr>
+      <!--{/if}-->
+      <!--{/section}-->
+    </table>
+    <p><span class="attention">※</span>印は入力必須項目です。</p>
+    <table id="inquiry-personal">
+      <tr>
+        <th><span class="attention">※</span>お名前</th>
+        <td>
+          <!--{$arrForm.name01|escape}-->&nbsp;<!--{$arrForm.name02|escape}-->
+          <input type="hidden" name="name01" value="<!--{$arrForm.name01|escape}-->" />
+          <input type="hidden" name="name02" value="<!--{$arrForm.name02|escape}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>フリガナ</th>
+        <td>
+          <!--{$arrForm.kana01|escape}-->&nbsp;<!--{$arrForm.kana02|escape}-->
+          <input type="hidden" name="kana01" value="<!--{$arrForm.kana01|escape}-->" />
+          <input type="hidden" name="kana02" value="<!--{$arrForm.kana02|escape}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>郵便番号</th>
+        <td>
+          〒<!--{$arrForm.zip01|escape}-->-<!--{$arrForm.zip02|escape}-->
+          <input type="hidden" name="zip01" value="<!--{$arrForm.zip01|escape}-->" />
+          <input type="hidden" name="zip02" value="<!--{$arrForm.zip02|escape}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>ご住所</th>
+        <td>
+          <input type="hidden" name="pref" value="<!--{$arrForm.pref|escape}-->" />
+          <input type="hidden" name="addr01" value="<!--{$arrForm.addr01|escape}-->" />
+          <input type="hidden" name="addr02" value="<!--{$arrForm.addr02|escape}-->" />
+          <!--{$arrPref[$arrForm.pref]|escape}--><!--{$arrForm.addr01|escape}--> <!--{$arrForm.addr02|escape}-->
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>お電話番号</th>
+        <td>
+          <!--{$arrForm.tel01|escape}-->-<!--{$arrForm.tel02|escape}-->-<!--{$arrForm.tel03|escape}-->
+          <input type="hidden" name="tel01" value="<!--{$arrForm.tel01|escape}-->" />
+          <input type="hidden" name="tel02" value="<!--{$arrForm.tel02|escape}-->" />
+          <input type="hidden" name="tel03" value="<!--{$arrForm.tel03|escape}-->" />
+        </td>
+      </tr>
+      <tr>
+        <th><span class="attention">※</span>メールアドレス</th>
+        <td>
+          <!--{$arrForm.email|escape}-->
+          <input type="hidden" name="email" value="<!--{$arrForm.email|escape}-->" />
+          <input type="hidden" name="email02" value="<!--{$arrForm.email02|escape}-->" />
+        </td>
+      </tr>
+    </table>
+    <div class="btn">
+      <button type="button" name="subm1" onclick="return func_return();"><span>戻る</span></button>
+      <button type="submit" name="subm2"><span>送信</span></button>
+    </div>
+  </form>
+</div>
 
-<!--▲TITLE-->
-<table width="760" border="0" cellspacing="0" cellpadding="0" summary=" ">
-	<tr>
-		<td height="40" bgcolor="#f6f6f6" align="center">
-		<table width="710" border="0" cellspacing="0" cellpadding="0" summary=" ">
-			<tr>
-				<td height="30" bgcolor="ff0000"><img src="../misc/_.gif" width="7" height="1" alt=""></td>
-				<td height="30"><img src="../misc/_.gif" width="8" height="1" alt=""></td>
-				<td height="30"width="695" class="red"><strong><span class="fs18n"><!--{$QUESTION.title|escape}--></span></strong></td>
-			</tr>
-		</table>
-		</td>
-	</tr>
-	<tr>
-		<td bgcolor="#e2e2e2"><img src="../misc/_.gif" width="10" height="1" alt=""></td>
-	</tr>
-	<tr><td height="10"></td></tr>
-	<tr>
-		<td align="center" valign="top">
-		<table width="600" border="0" cellspacing="0" cellpadding="0" summary=" ">
-			<tr>
-				<td class="fs12"><!--{$QUESTION.contents|nl2br}-->
-				</td>
-			</tr>
-			<tr><td height="10"></td></tr>
-			<!--{if $errmsg}--><tr><td class="fs12n"><span class="red"><br>入力エラーが発生致しました。各項目のエラーメッセージをご確認の上、正しく入力してください。</span></td></tr><!--{/if}-->	
-			<tr>
-				<td bgcolor="#cccccc">
-				<table width="600" border="0" cellspacing="1" cellpadding="10" summary=" ">
-				<!--{section name=question loop=$QUESTION.question}-->
-				<!--{if $QUESTION.question[question].kind ne '0' }-->
-					<tr>
-						<td colspan="2" bgcolor="#edf6ff" class="fs12n">質問<!--{$smarty.section.question.iteration}-->：<!--{$QUESTION.question[question].name|escape}--></td>
-					</tr>
-					<!--{if $QUESTION.question[question].kind eq 1}-->
-					<tr>
-						<td colspan="2" bgcolor="ffffff" class="fs12n">
-						<!--{$smarty.post.option[$smarty.section.question.index]|nl2br}-->
-						</td>
-					</tr>
-					<!--{elseif $QUESTION.question[question].kind eq 2}-->
-					<tr>
-						<td colspan="2" bgcolor="ffffff" class="fs12n">
-						<!--{$smarty.post.option[$smarty.section.question.index]|escape}-->
-						</td>
-						</tr>
-					<!--{elseif $QUESTION.question[question].kind eq 4}-->
-					<tr>
-						<td colspan="2" bgcolor="ffffff" class="fs12n">
-						<!--{lfArray_Search_key_Smarty arr=$QUESTION.question[question].option val=$smarty.post.option[$smarty.section.question.index] }-->
-						</td>
-					</tr>
-					<!--{elseif $QUESTION.question[question].kind eq 3}-->
-					<tr>
-						<td colspan="2" bgcolor="ffffff" class="fs12n">
-						<!--{foreach item=sub from=$smarty.post.option[question]}-->	
-							<!--{if strlen($sub) > 0}-->
-								<!--{lfArray_Search_key_Smarty arr=$QUESTION.question[question].option val=$sub }--><br>
-							<!--{/if}-->
-						<!--{/foreach}-->
-						</td>
-					</tr>
-					<!--{/if}-->
-				<!--{/if}-->
-				<!--{/section}-->				
-				</table>
-				</td>
-			</tr>
-			<tr><td height="30"></td></tr>
-			<tr>
-				<td class="fs12n"><span class="red">※</span>印は入力必須項目です。</td>
-			</tr>
-			<tr><td height="5"></td></tr>
-			<form name="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
-			<input type="hidden" name="mode" value="regist">
-			<!--{foreach key=key item=item from=$arrHidden}-->
-			<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" >
-			<!--{/foreach}-->
-			<tr>
-				<td bgcolor="#cccccc">
-				<table width="600" border="0" cellspacing="1" cellpadding="10">
-					
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>お名前</td>
-						<td class="fs12"bgcolor="#ffffff" width="407" class="fs12n">
-							<!--{$arrForm.name01|escape}-->&nbsp;<!--{$arrForm.name02|escape}-->
-							<input type="hidden" name="name01" value="<!--{$arrForm.name01|escape}-->" />
-							<input type="hidden" name="name02" value="<!--{$arrForm.name02|escape}-->" />
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>フリガナ</td>
-						<td class="fs12n" bgcolor="#ffffff" width="407">
-							<!--{$arrForm.kana01|escape}-->&nbsp;<!--{$arrForm.kana02|escape}-->
-							<input type="hidden" name="kana01" value="<!--{$arrForm.kana01|escape}-->"/>
-							<input type="hidden" name="kana02" value="<!--{$arrForm.kana02|escape}-->"/>
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>郵便番号</td>
-						<td class="fs12n" bgcolor="#ffffff" width="407">
-							〒<!--{$arrForm.zip01|escape}-->-<!--{$arrForm.zip02|escape}-->
-							<input type="hidden" name="zip01" value="<!--{$arrForm.zip01|escape}-->" />
-							<input type="hidden" name="zip02" value="<!--{$arrForm.zip02|escape}-->" />
-							<!--{* <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01');" /> *}-->
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>ご住所</td>
-						<td bgcolor="#ffffff" class="fs12n">
-							<input type="hidden" name="pref" value="<!--{$arrForm.pref|escape}-->" />
-							<input type="hidden" name="addr01" value="<!--{$arrForm.addr01|escape}-->" />
-							<input type="hidden" name="addr02" value="<!--{$arrForm.addr02|escape}-->" />
-							<!--{$arrPref[$arrForm.pref]|escape}--><!--{$arrForm.addr01|escape}--> <!--{$arrForm.addr02|escape}-->
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>お電話番号</td>
-						<td class="fs12n" bgcolor="#ffffff" width="407">
-							<!--{$arrForm.tel01|escape}-->-<!--{$arrForm.tel02|escape}-->-<!--{$arrForm.tel03|escape}-->
-							<input type="hidden" name="tel01" value="<!--{$arrForm.tel01|escape}-->" />
-							<input type="hidden" name="tel02" value="<!--{$arrForm.tel02|escape}-->" />
-							<input type="hidden" name="tel03" value="<!--{$arrForm.tel03|escape}-->" />
-						</td>
-					</tr>
-					<tr>
-						<td class="fs12n" bgcolor="#ebf9ff" width="150"><span class="red">※</span>メールアドレス</td>
-						<td class="fs12n" bgcolor="#ffffff" width="407">
-							<!--{$arrForm.email|escape}-->
-							<input type="hidden" name="email" value="<!--{$arrForm.email|escape}-->" />
-							<input type="hidden" name="email02" value="<!--{$arrForm.email02|escape}-->" />
-						</td>
-					</tr>
-				</table>
-				</td>
-			</tr>
-			<tr><td height="15"></td></tr>
-			<tr>
-				<td align="center"><input type="button" name="subm1" onclick="return func_return();"value="戻る">　<input type="submit" name="subm2" value="送信"></td>
-			</tr>
-			</form>
-		</table>
-		<br>			
-
-		</td>
-	</tr>
-</table>
-
-</body>
-</html>
+<!--{include file="`$smarty.const.TEMPLATE_DIR`popup_footer.tpl"}-->
Index: /branches/comu-ver2/data/Smarty/templates/default/inquiry/inquiry.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/inquiry/inquiry.tpl	(revision 16583)
+++ /branches/comu-ver2/data/Smarty/templates/default/inquiry/inquiry.tpl	(revision 17097)
@@ -1,80 +1,42 @@
-<!--{*
- * This file is part of EC-CUBE
- *
- * Copyright(c) 2000-2007 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.
- *}-->
 <!--{section name=question loop=$QUESTION.question}-->
-	<!--{if $QUESTION.question[question].kind }-->
-		<tr>
-			<td colspan="2" bgcolor="#edf6ff" class="fs12n">質問<!--{$smarty.section.question.iteration}-->：<!--{$QUESTION.question[question].name|escape}--></td>
-		</tr>
-		<!--{if $QUESTION.question[question].kind eq 1}-->
-		<tr>
-			<td colspan="2" bgcolor="ffffff" class="fs12n">
-			<textarea name="option[<!--{$smarty.section.question.index}-->]" cols="55" rows="8" class="area55" wrap="physical" <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.option[$smarty.section.question.index]|escape}--></textarea>
-			<!--{if $arrErr.option[$smarty.section.question.index]}--><br><span class="red">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn><!--{/if}-->
-			</td>
-		</tr>
-		<!--{elseif $QUESTION.question[question].kind eq 2}-->
-		<tr>
-			<td colspan="2" bgcolor="ffffff" class="fs12n">
-			<input type="text" name="option[<!--{$smarty.section.question.index}-->]" size="55" class="box50" value="<!--{$arrForm.option[$smarty.section.question.index]|escape}-->" <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-			<!--{if $arrErr.option[$smarty.section.question.index]}--><br><span class="red">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn><!--{/if}-->
-			</td>
-			</tr>
-		<!--{elseif $QUESTION.question[question].kind eq 3}-->
-		<tr>
-			<td colspan="2" bgcolor="ffffff">
-			<table width="540" border="0" cellspacing="0" cellpadding="3" summary=" ">
-				<input type="hidden" name="option[<!--{$smarty.section.question.index}-->][0]" value="">
-				<tr><td class="fs12n">
-					<span  <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-					<!--{html_checkboxes name="option[`$smarty.section.question.index`]" options=$QUESTION.question[question].option selected=$arrForm.option[question] separator="<br>"}-->
-					</span>
-					</td>
-				</tr>
-				<!--{if $arrErr.option[$smarty.section.question.index]}--><tr><td class="fs12n"><span class="red">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn></td></tr><!--{/if}-->
-				</table>
-			</td>
-		</tr>
-		<!--{elseif $QUESTION.question[question].kind eq 4}-->
-		<tr>
-			<td colspan="2" bgcolor="ffffff">
-			<input type="hidden" name="option[<!--{$smarty.section.question.index}-->][0]" value="">
-			<table width="540" border="0" cellspacing="0" cellpadding="3" summary=" ">
-				<!--{section name=sub loop=$QUESTION.question[question].option}-->
-					<!--{if $smarty.section.sub.index is even}--><tr><!--{/if}-->
-					<td width="270" class="fs12n">
-						<span  <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->>
-						<!--{if $QUESTION.question[question].option[sub]}-->
-						<input type="radio" name="option[<!--{$smarty.section.question.index}-->]" value="<!--{$smarty.section.sub.index|escape}-->" <!--{if $smarty.section.sub.index eq $arrForm.option[question]|default:"-1" }-->checked<!--{/if}-->>
-						<!--{$QUESTION.question[question].option[sub]|escape}-->
-						<!--{/if}-->
-						</span>
-					</td>
-					<!--{if $smarty.section.sub.index is odd}--></tr><!--{/if}-->
-				<!--{/section}-->
-				<!--{if $arrErr.option[$smarty.section.question.index]}--><tr><td class="fs12n"><span class="red">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn></tr><!--{/if}-->
-			</table>
-			</td>
-		</tr>
-		<!--{/if}-->
-	<!--{/if}-->
-	
+  <!--{if $QUESTION.question[question].kind }-->
+    <tr>
+      <th>質問<!--{$smarty.section.question.iteration}-->：<!--{$QUESTION.question[question].name|escape}--></th>
+    </tr>
+    <!--{if $QUESTION.question[question].kind eq 1}-->
+    <tr>
+      <td>
+        <textarea name="option[<!--{$smarty.section.question.index}-->]" cols="55" rows="8" class="area55" <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.option[$smarty.section.question.index]|escape}--></textarea>
+        <!--{if $arrErr.option[$smarty.section.question.index]}--><br /><span class="attention">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn><!--{/if}-->
+      </td>
+    </tr>
+    <!--{elseif $QUESTION.question[question].kind eq 2}-->
+    <tr>
+      <td>
+        <input type="text" name="option[<!--{$smarty.section.question.index}-->]" size="55" class="box50" value="<!--{$arrForm.option[$smarty.section.question.index]|escape}-->" <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+        <!--{if $arrErr.option[$smarty.section.question.index]}--><br /><span class="attention">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn><!--{/if}-->
+      </td>
+    </tr>
+    <!--{elseif $QUESTION.question[question].kind eq 3}-->
+    <tr>
+      <td>
+        <input type="hidden" name="option[<!--{$smarty.section.question.index}-->][0]" value="" />
+        <span <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <!--{html_checkboxes name="option[`$smarty.section.question.index`]" options=$QUESTION.question[question].option selected=$arrForm.option[question] separator="<br />"}-->
+        </span>
+        <!--{if $arrErr.option[$smarty.section.question.index]}--><br /><span class="attention">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn><!--{/if}-->
+      </td>
+    </tr>
+    <!--{elseif $QUESTION.question[question].kind eq 4}-->
+    <tr>
+      <td>
+        <input type="hidden" name="option[<!--{$smarty.section.question.index}-->][0]" value="" />
+        <span <!--{if $arrErr.option[$smarty.section.question.index]}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+          <!--{html_radios name="option[`$smarty.section.question.index`]" options=$QUESTION.question[question].option selected=$arrForm.option[question] separator="<br />"}-->
+        </span>
+        <!--{if $arrErr.option[$smarty.section.question.index]}--><br /><span class="attention">質問<!--{$smarty.section.question.iteration}-->を入力して下さい</sapn><!--{/if}-->
+      </td>
+    </tr>
+    <!--{/if}-->
+  <!--{/if}-->
 <!--{/section}-->
