diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 15d64ae56..38825ab5d 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -82,7 +82,7 @@ template(name="activity") +viewer = activity.checklist.title else - a.activity-checklist(href="{{ activity.card.absoluteUrl }}") + a.activity-checklist(href="{{ activity.card.originRelativeUrl }}") +viewer = activity.checklist.title @@ -103,7 +103,7 @@ template(name="activity") if($eq activity.activityType 'addChecklistItem') | {{{_ 'activity-checklist-item-added' (sanitize activity.checklist.title) cardLink}}}. - .activity-checklist(href="{{ activity.card.absoluteUrl }}") + .activity-checklist(href="{{ activity.card.originRelativeUrl }}") +viewer = activity.checklistItem.title @@ -139,7 +139,7 @@ template(name="activity") //- if we are not in card mode we only display a summary of the comment if($eq activity.activityType 'addComment') | {{{_ 'activity-on' cardLink}}} - a.activity-comment(href="{{ activity.card.absoluteUrl }}") + a.activity-comment(href="{{ activity.card.originRelativeUrl }}") +viewer = activity.comment.text diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js index abd619aaa..926a24d16 100644 --- a/client/components/activities/activities.js +++ b/client/components/activities/activities.js @@ -243,7 +243,7 @@ function createCardLink(card) { Blaze.toHTML( HTML.A( { - href: card.absoluteUrl(), + href: card.originRelativeUrl(), class: 'action-card', }, sanitizeXss(card.title), @@ -260,7 +260,7 @@ function createBoardLink(board, list) { Blaze.toHTML( HTML.A( { - href: board.absoluteUrl(), + href: board.originRelativeUrl(), class: 'action-board', }, sanitizeXss(text), diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 6fdd2cd4f..bd8a8346a 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -8,11 +8,11 @@ template(name="cardDetails") a.fa.fa-times-thin.close-card-details.js-close-card-details if currentUser.isBoardMember a.fa.fa-navicon.card-details-menu.js-open-card-details-menu - input.inline-input(type="text" id="cardURL_copy" value="{{ absoluteUrl }}") + input.inline-input(type="text" id="cardURL_copy" value="{{ originRelativeUrl }}") a.fa.fa-link.card-copy-button.js-copy-link( class="fa-link" title="{{_ 'copy-card-link-to-clipboard'}}" - value="{{ absoluteUrl }}" + value="{{ originRelativeUrl }}" ) if isMiniScreen a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details @@ -533,7 +533,7 @@ template(name="cardMorePopup") span {{_ 'link-card'}} = ' ' i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}") - input.inline-input(type="text" id="cardURL" readonly value="{{ absoluteUrl }}" autofocus="autofocus") + input.inline-input(type="text" id="cardURL" readonly value="{{ originRelativeUrl }}" autofocus="autofocus") button.js-copy-card-link-to-clipboard(class="btn" id="clipboard") {{_ 'copy-card-link-to-clipboard'}} span.clearfix br diff --git a/client/components/cards/resultCard.jade b/client/components/cards/resultCard.jade index 4a873b8fd..6cff985aa 100644 --- a/client/components/cards/resultCard.jade +++ b/client/components/cards/resultCard.jade @@ -1,6 +1,6 @@ template(name="resultCard") .result-card-wrapper - a.minicard-wrapper.card-title(href=absoluteUrl) + a.minicard-wrapper.card-title(href=originRelativeUrl) +minicard(this) //= card.title ul.result-card-context-list diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade index 8962c5c62..3213ed95b 100644 --- a/client/components/lists/listBody.jade +++ b/client/components/lists/listBody.jade @@ -5,7 +5,7 @@ template(name="listBody") +inlinedForm(autoclose=false position="top") +addCardForm(listId=_id position="top") each (cardsWithLimit (idOrNull ../../_id)) - a.minicard-wrapper.js-minicard(href=absoluteUrl + a.minicard-wrapper.js-minicard(href=originRelativeUrl class="{{#if cardIsSelected}}is-selected{{/if}}" class="{{#if MultiSelection.isSelected _id}}is-checked{{/if}}") if MultiSelection.isActive diff --git a/client/components/main/myCards.jade b/client/components/main/myCards.jade index 79d28050b..01a9027fb 100644 --- a/client/components/main/myCards.jade +++ b/client/components/main/myCards.jade @@ -30,8 +30,8 @@ template(name="myCards") each board in myCardsList .my-cards-board-wrapper .my-cards-board-title(class=board.colorClass, id="header") - a(href=board.absoluteUrl) - +viewer + a(href=board.originRelativeUrl) + +viewer = board.title each swimlane in board.mySwimlanes .my-cards-swimlane-title(class="{{#if swimlane.colorClass}}{{ swimlane.colorClass }}{{else}}swimlane-default-color{{/if}}") @@ -44,7 +44,7 @@ template(name="myCards") = list.title each card in list.myCards .my-cards-card-wrapper - a.minicard-wrapper(href=card.absoluteUrl) + a.minicard-wrapper(href=card.originRelativeUrl) +minicard(card) else .my-cards-dueat-list-wrapper diff --git a/client/components/sidebar/sidebarSearches.jade b/client/components/sidebar/sidebarSearches.jade index d75be7bb7..212ba57a2 100644 --- a/client/components/sidebar/sidebarSearches.jade +++ b/client/components/sidebar/sidebarSearches.jade @@ -4,9 +4,9 @@ template(name="searchSidebar") .list-body .minilists.clearfix.js-minilists each (lists) - a.minilist-wrapper.js-minilist(href=absoluteUrl) + a.minilist-wrapper.js-minilist(href=originRelativeUrl) +minilist(this) .minicards.clearfix.js-minicards each (results) - a.minicard-wrapper.js-minicard(href=absoluteUrl) + a.minicard-wrapper.js-minicard(href=originRelativeUrl) +minicard(this) diff --git a/models/boards.js b/models/boards.js index c56265f52..b78d43a8e 100644 --- a/models/boards.js +++ b/models/boards.js @@ -777,6 +777,9 @@ Boards.helpers({ absoluteUrl() { return FlowRouter.url('board', { id: this._id, slug: this.slug }); }, + originRelativeUrl() { + return FlowRouter.path('board', { id: this._id, slug: this.slug }); + }, colorClass() { return `board-color-${this.color}`; diff --git a/models/cards.js b/models/cards.js index 4d9eea2bc..712f18e11 100644 --- a/models/cards.js +++ b/models/cards.js @@ -758,6 +758,14 @@ Cards.helpers({ cardId: this._id, }); }, + originRelativeUrl() { + const board = this.board(); + return FlowRouter.path('card', { + boardId: board._id, + slug: board.slug, + cardId: this._id, + }); + }, canBeRestored() { const list = Lists.findOne({ diff --git a/models/lists.js b/models/lists.js index 13a4ce8aa..141804492 100644 --- a/models/lists.js +++ b/models/lists.js @@ -280,6 +280,10 @@ Lists.helpers({ const card = Cards.findOne({ listId: this._id }); return card && card.absoluteUrl(); }, + originRelativeUrl() { + const card = Cards.findOne({ listId: this._id }); + return card && card.originRelativeUrl(); + }, remove() { Lists.remove({ _id: this._id }); },