[Svn-src-all:3221] [version-2_12-multilang 22122] #1955 r22111 〜 r22120 間のコミットをmerge
h_yoshimoto
admin ＠ mail.ec-cube.net
2012年 12月 4日 (火) 20:09:03 JST
Subversion committed to /home/svn/open 22122
http://svn.ec-cube.net/open_trac/changeset/22122
┌────────────────────────────┐
│更新者 : h_yoshimoto │
│更新日時: 2012-12-04 20:09:02 +0900 (火, 04 12月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1955 r22111 〜 r22120 間のコミットをmerge
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/basis/kiyaku.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/basis/tradelaw.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend_search.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/design/bloc.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/design/css.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/design/header.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/design/main_edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/mail/input.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/mail/template_input.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail_confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/products/review_edit.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/system/adminarea.tpl
U branches/version-2_12-multilang/data/Smarty/templates/admin/system/bkup.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default/contact/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default/entry/kiyaku.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default/products/review.tpl
U branches/version-2_12-multilang/data/Smarty/templates/default/shopping/payment.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/cart/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/kiyaku.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change_confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/delivery_addr.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/login.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/refusal.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/products/detail.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find1.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find2.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_item.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/payment.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/confirm.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/index.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone/products/review.tpl
U branches/version-2_12-multilang/data/Smarty/templates/sphone/shopping/payment.tpl
U branches/version-2_12-multilang/data/class/SC_CheckError.php
U branches/version-2_12-multilang/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
U branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
U branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
U branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
U branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/delivery_input.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -50,7 +50,7 @@
<td colspan="3">
<!--{assign var=key value="remark"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" cols="60" rows="8" class="area60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key].value|h}--></textarea></td>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" cols="60" rows="8" class="area60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea></td>
</tr>
<tr>
<th><!--{t string="tpl_011"}--></th>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -246,7 +246,7 @@
<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]|h}--></textarea>
+ <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea>
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span>
</td>
</tr>
@@ -255,7 +255,7 @@
<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]|h}--></textarea>
+ <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea>
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/kiyaku.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/kiyaku.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -41,7 +41,7 @@
<th><!--{t string="tpl_063"}--><span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.kiyaku_text}--></span>
- <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{$arrForm.kiyaku_text|h}--></textarea>
+ <textarea name="kiyaku_text" maxlength="<!--{$smarty.const.MLTEXT_LEN}-->" cols="60" rows="8" class="area60" style="<!--{if $arrErr.kiyaku_text != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" ><!--{"\n"}--><!--{$arrForm.kiyaku_text|h}--></textarea>
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.MLTEXT_LEN}--></span>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/mail.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -80,7 +80,7 @@
<!--{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]|h}--></textarea><br />
+ <textarea name="header" cols="75" rows="12" class="area75" onChange="setFlag();" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LTEXT_LEN}-->
</span>
<div>
@@ -100,7 +100,7 @@
<!--{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]|h}--></textarea><br />
+ <textarea name="footer" cols="75" rows="12" class="area75" onChange="setFlag();" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LTEXT_LEN}--></span>
<div>
<a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','footer','cnt_footer'); return false;"><span><!--{t string="tpl_072"}--></span></a>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/basis/tradelaw.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/basis/tradelaw.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -34,7 +34,9 @@
<!--{if $arrErr[$key]}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
<!--{/if}-->
- <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /><span class="attention"> <!--{t string="tpl_023" T_FIELD=$arrForm[$key].length}--></span></td>
+ <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
+ <span class="attention"> <!--{t string="tpl_023" T_FIELD=$arrForm[$key].length}--></span>
+ </td>
</tr>
<tr>
<th><!--{t string="tpl_105"}--><span class="attention"> *</span></th>
@@ -64,8 +66,8 @@
<tr>
<th><!--{t string="tpl_107"}--><span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_pref"}-->
- <!--{if $arrErr[$key]}-->
+ <!--{assign var=key value="law_pref"}-->
+ <!--{if $arrErr[$key]}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
<!--{/if}-->
<select class="top" name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
@@ -91,33 +93,33 @@
<tr>
<th><!--{t string="tpl_037"}--><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|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
- <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
- <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+ <!--{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|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+ <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
+ <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
</td>
</tr>
<tr>
<th><!--{t string="tpl_039"}--></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|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
- <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
- <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+ <!--{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|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+ <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> -
+ <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|h}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
</td>
</tr>
<tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/csv_sql.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -87,7 +87,7 @@
<td align="left">
<span class="attention"><!--{$arrErr.csv_sql}--></span>
<div>
- <textarea name="csv_sql" cols=50 rows=20 align="left" wrap=off style="<!--{if $arrErr.csv_sql != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"><!--{$arrForm.csv_sql|h}--></textarea>
+ <textarea name="csv_sql" cols=50 rows=20 align="left" wrap=off style="<!--{if $arrErr.csv_sql != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->"><!--{"\n"}--><!--{$arrForm.csv_sql|h}--></textarea>
</div>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -138,7 +138,7 @@
<th><!--{t string="tpl_022"}--><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|h}-->"<!--{/if}-->><!--{$arrForm.news_title|h}--></textarea><br />
+ <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|h}-->"<!--{/if}-->><!--{"\n"}--><!--{$arrForm.news_title|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.MTEXT_LEN}--></span>
</td>
</tr>
@@ -158,7 +158,7 @@
<th><!--{t string="tpl_111"}--></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|h}--><!--{/if}-->"><!--{$arrForm.news_comment|h}--></textarea><br />
+ <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|h}--><!--{/if}-->"><!--{"\n"}--><!--{$arrForm.news_comment|h}--></textarea><br />
<span class="attention"> (<!--{t string="tpl_113"}-->)</span>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -71,7 +71,7 @@
flag = false;
}
}
-
+
if ( flag ){
document.form1["mode"].value = mode;
document.form1["rank"].value = data;
@@ -110,6 +110,9 @@
</div>
<div class="table-detail">
<div class="detail-name"><!--{t string="tpl_188"}-->： <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div>
+ <!--{if $arrItems[$smarty.section.cnt.iteration].p_del_flg == '1'}-->
+ <div class="attention">※<!--{$arrItems[$smarty.section.cnt.iteration].name|h}-->は販売商品から削除されています。</div>
+ <!--{/if}-->
<div class="detail-form">
<form name="form<!--{$smarty.section.cnt.iteration}-->" id="form<!--{$smarty.section.cnt.iteration}-->" method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
@@ -118,7 +121,7 @@
<input type="hidden" name="category_id" value="<!--{$category_id|h}-->" />
<input type="hidden" name="rank" value="<!--{$arrItems[$smarty.section.cnt.iteration].rank|h}-->" />
<span class="attention"><!--{$arrErr[$smarty.section.cnt.iteration].comment}--></span>
- <textarea class="top" name="comment" cols="45" rows="4" style="width: 586px; height: 80px; <!--{$arrErr[$smarty.section.cnt.iteration].comment|sfGetErrorColor}-->" <!--{$arrItems[$smarty.section.cnt.iteration].product_id|sfGetEnabled}-->><!--{$arrItems[$smarty.section.cnt.iteration].comment|h}--></textarea>
+ <textarea class="top" name="comment" cols="45" rows="4" style="width: 586px; height: 80px; <!--{$arrErr[$smarty.section.cnt.iteration].comment|sfGetErrorColor}-->" <!--{$arrItems[$smarty.section.cnt.iteration].product_id|sfGetEnabled}-->><!--{"\n"}--><!--{$arrItems[$smarty.section.cnt.iteration].comment|h}--></textarea>
</form>
</div>
</div>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend_search.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend_search.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend_search.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -61,7 +61,7 @@
<th><!--{t string="tpl_192"}--></th>
<td><input type="text" name="search_product_code" value="<!--{$arrForm.search_product_code}-->" size="35" class="box35" /></td>
</tr>
- <tr>
+ <tr>
<th><!--{t string="tpl_189"}--></th>
<td><input type="text" name="search_name" value="<!--{$arrForm.search_name}-->" size="35" class="box35" /></td>
</tr>
@@ -95,7 +95,7 @@
<img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arr.main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="" />
</td>
<td>
- <!--{assign var=codemin value=`$arr.product_code_min`}-->
+ <!--{assign var=codemin value=`$arr.product_code_min`}-->
<!--{assign var=codemax value=`$arr.product_code_max`}-->
<!--{* 商品コード *}-->
<!--{if $codemin != $codemax}-->
@@ -107,14 +107,14 @@
<td><!--{$arr.name|h}--></td>
<td class="center"><a href="" onClick="return func_submit(<!--{$arr.product_id}-->)"><!--{t string="tpl_196"}--></a></td>
</tr>
- <!--▲商品<!--{$smarty.foreach.loop.iteration}-->-->
+ <!--▲商品<!--{$smarty.foreach.loop.iteration}-->-->
<!--{/foreach}-->
<!--{if !$tpl_linemax>0}-->
<tr>
<td colspan="4"><!--{t string="tpl_197"}--></td>
</tr>
<!--{/if}-->
-
+
</table>
<!--{/if}-->
<!--{* ▲検索結果表示 *}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/customer/edit.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -220,7 +220,7 @@
<th><!--{t string="tpl_225"}--></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"><!--{$arrForm.note|h}--></textarea>
+ <textarea name="note" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" <!--{if $arrErr.note != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> cols="60" rows="8" class="area60"><!--{"\n"}--><!--{$arrForm.note|h}--></textarea>
</td>
</tr>
<tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/design/bloc.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/design/bloc.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -58,7 +58,7 @@
<tr>
<td colspan="2">
<!--{assign var=key value="bloc_html"}-->
- <textarea class="top" id="<!--{$key}-->" name="<!--{$key}-->" rows="<!--{$text_row}-->" style="width: 99%;"><!--{$arrForm[$key].value|smarty:nodefaults|h}--></textarea>
+ <textarea class="top" id="<!--{$key}-->" name="<!--{$key}-->" rows="<!--{$text_row}-->" style="width: 99%;"><!--{"\n"}--><!--{$arrForm[$key].value|smarty:nodefaults|h}--></textarea>
<input type="hidden" name="html_area_row" value="<!--{$text_row}-->" />
<div>
<a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#bloc_html', 50, 13); return false;"><!--{t string="tpl_266"}--></a>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/design/css.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/design/css.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -51,7 +51,7 @@
<th><!--{t string="tpl_271"}--></th>
<td>
<!--{assign var=key value="css_data"}-->
- <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows=<!--{$area_row}--> align="left" style="width: 650px;"><!--{$arrForm[$key].value|h}--></textarea>
+ <textarea id="css" class="top" name="<!--{$key}-->" cols="90" rows=<!--{$area_row}--> align="left" style="width: 650px;"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
<input type="hidden" name="area_row" value="<!--{$area_row}-->" />
<div class="btn">
<a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#css', 50, 30); return false;"><!--{t string="tpl_266"}--></a>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/design/header.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/design/header.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -39,7 +39,7 @@
<input type="hidden" name="header_row" value="<!--{$header_row}-->" />
<input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
- <textarea id="header-area" class="top" name="header" rows="<!--{$header_row}-->" style="width: 100%;"><!--{$header_data|h|smarty:nodefaults}--></textarea>
+ <textarea id="header-area" class="top" name="header" rows="<!--{$header_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$header_data|h|smarty:nodefaults}--></textarea>
<div class="btn">
<a id="header-area-resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#header-area-resize-btn', '#header-area', 50, 13); $('input[name=header_row]').val($('#header-area').attr('rows'));return false;"><span><!--{t string="tpl_266"}--></span></a>
</div>
@@ -62,7 +62,7 @@
<input type="hidden" name="footer_row" value=<!--{$footer_row}--> />
<input type="hidden" name="device_type_id" value="<!--{$device_type_id|h}-->" />
- <textarea id="footer-area" class="top" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{$footer_data|h|smarty:nodefaults}--></textarea>
+ <textarea id="footer-area" class="top" name="footer" rows="<!--{$footer_row}-->" style="width: 100%;"><!--{"\n"}--><!--{$footer_data|h|smarty:nodefaults}--></textarea>
<div class="btn">
<a id="footer-area-resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#footer-area-resize-btn', '#footer-area', 50, 13); $('input[name=footer_row]').val($('#footer-area').attr('rows'));return false;"><span><!--{t string="tpl_266"}--></span></a>
</div>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/design/main_edit.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/design/main_edit.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -81,7 +81,7 @@
<label for="header-chk"><input type="checkbox" name="header_chk" id="header-chk" value="1" <!--{if $arrForm.header_chk.value == "1"}-->checked="checked"<!--{/if}--> /><!--{t string="tpl_287"}--></label>
<label for="footer-chk"><input type="checkbox" name="footer_chk" id="footer-chk" value="1" <!--{if $arrForm.footer_chk.value == "1"}-->checked="checked"<!--{/if}--> /><!--{t string="tpl_288"}--></label>
<div>
- <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
+ <textarea id="tpl_data" class="top" name="tpl_data" rows=<!--{$text_row}--> style="width: 98%;"><!--{"\n"}--><!--{$arrForm.tpl_data.value|h|smarty:nodefaults}--></textarea>
<input type="hidden" name="html_area_row" value="<!--{$text_row}-->" /><br />
<a id="resize-btn" class="btn-normal" href="javascript:;" onclick="ChangeSize('#resize-btn', '#tpl_data', 50, 13); return false;"><span><!--{t string="tpl_266"}--></span></a>
</div>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/mail/input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/mail/input.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/mail/input.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -65,7 +65,7 @@
<td>
<!--{assign var=key value="body"}-->
<!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
- <textarea name="body" cols="90" rows="40" class="area90" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key].value|h}--></textarea>
+ <textarea name="body" cols="90" rows="40" class="area90" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/mail/template_input.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/mail/template_input.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/mail/template_input.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -45,7 +45,7 @@
<tr>
<th><!--{t string="tpl_333"}--><span class="attention"> *</span><br /><!--{t string="tpl_332"}--></th>
<td>
- <textarea name="body" cols="90" rows="40" class="area90 top" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{$arrForm.body|h}--></textarea>
+ <textarea name="body" cols="90" rows="40" class="area90 top" <!--{if $arrErr.body}--><!--{sfSetErrorStyle}--><!--{/if}-->><!--{"\n"}--><!--{$arrForm.body|h}--></textarea>
<!--{if $arrErr.body}--><br /><span class="attention"><!--{$arrErr.body}--></span><!--{/if}-->
<div>
<a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','body','cnt_footer'); return false;" name="next" id="next"><span><!--{t string="tpl_354"}--></span></a>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/edit.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -610,7 +610,7 @@
<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|h}--></textarea>
+ <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -81,7 +81,7 @@
<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|h}--></textarea>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="75" rows="12" class="area75"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
</td>
</tr>
<tr>
@@ -92,7 +92,7 @@
<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|h}--></textarea>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="75" rows="12" class="area75"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail_confirm.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/mail_confirm.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -26,8 +26,8 @@
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
<input type="hidden" name="mode" value="send" />
<input type="hidden" name="order_id_array" value="<!--{$order_id_array}-->" />
-<!--{foreach key=key item=item from=$arrHidden}-->
-<input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
+<!--{foreach key=key item=item from=$arrForm}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$item.value|h}-->" />
<!--{/foreach}-->
<!--{foreach key=key item=item from=$arrSearchHidden}-->
<!--{if is_array($item)}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/order/status.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -101,7 +101,6 @@
</tr>
<!--{/section}-->
</table>
- <input type="hidden" name="move[]" value="" />
<p><!--{$tpl_strnavi}--></p>
@@ -119,15 +118,14 @@
<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 (fm.change_status.options[document.form1.change_status.selectedIndex].value == "") {
+ selectflag = 1;
}
- if(selectflag == 1){
+ if (selectflag == 1) {
alert('<!--{t string="tpl_438"}-->');
return false;
}
@@ -135,26 +133,26 @@
var checkflag = 0;
var max = fm["move[]"].length;
- if(max) {
+ if (max) {
for (i=0;i<max;i++){
- if(fm["move[]"][i].checked == true){
+ if(fm["move[]"][i].checked == true) {
checkflag = 1;
}
}
} else {
- if(fm["move[]"].checked == true) {
+ if (fm["move[]"].checked == true) {
checkflag = 1;
}
}
- if(checkflag == 0){
+ if (checkflag == 0){
alert(<!--{t string="tpl_398"}-->);
return false;
}
- if(selectflag == 0 && checkflag == 1){
- document.form1.mode.value = 'update';
- document.form1.submit();
+ if (selectflag == 0 && checkflag == 1) {
+ document.form1.mode.value = 'update';
+ document.form1.submit();
}
}
//-->
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/ownersstore/settings.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -36,7 +36,7 @@
<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]|h}--></textarea>
+ <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.MTEXT_LEN}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -252,7 +252,7 @@
<th><!--{t string="tpl_592"}--></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|h}--></textarea><br />
+ <textarea name="comment3" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.comment3|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm.comment3|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span>
</td>
</tr>
@@ -260,7 +260,7 @@
<th><!--{t string="tpl_565"}--></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|h}--></textarea><br />
+ <textarea name="note" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.note|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm.note|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span>
</td>
</tr>
@@ -268,7 +268,7 @@
<th><!--{t string="tpl_566"}--><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|h}--></textarea><br />
+ <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"><!--{"\n"}--><!--{$arrForm.main_list_comment|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.MTEXT_LEN}--></span>
</td>
</tr>
@@ -276,7 +276,7 @@
<th><!--{t string="tpl_567"}--><span class="attention"><!--{t string="tpl_594"}-->*</span></th>
<td>
<span class="attention"><!--{$arrErr.main_comment}--></span>
- <textarea name="main_comment" 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|h}--></textarea><br />
+ <textarea name="main_comment" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{if $arrErr.main_comment != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" cols="60" rows="8" class="area60"><!--{"\n"}--><!--{$arrForm.main_comment|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span>
</td>
</tr>
@@ -353,7 +353,7 @@
<!--{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]|h}--></textarea><br />
+ <textarea name="sub_comment<!--{$smarty.section.cnt.iteration}-->" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span>
</td>
</tr>
@@ -422,7 +422,7 @@
<span class="attention"><!--{$arrErr[$key]}--></span>
<!--{t string="tpl_192"}-->:<!--{$arrRecommend[$recommend_no].product_code_min}--><br />
<!--{t string="tpl_189"}-->:<!--{$arrRecommend[$recommend_no].name|h}--><br />
- <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrRecommend[$recommend_no].comment|h}--></textarea><br />
+ <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrRecommend[$recommend_no].comment|h}--></textarea><br />
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LTEXT_LEN}--></span>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/products/review_edit.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/products/review_edit.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -95,7 +95,7 @@
<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}-->" ><!--{$arrForm.comment|h}--></textarea>
+ <textarea name="comment" rows="20" cols="60" class="area60" wrap="soft" style="<!--{$arrErr.comment|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrForm.comment|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/system/adminarea.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/system/adminarea.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/system/adminarea.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -63,7 +63,7 @@
<td>
<!--{assign var=key value="admin_allow_hosts"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key]|h}--></textarea>
+ <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key]|h}--></textarea>
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LTEXT_LEN}--></span><br />
<span><!--{t string="tpl_645"}--></span><br />
変更: branches/version-2_12-multilang/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/admin/system/bkup.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/admin/system/bkup.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -54,7 +54,7 @@
<!--{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|h}--></textarea>
+ <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}-->"><!--{"\n"}--><!--{$arrForm.bkup_memo|h}--></textarea>
<span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.MTEXT_LEN}--></span>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/default/contact/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default/contact/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/default/contact/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -114,7 +114,7 @@
<span class="mini">（全角<!--{$smarty.const.MLTEXT_LEN}-->字以下）</span></th>
<td>
<span class="attention"><!--{$arrErr.contents}--></span>
- <textarea name="contents" class="box380" cols="60" rows="20" style="<!--{$arrErr.contents.value|h|sfGetErrorColor}-->; ime-mode: active;"><!--{$arrForm.contents.value|h}--></textarea>
+ <textarea name="contents" class="box380" cols="60" rows="20" style="<!--{$arrErr.contents.value|h|sfGetErrorColor}-->; ime-mode: active;"><!--{"\n"}--><!--{$arrForm.contents.value|h}--></textarea>
<p class="mini attention">※ご注文に関するお問い合わせには、必ず「ご注文番号」をご記入くださいますようお願いいたします。</p>
</td>
</tr>
変更: branches/version-2_12-multilang/data/Smarty/templates/default/entry/kiyaku.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default/entry/kiyaku.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/default/entry/kiyaku.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -30,7 +30,7 @@
<form name="form1" id="form1" method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" />
- <textarea name="textfield" class="kiyaku_text" cols="80" rows="30" readonly="readonly"><!--{$tpl_kiyaku_text|h}--></textarea>
+ <textarea name="textfield" class="kiyaku_text" cols="80" rows="30" readonly="readonly"><!--{"\n"}--><!--{$tpl_kiyaku_text|h}--></textarea>
<div class="btn_area">
<ul>
変更: branches/version-2_12-multilang/data/Smarty/templates/default/products/review.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default/products/review.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/default/products/review.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -76,7 +76,7 @@
<th>コメント<span class="attention">※</span></th>
<td>
<span class="attention"><!--{$arrErr.comment}--></span>
- <textarea name="comment" cols="50" rows="10" style="<!--{$arrErr.comment|sfGetErrorColor}-->" class="area350"><!--{$arrForm.comment|h}--></textarea>
+ <textarea name="comment" cols="50" rows="10" style="<!--{$arrErr.comment|sfGetErrorColor}-->" class="area350"><!--{"\n"}--><!--{$arrForm.comment|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/default/shopping/payment.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/default/shopping/payment.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -268,7 +268,7 @@
<!--★その他お問い合わせ事項★-->
<!--{assign var=key value="message"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="70" rows="8" class="txtarea" wrap="hard"><!--{$arrForm[$key].value|h}--></textarea>
+ <textarea name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="70" rows="8" class="txtarea" wrap="hard"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
<p class="attention"> (<!--{$smarty.const.LTEXT_LEN}-->文字まで)</p>
</div>
</div>
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/cart/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/cart/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/cart/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -42,37 +42,37 @@
<!--{foreach from=$cartKeys item=key}-->
<form name="form<!--{$key}-->" id="form<!--{$key}-->" method="post" action="?" utn>
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="hidden" name="mode" value="confirm">
- <input type="hidden" name="cart_no" value="">
- <input type="hidden" name="cartKey" value="<!--{$key}-->">
- <!--ご注文内容ここから-->
+ <input type="hidden" name="mode" value="confirm">
+ <input type="hidden" name="cart_no" value="">
+ <input type="hidden" name="cartKey" value="<!--{$key}-->">
+ <!--ご注文内容ここから-->
<!--{if count($cartKeys) > 1}-->
<hr>
■<!--{$arrProductType[$key]}-->
<hr>
<!--{/if}-->
<!--{foreach from=$cartItems[$key] item=item}-->
- ◎<!--{* 商品名 *}--><!--{$item.productsClass.name|h}--><br>
+ ◎<!--{* 商品名 *}--><!--{$item.productsClass.name|h}--><br>
<!--{* 規格名1 *}--><!--{if $item.productsClass.classcategory_name1 != ""}--><!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br><!--{/if}-->
<!--{* 規格名2 *}--><!--{if $item.productsClass.classcategory_name2 != ""}--><!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}--><br><!--{/if}-->
- <!--{* 販売価格 *}-->
- <!--{$item.price|sfCalcIncTax|number_format}-->円
- × <!--{$item.quantity}--><br>
- <br>
- <!--{* 数量 *}-->
- 数量:<!--{$item.quantity}-->
- <a href="?mode=up&cart_no=<!--{$item.cart_no}-->&cartKey=<!--{$key}-->">＋</a>
- <a href="?mode=down&cart_no=<!--{$item.cart_no}-->&cartKey=<!--{$key}-->">−</a>
- <a href="?mode=delete&cart_no=<!--{$item.cart_no}-->&cartKey=<!--{$key}-->">削除</a><br>
- <!--{* 合計 *}-->
- 小計:<!--{$item.total_inctax|number_format}-->円<br>
- <div align="right"><a href="<!--{$smarty.const.MOBILE_P_DETAIL_URLPATH}--><!--{$item.productsClass.product_id|u}-->">→商品詳細へ</a></div>
- <HR>
- <!--{/foreach}-->
- <font color="#FF0000">
- 商品合計:<!--{$tpl_total_inctax[$key]|number_format}-->円<br>
- 合計:<!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->円<br>
- </font>
+ <!--{* 販売価格 *}-->
+ <!--{$item.price|sfCalcIncTax|number_format}-->円
+ × <!--{$item.quantity}--><br>
+ <br>
+ <!--{* 数量 *}-->
+ 数量:<!--{$item.quantity}-->
+ <a href="?mode=up&cart_no=<!--{$item.cart_no}-->&cartKey=<!--{$key}-->">＋</a>
+ <a href="?mode=down&cart_no=<!--{$item.cart_no}-->&cartKey=<!--{$key}-->">−</a>
+ <a href="?mode=delete&cart_no=<!--{$item.cart_no}-->&cartKey=<!--{$key}-->">削除</a><br>
+ <!--{* 合計 *}-->
+ 小計:<!--{$item.total_inctax|number_format}-->円<br>
+ <div align="right"><a href="<!--{$smarty.const.MOBILE_P_DETAIL_URLPATH}--><!--{$item.productsClass.product_id|u}-->">→商品詳細へ</a></div>
+ <HR>
+ <!--{/foreach}-->
+ <font color="#FF0000">
+ 商品合計:<!--{$tpl_total_inctax[$key]|number_format}-->円<br>
+ 合計:<!--{$arrData[$key].total-$arrData[$key].deliv_fee|number_format}-->円<br>
+ </font>
<br>
<!--{if $key != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
<!--{if $arrInfo.free_rule > 0}-->
@@ -85,17 +85,17 @@
<!--{/if}-->
<!--{/if}-->
- <!--{if $smarty.const.USE_POINT !== false}-->
+ <!--{if $smarty.const.USE_POINT !== false}-->
<!--{if $arrData[$key].birth_point > 0}-->
- お誕生月ポイント<br>
- <!--{$arrData[$key].birth_point|number_format}-->pt<br>
- <!--{/if}-->
+ お誕生月ポイント<br>
+ <!--{$arrData[$key].birth_point|number_format}-->pt<br>
+ <!--{/if}-->
今回加算ポイント<br>
<!--{$arrData[$key].add_point|number_format}-->pt<br>
<br>
- <!--{/if}-->
+ <!--{/if}-->
- <center><input type="submit" value="注文する"></center>
+ <center><input type="submit" value="注文する"></center>
</form>
<br>
@@ -105,7 +105,7 @@
<!--{/if}-->
<!--{/foreach}-->
<!--{else}-->
- ※現在カート内に商品はございません。<br>
+ ※現在カート内に商品はございません。<br>
<br>
<!--{/if}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/confirm.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/confirm.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -24,52 +24,52 @@
<!--{strip}-->
<form name="form1" id="form1" method="post" action="?" utn>
- <input type="hidden" name="mode" value="complete">
+ <input type="hidden" name="mode" value="complete">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <!--{foreach from=$arrForm key=key item=item}-->
- <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
- <!--{/foreach}-->
- 下記の内容でご登録してもよろしいですか？<br>
- <br>
+ <!--{foreach from=$arrForm key=key item=item}-->
+ <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
+ <!--{/foreach}-->
+ 下記の内容でご登録してもよろしいですか？<br>
+ <br>
- ●お名前<br>
- <!--{$arrForm.name01|h}--> <!--{$arrForm.name02|h}--><br>
+ ●お名前<br>
+ <!--{$arrForm.name01|h}--> <!--{$arrForm.name02|h}--><br>
- ●お名前(フリガナ)<br>
- <!--{$arrForm.kana01|h}--> <!--{$arrForm.kana02|h}--><br>
+ ●お名前(フリガナ)<br>
+ <!--{$arrForm.kana01|h}--> <!--{$arrForm.kana02|h}--><br>
- ●性別<br>
- <!--{if $arrForm.sex eq 1}-->男性<!--{else}-->女性<!--{/if}--><br>
+ ●性別<br>
+ <!--{if $arrForm.sex eq 1}-->男性<!--{else}-->女性<!--{/if}--><br>
- ●職業<br>
- <!--{if $arrForm.job}--><!--{$arrJob[$arrForm.job]|h}--><!--{else}-->未登録<!--{/if}--><br>
+ ●職業<br>
+ <!--{if $arrForm.job}--><!--{$arrJob[$arrForm.job]|h}--><!--{else}-->未登録<!--{/if}--><br>
- ●生年月日<br>
- <!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|h}-->年<!--{$arrForm.month|h}-->月<!--{$arrForm.day|h}-->日生まれ<!--{else}-->未登録<!--{/if}--><br>
+ ●生年月日<br>
+ <!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|h}-->年<!--{$arrForm.month|h}-->月<!--{$arrForm.day|h}-->日生まれ<!--{else}-->未登録<!--{/if}--><br>
- ●住所<br>
- 〒<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--><br>
- <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--><br>
+ ●住所<br>
+ 〒<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--><br>
+ <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--><br>
- ●電話番号<br>
- <!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02|h}-->-<!--{$arrForm.tel03|h}--><br>
-
- ●メールアドレス<br>
- <!--{$arrForm.email|h}--><br>
+ ●電話番号<br>
+ <!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02|h}-->-<!--{$arrForm.tel03|h}--><br>
+
+ ●メールアドレス<br>
+ <!--{$arrForm.email|h}--><br>
- ●パスワード確認用質問<br>
- <!--{$arrReminder[$arrForm.reminder]|h}--><br>
+ ●パスワード確認用質問<br>
+ <!--{$arrReminder[$arrForm.reminder]|h}--><br>
- ●質問の答え<br>
- <!--{$arrForm.reminder_answer|h}--><br>
+ ●質問の答え<br>
+ <!--{$arrForm.reminder_answer|h}--><br>
- ●メールマガジン<br>
- <!--{if $arrForm.mailmaga_flg eq 2}-->希望する<!--{else}-->希望しない<!--{/if}--><br>
- <br>
+ ●メールマガジン<br>
+ <!--{if $arrForm.mailmaga_flg eq 2}-->希望する<!--{else}-->希望しない<!--{/if}--><br>
+ <br>
- <center>
- <input type="submit" name="submit" value="登録"><br>
- <input type="submit" name="return" value="戻る">
- </center>
+ <center>
+ <input type="submit" name="submit" value="登録"><br>
+ <input type="submit" name="return" value="戻る">
+ </center>
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -26,115 +26,115 @@
<form name="form1" method="post" action="?">
<input type="hidden" name="mode" value="confirm">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <font color="#FF0000">*は必須項目です。</font><br>
- <br>
+ <font color="#FF0000">*は必須項目です。</font><br>
+ <br>
- ●お名前<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font>
- 姓（例：渋谷）<br>
- <input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+ ●お名前<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font>
+ 姓（例：渋谷）<br>
+ <input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- 名（例：花子）<br>
- <input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
+ 名（例：花子）<br>
+ <input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+ <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
- ●お名前(フリガナ)<font color="#FF0000"> *</font><br>
- フリガナ/姓（例：シブヤ）<br>
- <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ ●お名前(フリガナ)<font color="#FF0000"> *</font><br>
+ フリガナ/姓（例：シブヤ）<br>
+ <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- フリガナ/名（例：ハナコ）<br>
- <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ フリガナ/名（例：ハナコ）<br>
+ <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- ●性別<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.sex}--></font>
- <input type="radio" name="sex" value="1" <!--{if $arrForm.sex eq 1}-->checked<!--{/if}-->>男性 <input type="radio" name="sex" value="2" <!--{if $arrForm.sex eq 2}-->checked<!--{/if}-->>女性<br>
+ ●性別<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.sex}--></font>
+ <input type="radio" name="sex" value="1" <!--{if $arrForm.sex eq 1}-->checked<!--{/if}-->>男性 <input type="radio" name="sex" value="2" <!--{if $arrForm.sex eq 2}-->checked<!--{/if}-->>女性<br>
- ●職業<br>
- <font color="#FF0000"><!--{$arrErr.job}--></font>
- <select name="job">
- <option value="">選択してください</option>
- <!--{html_options options=$arrJob selected=$arrForm.job}-->
- </select><br>
+ ●職業<br>
+ <font color="#FF0000"><!--{$arrErr.job}--></font>
+ <select name="job">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrJob selected=$arrForm.job}-->
+ </select><br>
- ●生年月日<br>
- <font color="#FF0000"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></font>
- <input type="text" name="year" value="<!--{$arrForm.year|h}-->" size="4" maxlength="4" istyle="4">年<br>
- <select name="month">
- <!--{html_options options=$arrMonth selected=$arrForm.month}-->
- </select>月<br>
- <select name="day">
- <!--{html_options options=$arrDay selected=$arrForm.day}-->
- </select>日<br>
+ ●生年月日<br>
+ <font color="#FF0000"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></font>
+ <input type="text" name="year" value="<!--{$arrForm.year|h}-->" size="4" maxlength="4" istyle="4">年<br>
+ <select name="month">
+ <!--{html_options options=$arrMonth selected=$arrForm.month}-->
+ </select>月<br>
+ <select name="day">
+ <!--{html_options options=$arrDay selected=$arrForm.day}-->
+ </select>日<br>
- <!--{assign var=key1 value="zip01"}-->
- <!--{assign var=key2 value="zip02"}-->
- ●郵便番号<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
- <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
- <!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
- <input size="<!--{$size1}-->" type="text" name="zip01" value="<!--{if $arrForm.zip01 == ""}--><!--{$arrOtherDeliv.zip01|h}--><!--{else}--><!--{$arrForm.zip01|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" istyle="4">
- -
- <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 == ""}--><!--{$arrOtherDeliv.zip02|h}--><!--{else}--><!--{$arrForm.zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
- <input type="submit" name="submit_address" value="自動住所入力"><br>
- 郵便番号を入力後、クリックしてください。<br>
+ <!--{assign var=key1 value="zip01"}-->
+ <!--{assign var=key2 value="zip02"}-->
+ ●郵便番号<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
+ <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
+ <!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
+ <input size="<!--{$size1}-->" type="text" name="zip01" value="<!--{if $arrForm.zip01 == ""}--><!--{$arrOtherDeliv.zip01|h}--><!--{else}--><!--{$arrForm.zip01|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" istyle="4">
+ -
+ <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 == ""}--><!--{$arrOtherDeliv.zip02|h}--><!--{else}--><!--{$arrForm.zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
+ <input type="submit" name="submit_address" value="自動住所入力"><br>
+ 郵便番号を入力後、クリックしてください。<br>
- ●都道府県<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.pref}--></font>
- <select name="pref">
- <option value="">都道府県を選択</option>
- <!--{html_options options=$arrPref selected=$arrForm.pref}-->
- </select><br>
+ ●都道府県<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.pref}--></font>
+ <select name="pref">
+ <option value="">都道府県を選択</option>
+ <!--{html_options options=$arrPref selected=$arrForm.pref}-->
+ </select><br>
- ●住所1<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.addr01}--></font>
- <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br>
+ ●住所1<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.addr01}--></font>
+ <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br>
- ●住所2<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.addr02}--></font>
- <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br>
+ ●住所2<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.addr02}--></font>
+ <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br>
- ●電話番号<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font>
- <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
- <input type="text" size="<!--{$size}-->" name="tel01" value="<!--{$arrForm.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="tel02" value="<!--{$arrForm.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
+ ●電話番号<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font>
+ <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
+ <input type="text" size="<!--{$size}-->" name="tel01" value="<!--{$arrForm.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="tel02" value="<!--{$arrForm.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
- ●メールアドレス<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.email}--></font>
- <input type="text" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">
+ ●メールアドレス<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.email}--></font>
+ <input type="text" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">
<br>
- ●パスワード<font color="#FF0000"> *</font><br>
- （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br>
- <font color="#FF0000"><!--{$arrErr.password}--></font>
- <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}-->
- <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br>
+ ●パスワード<font color="#FF0000"> *</font><br>
+ （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br>
+ <font color="#FF0000"><!--{$arrErr.password}--></font>
+ <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}-->
+ <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br>
- ●パスワード確認用の質問<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.reminder}--></font>
- <select name="reminder">
- <option value="">選択してください</option>
- <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
- </select><br>
+ ●パスワード確認用の質問<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.reminder}--></font>
+ <select name="reminder">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
+ </select><br>
- ●質問の答え<font color="#FF0000"> *</font><br>
- <font color="#FF0000"><!--{$arrErr.reminder_answer}--></font>
- <input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" istyle="1"><br>
+ ●質問の答え<font color="#FF0000"> *</font><br>
+ <font color="#FF0000"><!--{$arrErr.reminder_answer}--></font>
+ <input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" istyle="1"><br>
- ●メールマガジン<br>
- お得な情報を希望されますか？<br>
- <input type="hidden" name="mailmaga_flg" value="3">
- 配信希望<input type="checkbox" name="mailmaga_flg" value="2" <!--{if $arrForm.mailmaga_flg == 2}-->checked<!--{/if}-->><br>
- <!--{if $arrForm.mailmaga_flg == 2}-->（希望されない場合はチェックをはずしてください）<br><!--{/if}-->
- <br>
+ ●メールマガジン<br>
+ お得な情報を希望されますか？<br>
+ <input type="hidden" name="mailmaga_flg" value="3">
+ 配信希望<input type="checkbox" name="mailmaga_flg" value="2" <!--{if $arrForm.mailmaga_flg == 2}-->checked<!--{/if}-->><br>
+ <!--{if $arrForm.mailmaga_flg == 2}-->（希望されない場合はチェックをはずしてください）<br><!--{/if}-->
+ <br>
- <center><input type="submit" name="submit" value="次へ"></center>
+ <center><input type="submit" name="submit" value="次へ"></center>
- <!--{foreach from=$list_data key=key item=item}-->
- <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
- <!--{/foreach}-->
+ <!--{foreach from=$list_data key=key item=item}-->
+ <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
+ <!--{/foreach}-->
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/kiyaku.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/kiyaku.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/entry/kiyaku.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -32,7 +32,7 @@
<!--{$tpl_kiyaku_text|h|nl2br}--><br>
<!--{if $max >= $offset+1}-->
- <a href="kiyaku.php?offset=<!--{$offset+1}-->">次へ→</a><br><br>
+ <a href="kiyaku.php?offset=<!--{$offset+1}-->">次へ→</a><br><br>
<!--{/if}-->
<a href="<!--{$smarty.const.HTTPS_URL}-->entry/<!--{$smarty.const.DIR_INDEX_PATH}-->?<!--{$smarty.const.SID}-->" accesskey="1"><!--{1|numeric_emoji}-->同意して登録へ</a><br>
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -26,126 +26,126 @@
<form name="form1" method="post" action="?">
<input type="hidden" name="mode" value="confirm">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <font color="#FF0000">*は必須項目です。</font><br>
- <br>
+ <font color="#FF0000">*は必須項目です。</font><br>
+ <br>
- 【お名前】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font>
- 姓（例：渋谷）<br>
- <input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+ 【お名前】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font>
+ 姓（例：渋谷）<br>
+ <input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- 名（例：花子）<br>
- <input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
+ 名（例：花子）<br>
+ <input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+ <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
- フリガナ/姓（例：シブヤ）<font color="#FF0000">※</font><br>
- <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ フリガナ/姓（例：シブヤ）<font color="#FF0000">※</font><br>
+ <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- フリガナ/名（例：ハナコ）<font color="#FF0000">※</font><br>
- <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ フリガナ/名（例：ハナコ）<font color="#FF0000">※</font><br>
+ <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- 【性別】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.sex}--></font>
- <input type="radio" name="sex" value="1" <!--{if $arrForm.sex eq 1}-->checked<!--{/if}-->>男性 <input type="radio" name="sex" value="2" <!--{if $arrForm.sex eq 2}-->checked<!--{/if}-->>女性<br>
+ 【性別】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.sex}--></font>
+ <input type="radio" name="sex" value="1" <!--{if $arrForm.sex eq 1}-->checked<!--{/if}-->>男性 <input type="radio" name="sex" value="2" <!--{if $arrForm.sex eq 2}-->checked<!--{/if}-->>女性<br>
- 【職業】<br>
- <font color="#FF0000"><!--{$arrErr.job}--></font>
- <select name="job">
- <option value="">選択してください</option>
- <!--{html_options options=$arrJob selected=$arrForm.job}-->
- </select><br>
+ 【職業】<br>
+ <font color="#FF0000"><!--{$arrErr.job}--></font>
+ <select name="job">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrJob selected=$arrForm.job}-->
+ </select><br>
- 【生年月日】<br>
- <font color="#FF0000"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></font>
- <input type="text" name="year" value="<!--{$arrForm.year|h}-->" size="4" maxlength="4" istyle="4">年<br>
- <select name="month">
- <!--{html_options options=$arrMonth selected=$arrForm.month}-->
- </select>月<br>
- <select name="day">
- <!--{html_options options=$arrDay selected=$arrForm.day}-->
- </select>日<br>
+ 【生年月日】<br>
+ <font color="#FF0000"><!--{$arrErr.year}--><!--{$arrErr.month}--><!--{$arrErr.day}--></font>
+ <input type="text" name="year" value="<!--{$arrForm.year|h}-->" size="4" maxlength="4" istyle="4">年<br>
+ <select name="month">
+ <!--{html_options options=$arrMonth selected=$arrForm.month}-->
+ </select>月<br>
+ <select name="day">
+ <!--{html_options options=$arrDay selected=$arrForm.day}-->
+ </select>日<br>
- <!--{assign var=key1 value="zip01"}-->
- <!--{assign var=key2 value="zip02"}-->
- 【郵便番号】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
- <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
- <!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
- <input size="<!--{$size1}-->" type="text" name="zip01" value="<!--{if $arrForm.zip01 == ""}--><!--{$arrOtherDeliv.zip01|h}--><!--{else}--><!--{$arrForm.zip01|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" istyle="4">
- -
- <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 == ""}--><!--{$arrOtherDeliv.zip02|h}--><!--{else}--><!--{$arrForm.zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
- <input type="submit" name="submit_address" value="自動住所入力"><br>
- 郵便番号を入力後、クリックしてください。<br>
+ <!--{assign var=key1 value="zip01"}-->
+ <!--{assign var=key2 value="zip02"}-->
+ 【郵便番号】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
+ <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
+ <!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
+ <input size="<!--{$size1}-->" type="text" name="zip01" value="<!--{if $arrForm.zip01 == ""}--><!--{$arrOtherDeliv.zip01|h}--><!--{else}--><!--{$arrForm.zip01|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" istyle="4">
+ -
+ <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 == ""}--><!--{$arrOtherDeliv.zip02|h}--><!--{else}--><!--{$arrForm.zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
+ <input type="submit" name="submit_address" value="自動住所入力"><br>
+ 郵便番号を入力後、クリックしてください。<br>
- 【都道府県】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.pref}--></font>
- <select name="pref">
- <option value="">都道府県を選択</option>
- <!--{html_options options=$arrPref selected=$arrForm.pref}-->
- </select><br>
+ 【都道府県】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.pref}--></font>
+ <select name="pref">
+ <option value="">都道府県を選択</option>
+ <!--{html_options options=$arrPref selected=$arrForm.pref}-->
+ </select><br>
- 【住所1】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.addr01}--></font>
- <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br>
+ 【住所1】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.addr01}--></font>
+ <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br>
- 【住所2】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.addr02}--></font>
- <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br>
+ 【住所2】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.addr02}--></font>
+ <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br>
- 【電話番号】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font>
- <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
- <input type="text" size="<!--{$size}-->" name="tel01" value="<!--{$arrForm.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="tel02" value="<!--{$arrForm.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
+ 【電話番号】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font>
+ <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
+ <input type="text" size="<!--{$size}-->" name="tel01" value="<!--{$arrForm.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="tel02" value="<!--{$arrForm.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
- 【FAX番号】<br>
- <font color="#FF0000"><!--{$arrErr.fax01}--><!--{$arrErr.fax02}--><!--{$arrErr.fax03}--></font>
- <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
- <input type="text" size="<!--{$size}-->" name="fax01" value="<!--{$arrForm.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="fax02" value="<!--{$arrForm.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="fax03" value="<!--{$arrForm.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
+ 【FAX番号】<br>
+ <font color="#FF0000"><!--{$arrErr.fax01}--><!--{$arrErr.fax02}--><!--{$arrErr.fax03}--></font>
+ <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
+ <input type="text" size="<!--{$size}-->" name="fax01" value="<!--{$arrForm.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="fax02" value="<!--{$arrForm.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="fax03" value="<!--{$arrForm.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
- 【携帯メールアドレス】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.email_mobile}--></font>
- <input type="text" name="email_mobile" value="<!--{$arrForm.email_mobile|h}-->" istyle="3"><br>
+ 【携帯メールアドレス】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.email_mobile}--></font>
+ <input type="text" name="email_mobile" value="<!--{$arrForm.email_mobile|h}-->" istyle="3"><br>
<!--{* PCメールアドレス *}-->
- <input type="hidden" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">
+ <input type="hidden" name="email" value="<!--{$arrForm.email|h}-->" istyle="3">
- 【パスワード】<font color="#FF0000">※</font><br>
- （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br>
- <font color="#FF0000"><!--{$arrErr.password}--></font>
- <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}-->
- <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br>
+ 【パスワード】<font color="#FF0000">※</font><br>
+ （半角英数字<!--{$smarty.const.PASSWORD_MIN_LEN}-->文字以上<!--{$smarty.const.PASSWORD_MAX_LEN}-->文字以内）<br>
+ <font color="#FF0000"><!--{$arrErr.password}--></font>
+ <!--{assign var="size" value="`$smarty.const.PASSWORD_MAX_LEN+2`"}-->
+ <input type="password" name="password" value="<!--{$arrForm.password}-->" istyle="4" maxlength="<!--{$smarty.const.PASSWORD_MAX_LEN}-->" size="<!--{$size}-->"><br>
- 【パスワード確認用の質問】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.reminder}--></font>
- <select name="reminder">
- <option value="">選択してください</option>
- <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
- </select><br>
+ 【パスワード確認用の質問】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.reminder}--></font>
+ <select name="reminder">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrReminder selected=$arrForm.reminder}-->
+ </select><br>
- 【質問の答え】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.reminder_answer}--></font>
- <input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" istyle="1"><br>
+ 【質問の答え】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.reminder_answer}--></font>
+ <input type="text" name="reminder_answer" value="<!--{$arrForm.reminder_answer|h}-->" istyle="1"><br>
- 【メールマガジン】<br>
- お得な情報を希望されますか？<br>
- （希望されない場合はチェックをはずしてください）<br>
- <input type="hidden" name="mailmaga_flg" value="3">
- 配信希望<input type="checkbox" name="mailmaga_flg" value="2" <!--{if $arrForm.mailmaga_flg == 2}-->checked<!--{/if}-->><br>
+ 【メールマガジン】<br>
+ お得な情報を希望されますか？<br>
+ （希望されない場合はチェックをはずしてください）<br>
+ <input type="hidden" name="mailmaga_flg" value="3">
+ 配信希望<input type="checkbox" name="mailmaga_flg" value="2" <!--{if $arrForm.mailmaga_flg == 2}-->checked<!--{/if}-->><br>
- <br>
+ <br>
- <center><input type="submit" name="submit" value="次へ"></center>
+ <center><input type="submit" name="submit" value="次へ"></center>
- <!--{foreach from=$list_data key=key item=item}-->
- <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
- <!--{/foreach}-->
+ <!--{foreach from=$list_data key=key item=item}-->
+ <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
+ <!--{/foreach}-->
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change_confirm.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/change_confirm.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -25,46 +25,46 @@
<!--{strip}-->
<form name="form1" id="form1" method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="hidden" name="mode" value="complete">
- <!--{foreach from=$arrForm key=key item=item}-->
- <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
- <!--{/foreach}-->
- 下記の内容でご登録してもよろしいですか？<br>
- <br>
+ <input type="hidden" name="mode" value="complete">
+ <!--{foreach from=$arrForm key=key item=item}-->
+ <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
+ <!--{/foreach}-->
+ 下記の内容でご登録してもよろしいですか？<br>
+ <br>
- 【個人情報】<br>
- <!--{$arrForm.name01|h}--> <!--{$arrForm.name02|h}--><br>
- <!--{$arrForm.kana01|h}--> <!--{$arrForm.kana02|h}--><br>
- <!--{if $arrForm.sex eq 1}-->男性<!--{else}-->女性<!--{/if}--><br>
- <!--{$arrJob[$arrForm.job]|h}--><br>
- <!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|h}-->年<!--{$arrForm.month|h}-->月<!--{$arrForm.day|h}-->日生まれ<!--{else}-->生年月日 未登録<!--{/if}--><br>
- 〒<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--><br>
- <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--><br>
- <!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02|h}-->-<!--{$arrForm.tel03|h}--><br>
- <!--{if $arrForm.fax01 > 0}-->
- <!--{$arrForm.fax01|h}-->-<!--{$arrForm.fax02|h}-->-<!--{$arrForm.fax03|h}--><br>
- <!--{/if}-->
- <br>
+ 【個人情報】<br>
+ <!--{$arrForm.name01|h}--> <!--{$arrForm.name02|h}--><br>
+ <!--{$arrForm.kana01|h}--> <!--{$arrForm.kana02|h}--><br>
+ <!--{if $arrForm.sex eq 1}-->男性<!--{else}-->女性<!--{/if}--><br>
+ <!--{$arrJob[$arrForm.job]|h}--><br>
+ <!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|h}-->年<!--{$arrForm.month|h}-->月<!--{$arrForm.day|h}-->日生まれ<!--{else}-->生年月日 未登録<!--{/if}--><br>
+ 〒<!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--><br>
+ <!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--><br>
+ <!--{$arrForm.tel01|h}-->-<!--{$arrForm.tel02|h}-->-<!--{$arrForm.tel03|h}--><br>
+ <!--{if $arrForm.fax01 > 0}-->
+ <!--{$arrForm.fax01|h}-->-<!--{$arrForm.fax02|h}-->-<!--{$arrForm.fax03|h}--><br>
+ <!--{/if}-->
+ <br>
- 【携帯メールアドレス】<br>
- <!--{$arrForm.email_mobile|default:"未登録"|h}--><br>
- <br>
-
- 【パスワード確認用質問】<br>
- <!--{$arrReminder[$arrForm.reminder]|h}--><br>
- <br>
+ 【携帯メールアドレス】<br>
+ <!--{$arrForm.email_mobile|default:"未登録"|h}--><br>
+ <br>
+
+ 【パスワード確認用質問】<br>
+ <!--{$arrReminder[$arrForm.reminder]|h}--><br>
+ <br>
- 【質問の答え】<br>
- <!--{$arrForm.reminder_answer|h}--><br>
- <br>
+ 【質問の答え】<br>
+ <!--{$arrForm.reminder_answer|h}--><br>
+ <br>
- 【メールマガジン゛】<br>
- <!--{if $arrForm.mailmaga_flg eq 2}-->希望する<!--{else}-->希望しない<!--{/if}--><br>
- <br>
+ 【メールマガジン゛】<br>
+ <!--{if $arrForm.mailmaga_flg eq 2}-->希望する<!--{else}-->希望しない<!--{/if}--><br>
+ <br>
- <center>
- <input type="submit" name="submit" value="変更"><br>
- <input type="submit" name="return" value="戻る">
- </center>
+ <center>
+ <input type="submit" name="submit" value="変更"><br>
+ <input type="submit" name="return" value="戻る">
+ </center>
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/delivery_addr.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/delivery_addr.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/delivery_addr.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -25,72 +25,72 @@
<!--{strip}-->
<form name="form1" method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="hidden" name="mode" value="edit">
+ <input type="hidden" name="mode" value="edit">
<input type="hidden" name="other_deliv_id" value="<!--{$smarty.session.other_deliv_id|h}-->">
<input type="hidden" name="ParentPage" value="<!--{$ParentPage}-->">
- <font color="#FF0000">*は必須項目です。</font><br>
- <br>
+ <font color="#FF0000">*は必須項目です。</font><br>
+ <br>
- 【お名前】<font color="#FF0000">※</font><br>
- <font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font>
- 姓（例：渋谷）<br>
- <input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+ 【お名前】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></font>
+ 姓（例：渋谷）<br>
+ <input type="text" name="name01" value="<!--{$arrForm.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- 名（例：花子）<br>
- <input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
+ 名（例：花子）<br>
+ <input type="text" name="name02" value="<!--{$arrForm.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
+ <font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
- フリガナ/姓（例：シブヤ）<br>
- <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ フリガナ/姓（例：シブヤ）<br>
+ <input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- フリガナ/名（例：ハナコ）<br>
- <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ フリガナ/名（例：ハナコ）<br>
+ <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- <br>
+ <br>
- <!--{assign var=key1 value="zip01"}-->
- <!--{assign var=key2 value="zip02"}-->
- 【郵便番号】<font color="#FF0000">*</font><br>
- <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
- <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
- <!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
- <input size="<!--{$size1}-->" type="text" name="zip01" value="<!--{if $arrForm.zip01 != ""}--><!--{$arrForm.zip01|h}--><!--{else}--><!--{$zip01|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" istyle="4">
- -
- <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 != ""}--><!--{$arrForm.zip02|h}--><!--{else}--><!--{$zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
+ <!--{assign var=key1 value="zip01"}-->
+ <!--{assign var=key2 value="zip02"}-->
+ 【郵便番号】<font color="#FF0000">*</font><br>
+ <font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
+ <!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
+ <!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
+ <input size="<!--{$size1}-->" type="text" name="zip01" value="<!--{if $arrForm.zip01 != ""}--><!--{$arrForm.zip01|h}--><!--{else}--><!--{$zip01|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" istyle="4">
+ -
+ <input size="<!--{$size2}-->" type="text" name="zip02" value="<!--{if $arrForm.zip02 != ""}--><!--{$arrForm.zip02|h}--><!--{else}--><!--{$zip02|h}--><!--{/if}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" istyle="4"><br>
- <br>
- 【都道府県】<font color="#FF0000">*</font><br>
- <font color="#FF0000"><!--{$arrErr.pref}--></font>
- <select name="pref">
- <option value="">都道府県を選択</option>
- <!--{html_options options=$arrPref selected=$arrForm.pref}-->
- </select><br>
+ <br>
+ 【都道府県】<font color="#FF0000">*</font><br>
+ <font color="#FF0000"><!--{$arrErr.pref}--></font>
+ <select name="pref">
+ <option value="">都道府県を選択</option>
+ <!--{html_options options=$arrPref selected=$arrForm.pref}-->
+ </select><br>
- 【住所1】<font color="#FF0000">*</font><br>
- <font color="#FF0000"><!--{$arrErr.addr01}--></font>
- <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br>
+ 【住所1】<font color="#FF0000">*</font><br>
+ <font color="#FF0000"><!--{$arrErr.addr01}--></font>
+ <input type="text" name="addr01" value="<!--{$arrForm.addr01|h}-->" istyle="1"><br>
- 【住所2】<font color="#FF0000">*</font><br>
- <font color="#FF0000"><!--{$arrErr.addr02}--></font>
- <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br>
+ 【住所2】<font color="#FF0000">*</font><br>
+ <font color="#FF0000"><!--{$arrErr.addr02}--></font>
+ <input type="text" name="addr02" value="<!--{$arrForm.addr02|h}-->" istyle="1"><br>
- 【電話番号】<font color="#FF0000">*</font><br>
- <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font>
- <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
- <input type="text" size="<!--{$size}-->" name="tel01" value="<!--{$arrForm.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="tel02" value="<!--{$arrForm.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
- -
- <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
+ 【電話番号】<font color="#FF0000">*</font><br>
+ <font color="#FF0000"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></font>
+ <!--{assign var="size" value="`$smarty.const.TEL_ITEM_LEN+2`"}-->
+ <input type="text" size="<!--{$size}-->" name="tel01" value="<!--{$arrForm.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="tel02" value="<!--{$arrForm.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4">
+ -
+ <input type="text" size="<!--{$size}-->" name="tel03" value="<!--{$arrForm.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" istyle="4"><br>
- <br>
+ <br>
- <div align="center"><input type="submit" name="submit" value="次へ"></div>
+ <div align="center"><input type="submit" name="submit" value="次へ"></div>
- <!--{foreach from=$list_data key=key item=item}-->
- <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
- <!--{/foreach}-->
+ <!--{foreach from=$list_data key=key item=item}-->
+ <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->">
+ <!--{/foreach}-->
</form>
<br>
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/login.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/login.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/login.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -24,23 +24,23 @@
<!--{strip}-->
<form name="member_form" id="member_form" method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->frontparts/login_check.php">
- <input type="hidden" name="mode" value="login">
+ <input type="hidden" name="mode" value="login">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
<input type="hidden" name="url" value="<!--{$smarty.server.REQUEST_URI|h}-->">
<!--{if !$tpl_valid_phone_id}-->
- ●メールアドレス<br>
+ ●メールアドレス<br>
<!--{assign var=key value="login_email"}-->
- <font color="#FF0000"><!--{$arrErr[$key]}--></font>
+ <font color="#FF0000"><!--{$arrErr[$key]}--></font>
<input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" maxlength="<!--{$arrForm[$key].length}-->" size="40" istyle="3"><br>
<!--{else}-->
- <input type="hidden" name="login_email" value="dummy">
+ <input type="hidden" name="login_email" value="dummy">
<!--{/if}-->
- ●パスワード<br>
+ ●パスワード<br>
<!--{assign var=key value="login_pass"}-->
<font color="#FF0000"><!--{$arrErr[$key]}--></font>
<input type="password" name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" size="40" istyle="3"><br>
- <center><input type="submit" value="送信" name="log"></center><br>
- <a href="<!--{$smarty.const.HTTPS_URL}-->forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->">パスワードをお忘れの方はこちら</a><br>
+ <center><input type="submit" value="送信" name="log"></center><br>
+ <a href="<!--{$smarty.const.HTTPS_URL}-->forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->">パスワードをお忘れの方はこちら</a><br>
</form>
<br>
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/refusal.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/refusal.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/mypage/refusal.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -30,7 +30,7 @@
<input type="hidden" name="mode" value="complete">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="submit" name="complete" value="退会する">
+ <input type="submit" name="complete" value="退会する">
</form>
</div>
<br>
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/products/detail.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/products/detail.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/products/detail.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -79,9 +79,9 @@
<!--★販売価格★-->
<font color="#FF0000"><!--{$smarty.const.SALE_PRICE_TITLE}-->(税込)：
<!--{if $arrProduct.price02_min_inctax == $arrProduct.price02_max_inctax}-->
- <!--{$arrProduct.price02_min_inctax|number_format}-->
+ <!--{$arrProduct.price02_min_inctax|number_format}-->
<!--{else}-->
- <!--{$arrProduct.price02_min_inctax|number_format}-->〜<!--{$arrProduct.price02_max_inctax|number_format}-->
+ <!--{$arrProduct.price02_min_inctax|number_format}-->〜<!--{$arrProduct.price02_max_inctax|number_format}-->
<!--{/if}-->
円</font>
<br>
@@ -126,15 +126,15 @@
<br>
<form name="form1" method="post" action="?">
- <input type="hidden" name="mode" value="select">
+ <input type="hidden" name="mode" value="select">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
+ <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
<!--{if $tpl_stock_find}-->
- <!--★商品を選ぶ★-->
- <center><input type="submit" name="select" id="cart" value="この商品を選ぶ"></center>
+ <!--★商品を選ぶ★-->
+ <center><input type="submit" name="select" id="cart" value="この商品を選ぶ"></center>
<!--{else}-->
- <font color="#FF0000">申し訳ございませんが、只今品切れ中です。</font>
+ <font color="#FF0000">申し訳ございませんが、只今品切れ中です。</font>
<!--{/if}-->
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find1.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find1.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find1.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -28,16 +28,16 @@
<hr>
<!--{if $arrErr.classcategory_id1 != ""}-->
- <font color="#FF0000">※<!--{$tpl_class_name1}-->を入力して下さい。</font><br>
+ <font color="#FF0000">※<!--{$tpl_class_name1}-->を入力して下さい。</font><br>
<!--{/if}-->
<form method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <select name="classcategory_id1">
- <option value="">選択してください</option>
- <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
- </select><br>
- <input type="hidden" name="mode" value="select2">
- <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
- <center><input type="submit" name="submit" value="次へ"></center>
+ <select name="classcategory_id1">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrClassCat1 selected=$arrForm.classcategory_id1.value}-->
+ </select><br>
+ <input type="hidden" name="mode" value="select2">
+ <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
+ <center><input type="submit" name="submit" value="次へ"></center>
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find2.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find2.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_find2.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -27,17 +27,17 @@
<hr>
<!--{if $arrErr.classcategory_id2 != ""}-->
- <font color="#FF0000">※<!--{$tpl_class_name2}-->を入力して下さい。</font><br>
+ <font color="#FF0000">※<!--{$tpl_class_name2}-->を入力して下さい。</font><br>
<!--{/if}-->
<form method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <select name="classcategory_id2">
- <option value="">選択してください</option>
- <!--{html_options options=$arrClassCat2 selected=$arrForm.classcategory_id2.value}-->
- </select><br>
- <input type="hidden" name="mode" value="selectItem">
- <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
- <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
- <center><input type="submit" name="submit" value="次へ"></center>
+ <select name="classcategory_id2">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrClassCat2 selected=$arrForm.classcategory_id2.value}-->
+ </select><br>
+ <input type="hidden" name="mode" value="selectItem">
+ <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
+ <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
+ <center><input type="submit" name="submit" value="次へ"></center>
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_item.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_item.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/products/select_item.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -27,17 +27,17 @@
<hr>
<!--{if $arrErr.quantity != ""}-->
- <font color="#FF0000">※数量を入力して下さい。</font><br>
+ <font color="#FF0000">※数量を入力して下さい。</font><br>
<!--{/if}-->
<form method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="text" name="quantity" size="3" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength=<!--{$smarty.const.INT_LEN}--> istyle="4"><br>
- <input type="hidden" name="mode" value="cart">
- <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
- <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value}-->">
- <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
+ <input type="text" name="quantity" size="3" value="<!--{$arrForm.quantity.value|default:1|h}-->" maxlength=<!--{$smarty.const.INT_LEN}--> istyle="4"><br>
+ <input type="hidden" name="mode" value="cart">
+ <input type="hidden" name="classcategory_id1" value="<!--{$arrForm.classcategory_id1.value}-->">
+ <input type="hidden" name="classcategory_id2" value="<!--{$arrForm.classcategory_id2.value}-->">
+ <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->">
<input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->">
<input type="hidden" name="product_type" value="<!--{$tpl_product_type}-->">
- <center><input type="submit" name="submit" value="かごに入れる"></center>
+ <center><input type="submit" name="submit" value="かごに入れる"></center>
</form>
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -29,7 +29,7 @@
(新規ご登録)<br>
<form name="member_form" id="member_form" method="post" action="<!--{$smarty.const.ROOT_URLPATH}-->entry/kiyaku.php">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <div align="center"><input type="submit" value="新規登録"></div><br>
+ <div align="center"><input type="submit" value="新規登録"></div><br>
</form>
<!--▲まだ会員登録されていないお客様-->
<!--{/if}-->
@@ -37,22 +37,22 @@
<!--▼会員登録がお済みのお客様-->
<form name="member_form" id="member_form" method="post" action="?">
<input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->">
- <input type="hidden" name="mode" value="login">
+ <input type="hidden" name="mode" value="login">
<!--{if !$tpl_valid_phone_id}-->
- ■以前にご注文された方<br>
- (モバイル又はPCでご登録済み)<br>
- ▼メールアドレス<br>
- <!--{assign var=key value="login_email"}-->
- <font color="#FF0000"><!--{$arrErr[$key]}--></font>
- <input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" size="40" istyle="3"><br>
+ ■以前にご注文された方<br>
+ (モバイル又はPCでご登録済み)<br>
+ ▼メールアドレス<br>
+ <!--{assign var=key value="login_email"}-->
+ <font color="#FF0000"><!--{$arrErr[$key]}--></font>
+ <input type="text" name="<!--{$key}-->" value="<!--{$tpl_login_email|h}-->" size="40" istyle="3"><br>
<!--{else}-->
<input type="hidden" name="login_email" value="dummy">
<!--{/if}-->
- ▼パスワード<br>
- <!--{assign var=key value="login_pass"}--><font color="#FF0000"><!--{$arrErr[$key]}--></font>
- <input type="password" name="<!--{$key}-->" size="40" istyle="3"><br>
- <center><input type="submit" value="送信" name="log"></center><br>
- <a href="<!--{$smarty.const.ROOT_URLPATH}-->forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->">パスワードをお忘れの方はこちら</a><br>
+ ▼パスワード<br>
+ <!--{assign var=key value="login_pass"}--><font color="#FF0000"><!--{$arrErr[$key]}--></font>
+ <input type="password" name="<!--{$key}-->" size="40" istyle="3"><br>
+ <center><input type="submit" value="送信" name="log"></center><br>
+ <a href="<!--{$smarty.const.ROOT_URLPATH}-->forgot/<!--{$smarty.const.DIR_INDEX_PATH}-->">パスワードをお忘れの方はこちら</a><br>
</form>
<!--▲会員登録がお済のお客様-->
<!--{/strip}-->
変更: branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/payment.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/payment.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/mobile/shopping/payment.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -82,7 +82,7 @@
<!--{if $arrErr[$key] != ""}-->
<font color="#FF0000"><!--{$arrErr[$key]}--></font>
<!--{/if}-->
- <textarea cols="20" rows="2" name="<!--{$key}-->"><!--{$arrForm[$key].value|h}--></textarea>
+ <textarea cols="20" rows="2" name="<!--{$key}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
<br>
<br>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/confirm.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/confirm.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/confirm.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -62,7 +62,7 @@
<dt>メールアドレス</dt>
<dd><a href="mailto:<!--{$arrForm.email.value|escape:'hex'}-->"><!--{$arrForm.email.value|escape:'hexentity'}--></a></dd>
- <dt>お問い合わせ内容<br /><span class="mini">（全角1000字以下）</span></dt>
+ <dt>お問い合わせ内容</dt>
<dd><!--{$arrForm.contents.value|h|nl2br}--></dd>
</dl>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/index.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone/contact/index.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -138,7 +138,7 @@
<dt>お問い合わせ内容 <span class="attention">※</span>
<span class="mini">（全角<!--{$smarty.const.MLTEXT_LEN}-->字以下）</span></dt>
<dd><span class="attention"><!--{$arrErr.contents}--></span>
- <textarea name="contents" id="contents" class="textarea data-role-none" rows="4" cols="42" style="<!--{$arrErr.contents|sfGetErrorColor}-->"><!--{$arrForm.contents.value|h}--></textarea>
+ <textarea name="contents" id="contents" class="textarea data-role-none" rows="4" cols="42" style="<!--{$arrErr.contents|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm.contents.value|h}--></textarea>
</dd>
</dl>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone/products/review.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone/products/review.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -73,7 +73,7 @@
<th>コメント<span class="attention">※</span></th>
<td>
<span class="attention"><!--{$arrErr.comment}--></span>
- <textarea name="comment" cols="15" rows="10" style="<!--{$arrErr.comment|sfGetErrorColor}-->" class="textarea data-role-none" wrap="hard"><!--{$arrForm.comment|h}--></textarea>
+ <textarea name="comment" cols="15" rows="10" style="<!--{$arrErr.comment|sfGetErrorColor}-->" class="textarea data-role-none" wrap="hard"><!--{"\n"}--><!--{$arrForm.comment|h}--></textarea>
</td>
</tr>
</table>
変更: branches/version-2_12-multilang/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_12-multilang/data/Smarty/templates/sphone/shopping/payment.tpl 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/Smarty/templates/sphone/shopping/payment.tpl 2012-12-04 11:09:02 UTC (rev 22122)
@@ -262,7 +262,7 @@
<!--{assign var=key value="message"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$key}-->" id="etc" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="62" rows="8" class="textarea data-role-none" wrap="hard"><!--{$arrForm[$key].value|h}--></textarea><br />
+ <textarea name="<!--{$key}-->" id="etc" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" cols="62" rows="8" class="textarea data-role-none" wrap="hard"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea><br />
</div><!--▲form_area -->
</section>
変更: branches/version-2_12-multilang/data/class/SC_CheckError.php
===================================================================
--- branches/version-2_12-multilang/data/class/SC_CheckError.php 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/class/SC_CheckError.php 2012-12-04 11:09:02 UTC (rev 22122)
@@ -558,7 +558,7 @@
return;
}
$this->createParam($value);
- if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:graph:]|[:space:]]+$/i", $this->arrParam[$value[1]])) {
+ if (strlen($this->arrParam[$value[1]]) > 0 && !preg_match("/^[[:graph:][:space:]]+$/i", $this->arrParam[$value[1]])) {
$this->arrErr[$value[1]] = t('SC_CheckError_030', array('T_FIELD' => $value[0]));
}
}
変更: branches/version-2_12-multilang/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 2012-12-04 11:09:02 UTC (rev 22122)
@@ -174,7 +174,7 @@
*/
function getRecommendProducts() {
$objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance();
- $col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*';
+ $col = 'dtb_products.name,dtb_products.main_list_image,dtb_products.del_flg as p_del_flg,dtb_best_products.*';
$table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id';
$where = 'dtb_best_products.del_flg = 0';
$order = 'rank';
変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 2012-12-04 11:09:02 UTC (rev 22122)
@@ -107,42 +107,45 @@
// 検索パラメーターの引き継ぎ
$this->arrSearchHidden = $objFormParam->getSearchArray();
+ // 履歴を読み込むか
+ $load_history = SC_Utils_Ex::sfIsInt($this->tpl_order_id);
+
switch ($this->getMode()) {
- case 'pre_edit':
- case 'mail_select':
+ case 'confirm':
+ $status = $this->confirm($objFormParam);
+ if ($status === true) {
+ $load_history = false;
+ } else {
+ $this->arrErr = $status;
+ }
break;
- case 'return':
- break;
+
case 'send':
$sendStatus = $this->doSend($objFormParam);
if ($sendStatus === true) {
-
SC_Response_Ex::sendRedirect(ADMIN_ORDER_URLPATH);
SC_Response_Ex::actionExit();
- } else {
- $this->arrErr = $sendStatus;
}
- case 'confirm':
- $status = $this->confirm($objFormParam);
- if ($status === true) {
- $this->arrHidden = $objFormParam->getHashArray();
+ $this->arrErr = $sendStatus;
+ break;
- return ;
- } else {
- $this->arrErr = $status;
- }
- break;
case 'change':
$objFormParam = $this->changeData($objFormParam);
break;
- }
- if (SC_Utils_Ex::sfIsInt($objFormParam->getValue('order_id'))) {
- $this->arrMailHistory = $this->getMailHistory($objFormParam->getValue('order_id'));
+ case 'pre_edit':
+ case 'mail_select':
+ case 'return':
+ default:
+ break;
}
+ // 入力内容の引き継ぎ
$this->arrForm = $objFormParam->getFormParamList();
+ if ($load_history) {
+ $this->arrMailHistory = $this->getMailHistory($this->tpl_order_id);
+ }
}
/**
@@ -171,7 +174,6 @@
$order_id_array = explode(',',$this->order_id_array);
foreach ($order_id_array as $order_id){
$objMail = new SC_Helper_Mail_Ex();
- $objMail->setPage($this);
$objSendMail = $objMail->sfSendOrderMail($order_id,
$objFormParam->getValue('template_id'),
$objFormParam->getValue('subject'),
@@ -194,7 +196,6 @@
if (count($arrErr) == 0) {
// 注文受付メール(送信なし)
$objMail = new SC_Helper_Mail_Ex();
- $objMail->setPage($this);
$objSendMail = $objMail->sfSendOrderMail(
$objFormParam->getValue('order_id'),
$objFormParam->getValue('template_id'),
@@ -217,21 +218,23 @@
* @param SC_FormParam $objFormParam
*/
function changeData(&$objFormParam) {
- if (SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
- $objQuery =& SC_Query_Ex::getSingletonInstance();
- $where = 'template_id = ?';
- $mailTemplates = $objQuery->select('subject, header, footer', 'dtb_mailtemplate', $where, array($objFormParam->getValue('template_id')));
- if (!is_null($mailTemplates)) {
- foreach (array('subject','header','footer') as $key) {
- $objFormParam->setValue($key,$mailTemplates[$key]);
- }
+ $objQuery =& SC_Query_Ex::getSingletonInstance();
+
+ if (!SC_Utils_Ex::sfIsInt($objFormParam->getValue('template_id'))) {
+ trigger_error('テンプレートが指定されていません。', E_USER_ERROR);
+ }
+
+ $where = 'template_id = ?';
+ $arrWhereVal = array($objFormParam->getValue('template_id'));
+ $mailTemplates = $objQuery->getRow('subject, header, footer', 'dtb_mailtemplate', $where, $arrWhereVal);
+ if (empty($mailTemplates)) {
+ foreach (array('subject','header','footer') as $key) {
+ $objFormParam->setValue($key, '');
}
- $objFormParam->setParam($mailTemplates[0]);
} else {
- foreach (array('subject','header','footer') as $key) {
- $objFormParam->setValue($key,'');
- }
+ $objFormParam->setParam($mailTemplates);
}
+
return $objFormParam;
}
変更: branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 2012-12-04 11:09:02 UTC (rev 22122)
@@ -82,7 +82,6 @@
$objFormParam->convParam();
$this->arrForm = $objFormParam->getHashArray();
- // $this->arrForm = $_POST;
//支払方法の取得
$this->arrPayment = $objDb->sfGetIDValueList('dtb_payment', 'payment_id', 'payment_method');
@@ -90,35 +89,28 @@
switch ($this->getMode()) {
case 'update':
switch ($objFormParam->getValue('change_status')) {
- case '':
- break;
- // 削除
+ // 削除
case 'delete':
$this->lfDelete($objFormParam->getValue('move'));
break;
- // 更新
+ // 更新
default:
$this->lfStatusMove($objFormParam->getValue('change_status'), $objFormParam->getValue('move'));
break;
}
-
- // 対応状況
- $status = !is_null($objFormParam->getValue('status')) ? $objFormParam->getValue('status') : '';
break;
case 'search':
- // 対応状況
- $status = !is_null($_POST['status']) ? $objFormParam->getValue('status') : '';
- break;
-
default:
- // 対応状況
- //デフォルトで新規受付一覧表示
- $status = ORDER_NEW;
break;
}
// 対応状況
+ $status = $objFormParam->getValue('status');
+ if (strlen($status) === 0) {
+ //デフォルトで新規受付一覧表示
+ $status = ORDER_NEW;
+ }
$this->SelectedStatus = $status;
//検索結果の表示
$this->lfStatusDisp($status, $objFormParam->getValue('search_pageno'));
@@ -132,9 +124,11 @@
function lfInitParam(&$objFormParam) {
$objFormParam->addParam(t('PARAM_LABEL_ORDER_NUMBER'), 'order_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_BEFORE_ORDER_STATUS'), 'status', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
- $objFormParam->addParam(t('PARAM_LABEL_AFTER_ORDER_STATUS'), 'change_status', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam(t('PARAM_LABEL_PAGE_NO'), 'search_pageno', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
- $objFormParam->addParam(t('PARAM_LABEL_MOVE_ORDER_NUMBER'), 'move', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ if ($this->getMode() == 'update') {
+ $objFormParam->addParam(t('PARAM_LABEL_AFTER_ORDER_STATUS'), 'change_status', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam(t('PARAM_LABEL_MOVE_ORDER_NUMBER'), 'move', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
+ }
}
/**
@@ -148,13 +142,6 @@
if (is_null($objFormParam->getValue('search_pageno'))) {
$objFormParam->setValue('search_pageno', 1);
}
-
- if ($this->getMode() == 'change') {
- if (is_null($objFormParam->getValue('change_status'))) {
- $objFormParam->setValue('change_status','');
- }
- }
-
}
/**
変更: branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Recommend.php 2012-12-04 11:09:02 UTC (rev 22122)
@@ -93,7 +93,7 @@
// おすすめ商品取得
$col = 'T1.best_id, T1.category_id, T1.rank, T1.product_id, T1.title, T1.comment, T1.create_date, T1.update_date';
$table = 'dtb_best_products as T1 INNER JOIN dtb_products as T2 ON T1.product_id = T2.product_id';
- $where = 'T1.del_flg = 0 and T2.status = 1';
+ $where = 'T1.del_flg = 0 and T2.status = 1 and T2.del_flg = 0';
$objQuery->setOrder('T1.rank');
$objQuery->setLimit(RECOMMEND_NUM);
$arrBestProducts = $objQuery->select($col, $table, $where);
変更: branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2012-12-04 10:35:44 UTC (rev 22121)
+++ branches/version-2_12-multilang/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2012-12-04 11:09:02 UTC (rev 22122)
@@ -76,7 +76,6 @@
$objCustomer = new SC_Customer_Ex();
$objPurchase = new SC_Helper_Purchase_Ex();
$objHelperMail = new SC_Helper_Mail_Ex();
- $objHelperMail->setPage($this);
$this->is_multiple = $objPurchase->isMultiple();
Svn-src-all メーリングリストの案内