diff options
Diffstat (limited to 'client/components/cards')
-rw-r--r-- | client/components/cards/cardDetails.jade | 133 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 2 | ||||
-rw-r--r-- | client/components/cards/cardDetails.styl | 12 |
3 files changed, 84 insertions, 63 deletions
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index aec95486..41ab8ca2 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -8,7 +8,7 @@ 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 }}" autofocus="autofocus") + input.inline-input(type="hidden" id="cardURL_copy" value="{{ absoluteUrl }}") a.fa.fa-link.card-copy-button.js-copy-link if isMiniScreen a.fa.fa-times-thin.close-card-details-mobile-web.js-close-card-details @@ -49,7 +49,8 @@ template(name="cardDetails") else if canModifyCard unless currentUser.isWorker - a.js-received-date {{_ 'add'}} + a.card-label.add-label.js-received-date + i.fa.fa-plus if currentBoard.allowsStartDate .card-details-item.card-details-item-start @@ -61,7 +62,21 @@ template(name="cardDetails") else if canModifyCard unless currentUser.isWorker - a.js-start-date {{_ 'add'}} + a.card-label.add-label.js-start-date + i.fa.fa-plus + + if currentBoard.allowsDueDate + .card-details-item.card-details-item-due + h3 + i.fa.fa-sign-in + card-details-item-title {{_ 'card-due'}} + if getDue + +cardDueDate + else + if canModifyCard + unless currentUser.isWorker + a.card-label.add-label.js-due-date + i.fa.fa-plus if currentBoard.allowsEndDate .card-details-item.card-details-item-end @@ -73,34 +88,25 @@ template(name="cardDetails") else if canModifyCard unless currentUser.isWorker - a.js-end-date {{_ 'add'}} + a.card-label.add-label.js-end-date + i.fa.fa-plus .card-details-items - .card-details-item.card-details-item-members - h3 - i.fa.fa-users - card-details-item-title {{_ 'members'}} - each getMembers - +userAvatar(userId=this cardId=../_id) - | {{! XXX Hack to hide syntaxic coloration /// }} - if canModifyCard - unless currentUser.isWorker - a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}") - i.fa.fa-plus - if currentBoard.allowsDueDate - .card-details-item.card-details-item-due + if currentBoard.allowsMembers + .card-details-item.card-details-item-members h3 - i.fa.fa-sign-in - card-details-item-title {{_ 'card-due'}} - if getDue - +cardDueDate - else - if canModifyCard - unless currentUser.isWorker - a.card-label.add-label.js-due-date - i.fa.fa-plus + i.fa.fa-users + card-details-item-title {{_ 'members'}} + each getMembers + +userAvatar(userId=this cardId=../_id) + | {{! XXX Hack to hide syntaxic coloration /// }} + if canModifyCard + unless currentUser.isWorker + a.member.add-member.card-details-item-add-button.js-add-members(title="{{_ 'card-members-title'}}") + i.fa.fa-plus - if assigngeeSelected + //if assigneeSelected + if currentBoard.allowsAssignee .card-details-item.card-details-item-assignees h3 i.fa.fa-user @@ -116,19 +122,20 @@ template(name="cardDetails") a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}") i.fa.fa-plus - .card-details-item.card-details-item-labels - h3 - i.fa.fa-tags - card-details-item-title {{_ 'labels'}} - a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}") - each labels - span.card-label(class="card-label-{{color}}" title=name) - +viewer - = name - if canModifyCard - unless currentUser.isWorker - a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}") - i.fa.fa-plus + if currentBoard.allowsLabels + .card-details-item.card-details-item-labels + h3 + i.fa.fa-tags + card-details-item-title {{_ 'labels'}} + a(class="{{#if canModifyCard}}js-add-labels{{else}}is-disabled{{/if}}" title="{{_ 'card-labels-title'}}") + each labels + span.card-label(class="card-label-{{color}}" title=name) + +viewer + = name + if canModifyCard + unless currentUser.isWorker + a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}") + i.fa.fa-plus .card-details-items each customFieldsWD @@ -151,8 +158,8 @@ template(name="cardDetails") if canModifyCard unless currentUser.isWorker //h3 - //- i.fa.fa-align-left - //- card-details-item-title {{_ 'description'}} + // i.fa.fa-align-left + // card-details-item-title {{_ 'description'}} +inlinedCardDescription(classNames="card-description js-card-description") +editor(autofocus=true) | {{getUnsavedValue 'cardDescription' _id getDescription}} @@ -178,7 +185,7 @@ template(name="cardDetails") = getDescription .card-details-items - if requestBySelected + if currentBoard.allowsRequestedBy .card-details-item.card-details-item-name h3 i.fa.fa-shopping-cart @@ -198,7 +205,7 @@ template(name="cardDetails") +viewer = getRequestedBy - if assigneeBySelected + if currentBoard.allowsAssignedBy .card-details-item.card-details-item-name h3 i.fa.fa-user-plus @@ -220,16 +227,17 @@ template(name="cardDetails") .card-checklist-attachmentGalerys .card-checklist-attachmentGalery.card-checklists + if currentBoard.allowsChecklists +checklists(cardId = _id) - if currentBoard.allowsSubtasks - hr - +subtasks(cardId = _id) - - //- hr - //- h3 - //- i.fa.fa-paperclip - //- | {{_ 'attachments'}} - .card-checklist-attachmentGalery.card-attachmentGalery + if currentBoard.allowsSubtasks + hr + +subtasks(cardId = _id) + if currentBoard.allowsAttachments + //- hr + //- h3 + //- i.fa.fa-paperclip + //- | {{_ 'attachments'}} + .card-checklist-attachmentGalery.card-attachmentGalery +attachmentsGalery hr @@ -246,15 +254,16 @@ template(name="cardDetails") else input.toggle-switch(type="checkbox" id="toggleButton") label.toggle-label(for="toggleButton") - if currentUser.isBoardMember - unless currentUser.isNoComments - if canModifyCard - +inlinedForm(autoclose=false classNames="js-new-comment-form") - +commentForm - else - +userAvatar(userId=currentUser._id) - a.comment-item.add-comment.js-open-inlined-form - | {{_ 'Write Comment'}} + if currentBoard.allowsComments + if currentUser.isBoardMember + unless currentUser.isNoComments + if canModifyCard + +inlinedForm(autoclose=false classNames="js-new-comment-form") + +commentForm + else + +userAvatar(userId=currentUser._id) + a.comment-item.add-comment.js-open-inlined-form + | {{_ 'Write Comment'}} unless currentUser.isNoComments if isLoaded.get if isLinkedCard diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 231cbb10..92edec38 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -403,7 +403,7 @@ Template.cardDetails.helpers({ }, startSelected() { - if (this.getstart().length === 0) { + if (this.getStart().length === 0) { return false; } else { return true; diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 3fc4d047..fd6122eb 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -108,6 +108,8 @@ avatar-radius = 50% .close-card-details, .card-details-menu, + .card-copy-button, + .card-copy-mobile-button, .close-card-details-mobile-web, .card-details-menu-mobile-web float: right @@ -122,6 +124,16 @@ avatar-radius = 50% padding: 5px margin-right: 40px + .card-copy-button + font-size: 17px + padding: 10px + margin-right: 10px + + .card-copy-mobile-button + font-size: 17px + padding: 10px + margin-right: 10px + .card-details-menu font-size: 17px padding: 10px |