From 6f00d92889eb80831adda7e34aeeecef76b827de Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 11:45:31 +0800 Subject: [PATCH 1/5] fix --- templates/admin/dashboard.tmpl | 10 +++++----- web_src/css/admin.css | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 0aa95c0e73c50..678445137660c 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -16,9 +16,9 @@

{{.locale.Tr "admin.dashboard.operations"}}

-
- {{.CsrfTokenHtml}} -
+
+ + {{.CsrfTokenHtml}} @@ -71,8 +71,8 @@
-
- + +

{{.locale.Tr "admin.dashboard.system_status"}} diff --git a/web_src/css/admin.css b/web_src/css/admin.css index c8e17dbba9164..f3a78f3ad417d 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -60,3 +60,7 @@ white-space: pre-wrap; word-wrap: break-word; } + +.admin .ui.table.segment { + overflow-x: auto; /* if the screen width is small, many wide tables (eg: user list) need scroll bars */ +} From 450012d4683ca3846bfef7301e48b5f07948843e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 12:10:33 +0800 Subject: [PATCH 2/5] fine tune more --- options/locale/locale_en-US.ini | 1 + templates/admin/config.tmpl | 18 ++++++++++-------- templates/admin/repo/unadopted.tmpl | 2 +- templates/repo/settings/webhook/base_list.tmpl | 2 +- web_src/css/admin.css | 17 +---------------- 5 files changed, 14 insertions(+), 26 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 54e041d7854a8..311a3613c3ec6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2958,6 +2958,7 @@ config.mailer_sendmail_timeout = Sendmail Timeout config.mailer_use_dummy = Dummy config.test_email_placeholder = Email (e.g. test@example.com) config.send_test_mail = Send Testing Email +config.send_test_mail_submit = Send config.test_mail_failed = Failed to send a testing email to "%s": %v config.test_mail_sent = A testing email has been sent to "%s". diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 136ad38f16325..f0d0ad3643a24 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -238,16 +238,18 @@
{{.Mailer.SMTPPort}}
{{end}}
{{.locale.Tr "admin.config.mailer_user"}}
-
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}

-
- {{.CsrfTokenHtml}} -
-
+
{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}
+
+
{{.locale.Tr "admin.config.send_test_mail"}}
+
+ + {{.CsrfTokenHtml}} +
-
- - + + + {{end}}
diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 3e47447178c9f..364a3dadf15b2 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -18,7 +18,7 @@ {{if .search}}
{{if .Dirs}} -
+
{{range $dirI, $dir := .Dirs}}
diff --git a/templates/repo/settings/webhook/base_list.tmpl b/templates/repo/settings/webhook/base_list.tmpl index 61c57995134c1..663fde1528f45 100644 --- a/templates/repo/settings/webhook/base_list.tmpl +++ b/templates/repo/settings/webhook/base_list.tmpl @@ -1,7 +1,7 @@

{{.Title}}
-
+
{{.locale.Tr "repo.settings.add_webhook"}}
diff --git a/web_src/css/admin.css b/web_src/css/admin.css index f3a78f3ad417d..0c5c73823e761 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -4,18 +4,7 @@ margin: 12px -1rem -1rem; } -.admin .settings .button.adopt, -.admin .settings .button.delete { - margin-top: -15px; - margin-bottom: -15px; -} - -.admin .settings .button.adopt .label, -.admin .settings .button.delete .label { - vertical-align: middle; -} - -.admin.user .email { +.admin.user table.table .email { max-width: 200px; } @@ -51,10 +40,6 @@ } } -.admin.config #test-mail-btn { - margin-left: 5px; -} - .admin code, .admin pre { white-space: pre-wrap; From 387a6948170f4a68f4bafa6d4138d216c0577ee4 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Thu, 27 Apr 2023 12:31:51 +0800 Subject: [PATCH 3/5] fix unadopted tmpl --- templates/admin/repo/list.tmpl | 2 +- templates/admin/repo/unadopted.tmpl | 73 ++++++++++++++--------------- templates/user/settings/repos.tmpl | 16 +++---- web_src/css/user.css | 11 ----- 4 files changed, 44 insertions(+), 58 deletions(-) diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl index 3d09f2de23973..515ec78a346c1 100644 --- a/templates/admin/repo/list.tmpl +++ b/templates/admin/repo/list.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}

{{.locale.Tr "admin.repos.repo_manage_panel"}} ({{.locale.Tr "admin.total" .Total}}) diff --git a/templates/admin/repo/unadopted.tmpl b/templates/admin/repo/unadopted.tmpl index 364a3dadf15b2..27898a1854008 100644 --- a/templates/admin/repo/unadopted.tmpl +++ b/templates/admin/repo/unadopted.tmpl @@ -1,4 +1,4 @@ -{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin user")}} +{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin")}}

{{.locale.Tr "admin.repos.unadopted"}} @@ -20,45 +20,42 @@ {{if .Dirs}}
{{range $dirI, $dir := .Dirs}} -
-
- {{svg "octicon-file-directory-fill"}} - {{$dir}} -
- -