Ignore:
Timestamp:
2012/01/17 16:21:07 (15 years ago)
Author:
Seasoft
Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21357 #1324
r21356 #1324,#1565
r21355 #1431
r21354 #1555
r21353 #1563
r21352 #1431
r21351 #1538
r21350 #1560

Location:
branches/version-2_11-dev/data/Smarty/templates
Files:
5 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/version-2_11-dev/data/Smarty/templates/admin/order/disp.tpl

    r21355 r21405  
    106106        </tr> 
    107107        <tr> 
    108             <th>端末種別</th> 
     108            <th>アクセス端末</th> 
    109109            <td><!--{$arrDeviceType[$arrForm.device_type_id.value]|h}--></td> 
    110110        </tr> 

  • branches/version-2_11-dev/data/Smarty/templates/admin/order/edit.tpl

    r21355 r21405  
    235235        </tr> 
    236236        <tr> 
    237             <th>端末種別</th> 
     237            <th>アクセス端末</th> 
    238238            <td><!--{$arrDeviceType[$arrForm.device_type_id.value]|h}--></td> 
    239239        </tr> 

  • branches/version-2_11-dev/data/Smarty/templates/admin/products/confirm.tpl

    r21352 r21405  
    148148        </tr> 
    149149        <tr> 
    150             <th>販売制限数</th> 
     150            <th>購入制限</th> 
    151151            <td> 
    152152                <!--{$arrForm.sale_limit|default:'無制限'|h}--> 

  • branches/version-2_11-dev/data/Smarty/templates/admin/products/product.tpl

    r21352 r21405  
    223223        </tr> 
    224224        <tr> 
    225             <th>販売制限数</th> 
     225            <th>購入制限</th> 
    226226            <td> 
    227227                <span class="attention"><!--{$arrErr.sale_limit}--></span> 

  • branches/version-2_11-dev/data/Smarty/templates/mobile/mypage/history.tpl

    r21354 r21405  
    4646<!--{if $orderDetail.product_type_id == $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 
    4747<!--{if $orderDetail.is_downloadable}--> 
    48 <!--{if $isAU == false}--> 
    4948<a target="_self" href="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->">ダウンロード</a><br> 
    50 <!--{else}--> 
    51 <object data="<!--{$smarty.const.ROOT_URLPATH}-->mypage/download.php?order_id=<!--{$tpl_arrOrderData.order_id}-->&product_id=<!--{$orderDetail.product_id}-->&product_class_id=<!--{$orderDetail.product_class_id}-->&PHPSESSID=<!--{$phpsessid}-->" copyright="no" standby="ダウンロード" type="<!--{$orderDetail.mime_type}-->"> 
    52 <param name="title" value="<!--{$orderDetail.down_filename}-->" valuetype="data"> 
    53 </object><br> 
    54 <!--{/if}--> 
    5549<!--{else}--> 
    5650<!--{if $orderDetail.payment_date == "" && $orderDetail.effective == "0"}--> 
Note: See TracChangeset for help on using the changeset viewer.