From e90552ae6cd9975e6bb3622d57fe037553d236be Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 3 Jan 2024 11:22:30 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E5=83=8F=E3=81=8C?= =?UTF-8?q?=E6=AC=A0=E8=90=BD=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=20#810?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 画像を使わず CSS で対応。 - ロード完了前も表示対応とした。 - 画像とともに使われていない (既に404 だった) jquery.colorbox の CSS/JS も削除した。 - beforeunload イベントで表示するようにした。 --- html/install/templates/install_frame.tpl | 126 ++++++++++++++--------- 1 file changed, 78 insertions(+), 48 deletions(-) diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index 0d959ed88d..ad41f8f15b 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -26,7 +26,6 @@ - @@ -34,43 +33,22 @@ - - EC-CUBEインストール @@ -78,26 +56,78 @@ $(function(){ -
Loading...
-
-
+
+ +

Loading...

+
+ From 99563a82bb0ca091b754e37d7e9d7805bd1349e1 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Wed, 3 Jan 2024 11:37:21 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=E5=B9=BE=E3=82=89=E3=81=8B=E5=AE=B9?= =?UTF-8?q?=E9=87=8F=E3=81=8C=E5=A2=97=E3=81=88=E3=81=9F=E3=81=A8=E6=80=9D?= =?UTF-8?q?=E3=81=86=E3=81=AE=E3=81=A7=20strip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/install/templates/install_frame.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index ad41f8f15b..cf6f1b356d 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -53,6 +53,7 @@ $(window).on('beforeunload',function(){ EC-CUBEインストール +
diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index 0d959ed88d..cdafe1e795 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -65,7 +65,7 @@ +
@@ -103,3 +104,4 @@ function fnChangeVisible(check_id, mod_id){
+ diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl index fad5684f28..5c05bf9578 100644 --- a/html/install/templates/complete.tpl +++ b/html/install/templates/complete.tpl @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> +
@@ -36,11 +37,10 @@ -
-
+ diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index cdafe1e795..969bfc17ea 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -78,26 +78,25 @@ $(function(){
Loading...
-
-
diff --git a/html/install/templates/step0.tpl b/html/install/templates/step0.tpl index 9c3f58f959..496d03dda4 100644 --- a/html/install/templates/step0.tpl +++ b/html/install/templates/step0.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -42,12 +44,11 @@
-
-
+ diff --git a/html/install/templates/step0_1.tpl b/html/install/templates/step0_1.tpl index 2cfa6ed339..6465916cd9 100644 --- a/html/install/templates/step0_1.tpl +++ b/html/install/templates/step0_1.tpl @@ -20,6 +20,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> +

必要なファイルのコピー

@@ -44,13 +45,12 @@
-
-
+ diff --git a/html/install/templates/step1.tpl b/html/install/templates/step1.tpl index 52cd7812cc..01da4d74b1 100644 --- a/html/install/templates/step1.tpl +++ b/html/install/templates/step1.tpl @@ -39,6 +39,7 @@ $(function() { }); }); +
@@ -223,12 +224,11 @@ $(function() { -
-
+ diff --git a/html/install/templates/step2.tpl b/html/install/templates/step2.tpl index 2988be5268..f70874098e 100644 --- a/html/install/templates/step2.tpl +++ b/html/install/templates/step2.tpl @@ -32,6 +32,7 @@ function lfnChangePort(db_type) { } } +
@@ -101,13 +102,12 @@ function lfnChangePort(db_type) { -
-
+ diff --git a/html/install/templates/step3.tpl b/html/install/templates/step3.tpl index 128dba6c0b..03cc08be60 100644 --- a/html/install/templates/step3.tpl +++ b/html/install/templates/step3.tpl @@ -38,6 +38,7 @@ //--> +
@@ -74,12 +75,11 @@ -
-
+ diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl index 12b43519a6..53e2c6c624 100644 --- a/html/install/templates/step4.tpl +++ b/html/install/templates/step4.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -53,7 +55,6 @@   -
-
+ diff --git a/html/install/templates/welcome.tpl b/html/install/templates/welcome.tpl index 57d2085551..298eaaffa8 100644 --- a/html/install/templates/welcome.tpl +++ b/html/install/templates/welcome.tpl @@ -19,6 +19,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *}--> + +
@@ -29,11 +31,10 @@ EC-CUBEのインストールを開始します。 -
-
+ From 01d9fe174c0a4c084aa9f918f7afdb95e350f5a0 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 4 Jan 2024 19:22:56 +0900 Subject: [PATCH 09/10] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=87=E3=82=A3=E3=83=B3=E3=82=B0=E7=94=BB=E5=83=8F=E3=81=8C?= =?UTF-8?q?=E6=AC=A0=E8=90=BD=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=20#810?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - JavaScript の追加位置が不適切(IF分岐内)だったのを修正。 --- html/install/templates/install_frame.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index e76011c133..0e79287b1f 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -34,14 +34,15 @@ - - EC-CUBEインストール From 3ed97bb129d68f0991127e756d5b8b48baafe744 Mon Sep 17 00:00:00 2001 From: Seasoft Date: Thu, 4 Jan 2024 19:29:34 +0900 Subject: [PATCH 10/10] Fix a typo. "EC CUBE" -> "EC-CUBE" --- html/install/templates/complete.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/install/templates/complete.tpl b/html/install/templates/complete.tpl index 5c05bf9578..38eadded46 100644 --- a/html/install/templates/complete.tpl +++ b/html/install/templates/complete.tpl @@ -29,7 +29,7 @@
-

EC CUBE インストールが完了しました。

+

EC-CUBE インストールが完了しました。

管理画面にログインできます。