From 47a966561e551bef6aaced2d32e33cf292ae5354 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 7 Dec 2024 23:01:51 +0800 Subject: [PATCH 1/4] fix --- templates/org/settings/labels.tmpl | 24 ++-- templates/repo/issue/labels.tmpl | 10 +- ...elete_label.tmpl => label_edit_modal.tmpl} | 25 ++-- templates/repo/issue/labels/label_list.tmpl | 18 ++- templates/repo/issue/labels/label_new.tmpl | 48 ------- web_src/css/repo.css | 11 -- web_src/js/features/common-organization.ts | 2 +- web_src/js/features/comp/LabelEdit.ts | 133 ++++++++---------- web_src/js/features/repo-legacy.ts | 2 +- 9 files changed, 93 insertions(+), 180 deletions(-) rename templates/repo/issue/labels/{edit_delete_label.tmpl => label_edit_modal.tmpl} (79%) delete mode 100644 templates/repo/issue/labels/label_new.tmpl diff --git a/templates/org/settings/labels.tmpl b/templates/org/settings/labels.tmpl index 25a562c975a85..21d7c0ef3c06b 100644 --- a/templates/org/settings/labels.tmpl +++ b/templates/org/settings/labels.tmpl @@ -1,15 +1,13 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}} -
-
-
- {{ctx.Locale.Tr "org.settings.labels_desc"}} -
- -
-
- {{template "repo/issue/labels/label_new" .}} - {{template "repo/issue/labels/label_list" .}} -
-{{template "repo/issue/labels/edit_delete_label" .}} +
+
+
+ {{ctx.Locale.Tr "org.settings.labels_desc"}} +
+ +
+
+ {{template "repo/issue/labels/label_list" .}} + {{template "repo/issue/labels/label_edit_modal" .}} +
{{template "org/settings/layout_footer" .}} - diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 230777efcc3a9..317fe09000260 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -8,15 +8,11 @@ {{end}} - {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} - {{template "repo/issue/labels/label_new" .}} - {{end}} {{template "base/alert" .}} {{template "repo/issue/labels/label_list" .}} + {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} + {{template "repo/issue/labels/label_edit_modal" .}} + {{end}} - -{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} - {{template "repo/issue/labels/edit_delete_label" .}} -{{end}} {{template "base/footer" .}} diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/label_edit_modal.tmpl similarity index 79% rename from templates/repo/issue/labels/edit_delete_label.tmpl rename to templates/repo/issue/labels/label_edit_modal.tmpl index fcf69217ea7e9..1c1c224cd56cd 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/label_edit_modal.tmpl @@ -1,22 +1,13 @@ - - -