Index: branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl	(revision 19993)
@@ -52,5 +52,5 @@
 function fnCheckStock(form) {
     classcat_id1 = form.classcategory_id1.value;
-    classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : 0;
+    classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : '';
     classcat2 = classCategories[classcat_id1][classcat_id2];
 
Index: branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl	(revision 19993)
@@ -80,5 +80,5 @@
     product_id = form.product_id.value;
     classcat_id1 = form.classcategory_id1.value;
-    classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : 0;
+    classcat_id2 = form.classcategory_id2 ? form.classcategory_id2.value : '';
     classcat2 = productsClassCategories[product_id][classcat_id1][classcat_id2];
     
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 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class.tpl	(revision 19993)
@@ -114,5 +114,5 @@
       <th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
       <th>商品種別<span class="attention">*</span></th>
-      <th><label for="allPaymentIds">支払方法</label><span class="attention">*</span> <input type="checkbox" name="allPaymentIds" onclick="fnAllCheck(this, 'input[name^=payment_ids]')" /></th>
+      <th><span class="attention">*</span> <input type="checkbox" name="allPaymentIds" id="allPaymentIds" onclick="fnAllCheck(this, 'input[name^=payment_ids]')" /><label for="allPaymentIds">支払方法</label></th>
       <th>ダウンロード<br>ファイル名<span class="red"><br>上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
       <th>ダウンロード商品用<br>ファイル</th>
@@ -151,12 +151,10 @@
       <!--{assign var=key value="price02:`$smarty.section.cnt.iteration`"}-->
       <td class="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>
+      <td class="class-product-type">
         <!--{assign var=key value="product_type_id:`$smarty.section.cnt.iteration`"}-->
-        <input type="radio" name="<!--{$key}-->" value="<!--{$smarty.const.PRODUCT_TYPE_NORMAL}-->" <!--{if $arrForm[$key] == "1"}-->checked<!--{/if}-->/>通常<br>
-        <input type="radio" name="<!--{$key}-->" value="<!--{$smarty.const.PRODUCT_TYPE_DOWNLOAD}-->" <!--{if $arrForm[$key] == "2"}-->checked<!--{/if}--> />ダウンロード
+        <!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key] separator='<br />'}-->
       </td>
       <td class="class-payment center">
         <!--{assign var=key value="payment_ids:`$smarty.section.cnt.iteration`"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
         <!--{html_checkboxes name=$key options=$arrPayments selected=$arrForm[$key] separator='<br />'}-->
       </td>
@@ -167,12 +165,11 @@
       </td>
       <!--{assign var=key value="down_realfilename:`$smarty.section.cnt.iteration`"}-->
-      <td>
-        <span class="attention"><!--{$arrErr[$key]}--></span>
+      <td><span class="attention"><!--{$arrErr[$key]}--></span>
           <!--{if $arrForm[$key] != ""}-->
             <!--{$arrForm[$key]|h}--><input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key]|h}-->">
-            <a href="" onclick="fnModeSubmit('delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
+            <a href="" onclick="fnFormModeSubmit('form1', 'delete_down', 'down_key', '<!--{$key}-->'); return false;">[ファイルの取り消し]</a><br>
           <!--{/if}-->
           <input type="file" name="<!--{$key}-->" size="10" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
-          <a class="btn-normal" href="javascript:;" name="btn" onclick="fnModeSubmit('upload_down', 'down_key', '<!--{$key}-->'); return false;">アップロード</a>
+          <a class="btn-normal" href="javascript:;" name="btn" onclick="fnFormModeSubmit('form1', 'upload_down', 'down_key', '<!--{$key}-->'); return false;">アップロード</a>
       </td>
     </tr>
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 19965)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/complete.tpl	(revision 19993)
@@ -35,5 +35,5 @@
 		<div class="btn-area">
 			<ul>
-				<li><a class="btn-action" href="./product.php"><span class="btn-prev">検索結果へ戻る</span></a></li>
+				<!--{* TODO <li><a class="btn-action" href="./"><span class="btn-prev">検索結果へ戻る</span></a></li> *}-->
 				<li><a class="btn-action" href="./product.php"><span class="btn-next">続けて登録を行う</span></a></li>
 				<li><a class="btn-action" href="?" onclick="fnModeSubmit('pre_edit', 'product_id', '<!--{$arrForm.product_id}-->'); return false;"><span class="btn-next">この商品の規格を登録する</span></a></li>
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 19954)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl	(revision 19993)
@@ -79,6 +79,9 @@
       <td class="right"><!--{$arrForm[$key]}--></td>
       <!--{assign var=key value="product_type_id:`$smarty.section.cnt.iteration`"}-->
-      <!--{assign var=inkey value="`$arrForm[$key]`"}-->
-      <td class="right"><!--{$arrDown[$inkey]}--></td>
+      <td class="right">
+      <!--{foreach from=$arrForm[$key] item=product_type_id}-->
+        <!--{$arrProductType[$product_type_id]|h}-->
+      <!--{/foreach}-->
+      </td>
       <!--{assign var=key value="payment_ids:`$smarty.section.cnt.iteration`"}-->
       <td>
@@ -101,5 +104,5 @@
   <div class="btn-area">
     <ul>
-      <li><a class="btn-action" href="javascript:;" onclick="fnModeSubmit('confirm_return','',''); return false"><span class="btn-prev">前へ戻る</span></a></li>
+      <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm_return','',''); return false"><span class="btn-prev">前へ戻る</span></a></li>
     <!--{if $tpl_check > 0}-->
       <li><a class="btn-action" href="javascript:;" onclick="document.form1.submit(); return false;"><span class="btn-next">この内容で登録する</span></a></li>
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 19993)
@@ -25,9 +25,18 @@
 <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>
+	<div id="complete">
+		<div class="complete-top"></div>
+		<div class="contents">
+			<div class="message">
+				登録が完了致しました。
+			</div>
+		</div>
+		<div class="btn-area-top"></div>
+		<div class="btn-area">
+			<ul>
+				<li><a class="btn-action" href="./product.php"><span class="btn-next">続けて登録を行う</span></a></li>
+			</ul>
+		</div>
+		<div class="btn-area-bottom"></div>
+	</div>
 </form>