diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index 90807bbe9..fc597205a 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -51,11 +51,7 @@ template(name="attachmentGallery") .attachment-gallery - if currentUser.isAdmin - a.attachment-item.add-attachment.js-add-attachment - i.fa.fa-plus.icon - - if currentUser.isNormal + if canModifyCard a.attachment-item.add-attachment.js-add-attachment i.fa.fa-plus.icon diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 5c3803534..9f4318f61 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -13,27 +13,12 @@ template(name="cardDetails") unless isMiniScreen unless isPopup a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}") - if isAdmin + if canModifyCard if cardMaximized a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}") else a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}") - if isNormal - if cardMaximized - a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}") - else - a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}") - if isWorker - if cardMaximized - a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}") - else - a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}") - if isNoComments - if cardMaximized - a.fa.fa-window-minimize.minimize-card-details.js-minimize-card-details(title="{{_ 'minimize-card'}}") - else - a.fa.fa-window-maximize.maximize-card-details.js-maximize-card-details(title="{{_ 'maximize-card'}}") - if currentUser.isBoardMember + if canModifyCard a.fa.fa-navicon.card-details-menu.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}") a.fa.fa-link.card-copy-button.js-copy-link( id="cardURL_copy" @@ -45,7 +30,7 @@ template(name="cardDetails") else unless isPopup a.fa.fa-times-thin.close-card-details.js-close-card-details(title="{{_ 'close-card'}}") - if currentUser.isBoardMember + if canModifyCard a.fa.fa-navicon.card-details-menu-mobile-web.js-open-card-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}") a.fa.fa-link.card-copy-mobile-button.js-copy-link( id="cardURL_copy" diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index a87d154be..b13ddc4b4 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -3,14 +3,7 @@ template(name="minicard") class="{{#if isLinkedCard}}linked-card{{/if}}" class="{{#if isLinkedBoard}}linked-board{{/if}}" class="{{#if colorClass}}minicard-{{colorClass}}{{/if}}") - if currentUser.isAdmin - if isTouchScreenOrShowDesktopDragHandles - a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}") - .handle - .fa.fa-arrows - else - a.fa.fa-navicon.minicard-details-menu.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}") - if currentUser.isNormal + if canModifyCard if isTouchScreenOrShowDesktopDragHandles a.fa.fa-navicon.minicard-details-menu-with-handle.js-open-minicard-details-menu(title="{{_ 'cardDetailsActionsPopup-title'}}") .handle @@ -142,7 +135,7 @@ template(name="minicard") +userAvatar(userId=this.userId noRemove=true) .badges - unless currentUser.isNoComments + if canModifyCard if comments.length .badge(title="{{_ 'card-comments-title' comments.length }}") span.badge-icon.fa.fa-comment-o.badge-comment.badge-text @@ -197,12 +190,11 @@ template(name="editCardSortOrderPopup") template(name="minicardDetailsActionsPopup") ul.pop-over-list - if currentUser.isBoardAdmin + if canModifyCard li a.js-move-card i.fa.fa-arrow-right | {{_ 'moveCardPopup-title'}} - unless currentUser.isWorker li a.js-copy-card i.fa.fa-copy