Changeset 19925 for branches


Ignore:
Timestamp:
2011/01/16 13:07:00 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19924
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/admin/login.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Flogin.tpl
data/Smarty/templates/admin/main_frame.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmain_frame.tpl
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
html/install/img/logo.jpg logo.jpg-20110116033548-jury956fzt2mfmnb-1
html/install/templates/install_frame.tpl 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Ftemplates%2Finstall_frame.tpl
html/install/templates/step4.tpl 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Ftemplates%2Fstep4.tpl
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20110116040545-k0sx4rqhthcuulce
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110116040657-2h3dglqgirth230h
bzr:revno:
2654
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/login.tpl nanasess@fsm.ne.jp-20110116040545-k0sx4rqhthcuulce
data/Smarty/templates/admin/main_frame.tpl nanasess@fsm.ne.jp-20110116040545-k0sx4rqhthcuulce
html/install/img/logo.jpg nanasess@fsm.ne.jp-20110116040545-k0sx4rqhthcuulce
html/install/templates/install_frame.tpl nanasess@fsm.ne.jp-20110116040545-k0sx4rqhthcuulce
html/install/templates/step4.tpl nanasess@fsm.ne.jp-20110116040545-k0sx4rqhthcuulce
bzr:timestamp:
2011-01-16 13:06:57.032999992 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-16T04:06:57.033000Z
Message:

#642(共通ロジックの機能向上)

  • Copyright 年のハードコーディングを修正

#633(インストーラーの改善)

  • ロゴのリンク切れを暫定的に修正
  • version-2_4-dev と同様のデータを送信するよう修正

#628(未使用処理・定義などの削除)

  • インストーラの不要と思われる変数を削除
Location:
branches/version-2_5-dev
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/login.tpl

    r19909 r19925  
    4242 
    4343    </div> 
    44     <div id="copyright">Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</div> 
     44    <div id="copyright">Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> LOCKON CO.,LTD. All Rights Reserved.</div> 
    4545 
    4646<!--{* エラーメッセージここから *}--> 

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

    r19909 r19925  
    143143<div id="footer"> 
    144144    <div id="footer-contents"> 
    145         <div id="copyright">Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</div> 
     145        <div id="copyright">Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> LOCKON CO.,LTD. All Rights Reserved.</div> 
    146146        <div id="topagetop"> 
    147147            <ul class="sites"> 

  • branches/version-2_5-dev/html/install/templates/install_frame.tpl

    r19873 r19925  
    2222 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA. 
    2323 *}--> 
    24 <!--{assign var=default_dir value="`$smarty.const.USER_DIR``$smarty.const.USER_PACKAGE_DIR``$smarty.const.DEFAULT_TEMPLATE_NAME`/"}--> 
    25 <!--{assign var=admin_dir value="`$smarty.const.USER_DIR``$smarty.const.USER_PACKAGE_DIR`admin/"}--> 
    2624<head> 
    2725<meta http-equiv="Content-Type" content="text/html; charset=<!--{$smarty.const.CHAR_CODE}-->"> 
    2826<meta http-equiv="content-script-type" content="text/javascript"> 
    2927<meta http-equiv="content-style-type" content="text/css"> 
    30 <link rel="stylesheet" href="../<!--{$smarty.const.ADMIN_DIR}-->css/install.css" type="text/css" > 
    3128<script type="text/javascript" src="../js/css.js"></script> 
    3229<script type="text/javascript" src="../js/navi.js"></script> 
     30<style type="text/css"> 
     31  .red { 
     32      color: #F00; 
     33  } 
     34</style> 
    3335<title>EC CUBE インストール画面</title> 
    3436</head> 
    … …  
    3638<body bgcolor="#ffffff" text="#000000" link="#006699" vlink="#006699" alink="#006699" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0"> 
    3739<noscript> 
    38 <link rel="stylesheet" href="../<!--{$default_dir}-->css/common.css" type="text/css" > 
    3940</noscript> 
    4041<div align="center"> 
    … …  
    4849        <table width="878" border="0" cellspacing="0" cellpadding="0" summary=" " background="img/header_bg2.jpg"> 
    4950            <tr valign="top"> 
    50                 <td><img src="../<!--{$smarty.const.USER_DIR}--><!--{$smarty.const.USER_PACKAGE_DIR}--><!--{$smarty.const.ADMIN_DIR}-->img/header/logo.jpg" width="230" height="50" alt="EC CUBE" border="0"></td> 
     51                <td><img src="img/logo.jpg" width="230" height="50" alt="EC CUBE" border="0"></td> 
    5152                <td width="648" align="right"></td> 
    5253            </tr> 
    … …  
    120121        <table width="878" border="0" cellspacing="0" cellpadding="10" summary=" "> 
    121122            <tr> 
    122                 <td class="fs10n"><span class="gray">&nbsp;Copyright &copy; 2000-2010 LOCKON CO.,LTD. All Rights Reserved.</span></td> 
     123                <td class="fs10n"><span class="gray">&nbsp;Copyright &copy; 2000-<!--{$smarty.now|date_format:"%Y"}--> LOCKON CO.,LTD. All Rights Reserved.</span></td> 
    123124            </tr> 
    124125        </table> 

  • branches/version-2_5-dev/html/install/templates/step4.tpl

    r19711 r19925  
    3030<input type="hidden" name="senddata_php_ver" value="<!--{$tpl_php_ver}-->"> 
    3131<input type="hidden" name="senddata_db_ver" value="<!--{$tpl_db_ver}-->"> 
     32<input type="hidden" name="senddata_os_type" value="<!--{""|php_uname|escape}--> <!--{$smarty.server.SERVER_SOFTWARE|escape}-->"> 
    3233<!--{foreach key=key item=item from=$arrHidden}--> 
    3334<input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->"> 
    … …  
    4243        <tr> 
    4344            <td bgcolor="#ffffff" class="fs12" height="50"> 
    44                 - サイトURL：<!--{$tpl_site_url}--><br/> 
    45                 - 店舗名：<!--{$tpl_shop_name}--><br/> 
    46                 - EC-CUBEバージョン：<!--{$tpl_cube_ver}--><br/> 
    47                 - PHP情報：<!--{$tpl_php_ver}--><br/> 
    48                 - DB情報：<!--{$tpl_db_ver}--><br/> 
     45              <ul> 
     46                <li>サイトURL：<!--{$tpl_site_url}--></li> 
     47                <li>店舗名：<!--{$tpl_shop_name}--></li> 
     48                <li>EC-CUBEバージョン：<!--{$tpl_cube_ver}--></li> 
     49                <li>PHP情報：<!--{$tpl_php_ver}--></li> 
     50                <li>DB情報：<!--{$tpl_db_ver}--></li> 
     51                <li>OS情報：<!--{""|php_uname|escape}--> <!--{$smarty.server.SERVER_SOFTWARE|escape}--></li> 
     52              </ul> 
    4953            </td> 
    5054        </tr> 
Note: See TracChangeset for help on using the changeset viewer.