Changeset 19925 for branches/version-2_5-dev/html/install/templates/step4.tpl

Timestamp:

2011/01/16 13:07:00 (10 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(未使用処理・定義などの削除)

• インストーラの不要と思われる変数を削除

File:

• branches/version-2_5-dev/html/install/templates/step4.tpl (modified) (2 diffs)

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

@@ -30 +30 @@
 <input type="hidden" name="senddata_php_ver" value="<!--{$tpl_php_ver}-->">
 <input type="hidden" name="senddata_db_ver" value="<!--{$tpl_db_ver}-->">
+<input type="hidden" name="senddata_os_type" value="<!--{""|php_uname|escape}--> <!--{$smarty.server.SERVER_SOFTWARE|escape}-->">
 <!--{foreach key=key item=item from=$arrHidden}-->
 <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->">
@@ -42 +43 @@
         <tr>
             <td bgcolor="#ffffff" class="fs12" height="50">
-                - サイトURL：<!--{$tpl_site_url}--><br/>
-                - 店舗名：<!--{$tpl_shop_name}--><br/>
-                - EC-CUBEバージョン：<!--{$tpl_cube_ver}--><br/>
-                - PHP情報：<!--{$tpl_php_ver}--><br/>
-                - DB情報：<!--{$tpl_db_ver}--><br/>
+              <ul>
+                <li>サイトURL：<!--{$tpl_site_url}--></li>
+                <li>店舗名：<!--{$tpl_shop_name}--></li>
+                <li>EC-CUBEバージョン：<!--{$tpl_cube_ver}--></li>
+                <li>PHP情報：<!--{$tpl_php_ver}--></li>
+                <li>DB情報：<!--{$tpl_db_ver}--></li>
+                <li>OS情報：<!--{""|php_uname|escape}--> <!--{$smarty.server.SERVER_SOFTWARE|escape}--></li>
+              </ul>
             </td>
         </tr>