aboutsummaryrefslogtreecommitdiffstats
path: root/templates/repo
diff options
context:
space:
mode:
authorDenys Konovalov <kontakt@denyskon.de>2023-08-12 12:30:28 +0200
committerGitHub <noreply@github.com>2023-08-12 10:30:28 +0000
commitab78c39e4152e6d2e3ace594a24b6e13cb3a1678 (patch)
tree369e037b8a22677d3125abb77692a89693d28ef7 /templates/repo
parent74930b1ccd9acacd1ddaa30d1b4849b0e4570d7c (diff)
downloadgitea-ab78c39e4152e6d2e3ace594a24b6e13cb3a1678.tar.gz
gitea-ab78c39e4152e6d2e3ace594a24b6e13cb3a1678.zip
Refactor project templates (#26448)
This PR refactors a bunch of projects-related code, mostly the templates. The following things were done: - rename boards to columns in frontend code - use the new `ctx.Locale.Tr` method - cleanup template, remove useless newlines, classes, comments - merge org-/user and repo level project template together - move "new column" button into project toolbar - move issue card (shared by projects and pinned issues) to shared template, remove useless duplicated styles - add search function to projects (to make the layout more similar to milestones list where it is inherited from :laughing:) - maybe more changes I forgot I've done :laughing: Closes #24893 After: ![Bildschirmfoto vom 2023-08-10 23-02-00](https://github.com/go-gitea/gitea/assets/47871822/cab61456-1d23-4373-8163-e567f1b3b5f9) ![Bildschirmfoto vom 2023-08-10 23-02-26](https://github.com/go-gitea/gitea/assets/47871822/94b55d60-5572-48eb-8111-538a52d8bcc6) ![Bildschirmfoto vom 2023-08-10 23-02-46](https://github.com/go-gitea/gitea/assets/47871822/a0358f4b-4e05-4194-a7bc-6e0ecba5a9b6) --------- Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'templates/repo')
-rw-r--r--templates/repo/issue/card.tmpl66
-rw-r--r--templates/repo/issue/list.tmpl57
-rw-r--r--templates/repo/projects/view.tmpl274
3 files changed, 73 insertions, 324 deletions
diff --git a/templates/repo/issue/card.tmpl b/templates/repo/issue/card.tmpl
new file mode 100644
index 0000000000..05b7dbaabc
--- /dev/null
+++ b/templates/repo/issue/card.tmpl
@@ -0,0 +1,66 @@
+{{with .Issue}}
+ {{if eq $.Page.Project.CardType 1}}{{/* Images and Text*/}}
+ <div class="card-attachment-images">
+ {{range (index $.Page.issuesAttachmentMap .ID)}}
+ <img src="{{.DownloadURL}}" alt="{{.Name}}" />
+ {{end}}
+ </div>
+ {{end}}
+ <div class="content gt-p-0 gt-w-100">
+ <div class="gt-df gt-items-start">
+ <div class="issue-card-icon">
+ {{template "shared/issueicon" .}}
+ </div>
+ <a class="issue-card-title muted issue-title" href="{{.Link}}">{{.Title | RenderEmoji ctx | RenderCodeBlock}}</a>
+ {{if and $.isPinnedIssueCard $.Page.IsRepoAdmin}}
+ <a role="button" class="issue-card-unpin muted gt-df gt-ac" data-tooltip-content={{ctx.Locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Page.Link}}/unpin/{{.Index}}">
+ {{svg "octicon-x" 16}}
+ </a>
+ {{end}}
+ </div>
+ <div class="meta gt-my-2">
+ <span class="text light grey muted-links">
+ {{if not $.Page.Repository}}{{.Repo.FullName}}{{end}}#{{.Index}}
+ {{$timeStr := TimeSinceUnix .GetLastEventTimestamp ctx.Locale}}
+ {{if .OriginalAuthor}}
+ {{ctx.Locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
+ {{else if gt .Poster.ID 0}}
+ {{ctx.Locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}}
+ {{else}}
+ {{ctx.Locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
+ {{end}}
+ </span>
+ </div>
+ {{if .MilestoneID}}
+ <div class="meta gt-my-2">
+ <a class="milestone" href="{{$.Page.RepoLink}}/milestone/{{.MilestoneID}}">
+ {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}}
+ <span class="gt-vm">{{.Milestone.Name}}</span>
+ </a>
+ </div>
+ {{end}}
+ {{if $.Page.LinkedPRs}}
+ {{range index $.Page.LinkedPRs .ID}}
+ <div class="meta gt-my-2">
+ <a href="{{$.Page.RepoLink}}/pulls/{{.Index}}">
+ <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span>
+ <span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span>
+ </a>
+ </div>
+ {{end}}
+ {{end}}
+ </div>
+
+ {{if or .Labels .Assignees}}
+ <div class="extra content labels-list gt-p-0 gt-pt-2">
+ {{range .Labels}}
+ <a target="_blank" href="{{$.Page.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel ctx .}}</a>
+ {{end}}
+ <div class="right floated">
+ {{range .Assignees}}
+ <a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{ctx.Locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}}</a>
+ {{end}}
+ </div>
+ </div>
+ {{end}}
+{{end}}
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 7ae65efedc..789ba4020f 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -6,61 +6,8 @@
{{if .PinnedIssues}}
<div id="issue-pins" {{if .IsRepoAdmin}}data-is-repo-admin{{end}}>
{{range .PinnedIssues}}
- <div class="pinned-issue-card gt-word-break" data-move-url="{{$.Link}}/move_pin" data-issue-id="{{.ID}}">
- {{if eq $.Project.CardType 1}}
- <div class="card-attachment-images">
- {{range (index $.issuesAttachmentMap .ID)}}
- <img src="{{.DownloadURL}}" alt="{{.Name}}">
- {{end}}
- </div>
- {{end}}
- <div class="content gt-p-0">
- <div class="header gt-df gt-items-start">
- <div class="pinned-issue-icon">
- {{template "shared/issueicon" .}}
- </div>
- <a class="pinned-issue-title muted issue-title" href="{{.Link}}">{{.Title | RenderEmoji $.Context | RenderCodeBlock}}</a>
- {{if $.IsRepoAdmin}}
- <a role="button" class="pinned-issue-unpin muted gt-df gt-ac" data-tooltip-content={{$.locale.Tr "repo.issues.unpin_issue"}} data-issue-id="{{.ID}}" data-unpin-url="{{$.Link}}/unpin/{{.Index}}">
- {{svg "octicon-x" 16}}
- </a>
- {{end}}
- </div>
- <div class="meta gt-my-2">
- <span class="text light grey muted-links">
- #{{.Index}}
- {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
- {{if .OriginalAuthor}}
- {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
- {{else if gt .Poster.ID 0}}
- {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}}
- {{else}}
- {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
- {{end}}
- </span>
- </div>
- {{- if .MilestoneID}}
- <div class="meta gt-my-2">
- <a class="milestone" href="{{$.RepoLink}}/milestone/{{.MilestoneID}}">
- {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}}
- <span class="gt-vm">{{.Milestone.Name}}</span>
- </a>
- </div>
- {{- end}}
- </div>
-
- {{if or .Labels .Assignees}}
- <div class="extra content labels-list gt-p-0 gt-pt-2">
- {{range .Labels}}
- <a href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a>
- {{end}}
- <div class="right floated">
- {{range .Assignees}}
- <a href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}}</a>
- {{end}}
- </div>
- </div>
- {{end}}
+ <div class="issue-card gt-word-break {{if $.IsRepoAdmin}}gt-cursor-grab{{end}}" data-move-url="{{$.Link}}/move_pin" data-issue-id="{{.ID}}">
+ {{template "repo/issue/card" (dict "Issue" . "Page" $ "isPinnedIssueCard" true)}}
</div>
{{end}}
</div>
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl
index 2dbb381960..5add33c5c0 100644
--- a/templates/repo/projects/view.tmpl
+++ b/templates/repo/projects/view.tmpl
@@ -1,277 +1,13 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
{{template "repo/header" .}}
- <div class="ui container">
- <div class="ui two column stackable grid">
- <div class="column">
- {{template "repo/issue/navbar" .}}
- </div>
- <div class="column right aligned">
- {{if and .CanWriteProjects (not .Repository.IsArchived)}}
- <a class="ui small green button item" href="{{$.RepoLink}}/issues/new/choose?project={{$.Project.ID}}">{{.locale.Tr "repo.issues.new"}}</a>
- <a class="ui small green button show-modal item" data-modal="#new-board-item">{{.locale.Tr "new_project_column"}}</a>
- {{end}}
- <div class="ui small modal new-board-modal" id="new-board-item">
- <div class="header">
- {{$.locale.Tr "repo.projects.column.new"}}
- </div>
- <div class="content">
- <form class="ui form">
- <div class="required field">
- <label for="new_board">{{$.locale.Tr "repo.projects.column.new_title"}}</label>
- <input class="new-board" id="new_board" name="title" required>
- </div>
-
- <div class="field color-field">
- <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
- <div class="color picker column">
- <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color_picker" name="color">
- <div class="column precolors">
- {{template "repo/issue/label_precolors"}}
- </div>
- </div>
- </div>
-
- <div class="text right actions">
- <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
- <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}" class="ui primary button disabled" id="new_board_submit">{{$.locale.Tr "repo.projects.column.new_submit"}}</button>
- </div>
- </form>
- </div>
- </div>
- </div>
- </div>
- <div class="divider"></div>
- <div class="ui two column stackable grid">
- <div class="column">
- <h2 class="project-title">{{$.Project.Title}}</h2>
- <div class="content project-description">{{$.Project.RenderedContent|Str2html}}</div>
- </div>
- {{if and $.CanWriteProjects (not $.Repository.IsArchived)}}
- <div class="column right aligned">
- <div class="ui compact right mini menu">
- <a class="item" href="{{$.RepoLink}}/projects/{{.Project.ID}}/edit?redirect=project">
- {{svg "octicon-pencil"}}
- <span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_edit"}}</span>
- </a>
- {{if .Project.IsClosed}}
- <a class="item link-action" href data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/open">
- {{svg "octicon-check"}}
- <span class="gt-mx-3">{{$.locale.Tr "repo.projects.open"}}</span>
- </a>
- {{else}}
- <a class="item link-action" href data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/close">
- {{svg "octicon-skip"}}
- <span class="gt-mx-3">{{$.locale.Tr "repo.projects.close"}}</span>
- </a>
- {{end}}
- <a class="item delete-button" href="#" data-url="{{$.RepoLink}}/projects/{{.Project.ID}}/delete" data-id="{{.Project.ID}}">
- {{svg "octicon-trash"}}
- <span class="gt-mx-3">{{$.locale.Tr "repo.issues.label_delete"}}</span>
- </a>
- </div>
- </div>
- {{end}}
+ <div class="ui container padded">
+ <div class="gt-df gt-sb gt-ac gt-mb-4">
+ {{template "repo/issue/navbar" .}}
+ <a class="ui right small green button item" href="{{.RepoLink}}/issues/new/choose?project={{.Project.ID}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>
</div>
- <div class="divider"></div>
+ {{template "projects/view" .}}
</div>
- <div class="ui container fluid padded" id="project-board">
-
- <div class="board {{if .CanWriteProjects}}sortable{{end}}">
- {{range $board := .Boards}}
-
- <div class="ui segment board-column" style="background: {{.Color}} !important;" data-id="{{.ID}}" data-sorting="{{.Sorting}}" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}">
- <div class="board-column-header gt-df gt-ac gt-sb">
- <div class="ui large label board-label gt-py-2">
- <div class="ui small circular grey label board-card-cnt">
- {{.NumIssues}}
- </div>
- {{.Title}}
- </div>
- {{if and $.CanWriteProjects (not $.Repository.IsArchived) (ne .ID 0)}}
- <div class="ui dropdown jump item">
- <div class="not-mobile gt-px-3" tabindex="-1">
- {{svg "octicon-kebab-horizontal"}}
- </div>
- <div class="menu user-menu" tabindex="-1">
- <a class="item show-modal button" data-modal="#edit-project-board-modal-{{.ID}}">
- {{svg "octicon-pencil"}}
- {{$.locale.Tr "repo.projects.column.edit"}}
- </a>
- {{if not .Default}}
- <a class="item show-modal button default-project-board-show"
- data-modal="#default-project-board-modal-{{.ID}}"
- data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
- data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
- data-type="set_default"
- data-url="{{$.Link}}/{{.ID}}/default">
- {{svg "octicon-pin"}}
- {{$.locale.Tr "repo.projects.column.set_default"}}
- </a>
- {{else}}
- <a class="item show-modal button default-project-board-show"
- data-modal="#default-project-board-modal-{{.ID}}"
- data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
- data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
- data-type="unset_default"
- data-url="{{$.Link}}/{{.ID}}/unsetdefault">
- {{svg "octicon-pin-slash"}}
- {{$.locale.Tr "repo.projects.column.unset_default"}}
- </a>
- {{end}}
- <a class="item show-modal button show-delete-column-modal"
- data-modal="#delete-board-modal-{{.ID}}"
- data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}"
- >
- {{svg "octicon-trash"}}
- {{$.locale.Tr "repo.projects.column.delete"}}
- </a>
-
- <div class="ui small modal edit-project-board" id="edit-project-board-modal-{{.ID}}">
- <div class="header">
- {{$.locale.Tr "repo.projects.column.edit"}}
- </div>
- <div class="content">
- <form class="ui form">
- <div class="required field">
- <label for="new_board_title">{{$.locale.Tr "repo.projects.column.edit_title"}}</label>
- <input class="project-board-title" id="new_board_title" name="title" value="{{.Title}}" required>
- </div>
-
- <div class="field color-field">
- <label for="new_board_color">{{$.locale.Tr "repo.projects.column.color"}}</label>
- <div class="color picker column">
- <input class="color-picker" maxlength="7" placeholder="#c320f6" id="new_board_color" name="color" value="{{.Color}}">
- <div class="column precolors">
- {{template "repo/issue/label_precolors"}}
- </div>
- </div>
- </div>
-
- <div class="text right actions">
- <button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
- <button data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" class="ui primary button edit-column-button">{{$.locale.Tr "repo.projects.column.edit"}}</button>
- </div>
- </form>
- </div>
- </div>
-
- <div class="ui g-modal-confirm modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
- <div class="header">
- <span id="default-project-board-header"></span>
- </div>
- <div class="content">
- <label id="default-project-board-content"></label>
- </div>
- {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
- </div>
-
- <div class="ui g-modal-confirm modal" id="delete-board-modal-{{.ID}}">
- <div class="header">
- {{$.locale.Tr "repo.projects.column.delete"}}
- </div>
- <div class="content">
- <label>
- {{$.locale.Tr "repo.projects.column.deletion_desc"}}
- </label>
- </div>
- {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}}
- </div>
- </div>
- </div>
- {{end}}
- </div>
- <div class="divider"></div>
-
- <div class="ui cards board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}" data-project="{{$.Project.ID}}" data-board="{{.ID}}" id="board_{{.ID}}">
-
- {{range (index $.IssuesMap .ID)}}
-
- <!-- start issue card -->
- <div class="card board-card" data-issue="{{.ID}}">
- {{if eq $.Project.CardType 1}}{{/* Images and Text*/}}
- <div class="card-attachment-images">
- {{range (index $.issuesAttachmentMap .ID)}}
- <img src="{{.DownloadURL}}" alt="{{.Name}}">
- {{end}}
- </div>
- {{end}}
- <div class="content gt-p-0">
- <div class="header">
- <span class="gt-dif gt-ac gt-vm">
- {{template "shared/issueicon" .}}
- </span>
- <a class="project-board-title gt-vm" href="{{.Link}}">
- {{.Title}}
- </a>
- </div>
- <div class="meta gt-my-2">
- <span class="text light grey">
- #{{.Index}}
- {{$timeStr := TimeSinceUnix .GetLastEventTimestamp $.locale}}
- {{if .OriginalAuthor}}
- {{$.locale.Tr .GetLastEventLabelFake $timeStr (.OriginalAuthor|Escape) | Safe}}
- {{else if gt .Poster.ID 0}}
- {{$.locale.Tr .GetLastEventLabel $timeStr (.Poster.HomeLink|Escape) (.Poster.GetDisplayName | Escape) | Safe}}
- {{else}}
- {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}}
- {{end}}
- </span>
- </div>
- {{- if .MilestoneID}}
- <div class="meta gt-my-2">
- <a class="milestone" href="{{$.RepoLink}}/milestone/{{.MilestoneID}}">
- {{svg "octicon-milestone" 16 "gt-mr-2 gt-vm"}}
- <span class="gt-vm">{{.Milestone.Name}}</span>
- </a>
- </div>
- {{- end}}
- {{- range index $.LinkedPRs .ID}}
- <div class="meta gt-my-2">
- <a href="{{$.RepoLink}}/pulls/{{.Index}}">
- <span class="gt-m-0 text {{if .PullRequest.HasMerged}}purple{{else if .IsClosed}}red{{else}}green{{end}}">{{svg "octicon-git-merge" 16 "gt-mr-2 gt-vm"}}</span>
- <span class="gt-vm">{{.Title}} <span class="text light grey">#{{.Index}}</span></span>
- </a>
- </div>
- {{- end}}
- </div>
-
- {{if or .Labels .Assignees}}
- <div class="extra content labels-list gt-p-0 gt-pt-2">
- {{range .Labels}}
- <a target="_blank" href="{{$.RepoLink}}/issues?labels={{.ID}}">{{RenderLabel $.Context .}}</a>
- {{end}}
- <div class="right floated">
- {{range .Assignees}}
- <a target="_blank" href="{{.HomeLink}}" data-tooltip-content="{{$.locale.Tr "repo.projects.column.assigned_to"}} {{.Name}}">{{ctx.AvatarUtils.Avatar . 28 "mini gt-mr-3"}}</a>
- {{end}}
- </div>
- </div>
- {{end}}
- </div>
- <!-- stop issue card -->
-
- {{end}}
- </div>
- </div>
- {{end}}
- </div>
-
- </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" .}}