Minahito
minah****@users*****
2006年 8月 1日 (火) 19:43:38 JST
Index: xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html:1.1.2.6 Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/base/admin/templates/imagecategory_delete.html Tue Aug 1 19:43:37 2006
@@ -17,44 +17,44 @@
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_ID}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_id')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_id')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_NAME}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_name')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_name')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_MAXSIZE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_maxsize')|number_format}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('imgcat_maxsize')|number_format}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_MAXWIDTH}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_maxwidth')|number_format}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('imgcat_maxwidth')|number_format}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_MAXHEIGHT}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_maxheight')|number_format}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('imgcat_maxheight')|number_format}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_DISPLAY}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_display')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_display')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_WEIGHT}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_weight')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_weight')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_TYPE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_type')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_type')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_STORETYPE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_storetype')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_storetype')}></td>
</tr>
<tr>
<td class="foot" colspan="2">
- <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/customblock_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/customblock_edit.html:1.1.2.7 Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_edit.html Tue Aug 1 19:43:38 2006
@@ -1,8 +1,8 @@
<div class="adminnavi">
<a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
»» <a href="./index.php?action=BlockList"><{$smarty.const._MI_BASE_MENU_BLOCKLIST}></a>
- <{if $actionForm->getVar('content')}>
- <{if $object->getVar('visible') == 1 }>
+ <{if $actionForm->get('content')}>
+ <{if $object->get('visible') == 1 }>
»» <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
<{else}>
»» <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
@@ -13,8 +13,8 @@
</div>
<h3>
- <{if $actionForm->getVar('content')}>
- <{if $object->getVar('visible') == 1 }>
+ <{if $actionForm->get('content')}>
+ <{if $object->get('visible') == 1 }>
<{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
<{else}>
<{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
@@ -36,12 +36,12 @@
<form action="index.php?action=CustomBlockEdit" method="post">
<{xoops_token form=$actionForm}>
- <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+ <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
<table class="outer">
<tr>
<th colspan="2">
- <{if $actionForm->getVar('content')}>
- <{if $object->getVar('visible') == 1 }>
+ <{if $actionForm->get('content')}>
+ <{if $object->get('visible') == 1 }>
»» <{$smarty.const._AD_BASE_LANG_CUSTOMBLOCK_EDIT}>
<{else}>
»» <{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}>
@@ -54,7 +54,7 @@
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}>
+ <{xoops_input type=text name=title value=$actionForm->get('title') size=50 maxlength=255}>
</td>
</tr>
<tr>
@@ -68,13 +68,13 @@
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}>
+ <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}>
</td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_CONTENT}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_dhtmltarea type=text name=content value=$actionForm->getVar('content') rows=20 cols=60}>
+ <{xoops_dhtmltarea type=text name=content value=$actionForm->get('content') rows=20 cols=60}>
</td>
</tr>
<tr>
@@ -112,7 +112,7 @@
<tr class="foot">
<td colspan="2">
<input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/image_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/image_delete.html:1.1.2.5 Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/base/admin/templates/image_delete.html Tue Aug 1 19:43:38 2006
@@ -1,7 +1,7 @@
<div class="adminnavi">
<a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
»» <a href="./index.php?action=ImagecategoryList"><{$smarty.const._MI_BASE_MENU_IMAGE_MANAGE}></a>
- »» <a href="./index.php?action=ImageList&imgcat_id=<{$object->getVar('imgcat_id')}>"><{$smarty.const._AD_BASE_LANG_IMAGE_LIST}></a>
+ »» <a href="./index.php?action=ImageList&imgcat_id=<{$object->getShow('imgcat_id')}>"><{$smarty.const._AD_BASE_LANG_IMAGE_LIST}></a>
»» <{$smarty.const._AD_BASE_LANG_IMAGE_DELETE}>
</div>
@@ -20,40 +20,40 @@
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_ID}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_id')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('image_id')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_NAME}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_name')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('image_name')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_NICENAME}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_nicename')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('image_nicename')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_MIMETYPE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_mimetype')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('image_mimetype')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_CREATED}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_created')|xoops_formattimestamp:l}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('image_created')|xoops_formattimestamp:l}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_DISPLAY}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_display')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('image_display')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMAGE_WEIGHT}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('image_weight')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('image_weight')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_IMGCAT_ID}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('imgcat_id')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('imgcat_id')}></td>
</tr>
<tr>
<td class="foot" colspan="2">
- <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/image_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.7 xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.8
--- xoops2jp/html/modules/base/admin/templates/image_edit.html:1.1.2.7 Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/image_edit.html Tue Aug 1 19:43:38 2006
@@ -1,7 +1,7 @@
<div class="adminnavi">
<a href="./index.php"><{$smarty.const._MI_BASE_NAME}></a>
»» <a href="./index.php?action=ImagecategoryList"><{$smarty.const._MI_BASE_MENU_IMAGE_MANAGE}></a>
- »» <a href="./index.php?action=ImageList&imgcat_id=<{$actionForm->getVar('imgcat_id')}>"><{$smarty.const._AD_BASE_LANG_IMAGE_LIST}></a>
+ »» <a href="./index.php?action=ImageList&imgcat_id=<{$actionForm->getShow('imgcat_id')}>"><{$smarty.const._AD_BASE_LANG_IMAGE_LIST}></a>
<{if $actionForm->get('image_id')}>
»» <{$smarty.const._AD_BASE_LANG_IMAGE_EDIT}>
<{else}>
@@ -77,7 +77,7 @@
<tr class="foot">
<td colspan="2">
<input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/comment_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.11
--- xoops2jp/html/modules/base/admin/templates/comment_edit.html:1.1.2.10 Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_edit.html Tue Aug 1 19:43:38 2006
@@ -40,9 +40,8 @@
<td class="head"><{$smarty.const._AD_BASE_LANG_COM_ICON}></td>
<td class="<{cycle values="odd,even"}>">
<{foreach item=icon from=$subjectIconArr}>
- <{xoops_input type=radio name=com_icon value=$icon->get('filename') default=$actionForm->get('com_icon')}><img src="<{$xoops_url}>/images/subject/<{$icon->getVar('filename')}>" />
+ <{xoops_input type=radio name=com_icon value=$icon->get('filename') default=$actionForm->get('com_icon')}><img src="<{$xoops_url}>/images/subject/<{$icon->getShow('filename')}>" />
<{/foreach}>
-
</td>
</tr>
<tr>
@@ -62,13 +61,7 @@
<td class="head"><{$smarty.const._AD_BASE_LANG_COM_STATUS}></td>
<td class="<{cycle values="odd,even"}>">
<select name="com_status">
- <{foreach item=status from=$statusArr}>
- <{if $status->get('id') == $actionForm->get('com_status')}>
- <option value="<{$status->getVar('id')}>" selected><{$status->getVar('name')}></option>
- <{else}>
- <option value="<{$status->getVar('id')}>"><{$status->getVar('name')}></option>
- <{/if}>
- <{/foreach}>
+ <{xoops_optionsArray label=name value=id from=$statusArr default=$actionForm->get('com_status')}>
</select>
</td>
</tr>
@@ -90,7 +83,7 @@
<tr>
<td colspan="2" class="foot">
<input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/comment_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.10 xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.11
--- xoops2jp/html/modules/base/admin/templates/comment_delete.html:1.1.2.10 Mon Jul 31 19:28:54 2006
+++ xoops2jp/html/modules/base/admin/templates/comment_delete.html Tue Aug 1 19:43:38 2006
@@ -45,11 +45,11 @@
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_COM_CREATED}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_created')|xoops_formattimestamp:l}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('com_created')|xoops_formattimestamp:l}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_COM_MODIFIED}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getShow('com_modified')|xoops_formattimestamp:l}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('com_modified')|xoops_formattimestamp:l}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_COM_UID}></td>
@@ -70,8 +70,8 @@
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_COM_SIG}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_input type=radio name=com_sig value=1 default=$object->getShow('com_sig') disabled=true}><{$smarty.const._YES}>
- <{xoops_input type=radio name=com_sig value=0 default=$object->getShow('com_sig') disabled=true}><{$smarty.const._NO}>
+ <{xoops_input type=radio name=com_sig value=1 default=$object->get('com_sig') disabled=true}><{$smarty.const._YES}>
+ <{xoops_input type=radio name=com_sig value=0 default=$object->get('com_sig') disabled=true}><{$smarty.const._NO}>
</td>
</tr>
<tr>
@@ -85,22 +85,22 @@
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_CONTROL}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_input type=checkbox name=dohtml value=1 default=$object->getShow('dohtml') disabled=true}>
+ <{xoops_input type=checkbox name=dohtml value=1 default=$object->get('dohtml') disabled=true}>
<{$smarty.const._AD_BASE_LANG_DOHTML}><br />
- <{xoops_input type=checkbox name=dosmiley value=1 default=$object->getShow('dosmiley') disabled=true}>
+ <{xoops_input type=checkbox name=dosmiley value=1 default=$object->get('dosmiley') disabled=true}>
<{$smarty.const._AD_BASE_LANG_DOSMILEY}><br />
- <{xoops_input type=checkbox name=doxcode value=1 default=$object->getShow('doxcode') disabled=true}>
+ <{xoops_input type=checkbox name=doxcode value=1 default=$object->get('doxcode') disabled=true}>
<{$smarty.const._AD_BASE_LANG_DOXCODE}><br />
- <{xoops_input type=checkbox name=doimage value=1 default=$object->getShow('doimage') disabled=true}>
+ <{xoops_input type=checkbox name=doimage value=1 default=$object->get('doimage') disabled=true}>
<{$smarty.const._AD_BASE_LANG_DOIMAGE}><br />
- <{xoops_input type=checkbox name=dobr value=1 default=$object->getShow('dobr') disabled=true}>
+ <{xoops_input type=checkbox name=dobr value=1 default=$object->get('dobr') disabled=true}>
<{$smarty.const._AD_BASE_LANG_DOBR}>
</td>
</tr>
<tr>
<td colspan="2" class="foot">
- <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
@@ -133,7 +133,7 @@
<td><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=UserInfo&uid=<{$obj->getShow('com_uid')}>"><{if $obj->mUser}><{$obj->mUser->getShow('uname')}><{else}><{$smarty.const._GUESTS}><{/if}></a></td>
<td><{$obj->getShow('com_ip')}></td>
<td>
- <{if $obj->get('com_status') == 1 }>
+ <{if $obj->get('com_status') == 2}>
<img src="<{"icons/active.gif"|theme}>" />
<{/if}>
</td>
Index: xoops2jp/html/modules/base/admin/templates/smiles_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.6 xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.7
--- xoops2jp/html/modules/base/admin/templates/smiles_edit.html:1.1.2.6 Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_edit.html Tue Aug 1 19:43:38 2006
@@ -71,7 +71,7 @@
<tr>
<td colspan="2" class="foot">
<input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/smiles_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/smiles_delete.html:1.1.2.5 Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/base/admin/templates/smiles_delete.html Tue Aug 1 19:43:38 2006
@@ -16,27 +16,27 @@
<th colspan="2"><{$smarty.const._AD_BASE_LANG_SMILES_DELETE}></th>
</tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_ID}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('id')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('id')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_CODE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('code')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('code')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_SMILE_URL}></td>
<td class="<{cycle values="odd,even"}>">
- <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getVar('smile_url')}>" />
- ( <{$object->getVar('smile_url')}> )
+ <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$object->getShow('smile_url')}>" />
+ ( <{$object->getShow('smile_url')}> )
</td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_EMOTION}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('emotion')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('emotion')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_DISPLAY}></td>
<td class="<{cycle values="odd,even"}>">
- <{if $object->getVar('display') == 1 }>
+ <{if $object->get('display') == 1 }>
<{$smarty.const._YES}>
<{else}>
<{$smarty.const._NO}>
@@ -45,8 +45,8 @@
</tr>
<tr>
<td colspan="2" class="foot">
- <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html:1.1.2.5 Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/imagecategory_edit.html Tue Aug 1 19:43:38 2006
@@ -101,7 +101,7 @@
<tr class="foot">
<td colspan="2">
<input class="formButton" type="submit" value="<{$smarty.const._SUBMIT}>" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html
diff -u xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.5 xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.6
--- xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html:1.1.2.5 Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/base/admin/templates/blockinstall_edit.html Tue Aug 1 19:43:38 2006
@@ -18,7 +18,7 @@
<form action="index.php?action=BlockInstallEdit" method="post">
<{xoops_token form=$actionForm}>
- <{xoops_input type=hidden name=bid value=$actionForm->getVar('bid')}>
+ <{xoops_input type=hidden name=bid value=$actionForm->get('bid')}>
<table class="outer">
<tr>
<th colspan="2"><{$smarty.const._AD_BASE_LANG_BLOCK_INSTALL}></th>
@@ -26,23 +26,21 @@
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_input type=text name=title value=$actionForm->getVar('title') size=50 maxlength=255}>
+ <{xoops_input type=text name=title value=$actionForm->get('title') size=50 maxlength=255}>
</td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
<td class="<{cycle values="odd,even"}>">
<select name="side">
- <{foreach item=side from=$columnSideArr}>
- <option value="<{$side->getVar('id')}>"><{$side->getVar('name')}></option>
- <{/foreach}>
+ <{xoops_optionsArray from=$columnSideArr value=id label=name default=$actionForm->get('side')}>
</select>
</td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
<td class="<{cycle values="odd,even"}>">
- <{xoops_input type=text name=weight value=$actionForm->getVar('weight') size=5}>
+ <{xoops_input type=text name=weight value=$actionForm->get('weight') size=5}>
</td>
</tr>
<tr>
@@ -57,9 +55,7 @@
<td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_MODULES}></td>
<td class="<{cycle values="odd,even"}>">
<select size='5' name='bmodule[]' multiple='multiple'>
- <{foreach item=module from=$moduleArr}>
- <option value="<{$module->getVar('mid')}>"><{$module->getVar('name')}></option>
- <{/foreach}>
+ <{xoops_optionsArray label=name value=mid from=$moduleArr default=$actionForm->get('bmodule')}>
</select>
</td>
</tr>
@@ -67,9 +63,7 @@
<td class="head"><{$smarty.const._AD_BASE_LANG_TARGET_GROUPS}></td>
<td class="<{cycle values="odd,even"}>">
<select size='5' name='groupid[]' multiple='multiple'>
- <{foreach item=group from=$groupArr}>
- <option value="<{$group->getVar('groupid')}>"><{$group->getVar('name')}></option>
- <{/foreach}>
+ <{xoops_optionsArray label=name value=groupid from=$groupArr default=$actionForm->get('groupid')}>
</select>
</td>
</tr>
@@ -84,7 +78,7 @@
<tr class="foot">
<td colspan="2">
<input class="formButton" type="submit" value="<{$smarty.const._INSTALL}>" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>
Index: xoops2jp/html/modules/base/admin/templates/customblock_delete.html
diff -u xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.4 xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.5
--- xoops2jp/html/modules/base/admin/templates/customblock_delete.html:1.1.2.4 Wed Jun 14 00:41:26 2006
+++ xoops2jp/html/modules/base/admin/templates/customblock_delete.html Tue Aug 1 19:43:38 2006
@@ -17,92 +17,92 @@
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_BID}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('bid')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('bid')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_MID}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('mid')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('mid')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_FUNC_NUM}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_num')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('func_num')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_OPTIONS}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('options')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('options')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_NAME}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('name')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('name')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_TITLE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('title')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('title')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_CONTENT}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('content')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('content')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_SIDE}></td>
<td class="<{cycle values="odd,even"}>">
- <{if $object->mColumn}><{$object->mColumn->getVar('name')}><{/if}>
+ <{if $object->mColumn}><{$object->mColumn->getShow('name')}><{/if}>
</td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_WEIGHT}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('weight')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('weight')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_VISIBLE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('visible')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('visible')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_BLOCK_TYPE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('block_type')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('block_type')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_C_TYPE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('c_type')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('c_type')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_ISACTIVE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('isactive')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('isactive')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_DIRNAME}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('dirname')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('dirname')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_FUNC_FILE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('func_file')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('func_file')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_SHOW_FUNC}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('show_func')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('show_func')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_EDIT_FUNC}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('edit_func')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('edit_func')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_TEMPLATE}></td>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('template')}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->getShow('template')}></td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_BCACHETIME}></td>
<td class="<{cycle values="odd,even"}>">
- <{if $object->mCachetime}><{$object->mCachetime->getVar('label')}><{/if}>
+ <{if $object->mCachetime}><{$object->mCachetime->getShow('label')}><{/if}>
</td>
</tr>
<tr>
<td class="head"><{$smarty.const._AD_BASE_LANG_LAST_MODIFIED}></th>
- <td class="<{cycle values="odd,even"}>"><{$object->getVar('last_modified')|xoops_formattimestamp:l}></td>
+ <td class="<{cycle values="odd,even"}>"><{$object->get('last_modified')|xoops_formattimestamp:l}></td>
</tr>
<tr>
<td class="foot" colspan="2">
- <input type="submit" value="<{$smarty.const._DELETE}>" class="formButton" />
- <input type="button" value="<{$smarty.const._BACK}>" onclick="javascript:history.back()" class="formButton" />
+ <input class="formButton" type="submit" value="<{$smarty.const._DELETE}>" />
+ <input class="formButton" type="submit" value="<{$smarty.const._BACK}>" name="_form_control_cancel" />
</td>
</tr>
</table>