[Svn-src-all:3218] [version-2_12-dev 22119] #1976 (textarea への値読み込みで先頭の改行が消失する)
Seasoft
admin ＠ mail.ec-cube.net
2012年 12月 3日 (月) 08:41:55 JST
Subversion committed to /home/svn/open 22119
http://svn.ec-cube.net/open_trac/changeset/22119
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2012-12-03 08:41:55 +0900 (月, 03 12月 2012)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#1976 (textarea への値読み込みで先頭の改行が消失する)
#1905 (typo修正・ソース整形・ソースコメントの改善)
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv_sql.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/design/bloc.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/mail/input.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/mail/template_input.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/order/mail.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/settings.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/system/adminarea.tpl
U branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl
U branches/version-2_12-dev/data/Smarty/templates/default/contact/index.tpl
U branches/version-2_12-dev/data/Smarty/templates/default/entry/kiyaku.tpl
U branches/version-2_12-dev/data/Smarty/templates/default/products/review.tpl
U branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl
U branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/payment.tpl
U branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl
U branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl
U branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl
変更: branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/delivery_input.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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>伝票No.URL</th>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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"> (上限<!--{$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"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/kiyaku.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -41,7 +41,7 @@
<th>規約内容<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"> (上限<!--{$smarty.const.MLTEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/mail.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)
</span>
<div>
@@ -101,7 +101,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"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span>
<div>
<a class="btn-normal" href="javascript:;" onclick="fnCharCount('form1','footer','cnt_footer'); return false;"><span>文字数カウント</span></a>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/tradelaw.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -30,153 +30,168 @@
<tr>
<th>販売業者<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_company"}-->
- <!--{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"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_company"}-->
+ <!--{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"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>運営責任者<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_manager"}-->
- <!--{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"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_manager"}-->
+ <!--{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"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>郵便番号<span class="attention"> *</span></th>
<td>
- <!--{assign var=key1 value="law_zip01"}-->
- <!--{assign var=key2 value="law_zip02"}-->
- <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
- <span class="attention"><!--{$arrErr[$key1]}--></span>
- <span class="attention"><!--{$arrErr[$key2]}--></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" />
- <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'law_zip01', 'law_zip02', 'law_pref', 'law_addr01'); return false;">所在地入力</a>
+ <!--{assign var=key1 value="law_zip01"}-->
+ <!--{assign var=key2 value="law_zip02"}-->
+ <!--{if $arrErr[$key1] || $arrErr[$key2]}-->
+ <span class="attention"><!--{$arrErr[$key1]}--></span>
+ <span class="attention"><!--{$arrErr[$key2]}--></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" />
+ <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.INPUT_ZIP_URLPATH}-->', 'law_zip01', 'law_zip02', 'law_pref', 'law_addr01'); return false;">所在地入力</a>
</td>
</tr>
<tr>
<th>所在地<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}-->">
- <option value="" selected="selected">都道府県を選択</option>
- <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
- </select><br />
- <!--{assign var=key value="law_addr01"}-->
- <!--{if $arrErr[$key]}-->
+ <!--{/if}-->
+ <select class="top" name="<!--{$arrForm[$key].keyname}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+ <option value="" selected="selected">都道府県を選択</option>
+ <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+ </select><br />
+ <!--{assign var=key value="law_addr01"}-->
+ <!--{if $arrErr[$key]}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <!--{/if}-->
- <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
- <br />
- <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
- <!--{assign var=key value="law_addr02"}-->
- <!--{if $arrErr[$key]}-->
+ <!--{/if}-->
+ <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ <br />
+ <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
+ <!--{assign var=key value="law_addr02"}-->
+ <!--{if $arrErr[$key]}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <!--{/if}-->
- <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
- <br />
- <!--{$smarty.const.SAMPLE_ADDRESS2}-->
+ <!--{/if}-->
+ <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ <br />
+ <!--{$smarty.const.SAMPLE_ADDRESS2}-->
</td>
</tr>
<tr>
<th>TEL<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>FAX</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>
<th>メールアドレス<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_email"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <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"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ <!--{assign var=key value="law_email"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <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"> (上限<!--{$arrForm[$key].length}-->文字)</span>
</td>
</tr>
<tr>
<th>URL<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_url"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <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"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ <!--{assign var=key value="law_url"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <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"> (上限<!--{$arrForm[$key].length}-->文字)</span>
</td>
</tr>
<tr>
<th>商品代金以外の必要料金<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_term01"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_term01"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+ <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>注文方法<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_term02"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_term02"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+ <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>支払方法<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_term03"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_term03"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+ <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>支払期限<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_term04"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_term04"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+ <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>引き渡し時期<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_term05"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_term05"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+ <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
<tr>
<th>返品・交換について<span class="attention"> *</span></th>
<td>
- <!--{assign var=key value="law_term06"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea><span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span></td>
+ <!--{assign var=key value="law_term06"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <textarea name="<!--{$arrForm[$key].keyname}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm[$key].value|h}--></textarea>
+ <span class="attention"> (上限<!--{$arrForm[$key].length}-->文字)</span>
+ </td>
</tr>
</table>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv_sql.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv_sql.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/csv_sql.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/admin/contents/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/index.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -138,7 +138,7 @@
<th>タイトル<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"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
</td>
</tr>
@@ -158,7 +158,7 @@
<th>本文作成</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"> (上限3000文字)</span>
</td>
</tr>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/contents/recommend.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -121,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-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/customer/edit.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -220,7 +220,7 @@
<th>SHOP用メモ</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-dev/data/Smarty/templates/admin/design/bloc.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/bloc.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/bloc.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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;">拡大</a>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/css.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -51,7 +51,7 @@
<th>CSS内容</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;">拡大</a>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/header.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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>拡大</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>拡大</span></a>
</div>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/design/main_edit.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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}--> />共通のヘッダーを使用する</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}--> />共通のフッターを使用する</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>拡大</span></a>
</div>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/mail/input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/mail/input.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/mail/input.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/admin/mail/template_input.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/mail/template_input.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/mail/template_input.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -45,7 +45,7 @@
<tr>
<th>本文<span class="attention"> *</span><br />（名前差し込み時は {name} といれてください）</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>文字数カウント</span></a>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -611,7 +611,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-dev/data/Smarty/templates/admin/order/mail.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/mail.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/mail.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/admin/ownersstore/settings.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/settings.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/ownersstore/settings.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/product.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -252,7 +252,7 @@
<th>検索ワード<br />※複数の場合は、カンマ( , )区切りで入力して下さい</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"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
</td>
</tr>
@@ -260,7 +260,7 @@
<th>備考欄(SHOP専用)</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"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
</td>
</tr>
@@ -268,7 +268,7 @@
<th>一覧-メインコメント<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"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
</td>
</tr>
@@ -276,7 +276,7 @@
<th>詳細-メインコメント<span class="attention">(タグ許可)*</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"> (上限<!--{$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"> (上限<!--{$smarty.const.LLTEXT_LEN}-->文字)</span>
</td>
</tr>
@@ -422,7 +422,7 @@
<span class="attention"><!--{$arrErr[$key]}--></span>
商品コード:<!--{$arrRecommend[$recommend_no].product_code_min}--><br />
商品名:<!--{$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"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/review_edit.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/admin/system/adminarea.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/adminarea.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/adminarea.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -64,7 +64,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"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span><br />
<span>※管理機能へのアクセスを特定のIPアドレスからの接続のみに制限します。<br />
アクセスを許可するIPアドレスを1行づつ入力してください。何も入力しない場合は全てを許可します。</span><br />
変更: branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/system/bkup.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -55,7 +55,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"> (上限<!--{$smarty.const.MTEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_12-dev/data/Smarty/templates/default/contact/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/contact/index.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/default/contact/index.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/default/entry/kiyaku.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/entry/kiyaku.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/default/entry/kiyaku.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/default/products/review.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/products/review.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/default/products/review.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/mobile/shopping/payment.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/payment.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/mobile/shopping/payment.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/sphone/contact/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/contact/index.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/sphone/products/review.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/products/review.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl 2012-12-02 22:56:32 UTC (rev 22118)
+++ branches/version-2_12-dev/data/Smarty/templates/sphone/shopping/payment.tpl 2012-12-02 23:41:55 UTC (rev 22119)
@@ -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>
Svn-src-all メーリングリストの案内