diff options
| author | Felipe Artur <fcardozo@gitlab.com> | 2018-07-30 16:44:41 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-30 16:44:41 +0300 |
| commit | 5815c5b48ac03dbd89a239e87c0f49216a428563 (patch) | |
| tree | 7af892c202f2e00ee79d2646d5429ee466ff3ded /app/views/shared | |
| parent | 4f08343463d6a987ad3415d410b38b4f9dde67a2 (diff) | |
[Backport] View summed weights of issues in board column
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/boards/components/_board.html.haml | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/app/views/shared/boards/components/_board.html.haml b/app/views/shared/boards/components/_board.html.haml index 03e008f5fa0..b35877e5518 100644 --- a/app/views/shared/boards/components/_board.html.haml +++ b/app/views/shared/boards/components/_board.html.haml @@ -32,17 +32,21 @@ "v-if" => "!list.preset && list.id" } %button.board-delete.has-tooltip.float-right{ type: "button", title: _("Delete list"), "aria-label" => _("Delete list"), data: { placement: "bottom" }, "@click.stop" => "deleteBoard" } = icon("trash") - .issue-count-badge.clearfix{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"' } - %span.issue-count-badge-count.float-left{ ":class" => '{ "has-btn": list.type !== "closed" && !disabled }' } + .issue-count-badge.text-secondary{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"', ":title": "counterTooltip", "v-tooltip": true, data: { placement: "top" } } + %span.issue-count-badge-count + %icon.mr-1{ name: "issues" } {{ list.issuesSize }} - - if can?(current_user, :admin_list, current_board_parent) - %button.issue-count-badge-add-button.btn.btn-sm.btn-default.has-tooltip.js-no-trigger-collapse{ type: "button", - "@click" => "showNewIssueForm", - "v-if" => 'list.type !== "closed"', - "aria-label" => _("New issue"), - "title" => _("New issue"), - data: { placement: "top", container: "body" } } - = icon("plus", class: "js-no-trigger-collapse") + = render_if_exists "shared/boards/components/list_weight" + + - if can?(current_user, :admin_list, current_board_parent) + %button.issue-count-badge-add-button.btn.btn-sm.btn-default.ml-1.has-tooltip.js-no-trigger-collapse{ type: "button", + "@click" => "showNewIssueForm", + "v-if" => 'list.type !== "closed"', + "aria-label" => _("New issue"), + "title" => _("New issue"), + data: { placement: "top", container: "body" } } + = icon("plus", class: "js-no-trigger-collapse") + %board-list{ "v-if" => 'list.type !== "blank" && list.type !== "promotion"', ":list" => "list", ":issues" => "list.issues", |