Ignore:
Timestamp:
2012/12/04 20:09:02 (11 years ago)
Author:
h_yoshimoto
Message:

#1955 r22111r22120 間のコミットをmerge

Location:
branches/version-2_12-multilang/data/Smarty/templates/admin/products
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-multilang/data/Smarty/templates/admin/products/product.tpl

    r22121 r22122  
    253253            <td> 
    254254                <span class="attention"><!--{$arrErr.comment3}--></span> 
    255                 <textarea name="comment3" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.comment3|sfGetErrorColor}-->"><!--{$arrForm.comment3|h}--></textarea><br /> 
     255                <textarea name="comment3" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.comment3|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm.comment3|h}--></textarea><br /> 
    256256                <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span> 
    257257            </td> 
     
    261261            <td> 
    262262                <span class="attention"><!--{$arrErr.note}--></span> 
    263                 <textarea name="note" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.note|sfGetErrorColor}-->"><!--{$arrForm.note|h}--></textarea><br /> 
     263                <textarea name="note" cols="60" rows="8" class="area60" maxlength="<!--{$smarty.const.LLTEXT_LEN}-->" style="<!--{$arrErr.note|sfGetErrorColor}-->"><!--{"\n"}--><!--{$arrForm.note|h}--></textarea><br /> 
    264264                <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span> 
    265265            </td> 
     
    269269            <td> 
    270270                <span class="attention"><!--{$arrErr.main_list_comment}--></span> 
    271                 <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 /> 
     271                <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 /> 
    272272                <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.MTEXT_LEN}--></span> 
    273273            </td> 
     
    277277            <td> 
    278278                <span class="attention"><!--{$arrErr.main_comment}--></span> 
    279                 <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 /> 
     279                <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 /> 
    280280                <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span> 
    281281            </td> 
     
    354354            <td> 
    355355                <span class="attention"><!--{$arrErr[$key]}--></span> 
    356                 <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 /> 
     356                <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 /> 
    357357                <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LLTEXT_LEN}--></span> 
    358358            </td> 
     
    423423                <!--{t string="tpl_192"}-->:<!--{$arrRecommend[$recommend_no].product_code_min}--><br /> 
    424424                <!--{t string="tpl_189"}-->:<!--{$arrRecommend[$recommend_no].name|h}--><br /> 
    425                 <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrRecommend[$recommend_no].comment|h}--></textarea><br /> 
     425                <textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrRecommend[$recommend_no].comment|h}--></textarea><br /> 
    426426                <span class="attention"> <!--{t string="tpl_023" T_FIELD=$smarty.const.LTEXT_LEN}--></span> 
    427427            </td> 
  • branches/version-2_12-multilang/data/Smarty/templates/admin/products/review_edit.tpl

    r22121 r22122  
    9696            <td> 
    9797                <!--{if $arrErr.comment}--><span class="attention"><!--{$arrErr.comment}--></span><!--{/if}--> 
    98                 <textarea name="comment" rows="20" cols="60" class="area60" wrap="soft" style="<!--{$arrErr.comment|sfGetErrorColor}-->" ><!--{$arrForm.comment|h}--></textarea> 
     98                <textarea name="comment" rows="20" cols="60" class="area60" wrap="soft" style="<!--{$arrErr.comment|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrForm.comment|h}--></textarea> 
    9999            </td> 
    100100        </tr> 
Note: See TracChangeset for help on using the changeset viewer.