From bbe37cfad83f261e2c24cca3b4f31baa0e818f58 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Wed, 27 Sep 2017 14:29:52 +0200 Subject: [PATCH 1/8] sugested fix for issue #881 --- client/components/cards/checklists.jade | 23 ++++++- client/components/cards/checklists.js | 90 ++++++++++++++++++++----- client/components/cards/checklists.styl | 39 +++++++++++ 3 files changed, 132 insertions(+), 20 deletions(-) diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 7ecc5dd39..74da58639 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 diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index bd9d275a0..257f1ec8a 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -64,6 +64,7 @@ Template.checklists.onRendered(function () { }); BlazeComponent.extendComponent({ + addChecklist(event) { event.preventDefault(); const textarea = this.find('textarea.js-add-checklist-item'); @@ -99,6 +100,30 @@ BlazeComponent.extendComponent({ textarea.focus(); }, + canModifyCard() { + return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); + }, + + deleteChecklist() { + const checklist = this.currentData().checklist; + if (checklist && checklist._id) { + Checklists.remove(checklist._id); + this.toggleDeleteDialog.set(false); + } + }, + + deleteDialog() { + return this.toggleDeleteDialog.get(); + }, + + deleteItem() { + const checklist = this.currentData().checklist; + const item = this.currentData().item; + if (checklist && item && item._id) { + checklist.removeItem(item._id); + } + }, + editChecklist(event) { event.preventDefault(); const textarea = this.find('textarea.js-edit-checklist-item'); @@ -107,10 +132,6 @@ BlazeComponent.extendComponent({ checklist.setTitle(title); }, - canModifyCard() { - return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); - }, - editChecklistItem(event) { event.preventDefault(); @@ -121,19 +142,9 @@ BlazeComponent.extendComponent({ checklist.editItem(itemId, title); }, - deleteItem() { - const checklist = this.currentData().checklist; - const item = this.currentData().item; - if (checklist && item && item._id) { - checklist.removeItem(item._id); - } - }, - - deleteChecklist() { - const checklist = this.currentData().checklist; - if (checklist && checklist._id) { - Checklists.remove(checklist._id); - } + onCreated() { + this.toggleDeleteDialog = new ReactiveVar(false); + this.checklistToDelete = null; //Store data context to pass to checklistDeleteDialog template }, pressKey(event) { @@ -146,18 +157,61 @@ BlazeComponent.extendComponent({ }, events() { + const events = { + 'click .toggle-delete-checklist-dialog'(event) { + if($(event.target).hasClass('js-delete-checklist')){ + this.checklistToDelete = this.currentData().checklist; //Store data context + } + this.toggleDeleteDialog.set(!this.toggleDeleteDialog.get()); + }, + }; + return [{ + ...events, 'submit .js-add-checklist': this.addChecklist, 'submit .js-edit-checklist-title': this.editChecklist, 'submit .js-add-checklist-item': this.addChecklistItem, 'submit .js-edit-checklist-item': this.editChecklistItem, 'click .js-delete-checklist-item': this.deleteItem, - 'click .js-delete-checklist': this.deleteChecklist, + 'click .confirm-checklist-delete': this.deleteChecklist, keydown: this.pressKey, }]; }, }).register('checklists'); +Template.checklistDeleteDialog.onCreated(() => { + const $cardDetails = this.$('.card-details'); + this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position + top: false //required for smooth scroll animation + }; + //Callback's purpose is to only prevent scrolling after animation is complete + $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; }); + + //Prevent scrolling while dialog is open + $cardDetails.on('scroll', () => { + if(this.scrollState.top) { //If it's already in position, keep it there. Otherwise let animation scroll + $cardDetails.scrollTop(0); + } + }); +}); + +Template.checklistDeleteDialog.onDestroyed(() => { + const $cardDetails = this.$('.card-details'); + $cardDetails.off('scroll'); //Reactivate scrolling + $cardDetails.animate( { scrollTop: this.scrollState.position }); +}); + +BlazeComponent.extendComponent({ + events() { + const handlers = { + 'click .confirm-checklist-delete'() { + console.log(this.scrollState) + }, + } + + return [ handlers ]; + } +}).register('checklistDeleteDialog'); Template.itemDetail.helpers({ canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl index 776683496..d3e8c4275 100644 --- a/client/components/cards/checklists.styl +++ b/client/components/cards/checklists.styl @@ -38,6 +38,45 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item .js-delete-checklist @extends .delete-text + +.js-confirm-checklist-delete + background-color: darken(white, 3%) + position: absolute + float: left; + width: 60% + margin-top: 0 + margin-left: 16% + padding-bottom: 2% + z-index: 17 + border-radius: 3px + + p + position: relative + margin-top: 3% + width: 100% + text-align: center + + span + font-weight: bold + + i + font-size: 2em + + .js-checklist-delete-buttons + position: relative + padding: left 2% right 2% + .confirm-checklist-delete + margin-left: 16% + float: left + .toggle-delete-checklist-dialog + margin-right: 16% + float: right + +#card-details-overlay + top: 0 + bottom: -600px + right: 0 + .checklist-items margin: 0 0 0.5em 1.33em From dcd4a2f1e35eccf056b12de05add8d6ec1707887 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Wed, 27 Sep 2017 14:50:00 +0200 Subject: [PATCH 2/8] code clean up --- client/components/cards/checklists.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 0596d7eb3..eccd05510 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -203,17 +203,6 @@ Template.checklistDeleteDialog.onDestroyed(() => { $cardDetails.animate( { scrollTop: this.scrollState.position }); }); -BlazeComponent.extendComponent({ - events() { - const handlers = { - 'click .confirm-checklist-delete'() { - console.log(this.scrollState) - }, - } - - return [ handlers ]; - } -}).register('checklistDeleteDialog'); Template.itemDetail.helpers({ canModifyCard() { return Meteor.user() && Meteor.user().isBoardMember() && !Meteor.user().isCommentOnly(); From 9940d635b447d98f60d31181e2fc15610d05b969 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Wed, 27 Sep 2017 15:42:48 +0200 Subject: [PATCH 3/8] removed linting errors --- client/components/cards/checklists.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index eccd05510..014b72a41 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -184,7 +184,7 @@ BlazeComponent.extendComponent({ Template.checklistDeleteDialog.onCreated(() => { const $cardDetails = this.$('.card-details'); this.scrollState = { position: $cardDetails.scrollTop(), //save current scroll position - top: false //required for smooth scroll animation + top: false, //required for smooth scroll animation }; //Callback's purpose is to only prevent scrolling after animation is complete $cardDetails.animate({ scrollTop: 0 }, 500, () => { this.scrollState.top = true; }); From 4a20208d95134ba26d2e9fdba3d1e7a4329eb451 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Fri, 29 Sep 2017 14:13:36 +0200 Subject: [PATCH 4/8] removed unnecessary deleteDialog helper, delete dialog now uses tap-i18n --- client/components/cards/checklists.jade | 4 ++-- client/components/cards/checklists.js | 6 +----- client/components/cards/checklists.styl | 9 +++++---- i18n/en-GB.i18n.json | 3 ++- i18n/en.i18n.json | 1 + i18n/pt-BR.i18n.json | 3 ++- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 559dd83ec..d6e6d7361 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 diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 014b72a41..030711bc6 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -113,11 +113,7 @@ BlazeComponent.extendComponent({ this.toggleDeleteDialog.set(false); } }, - - deleteDialog() { - return this.toggleDeleteDialog.get(); - }, - + deleteItem() { const checklist = this.currentData().checklist; const item = this.currentData().item; diff --git a/client/components/cards/checklists.styl b/client/components/cards/checklists.styl index d3e8c4275..d47763971 100644 --- a/client/components/cards/checklists.styl +++ b/client/components/cards/checklists.styl @@ -45,8 +45,10 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item float: left; width: 60% margin-top: 0 - margin-left: 16% + margin-left: 13% padding-bottom: 2% + padding-left: 3% + padding-right: 3% z-index: 17 border-radius: 3px @@ -55,7 +57,6 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item margin-top: 3% width: 100% text-align: center - span font-weight: bold @@ -66,10 +67,10 @@ textarea.js-add-checklist-item, textarea.js-edit-checklist-item position: relative padding: left 2% right 2% .confirm-checklist-delete - margin-left: 16% + margin-left: 12% float: left .toggle-delete-checklist-dialog - margin-right: 16% + margin-right: 12% float: right #card-details-overlay diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 8db041a5a..e9f679330 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", @@ -391,4 +392,4 @@ "no": "No", "accounts": "Accounts", "accounts-allowEmailChange": "Allow Email Change" -} \ No newline at end of file +} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 64a720db0..7c94e9fb0 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 1ea99b76c..981e272da 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Somente comentários", "comment-only-desc": "Pode comentar apenas em cartões.", "computer": "Computador", + "confirm-checklist-delete-dialog": "Tem a certeza de que pretende eliminar", "copy-card-link-to-clipboard": "Copiar link do cartão para a área de transferência", "copyCardPopup-title": "Copy Card", "create": "Criar", @@ -391,4 +392,4 @@ "no": "Não", "accounts": "Contas", "accounts-allowEmailChange": "Permitir Mudança de Email" -} \ No newline at end of file +} From e03f2102de5d5e47c997058d4f2c86c3ff2a1373 Mon Sep 17 00:00:00 2001 From: amadilsons Date: Fri, 29 Sep 2017 14:23:54 +0200 Subject: [PATCH 5/8] fixed linting error --- client/components/cards/checklists.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 030711bc6..1cd77c9ff 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -113,7 +113,7 @@ BlazeComponent.extendComponent({ this.toggleDeleteDialog.set(false); } }, - + deleteItem() { const checklist = this.currentData().checklist; const item = this.currentData().item; From 90d904e10df4d70d6a0a744531e6f9b255b9bb1e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Sep 2017 16:29:38 +0300 Subject: [PATCH 6/8] Restore spacing. --- client/components/cards/checklists.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index d6e6d7361..9ff52d8ee 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -7,7 +7,7 @@ template(name="checklists") .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) From 6bb2302f81ab3266a6d7910856322198512015ae Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Sep 2017 16:50:38 +0300 Subject: [PATCH 7/8] Update translations. --- i18n/ar.i18n.json | 1 + i18n/br.i18n.json | 1 + i18n/ca.i18n.json | 1 + i18n/cs.i18n.json | 1 + i18n/de.i18n.json | 1 + i18n/en-GB.i18n.json | 4 ++-- i18n/en.i18n.json | 2 +- i18n/eo.i18n.json | 1 + i18n/es.i18n.json | 1 + i18n/eu.i18n.json | 1 + i18n/fa.i18n.json | 1 + i18n/fi.i18n.json | 1 + i18n/fr.i18n.json | 5 +++-- i18n/gl.i18n.json | 1 + i18n/he.i18n.json | 5 +++-- i18n/hu.i18n.json | 1 + i18n/id.i18n.json | 1 + i18n/it.i18n.json | 1 + i18n/ja.i18n.json | 1 + i18n/ko.i18n.json | 1 + i18n/nb.i18n.json | 1 + i18n/nl.i18n.json | 1 + i18n/pl.i18n.json | 1 + i18n/pt-BR.i18n.json | 4 ++-- i18n/ro.i18n.json | 1 + i18n/ru.i18n.json | 1 + i18n/sr.i18n.json | 1 + i18n/sv.i18n.json | 5 +++-- i18n/ta.i18n.json | 1 + i18n/th.i18n.json | 1 + i18n/tr.i18n.json | 1 + i18n/uk.i18n.json | 1 + i18n/vi.i18n.json | 1 + i18n/zh-CN.i18n.json | 1 + i18n/zh-TW.i18n.json | 1 + 35 files changed, 43 insertions(+), 11 deletions(-) diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index ebf743d8d..88eaf7bea 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -146,6 +146,7 @@ "comment-only": "التعليق فقط", "comment-only-desc": "يمكن التعليق على بطاقات فقط.", "computer": "حاسوب", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "إنشاء", diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index c6882ba15..a0a23c2c7 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Krouiñ", diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index a3a0e7aa7..530f2d98e 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Només comentaris", "comment-only-desc": "Només pots fer comentaris a les fitxes", "computer": "Ordinador", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copia l'enllaç de la ftixa al porta-retalls", "copyCardPopup-title": "Copia la fitxa", "create": "Crea", diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index ca2cf7efb..7fa6b0b66 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Počítač", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Kopírovat adresu karty do mezipaměti", "copyCardPopup-title": "Kopírovat kartu", "create": "Vytvořit", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index bc1120edd..bc5599ac6 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Nur kommentierbar", "comment-only-desc": "Kann Karten nur Kommentieren", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Kopiere die Karte in die Zwischenablage", "copyCardPopup-title": "Karte kopieren", "create": "Erstellen", diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index e9f679330..9d9b823d5 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -146,7 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", @@ -392,4 +392,4 @@ "no": "No", "accounts": "Accounts", "accounts-allowEmailChange": "Allow Email Change" -} +} \ No newline at end of file diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 7c94e9fb0..466f58dd6 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -146,7 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", - "confirm-checklist-delete-dialog": "Are you sure you want to delete", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 5da9e81ae..efe04463e 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Komputilo", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Krei", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 5dca2df54..6577add60 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Sólo comentario", "comment-only-desc": "Solo se puede comentar en tarjetas.", "computer": "Ordenador", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copiar enlace a la tarjeta al portapapeles", "copyCardPopup-title": "Copy Card", "create": "Crear", diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index edf7e09a6..9bc874fa7 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Iruzkinak besterik ez", "comment-only-desc": "Iruzkinak txarteletan soilik egin ditzake", "computer": "Ordenagailua", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Kopiatu txartela arbelera", "copyCardPopup-title": "Copy Card", "create": "Sortu", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index c7c05a2b6..53eac924e 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -146,6 +146,7 @@ "comment-only": "صرفا یادداشت", "comment-only-desc": "صرفا یادداشت برروی کارت ها", "computer": "رایانه", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "ایجاد", diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 0a8349968..64a328fdb 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Vain kommentointi", "comment-only-desc": "Voi vain kommentoida kortteja", "computer": "Tietokone", + "confirm-checklist-delete-dialog": "Haluatko varmasti poistaa tarkistuslistan", "copy-card-link-to-clipboard": "Kopioi kortin linkki leikepöydälle", "copyCardPopup-title": "Kopioi kortti", "create": "Luo", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 4f4319611..053874c70 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -2,8 +2,8 @@ "accept": "Accepter", "act-activity-notify": "[Wekan] Notification d'activité", "act-addAttachment": "a joint __attachment__ à __card__", - "act-addChecklist": "added checklist __checklist__ to __card__", - "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", + "act-addChecklist": "a ajouté la checklist __checklist__ à __card__", + "act-addChecklistItem": "a ajouté l'élément __checklistItem__ à la checklist __checklist__ de __card__", "act-addComment": "a commenté __card__ : __comment__", "act-createBoard": "a créé __board__", "act-createCard": "a ajouté __card__ à __list__", @@ -146,6 +146,7 @@ "comment-only": "Commentaire uniquement", "comment-only-desc": "Ne peut que commenter des cartes.", "computer": "Ordinateur", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copier le lien vers la carte dans le presse-papier", "copyCardPopup-title": "Copier la carte", "create": "Créer", diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 6b2dd9b64..27769c08a 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computador", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Crear", diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 17eb1ea13..91b39872a 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -2,8 +2,8 @@ "accept": "אישור", "act-activity-notify": "[Wekan] הודעת פעילות", "act-addAttachment": " __attachment__ צורף לכרטיס __card__", - "act-addChecklist": "added checklist __checklist__ to __card__", - "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", + "act-addChecklist": "רשימת משימות __checklist__ נוספה ל __card__", + "act-addChecklistItem": " __checklistItem__ נוסף לרשימת משימות __checklist__ בכרטיס __card__", "act-addComment": "התקבלה תגובה על הכרטיס __card__:‏ __comment__", "act-createBoard": "הלוח __board__ נוצר", "act-createCard": "הכרטיס __card__ התווסף לרשימה __list__", @@ -146,6 +146,7 @@ "comment-only": "הערה בלבד", "comment-only-desc": "ניתן להעיר על כרטיסים בלבד.", "computer": "מחשב", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "העתק כרטיס", "create": "יצירה", diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 65bed443d..59922ec51 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Számítógép", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Létrehoz", diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index a8bb170fd..894710a4d 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Hanya komentar", "comment-only-desc": "Bisa komen hanya di kartu", "computer": "Komputer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Buat", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 72963a0f1..0ed9a895c 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Solo commenti", "comment-only-desc": "Puoi commentare solo le schede.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copia link della scheda sulla clipboard", "copyCardPopup-title": "Copy Card", "create": "Crea", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index f5c38263a..7c261acc2 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -146,6 +146,7 @@ "comment-only": "コメントのみ", "comment-only-desc": "カードにのみコメント可能", "computer": "コンピューター", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "カードへのリンクをクリップボードにコピー", "copyCardPopup-title": "Copy Card", "create": "作成", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 1842be0a9..d865017c0 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -146,6 +146,7 @@ "comment-only": "댓글만 입력 가능", "comment-only-desc": "카드에 댓글만 달수 있습니다.", "computer": "내 컴퓨터", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "생성", diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index e8cbed4db..538efd2b5 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 6cbcca6b2..60bf3b879 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Alleen reageren", "comment-only-desc": "Kan alleen op kaarten reageren.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Kopieer kaart link naar klembord", "copyCardPopup-title": "Copy Card", "create": "Aanmaken", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 024382ffb..144c29a37 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Komputer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Utwórz", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 981e272da..4c570dab1 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -146,7 +146,7 @@ "comment-only": "Somente comentários", "comment-only-desc": "Pode comentar apenas em cartões.", "computer": "Computador", - "confirm-checklist-delete-dialog": "Tem a certeza de que pretende eliminar", + "confirm-checklist-delete-dialog": "Tem a certeza de que pretende eliminar lista de verificação", "copy-card-link-to-clipboard": "Copiar link do cartão para a área de transferência", "copyCardPopup-title": "Copy Card", "create": "Criar", @@ -392,4 +392,4 @@ "no": "Não", "accounts": "Contas", "accounts-allowEmailChange": "Permitir Mudança de Email" -} +} \ No newline at end of file diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 926d63dc9..e6172a02f 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 5b26f7c26..1be6242b3 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Только комментирование", "comment-only-desc": "Может комментировать только карточки.", "computer": "Загрузить с компьютера", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Создать", diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 01b83edb3..1659c7228 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 180e6f580..e980bd4dd 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -2,8 +2,8 @@ "accept": "Acceptera", "act-activity-notify": "[Wekan] Aktivitetsavisering", "act-addAttachment": "bifogade __attachment__ to __card__", - "act-addChecklist": "added checklist __checklist__ to __card__", - "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", + "act-addChecklist": "lade till checklist __checklist__ till __card__", + "act-addChecklistItem": "lade till __checklistItem__ till checklistan __checklist__ on __card__", "act-addComment": "kommenterade __card__: __comment__", "act-createBoard": "skapade __board__", "act-createCard": "lade till __card__ to __list__", @@ -146,6 +146,7 @@ "comment-only": "Kommentera endast", "comment-only-desc": "Kan endast kommentera kort.", "computer": "Dator", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Kopiera kortlänk till urklipp", "copyCardPopup-title": "Kopiera kort", "create": "Skapa", diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index a1f810806..3c6d5a526 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index a5cee6929..8dc7ab8ea 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "คอมพิวเตอร์", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "สร้าง", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index e64510b50..83186d661 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Sadece yorum", "comment-only-desc": "Sadece kartlara yorum yazabilir.", "computer": "Bilgisayar", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Kartın linkini kopyala", "copyCardPopup-title": "Kartı Kopyala", "create": "Oluştur", diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 0da6ce1fe..d298c2fab 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index 93248d569..d6b805c2d 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -146,6 +146,7 @@ "comment-only": "Comment only", "comment-only-desc": "Can comment on cards only.", "computer": "Computer", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "Copy card link to clipboard", "copyCardPopup-title": "Copy Card", "create": "Create", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index f49f7b267..64687d336 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -146,6 +146,7 @@ "comment-only": "仅能评论", "comment-only-desc": "只能在卡片上评论。", "computer": "从本机上传", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "复制卡片链接到剪贴板", "copyCardPopup-title": "复制卡片", "create": "创建", diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 23566314d..3c9224b49 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -146,6 +146,7 @@ "comment-only": "只可以發表評論", "comment-only-desc": "只可以對卡片發表評論", "computer": "從本機上傳", + "confirm-checklist-delete-dialog": "Are you sure you want to delete checklist", "copy-card-link-to-clipboard": "將卡片連結複製到剪貼板", "copyCardPopup-title": "Copy Card", "create": "建立", From d8169138e57de08a1caaca65c034966e3365508e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Sep 2017 16:54:42 +0300 Subject: [PATCH 8/8] Confirm popup appears before Checklist Delete. Thanks to amadilsons ! Closes #881 --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 073560900..be693d2e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,14 @@ # Upcoming Wekan release -This release fixes the following bugs: +This release adds the following new features: + +* [Confirm popup appears before Checklist Delete](https://github.com/wekan/wekan/pull/1257). + +and fixes the following bugs: * [Fix errors when importing from Trello](https://github.com/wekan/wekan/pull/1259). -Thanks to GitHub user GhassenRjab for contributions. +Thanks to GitHub users amadilsons and GhassenRjab for contributions. # v0.43 2017-09-25 Wekan release