From a50d9af876435d007e6052c6ef8ebc838dd9709f Mon Sep 17 00:00:00 2001 From: puni9869 <80308335+puni9869@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:24:05 +0530 Subject: [PATCH] Display archived labels specially when listing labels (#26820) Follow up https://github.com/go-gitea/gitea/pull/26741 Changes: Added archived label for org labels and added into issue filter list. Part of https://github.com/go-gitea/gitea/issues/25237 --------- Signed-off-by: puni9869 Co-authored-by: silverwind --- options/locale/locale_en-US.ini | 3 +- templates/repo/issue/filters.tmpl | 5 +++- .../repo/issue/labels/label_archived.tmpl | 5 ++++ templates/repo/issue/labels/label_list.tmpl | 30 +++++++++---------- web_src/css/base.css | 3 +- web_src/css/repo/issue-label.css | 5 +++- 6 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 templates/repo/issue/labels/label_archived.tmpl diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index e11d5167aa..74b8931de8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -123,6 +123,8 @@ unpin = Unpin artifacts = Artifacts +archived = Archived + concept_system_global = Global concept_user_individual = Individual concept_code_repository = Repository @@ -317,7 +319,6 @@ filter_by_team_repositories = Filter by team repositories feed_of = Feed of "%s" show_archived = Archived -archived = Archived show_both_archived_unarchived = Showing both archived and unarchived show_only_archived = Showing only archived show_only_unarchived = Showing only unarchived diff --git a/templates/repo/issue/filters.tmpl b/templates/repo/issue/filters.tmpl index b482e471e1..3bfced90d6 100644 --- a/templates/repo/issue/filters.tmpl +++ b/templates/repo/issue/filters.tmpl @@ -29,7 +29,10 @@
{{end}} {{$previousExclusiveScope = $exclusiveScope}} - {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} {{RenderLabel $.Context .}} + {{if .IsExcluded}}{{svg "octicon-circle-slash"}}{{else if .IsSelected}}{{if $exclusiveScope}}{{svg "octicon-dot-fill"}}{{else}}{{svg "octicon-check"}}{{end}}{{end}} + {{RenderLabel $.Context .}} +

{{template "repo/issue/labels/label_archived" .}}

+ {{end}} diff --git a/templates/repo/issue/labels/label_archived.tmpl b/templates/repo/issue/labels/label_archived.tmpl new file mode 100644 index 0000000000..feaf77e456 --- /dev/null +++ b/templates/repo/issue/labels/label_archived.tmpl @@ -0,0 +1,5 @@ +{{if .IsArchived}} + + {{ctx.Locale.Tr "archived"}} + +{{end}} diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index b29e606baa..d9addb439b 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -33,11 +33,6 @@
  • {{RenderLabel $.Context .}} - {{if not .ArchivedUnix.IsZero}} - - {{$.locale.Tr "home.archived"}} - - {{end}} {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    @@ -47,14 +42,17 @@ {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}} {{end}}
    -
    - {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} - {{else if $.PageIsOrgSettingsLabels}} - {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} - {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} - {{end}} +
    + {{template "repo/issue/labels/label_archived" .}} +
    + {{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}} + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{else if $.PageIsOrgSettingsLabels}} + {{svg "octicon-pencil"}} {{$.locale.Tr "repo.issues.label_edit"}} + {{svg "octicon-trash"}} {{$.locale.Tr "repo.issues.label_delete"}} + {{end}} +
    • {{end}} @@ -78,9 +76,11 @@ {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    - {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}} + {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenRepoIssues}} +
    +
    + {{template "repo/issue/labels/label_archived" .}}
    -
    {{end}} {{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index b41bfc6942..a305701332 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1969,7 +1969,8 @@ a.ui.ui.ui.basic.primary.label:hover { } .ui.basic.labels .label, -.ui.basic.label { +.ui.basic.label, +.ui.secondary.labels .ui.basic.label { background: var(--color-button); border-color: var(--color-light-border); color: var(--color-text-light); diff --git a/web_src/css/repo/issue-label.css b/web_src/css/repo/issue-label.css index a2eb0344a5..1f83e81d96 100644 --- a/web_src/css/repo/issue-label.css +++ b/web_src/css/repo/issue-label.css @@ -30,7 +30,6 @@ .issue-label-list .item .label-operation { width: 33%; - text-align: right; } .issue-label-list .item a { @@ -42,3 +41,7 @@ .issue-label-list .item.org-label { opacity: 0.7; } + +.label-operation .label { + height: fit-content; +}