diff options
author | Earl Warren <109468362+earl-warren@users.noreply.github.com> | 2023-08-01 18:54:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-01 16:54:54 +0000 |
commit | 6ed4626ed594f8b7f0328d45c174c1b14144862a (patch) | |
tree | 86f29a3228157f527a31c6526bff4bf58ab21183 | |
parent | ab388deb0e52c058a19dbd844bdd890f7cf84d51 (diff) | |
download | gitea-6ed4626ed594f8b7f0328d45c174c1b14144862a.tar.gz gitea-6ed4626ed594f8b7f0328d45c174c1b14144862a.zip |
Merge `templates/projects/list.tmpl` and `templates/repo/projects/list.tmpl` together (#26265)
(cherry picked from commit 473862a1d599382ca022482e2e044025872d240b)
Refs: https://codeberg.org/forgejo/forgejo/pulls/1126
Co-authored-by: Louis Seubert <louis.seubert.ls@gmail.com>
Co-authored-by: Giteabot <teabot@gitea.io>
-rw-r--r-- | templates/projects/list.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/projects/list.tmpl | 87 | ||||
-rw-r--r-- | web_src/css/repo.css | 12 |
3 files changed, 3 insertions, 100 deletions
diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index fc8bf60811..e59e279c00 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -1,4 +1,4 @@ -{{if .CanWriteProjects}} +{{if and $.CanWriteProjects (not $.Repository.IsArchived)}} <div class="gt-text-right"> <a class="ui small green button" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> </div> @@ -72,7 +72,7 @@ {{template "base/paginate" .}} </div> -{{if $.CanWriteProjects}} +{{if and $.CanWriteProjects (not $.Repository.IsArchived)}} <div class="ui g-modal-confirm delete modal"> <div class="header"> {{svg "octicon-trash"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 674c6bfb62..9eae401fa2 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -2,92 +2,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository projects milestones"> {{template "repo/header" .}} <div class="ui container"> - <div class="navbar projects-header"> - <div> - <div class="small-menu-items ui compact tiny menu"> - <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=open"> - {{svg "octicon-project" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - </a> - <a class="item{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/projects?state=closed"> - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - </a> - </div> - </div> - <div class="projects-toolbar"> - <!-- Sort --> - <div class="ui small dropdown type jump item"> - <span class="text"> - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </span> - <div class="menu"> - <a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=oldest&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.oldest"}}</a> - <a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=recentupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.recentupdate"}}</a> - <a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?q={{$.Keyword}}&sort=leastupdate&state={{$.State}}">{{.locale.Tr "repo.issues.filter_sort.leastupdate"}}</a> - </div> - </div> - {{if and .CanWriteProjects (not .Repository.IsArchived)}} - <a class="ui small green button gt-ml-4" href="{{$.Link}}/new">{{.locale.Tr "repo.projects.new"}}</a> - {{end}} - </div> - </div> - {{template "base/alert" .}} - - <div class="milestone-list"> - {{range .Projects}} - <li class="milestone-card"> - <h3 class="flex-text-block gt-m-0"> - {{svg .IconName 16}} - <a class="muted" href="{{.Link}}">{{.Title}}</a> - </h3> - <div class="milestone-toolbar"> - <div class="group"> - <div class="flex-text-block"> - {{svg "octicon-issue-opened" 14}} - {{$.locale.PrettyNumber .NumOpenIssues}} {{$.locale.Tr "repo.issues.open_title"}} - </div> - <div class="flex-text-block"> - {{svg "octicon-check" 14}} - {{$.locale.PrettyNumber .NumClosedIssues}} {{$.locale.Tr "repo.issues.closed_title"}} - </div> - </div> - {{if and $.CanWriteProjects (not $.Repository.IsArchived)}} - <div class="group"> - <a class="flex-text-inline" href="{{.Link}}/edit">{{svg "octicon-pencil" 14}}{{$.locale.Tr "repo.issues.label_edit"}}</a> - {{if .IsClosed}} - <a class="link-action flex-text-inline" href data-url="{{.Link}}/open">{{svg "octicon-check" 14}}{{$.locale.Tr "repo.projects.open"}}</a> - {{else}} - <a class="link-action flex-text-inline" href data-url="{{.Link}}/close">{{svg "octicon-skip" 14}}{{$.locale.Tr "repo.projects.close"}}</a> - {{end}} - <a class="delete-button flex-text-inline" href="#" data-url="{{.Link}}/delete">{{svg "octicon-trash" 14}}{{$.locale.Tr "repo.issues.label_delete"}}</a> - </div> - {{end}} - </div> - {{if .Description}} - <div class="content"> - {{.RenderedContent|Str2html}} - </div> - {{end}} - </li> - {{end}} - - {{template "base/paginate" .}} - </div> + {{template "projects/list" .}} </div> </div> - -{{if .CanWriteProjects}} -<div class="ui g-modal-confirm delete modal"> - <div class="header"> - {{svg "octicon-trash"}} - {{.locale.Tr "repo.projects.deletion"}} - </div> - <div class="content"> - <p>{{.locale.Tr "repo.projects.deletion_desc"}}</p> - </div> - {{template "base/modal_actions_confirm" .}} -</div> -{{end}} {{template "base/footer" .}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index efa412dc53..2b3f4e1efb 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -87,18 +87,6 @@ } } -.projects-header { - margin-bottom: 1rem; - flex-direction: column; - gap: 8px; -} - -.projects-toolbar { - display: flex; - justify-content: space-between; - padding-left: 4px; -} - .repository .issue-content-right .menu { overflow-x: auto; max-height: 500px; |