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 20516)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl	(revision 20664)
@@ -22,12 +22,4 @@
  */
 *}-->
-<!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`admin_popup_header.tpl"}-->
-
-<script type="text/javascript">
-<!--
-self.moveTo(20,20);self.focus();
-//-->
-</script>
-
 <form name="form1" id="form1" method="post" action="./payment_input.php" enctype="multipart/form-data">
 <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
@@ -40,4 +32,5 @@
 <!--{/foreach}-->
 <input type="hidden" name="charge_flg" value="<!--{$charge_flg}-->" />
+<div id="basis" class="contents-main">
     <h2>支払方法登録・編集</h2>
 
@@ -86,5 +79,5 @@
                     <span class="attention"><!--{$arrErr[$key]}--></span>
                     <!--{if $arrFile[$key].filepath != ""}-->
-                    <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->">　<a href="" onclick="fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
+                    <img src="<!--{$arrFile[$key].filepath}-->" alt="<!--{$arrForm.name|h}-->">　<br /><a href="" onclick="fnModeSubmit('delete_image', 'image_key', '<!--{$key}-->'); return false;">[画像の取り消し]</a><br />
                     <!--{/if}-->
                     <input type="file" name="<!--{$key}-->" size="30" class="box30" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
@@ -96,10 +89,8 @@
     <div class="btn-area">
         <ul>
+            <li><a class="btn-action" href="javascript:;" onclick="location.href='./payment.php';"><span class="btn-prev">前のページに戻る</span></a></li>
             <li><a class="btn-action" href="javascript:;" onclick="fnFormModeSubmit('form1', 'edit', '', ''); return false;"><span class="btn-next">この内容で登録する</span></a></li>
         </ul>
     </div>
-
 </div>
 </form>
-
-<!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`admin_popup_footer.tpl"}-->
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 20509)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl	(revision 20664)
@@ -29,7 +29,6 @@
     <div class="btn">
         <ul>
-            <li><a class="btn-action" href="javascript:;" name="subm2" onclick="win03('./payment_input.php','payment_input','620','400');">
-                <span class="btn-next">支払方法を新規入力</span></a>
-            </li>
+            <li><a class="btn-action" href="javascript:;" name="subm2" onclick="fnChangeAction('./payment_input.php'); fnModeSubmit('','','');">
+                <span class="btn-next">支払方法を新規入力</span></a></li>
         </ul>
     </div>
@@ -63,5 +62,5 @@
                 <!--{if $arrPaymentListFree[cnt].rule > 0}--><!--{$arrPaymentListFree[cnt].rule|number_format|h}--><!--{else}-->0<!--{/if}-->円
                 <!--{if $arrPaymentListFree[cnt].upper_rule > 0}-->～<!--{$arrPaymentListFree[cnt].upper_rule|number_format|h}-->円<!--{elseif $arrPaymentListFree[cnt].upper_rule == "0"}--><!--{else}-->～無制限<!--{/if}--></td>
-            <td class="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','620','400'); return false;">編集</a><!--{else}-->-<!--{/if}--></td>
+            <td class="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnChangeAction('./payment_input.php'); fnModeSubmit('pre_edit', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">編集</a><!--{else}-->-<!--{/if}--></td>
             <td class="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnModeSubmit('delete', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td>
             <td class="center">