Ignore:
Timestamp:
2013/08/30 18:47:51 (13 years ago)
Author:
m_uehara
Message:

#2363 r23157 - r23159, r23165 - r23167, r23169 をマージ

Location:
branches/version-2_13-dev/data/Smarty/templates/admin
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl

    r23153 r23170  
    3636<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script> 
    3737<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script> 
    38 <!--{if $load_legacy_js}--> 
    39     <!--{* 従来のJavaScript関数が必要な場合 LC_Page::init() で $load_legacy_js を true に設定する *}--> 
    40     <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script> 
    41     <script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script> 
    42 <!--{/if}--> 
     38<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script> 
     39<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script> 
    4340<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script> 
    4441<link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" /> 

  • branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl

    r23138 r23170  
    2626 
    2727<h2>税率設定</h2> 
     28    <span class="attention"><!--{$arrErr.tax_rule_id}--></span> 
    2829 
    2930    <table id="basis-tax-func"> 

  • branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl

    r23142 r23170  
    3333<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script> 
    3434<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script> 
    35 <!--{if $load_legacy_js}--> 
    36     <!--{* 従来のJavaScript関数が必要な場合 LC_Page::init() で $load_legacy_js を true に設定する *}--> 
    37     <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script> 
    38 <!--{/if}--> 
     35<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script> 
    3936<title>管理機能</title> 
    4037<link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" /> 

  • branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl

    r23142 r23170  
    4444<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script> 
    4545<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script> 
    46 <!--{if $load_legacy_js}--> 
    47     <!--{* 従来のJavaScript関数が必要な場合 LC_Page::init() で $load_legacy_js を true に設定する *}--> 
    48     <script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script> 
    49     <script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script> 
    50 <!--{/if}--> 
     46<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script> 
     47<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script> 
    5148<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script> 
    5249<title><!--{$smarty.const.ADMIN_TITLE}--></title> 
Note: See TracChangeset for help on using the changeset viewer.