From 3ce3fa74b350ff1af73b0fffddaeff4b0f126e2c Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Tue, 5 Jun 2018 20:23:29 +0000 Subject: Add additional label colours (from pull by JamesLavin), Add Assigned & Requested By text fields. --- client/components/cards/cardDetails.jade | 50 ++++++++++++++++++++++++++++++-- client/components/cards/cardDetails.js | 42 ++++++++++++++++++++++++++- client/components/cards/cardDetails.styl | 3 +- client/components/cards/labels.styl | 42 +++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 4 deletions(-) (limited to 'client/components/cards') diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 55ee8d32..722e51c7 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -108,6 +108,39 @@ template(name="cardDetails") +viewer = description + .card-details-items + .card-details-item.card-details-item-name + h3.card-details-item-title {{_ 'requested-by'}} + if canModifyCard + +inlinedForm(classNames="js-card-details-requester") + +editCardRequesterForm + else + a.js-open-inlined-form + if requestedBy + +viewer + = requestedBy + else + | {{_ 'add'}} + else if requestedBy + +viewer + = requestedBy + + .card-details-item.card-details-item-name + h3.card-details-item-title {{_ 'assigned-by'}} + if canModifyCard + +inlinedForm(classNames="js-card-details-assigner") + +editCardAssignerForm + else + a.js-open-inlined-form + if assignedBy + +viewer + = assignedBy + else + | {{_ 'add'}} + else if requestedBy + +viewer + = assignedBy + hr +checklists(cardId = _id) @@ -141,6 +174,20 @@ template(name="editCardTitleForm") button.primary.confirm.js-submit-edit-card-title-form(type="submit") {{_ 'save'}} a.fa.fa-times-thin.js-close-inlined-form +template(name="editCardRequesterForm") + textarea.js-edit-card-requester(rows='1' autofocus) + = requestedBy + .edit-controls.clearfix + button.primary.confirm.js-submit-edit-card-requestor-form(type="submit") {{_ 'save'}} + a.fa.fa-times-thin.js-close-inlined-form + +template(name="editCardAssignerForm") + textarea.js-edit-card-assigner(rows='1' autofocus) + = assignedBy + .edit-controls.clearfix + button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}} + a.fa.fa-times-thin.js-close-inlined-form + template(name="cardDetailsActionsPopup") ul.pop-over-list li: a.js-toggle-watch-card {{#if isWatching}}{{_ 'unwatch'}}{{else}}{{_ 'watch'}}{{/if}} @@ -150,8 +197,8 @@ template(name="cardDetailsActionsPopup") li: a.js-members {{_ 'card-edit-members'}} li: a.js-labels {{_ 'card-edit-labels'}} li: a.js-attachments {{_ 'card-edit-attachments'}} - li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}} li: a.js-custom-fields {{_ 'card-edit-custom-fields'}} + li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}} li: a.js-start-date {{_ 'editCardStartDatePopup-title'}} li: a.js-due-date {{_ 'editCardDueDatePopup-title'}} li: a.js-end-date {{_ 'editCardEndDatePopup-title'}} @@ -178,7 +225,6 @@ template(name="copyCardPopup") = title +boardsAndLists - template(name="copyChecklistToManyCardsPopup") label(for='copy-checklist-cards-title') {{_ 'copyChecklistToManyCardsPopup-instructions'}}: textarea#copy-card-title.minicard-composer-textarea.js-card-title(autofocus) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 26549fda..8aec8a59 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -146,6 +146,20 @@ BlazeComponent.extendComponent({ this.data().setTitle(title); } }, + 'submit .js-card-details-assigner'(evt) { + evt.preventDefault(); + const assigner = this.currentComponent().getValue().trim(); + if (assigner) { + this.data().setAssignedBy(assigner); + } + }, + 'submit .js-card-details-requester'(evt) { + evt.preventDefault(); + const requester = this.currentComponent().getValue().trim(); + if (requestor) { + this.data().setRequestedBy(requester); + } + }, 'click .js-member': Popup.open('cardMember'), 'click .js-add-members': Popup.open('cardMembers'), 'click .js-add-labels': Popup.open('cardLabels'), @@ -215,8 +229,8 @@ Template.cardDetailsActionsPopup.events({ 'click .js-members': Popup.open('cardMembers'), 'click .js-labels': Popup.open('cardLabels'), 'click .js-attachments': Popup.open('cardAttachments'), - 'click .js-received-date': Popup.open('editCardReceivedDate'), 'click .js-custom-fields': Popup.open('cardCustomFields'), + 'click .js-received-date': Popup.open('editCardReceivedDate'), 'click .js-start-date': Popup.open('editCardStartDate'), 'click .js-due-date': Popup.open('editCardDueDate'), 'click .js-end-date': Popup.open('editCardEndDate'), @@ -263,6 +277,32 @@ Template.editCardTitleForm.events({ }, }); +Template.editCardRequesterForm.onRendered(function() { + autosize(this.$('.js-edit-card-requester')); +}); + +Template.editCardRequesterForm.events({ + 'keydown .js-edit-card-requester'(evt) { + // If enter key was pressed, submit the data + if (evt.keyCode === 13) { + $('.js-submit-edit-card-requester-form').click(); + } + }, +}); + +Template.editCardAssignerForm.onRendered(function() { + autosize(this.$('.js-edit-card-assigner')); +}); + +Template.editCardAssignerForm.events({ + 'keydown .js-edit-card-assigner'(evt) { + // If enter key was pressed, submit the data + if (evt.keyCode === 13) { + $('.js-submit-edit-card-assigner-form').click(); + } + }, +}); + Template.moveCardPopup.events({ 'click .js-done' () { // XXX We should *not* get the currentCard from the global state, but diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 7dbe8732..db9882df 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -82,7 +82,8 @@ &.card-details-item-start, &.card-details-item-due, &.card-details-item-end, - &.card-details-item-customfield + &.card-details-item-customfield, + &.card-details-item-name, max-width: 50% flex-grow: 1 diff --git a/client/components/cards/labels.styl b/client/components/cards/labels.styl index 361a17ae..084af64c 100644 --- a/client/components/cards/labels.styl +++ b/client/components/cards/labels.styl @@ -73,6 +73,48 @@ .card-label-lime background-color: #51e898 +.card-label-silver + background-color: #c0c0c0 + +.card-label-peachpuff + background-color: #ffdab9 + +.card-label-crimson + background-color: #dc143c + +.card-label-plum + background-color: #dda0dd + +.card-label-darkgreen + background-color: #006400 + +.card-label-slateblue + background-color: #6a5acd + +.card-label-magenta + background-color: #ff00ff + +.card-label-gold + background-color: #ffd700 + +.card-label-navy + background-color: #000080 + +.card-label-gray + background-color: #808080 + +.card-label-saddlebrown + background-color: #8b4513 + +.card-label-paleturquoise + background-color: #afeeee + +.card-label-mistyrose + background-color: #ffe4e1 + +.card-label-indigo + background-color: #4b0082 + .edit-label, .create-label .card-label -- cgit v1.2.3-1-g7c22