From 1c88db0b38c4b14558e14b280a2d565a009f5acd Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Thu, 26 Dec 2024 14:17:39 +0000 Subject: [PATCH 1/4] Optimize the installation page --- options/locale/locale_en-US.ini | 2 ++ templates/post-install.tmpl | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ea4d36fb1ca7d..3ab21facd333f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -244,6 +244,8 @@ license_desc = Go get [install] install = Installation +installing = Installing +installing_desc = Installing now, please wait title = Initial Configuration docker_helper = If you run Gitea inside Docker, please read the documentation before changing any settings. require_db_desc = Gitea requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB (MySQL protocol). diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index fb234008fb4ee..cd65bef027d75 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -6,14 +6,17 @@
+

+ {{ctx.Locale.Tr "install.installing"}} +

- {{ctx.Locale.Tr + {{ctx.Locale.Tr
-

{{ctx.Locale.Tr "loading"}}

+

{{ctx.Locale.Tr "install.installing_desc"}}...

From 647b093499e7cf3d0f3bbd77f387ef2f548035a5 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Fri, 27 Dec 2024 22:27:20 +0000 Subject: [PATCH 2/4] fix --- options/locale/locale_en-US.ini | 2 +- templates/post-install.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3ab21facd333f..c9391315b109c 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -245,7 +245,7 @@ license_desc = Go get [install] install = Installation installing = Installing -installing_desc = Installing now, please wait +installing_desc = Installing now, please wait... title = Initial Configuration docker_helper = If you run Gitea inside Docker, please read the documentation before changing any settings. require_db_desc = Gitea requires MySQL, PostgreSQL, MSSQL, SQLite3 or TiDB (MySQL protocol). diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index cd65bef027d75..172c37ed20d2b 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -16,7 +16,7 @@
-

{{ctx.Locale.Tr "install.installing_desc"}}...

+

{{ctx.Locale.Tr "install.installing_desc"}}

From 18fa8c6668db2bcd49a5f8b89a4a49ae8cdb3b57 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Tue, 31 Dec 2024 02:15:49 +0000 Subject: [PATCH 3/4] fix --- templates/post-install.tmpl | 9 +-------- web_src/css/install.css | 10 ++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index 172c37ed20d2b..bc8e079b7819d 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -6,16 +6,9 @@
-

- {{ctx.Locale.Tr "install.installing"}} -

-
+
{{ctx.Locale.Tr
-
-
-
-

{{ctx.Locale.Tr "install.installing_desc"}}

diff --git a/web_src/css/install.css b/web_src/css/install.css index 7ab729405ece8..249e3086320b7 100644 --- a/web_src/css/install.css +++ b/web_src/css/install.css @@ -1,3 +1,9 @@ +.page-content.install.post-install { + height: 100%; + display: flex; + align-items: center; +} + .page-content.install .install-config-container { max-width: 900px; margin: auto; @@ -53,3 +59,7 @@ text-align: left; margin: 10px auto; } + +.page-content.install .loading img { + width: 128px; +} From 19db8cb8499f47ecabc3e65e89d49eb8a15f45a4 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 31 Dec 2024 11:48:14 +0800 Subject: [PATCH 4/4] improve --- options/locale/locale_en-US.ini | 1 - templates/post-install.tmpl | 21 ++++++--------------- web_src/css/install.css | 10 ---------- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 92e5f87c58526..064dcc6bf95bb 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -244,7 +244,6 @@ license_desc = Go get [install] install = Installation -installing = Installing installing_desc = Installing now, please wait... title = Initial Configuration docker_helper = If you run Gitea inside Docker, please read the documentation before changing any settings. diff --git a/templates/post-install.tmpl b/templates/post-install.tmpl index bc8e079b7819d..fa10827295466 100644 --- a/templates/post-install.tmpl +++ b/templates/post-install.tmpl @@ -1,19 +1,10 @@ {{template "base/head" .}} -
-
-
-
-
-
-
-
- {{ctx.Locale.Tr -
-

{{ctx.Locale.Tr "install.installing_desc"}}

-
-
-
-
+
+
+ +
+
+ {{ctx.Locale.Tr "install.installing_desc"}}
diff --git a/web_src/css/install.css b/web_src/css/install.css index 249e3086320b7..7ab729405ece8 100644 --- a/web_src/css/install.css +++ b/web_src/css/install.css @@ -1,9 +1,3 @@ -.page-content.install.post-install { - height: 100%; - display: flex; - align-items: center; -} - .page-content.install .install-config-container { max-width: 900px; margin: auto; @@ -59,7 +53,3 @@ text-align: left; margin: 10px auto; } - -.page-content.install .loading img { - width: 128px; -}