Changeset 22814


Ignore:
Timestamp:
2013/05/13 16:13:25 (7 years ago)
Author:
michael_nelson
Message:

#2238 Merged r22797,r22802

Location:
branches/version-2_12_4en
Files:
3 deleted
4 edited
3 copied

Legend:

Unmodified
Added
Removed
  • branches/version-2_12_4en

  • branches/version-2_12_4en/data

  • branches/version-2_12_4en/data/Smarty/templates/sphone/popup_header.tpl

    r21867 r22814  
    4444    <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/win_op.js"></script> 
    4545    <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/site.js"></script> 
    46     <script src="<!--{$TPL_URLPATH}-->js/jquery-1.6.4.min.js"></script> 
     46    <script src="<!--{$TPL_URLPATH}-->js/jquery-1.8.1.min.js"></script> 
    4747    <script src="<!--{$TPL_URLPATH}-->js/jquery.biggerlink.js"></script> 
    4848    <script type="text/javascript"> 
     
    5757 
    5858    <!--{* jQuery Mobile *}--> 
    59     <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.css" /> 
     59    <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.css" /> 
    6060    <script src="<!--{$TPL_URLPATH}-->js/config.js"></script> 
    61     <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.js"></script> 
     61    <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.js"></script> 
    6262 
    6363    <!--{* スマートフォンカスタマイズ用JS *}--> 
  • branches/version-2_12_4en/data/Smarty/templates/sphone/site_frame.tpl

    r22166 r22814  
    4343        <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/win_op.js"></script> 
    4444        <script src="<!--{$smarty.const.ROOT_URLPATH}-->js/site.js"></script> 
    45         <script src="<!--{$TPL_URLPATH}-->js/jquery-1.6.4.min.js"></script> 
     45        <script src="<!--{$TPL_URLPATH}-->js/jquery-1.8.1.min.js"></script> 
    4646        <script src="<!--{$TPL_URLPATH}-->js/jquery.biggerlink.js"></script> 
    4747        <script>//<![CDATA[ 
     
    5656 
    5757        <!--{* jQuery Mobile *}--> 
    58         <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.css" /> 
     58        <link rel="stylesheet" media="only screen" href="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.css" /> 
    5959        <script src="<!--{$TPL_URLPATH}-->js/config.js"></script> 
    60         <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.0.1.min.js"></script> 
     60        <script src="<!--{$TPL_URLPATH}-->js/jquery.mobile/jquery.mobile-1.2.1.min.js"></script> 
    6161 
    6262        <!--{* スマートフォンカスタマイズ用CSS *}--> 
Note: See TracChangeset for help on using the changeset viewer.