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 ++-- 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 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 diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 014b72a4..030711bc 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 d3e8c427..d4776397 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 8db041a5..e9f67933 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 64a720db..7c94e9fb 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 1ea99b76..981e272d 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 +} -- cgit v1.2.3-1-g7c22