From f76d8e47a859c64a99cfd460e3fd496965bf021a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Manelli?= Date: Wed, 2 May 2018 15:03:22 -0300 Subject: Refactor imported -> linked in components --- client/components/cards/attachments.js | 6 +++--- client/components/cards/cardDetails.jade | 6 +++--- client/components/cards/cardDetails.styl | 2 +- client/components/cards/checklists.js | 4 ++-- client/components/cards/minicard.jade | 19 +++++++++---------- client/components/cards/minicard.js | 10 +++++----- client/components/cards/minicard.styl | 8 ++++---- 7 files changed, 27 insertions(+), 28 deletions(-) (limited to 'client/components/cards') diff --git a/client/components/cards/attachments.js b/client/components/cards/attachments.js index 1a4d5bb6..5cac930d 100644 --- a/client/components/cards/attachments.js +++ b/client/components/cards/attachments.js @@ -57,9 +57,9 @@ Template.cardAttachmentsPopup.events({ const card = this; FS.Utility.eachFile(evt, (f) => { const file = new FS.File(f); - if (card.isImportedCard()) { - file.boardId = Cards.findOne(card.importedId).boardId; - file.cardId = card.importedId; + if (card.isLinkedCard()) { + file.boardId = Cards.findOne(card.linkedId).boardId; + file.cardId = card.linkedId; } else { file.boardId = card.boardId; file.cardId = card._id; diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 7f206569..98fba692 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -19,13 +19,13 @@ template(name="cardDetails") a.js-parent-card(href=linkForCard) {{title}} // else {{_ 'top-level-card'}} - if isImportedCard - h3.imported-card-location + if isLinkedCard + h3.linked-card-location +viewer | {{getBoardTitle}} > {{getTitle}} if getArchived - if isImportedBoard + if isLinkedBoard p.warning {{_ 'board-archived'}} else p.warning {{_ 'card-archived'}} diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index ab65a5d6..1e290305 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -47,7 +47,7 @@ margin: 7px 0 0 padding: 0 - .imported-card-location + .linked-card-location font-style: italic font-size: 1em margin-bottom: 0 diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 5a612a51..5d789351 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -76,8 +76,8 @@ BlazeComponent.extendComponent({ const title = textarea.value.trim(); let cardId = this.currentData().cardId; const card = Cards.findOne(cardId); - if (card.isImported()) - cardId = card.importedId; + if (card.isLinked()) + cardId = card.linkedId; if (title) { Checklists.insert({ diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index 450af3c6..37f537db 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -1,7 +1,7 @@ template(name="minicard") .minicard( - class="{{#if isImportedCard}}imported-card{{/if}}" - class="{{#if isImportedBoard}}imported-board{{/if}}") + class="{{#if isLinkedCard}}linked-card{{/if}}" + class="{{#if isLinkedBoard}}linked-board{{/if}}") if cover .minicard-cover(style="background-image: url('{{cover.url}}');") if labels @@ -15,15 +15,14 @@ template(name="minicard") if $eq 'prefix-with-parent' currentBoard.presentParentTask .parent-prefix | {{ parentCardName }} - if isImportedBoard - a.js-imported-link - span.imported-icon.fa.fa-folder - else if isImportedCard - a.js-imported-link - span.imported-icon.fa.fa-id-card + if isLinkedBoard + a.js-linked-link + span.linked-icon.fa.fa-folder + else if isLinkedCard + a.js-linked-link + span.linked-icon.fa.fa-id-card if getArchived - span.imported-icon.imported-archived.fa.fa-archive - + span.linked-icon.linked-archived.fa.fa-archive +viewer = getTitle if $eq 'subtext-with-full-path' currentBoard.presentParentTask diff --git a/client/components/cards/minicard.js b/client/components/cards/minicard.js index e81705a9..000836f9 100644 --- a/client/components/cards/minicard.js +++ b/client/components/cards/minicard.js @@ -9,11 +9,11 @@ BlazeComponent.extendComponent({ events() { return [{ - 'click .js-imported-link' (evt) { - if (this.data().isImportedCard()) - Utils.goCardId(this.data().importedId); - else if (this.data().isImportedBoard()) - Utils.goBoardId(this.data().importedId); + 'click .js-linked-link' (evt) { + if (this.data().isLinkedCard()) + Utils.goCardId(this.data().linkedId); + else if (this.data().isLinkedBoard()) + Utils.goBoardId(this.data().linkedId); }, }]; }, diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 89beb1c2..8fec7238 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -44,14 +44,14 @@ transition: transform 0.2s, border-radius 0.2s - &.imported-board - &.imported-card - .imported-icon + &.linked-board + &.linked-card + .linked-icon display: inline-block margin-right: 11px vertical-align: baseline font-size: 0.9em - .imported-archived + .linked-archived color: #937760 .is-selected & -- cgit v1.2.3-1-g7c22