Ignore:
Timestamp:
2012/12/17 14:25:58 (11 years ago)
Author:
h_yoshimoto
Message:

#1955 r22123r22143 間のコミットをmerge

Location:
branches/version-2_12-multilang
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-multilang

  • branches/version-2_12-multilang/data/Smarty/templates/admin/contents/recommend.tpl

    r22132 r22144  
    111111                            <div class="table-detail"> 
    112112                                <div class="detail-name"><!--{t string="tpl_188"}--> <!--{$arrItems[$smarty.section.cnt.iteration].name|h}--></div> 
    113                                 <!--{if $arrItems[$smarty.section.cnt.iteration].p_del_flg == '1'}--> 
    114                                     <div class="attention"><!--{t string="tpl_707" T_FIELD=$arrItems[$smarty.section.cnt.iteration].name|h}--></div> 
    115113                                <!--{/if}--> 
    116114                                    <div class="detail-form"> 
  • branches/version-2_12-multilang/data/Smarty/templates/admin/total/index.tpl

    r22134 r22144  
    3232                    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 
    3333                    <input type="hidden" name="mode" value="search" /> 
    34                     <input type="hidden" name="form" value="1" /> 
     34                    <input type="hidden" name="search_form" value="1" /> 
    3535                    <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" /> 
    3636                    <input type="hidden" name="type" value="<!--{$smarty.post.type|h}-->" /> 
     
    5555                    <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 
    5656                    <input type="hidden" name="mode" value="search" /> 
    57                     <input type="hidden" name="form" value="2" /> 
     57                    <input type="hidden" name="search_form" value="2" /> 
    5858                    <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" /> 
    5959                    <input type="hidden" name="type" value="<!--{$smarty.post.type|h}-->" /> 
     
    100100        <input type="hidden" name="<!--{$smarty.const.TRANSACTION_ID_NAME}-->" value="<!--{$transactionid}-->" /> 
    101101        <input type="hidden" name="mode" value="search" /> 
    102         <input type="hidden" name="form" value="<!--{$arrForm.form.value|h}-->" /> 
    103102        <input type="hidden" name="type" value="<!--{$arrForm.type.value|h}-->" /> 
    104103        <input type="hidden" name="page" value="<!--{$arrForm.page.value|h}-->" /> 
     
    118117                <div id="graph-image"> 
    119118                    <!--{* <img src="<!--{$tpl_image}-->?<!--{$cashtime}-->" alt="グラフ"> *}--> 
    120                     <img src="?draw_image=true&amp;type=<!--{$smarty.post.type|h}-->&amp;mode=search&amp;page=<!--{$smarty.post.page|h}-->&amp;search_startyear_m=<!--{$smarty.post.search_startyear_m|h}-->&amp;search_startmonth_m=<!--{$smarty.post.search_startmonth_m|h}-->&amp;search_startyear=<!--{$smarty.post.search_startyear|h}-->&amp;search_startmonth=<!--{$smarty.post.search_startmonth|h}-->&amp;search_startday=<!--{$smarty.post.search_startday|h}-->&amp;search_endyear=<!--{$smarty.post.search_endyear|h}-->&amp;search_endmonth=<!--{$smarty.post.search_endmonth|h}-->&amp;search_endday=<!--{$smarty.post.search_endday|h}-->" alt="グラフ" /> 
     119                    <img src="?draw_image=true&amp;type=<!--{$smarty.post.type|h}-->&amp;mode=search&amp;search_form=<!--{$smarty.post.search_form|h}-->&amp;page=<!--{$smarty.post.page|h}-->&amp;search_startyear_m=<!--{$smarty.post.search_startyear_m|h}-->&amp;search_startmonth_m=<!--{$smarty.post.search_startmonth_m|h}-->&amp;search_startyear=<!--{$smarty.post.search_startyear|h}-->&amp;search_startmonth=<!--{$smarty.post.search_startmonth|h}-->&amp;search_startday=<!--{$smarty.post.search_startday|h}-->&amp;search_endyear=<!--{$smarty.post.search_endyear|h}-->&amp;search_endmonth=<!--{$smarty.post.search_endmonth|h}-->&amp;search_endday=<!--{$smarty.post.search_endday|h}-->" alt="グラフ" /> 
    121120                </div> 
    122121                <!--{/if}--> 
Note: See TracChangeset for help on using the changeset viewer.