From 71c1c7379a194d9ffec81bd5b4d34ca2bf32df5e Mon Sep 17 00:00:00 2001 From: rogerluo410 Date: Thu, 1 Apr 2021 14:04:03 +0800 Subject: [PATCH 1/6] Add assignees in project boards. --- options/locale/locale_en-US.ini | 2 ++ templates/repo/projects/view.tmpl | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 3be209ffef908..636bf9bd6355d 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -986,6 +986,8 @@ projects.board.delete = "Delete Board" projects.board.deletion_desc = "Deleting a project board moves all related issues to 'Uncategorized'. Continue?" projects.open = Open projects.close = Close +projects.board.assigned_to = Assigned to +projects.board.opened_by = opened by issues.desc = Organize bug reports, tasks and milestones. issues.filter_assignees = Filter Assignee diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 7a1583e5568cd..132dbae795f75 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -74,7 +74,12 @@
-
{{.Title}}
+
+
+ {{ len .Issues}} +
+ {{.Title}} +
{{if and $.CanWriteProjects (not $.Repository.IsArchived) $.PageIsProjects (ne .ID 0)}}
@@ -166,6 +171,12 @@ #{{.Index}} {{.Title}}
+
+ #{{.Index}} {{$.i18n.Tr "repo.projects.board.opened_by"}} + + {{.Poster.Name}} + +
{{- if .MilestoneID }}
@@ -186,6 +197,13 @@ {{ range .Labels }} {{.Name | RenderEmoji}} {{ end }} +
+ {{ range .Assignees }} + + {{avatar . 28 "mini mr-3"}} + + {{ end }} +
From 95d425451cdb6e1acfa970c3b3baa374c22a9f45 Mon Sep 17 00:00:00 2001 From: rogerluo410 Date: Thu, 1 Apr 2021 19:55:42 +0800 Subject: [PATCH 2/6] Update the number of cards in board while drop successful --- templates/repo/projects/view.tmpl | 2 +- web_src/js/features/projects.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 132dbae795f75..32af4859178ff 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -75,7 +75,7 @@
-
+
{{ len .Issues}}
{{.Title}} diff --git a/web_src/js/features/projects.js b/web_src/js/features/projects.js index 91e5c208500e2..072b610f23b4b 100644 --- a/web_src/js/features/projects.js +++ b/web_src/js/features/projects.js @@ -50,6 +50,14 @@ export default async function initProject() { }, contentType: 'application/json', type: 'POST', + success: () => { + // Update the number of cards in board while drop successful. + const fromCnt = e.from.parentElement.getElementsByClassName('board-card').length; + e.from.parentElement.getElementsByClassName('board-card-cnt')[0].innerText = fromCnt; + + const toCnt = e.to.parentElement.getElementsByClassName('board-card').length; + e.to.parentElement.getElementsByClassName('board-card-cnt')[0].innerText = toCnt; + }, error: () => { e.from.insertBefore(e.item, e.from.children[e.oldIndex]); }, From 8a782b36a288cb6a146a653ccd362fc437d614b0 Mon Sep 17 00:00:00 2001 From: rogerluo410 Date: Fri, 2 Apr 2021 13:15:35 +0800 Subject: [PATCH 3/6] Make cards arrange vertically in board list. --- web_src/less/_repository.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index f2234c855817c..7633484055dc9 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2996,13 +2996,18 @@ tbody.commit-list { .board-column > .cards { flex: 1; display: flex; - flex-direction: column; + // flex-direction: column; + align-content: baseline; margin: 0 !important; padding: 0 !important; .card .meta > a.milestone { color: #999999; } + + .card { + flex-basis: 100%; + } } .board-column > .divider { From f307fd8d93ad43eb8afa0ecf0a577efb1164557c Mon Sep 17 00:00:00 2001 From: Roger Luo Date: Sat, 10 Apr 2021 14:26:54 +0800 Subject: [PATCH 4/6] Update web_src/less/_repository.less Co-authored-by: zeripath --- web_src/less/_repository.less | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 7633484055dc9..3427474298993 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2996,7 +2996,6 @@ tbody.commit-list { .board-column > .cards { flex: 1; display: flex; - // flex-direction: column; align-content: baseline; margin: 0 !important; padding: 0 !important; From 7d0768c701a3fcd2e417ff6891d60132ef7988c3 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 8 Mar 2022 18:29:44 +0800 Subject: [PATCH 5/6] fix merge --- templates/repo/projects/view.tmpl | 45 +++----- web_src/js/features/projects.js | 151 --------------------------- web_src/js/features/repo-projects.js | 8 ++ web_src/less/_repository.less | 80 -------------- web_src/less/features/projects.less | 1 + 5 files changed, 23 insertions(+), 262 deletions(-) delete mode 100644 web_src/js/features/projects.js diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index cf9686fbb1163..7e21ab6fde3fe 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -82,25 +82,17 @@
-
{{.Title}}
+
+
+ {{len .Issues}} +
+ {{.Title}} +
{{if and $.CanWriteProjects (not $.Repository.IsArchived) (ne .ID 0)}}
{{svg "octicon-kebab-horizontal"}}
-
-
-
-
- {{ len .Issues}} -
- {{.Title}} -
- {{if and $.CanWriteProjects (not $.Repository.IsArchived) $.PageIsProjects (ne .ID 0)}} -
- - {{svg "octicon-kebab-horizontal" 24}} -
{{svg "octicon-pencil"}} @@ -226,14 +218,11 @@
- #{{.Index}} {{$.i18n.Tr "repo.projects.board.opened_by"}} - - {{.Poster.Name}} - + #{{.Index}} {{$.i18n.Tr "repo.projects.board.opened_by"}} {{.Poster.Name}}
{{- if .MilestoneID }}
- + {{svg "octicon-milestone" 16 "mr-2 vm"}} {{ .Milestone.Name }} @@ -248,25 +237,19 @@
{{- end }}
- {{if .Labels}} -
- {{ range .Labels }} - {{.Name | RenderEmoji}} - {{ end }} -
- {{end}} -
+ + {{ if or .Labels .Assignees }} +
{{ range .Labels }} - {{.Name | RenderEmoji}} + {{.Name | RenderEmoji}} {{ end }}
{{ range .Assignees }} - - {{avatar . 28 "mini mr-3"}} - + {{avatar . 28 "mini mr-3"}} {{ end }}
+ {{ end }}
diff --git a/web_src/js/features/projects.js b/web_src/js/features/projects.js deleted file mode 100644 index 072b610f23b4b..0000000000000 --- a/web_src/js/features/projects.js +++ /dev/null @@ -1,151 +0,0 @@ -const {csrf, PageIsProjects} = window.config; - -export default async function initProject() { - if (!PageIsProjects) { - return; - } - - const {Sortable} = await import(/* webpackChunkName: "sortable" */'sortablejs'); - const boardColumns = document.getElementsByClassName('board-column'); - - new Sortable( - document.getElementsByClassName('board')[0], - { - group: 'board-column', - draggable: '.board-column', - animation: 150, - onSort: () => { - const board = document.getElementsByClassName('board')[0]; - const boardColumns = board.getElementsByClassName('board-column'); - - boardColumns.forEach((column, i) => { - if (parseInt($(column).data('sorting')) !== i) { - $.ajax({ - url: $(column).data('url'), - data: JSON.stringify({sorting: i}), - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - method: 'PUT', - }); - } - }); - }, - }, - ); - - for (const column of boardColumns) { - new Sortable( - column.getElementsByClassName('board')[0], - { - group: 'shared', - animation: 150, - onAdd: (e) => { - $.ajax(`${e.to.dataset.url}/${e.item.dataset.issue}`, { - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - type: 'POST', - success: () => { - // Update the number of cards in board while drop successful. - const fromCnt = e.from.parentElement.getElementsByClassName('board-card').length; - e.from.parentElement.getElementsByClassName('board-card-cnt')[0].innerText = fromCnt; - - const toCnt = e.to.parentElement.getElementsByClassName('board-card').length; - e.to.parentElement.getElementsByClassName('board-card-cnt')[0].innerText = toCnt; - }, - error: () => { - e.from.insertBefore(e.item, e.from.children[e.oldIndex]); - }, - }); - }, - }, - ); - } - - $('.edit-project-board').each(function () { - const projectTitleLabel = $(this).closest('.board-column-header').find('.board-label'); - const projectTitleInput = $(this).find( - '.content > .form > .field > .project-board-title', - ); - - $(this) - .find('.content > .form > .actions > .red') - .on('click', function (e) { - e.preventDefault(); - - $.ajax({ - url: $(this).data('url'), - data: JSON.stringify({title: projectTitleInput.val()}), - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - method: 'PUT', - }).done(() => { - projectTitleLabel.text(projectTitleInput.val()); - projectTitleInput.closest('form').removeClass('dirty'); - $('.ui.modal').modal('hide'); - }); - }); - }); - - $(document).on('click', '.set-default-project-board', async function (e) { - e.preventDefault(); - - await $.ajax({ - method: 'POST', - url: $(this).data('url'), - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - }); - - window.location.reload(); - }); - - $('.delete-project-board').each(function () { - $(this).click(function (e) { - e.preventDefault(); - - $.ajax({ - url: $(this).data('url'), - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - method: 'DELETE', - }).done(() => { - window.location.reload(); - }); - }); - }); - - $('#new_board_submit').click(function (e) { - e.preventDefault(); - - const boardTitle = $('#new_board'); - - $.ajax({ - url: $(this).data('url'), - data: JSON.stringify({title: boardTitle.val()}), - headers: { - 'X-Csrf-Token': csrf, - 'X-Remote': true, - }, - contentType: 'application/json', - method: 'POST', - }).done(() => { - boardTitle.closest('form').removeClass('dirty'); - window.location.reload(); - }); - }); -} diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js index 3147626b51902..a948eba80727a 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -2,8 +2,16 @@ import $ from 'jquery'; const {csrfToken} = window.config; +function updateIssueCount(cards) { + const parent = cards.parentElement; + const cnt = parent.getElementsByClassName('board-card').length; + parent.getElementsByClassName('board-card-cnt')[0].innerText = cnt; +} + function moveIssue({item, from, to, oldIndex}) { const columnCards = to.getElementsByClassName('board-card'); + updateIssueCount(from); + updateIssueCount(to); const columnSorting = { issues: [...columnCards].map((card, i) => ({ diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 0229bd527471c..8b912ce90d861 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -3010,86 +3010,6 @@ tbody.commit-list { padding-top: 0 !important; } -.board { - display: flex; - flex-direction: row; - flex-wrap: nowrap; - overflow-x: auto; - margin: 0 .5em; -} - -.board-column { - background-color: rgba(0, 0, 0, .05) !important; - border: 1px solid var(--color-secondary) !important; - margin: 0 .5rem !important; - padding: .5rem !important; - width: 320px; - height: 60vh; - overflow-y: scroll; - flex: 0 0 auto; - overflow: visible; - display: flex; - flex-direction: column; -} - -.board-column-header { - display: flex; - justify-content: space-between; -} - -.board-label { - background: none !important; - line-height: 1.25 !important; -} - -.board-column > .cards { - flex: 1; - display: flex; - align-content: baseline; - margin: 0 !important; - padding: 0 !important; - - .card .meta > a.milestone { - color: #999999; - } - - .card { - flex-basis: 100%; - } -} - -.board-column > .divider { - margin: 5px 0; -} - -.board-column:first-child { - margin-left: auto !important; -} - -.board-column:last-child { - margin-right: auto !important; -} - -.board-card { - margin: 3px !important; - width: auto !important; - background-color: #fff; - border-radius: 5px; - cursor: pointer; -} - -.board-card .header { - font-size: 1.1em !important; -} - -.board-card .content { - padding: 8px 8px 5px !important; -} - -.board-card .extra.content { - padding: 5px 8px !important; -} - td.blob-excerpt { background-color: #fafafa; } diff --git a/web_src/less/features/projects.less b/web_src/less/features/projects.less index 99722b6cc5474..21514688b6fca 100644 --- a/web_src/less/features/projects.less +++ b/web_src/less/features/projects.less @@ -48,6 +48,7 @@ .board-column > .cards { flex: 1; display: flex; + align-content: baseline; margin: 0 !important; padding: 0 !important; flex-wrap: nowrap !important; From 45444bfe379c0b72b909614dce61e84618fc7555 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Tue, 8 Mar 2022 18:44:27 +0800 Subject: [PATCH 6/6] remove duplicated poster, remove unrelated code --- options/locale/locale_en-US.ini | 1 - templates/repo/projects/view.tmpl | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 9ee89a3756883..90309c9df9b8f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1182,7 +1182,6 @@ projects.board.color = "Color" projects.open = Open projects.close = Close projects.board.assigned_to = Assigned to -projects.board.opened_by = opened by issues.desc = Organize bug reports, tasks and milestones. issues.filter_assignees = Filter Assignee diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 7e21ab6fde3fe..e96b92fb77b57 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -217,12 +217,9 @@ {{end}}
-
- #{{.Index}} {{$.i18n.Tr "repo.projects.board.opened_by"}} {{.Poster.Name}} -
{{- if .MilestoneID }}
- + {{svg "octicon-milestone" 16 "mr-2 vm"}} {{ .Milestone.Name }}