From bbe37cfad83f261e2c24cca3b4f31baa0e818f58 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Wed, 27 Sep 2017 14:29:52 +0200 Subject: sugested fix for issue #881 --- client/components/cards/checklists.jade | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'client/components/cards/checklists.jade') diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 7ecc5dd3..74da5863 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -1,8 +1,14 @@ template(name="checklists") h2 {{_ 'checklists'}} + if deleteDialog + .board-overlay#card-details-overlay + +checklistDeleteDialog(checklist = checklistToDelete) + + .card-checklist-items each checklist in currentCard.checklists - +checklistDetail(checklist = checklist) + +checklistDetail(checklist=checklist) + if canModifyCard +inlinedForm(autoclose=false classNames="js-add-checklist" cardId = cardId) +addChecklistItemForm @@ -18,7 +24,8 @@ template(name="checklistDetail") .checklist-title .checkbox.fa.fa-check-square-o if canModifyCard - a.js-delete-checklist {{_ "delete"}}... + a.js-delete-checklist.toggle-delete-checklist-dialog {{_ "delete"}}... + span.checklist-stat(class="{{#if checklist.isFinished}}is-finished{{/if}}") {{checklist.finishedCount}}/{{checklist.itemCount}} if canModifyCard h2.title.js-open-inlined-form.is-editable {{checklist.title}} @@ -26,6 +33,18 @@ template(name="checklistDetail") h2.title {{checklist.title}} +checklistItems(checklist = checklist) +template(name="checklistDeleteDialog") + .js-confirm-checklist-delete + p + i(class="fa fa-exclamation-triangle" aria-hidden="true") + p + | Are you sure you want to delete + span {{checklist.title}} + | ? + .js-checklist-delete-buttons + button.confirm-checklist-delete(type="button") {{_ 'delete'}} + button.toggle-delete-checklist-dialog(type="button") {{_ 'cancel'}} + template(name="addChecklistItemForm") textarea.js-add-checklist-item(rows='1' autofocus) .edit-controls.clearfix -- cgit v1.2.3-1-g7c22 From 4a20208d95134ba26d2e9fdba3d1e7a4329eb451 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Fri, 29 Sep 2017 14:13:36 +0200 Subject: removed unnecessary deleteDialog helper, delete dialog now uses tap-i18n --- client/components/cards/checklists.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/components/cards/checklists.jade') diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 559dd83e..d6e6d736 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -1,6 +1,6 @@ template(name="checklists") h2 {{_ 'checklists'}} - if deleteDialog + if toggleDeleteDialog.get .board-overlay#card-details-overlay +checklistDeleteDialog(checklist = checklistToDelete) @@ -38,7 +38,7 @@ template(name="checklistDeleteDialog") p i(class="fa fa-exclamation-triangle" aria-hidden="true") p - | Are you sure you want to delete + | {{_ 'confirm-checklist-delete-dialog'}} span {{checklist.title}} | ? .js-checklist-delete-buttons -- cgit v1.2.3-1-g7c22