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 ++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) (limited to 'client/components/cards/cardDetails.jade') 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) -- cgit v1.2.3-1-g7c22 From 3c4b09157e3c73e6feeaaa8561443ce785aab8eb Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Wed, 6 Jun 2018 16:44:15 +0000 Subject: Fix AssignedBy & RequestedBy fields & forms --- client/components/cards/cardDetails.jade | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'client/components/cards/cardDetails.jade') diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 722e51c7..0915c4bc 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -175,15 +175,13 @@ template(name="editCardTitleForm") a.fa.fa-times-thin.js-close-inlined-form template(name="editCardRequesterForm") - textarea.js-edit-card-requester(rows='1' autofocus) - = requestedBy + input.js-edit-card-requester(type='text' autofocus value=requestedBy ) .edit-controls.clearfix - button.primary.confirm.js-submit-edit-card-requestor-form(type="submit") {{_ 'save'}} + button.primary.confirm.js-submit-edit-card-requester-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 + input.js-edit-card-assigner(type='text' autofocus value=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 -- cgit v1.2.3-1-g7c22 From 8f364281d2632809b4650db3ba49939617b6ca09 Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Wed, 6 Jun 2018 20:05:44 +0000 Subject: Remove delete option from board hamburger menu --- client/components/cards/cardDetails.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'client/components/cards/cardDetails.jade') diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 0915c4bc..cc1b60dd 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -175,7 +175,7 @@ template(name="editCardTitleForm") a.fa.fa-times-thin.js-close-inlined-form template(name="editCardRequesterForm") - input.js-edit-card-requester(type='text' autofocus value=requestedBy ) + input.js-edit-card-requester(type='text' autofocus value=requestedBy) .edit-controls.clearfix button.primary.confirm.js-submit-edit-card-requester-form(type="submit") {{_ 'save'}} a.fa.fa-times-thin.js-close-inlined-form -- cgit v1.2.3-1-g7c22 From ec4e1b6eff4b68d7a2f813c520fc5489d4894b24 Mon Sep 17 00:00:00 2001 From: RJevnikar <12701645+rjevnikar@users.noreply.github.com> Date: Thu, 7 Jun 2018 16:26:20 +0000 Subject: Fix spacing on cardDetails.jade to get 'Add' buttons in tag for RequestedBy & AssignedBy --- client/components/cards/cardDetails.jade | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'client/components/cards/cardDetails.jade') diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index cc1b60dd..aa4829a9 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -116,11 +116,11 @@ template(name="cardDetails") +editCardRequesterForm else a.js-open-inlined-form - if requestedBy - +viewer - = requestedBy - else - | {{_ 'add'}} + if requestedBy + +viewer + = requestedBy + else + | {{_ 'add'}} else if requestedBy +viewer = requestedBy @@ -132,11 +132,11 @@ template(name="cardDetails") +editCardAssignerForm else a.js-open-inlined-form - if assignedBy - +viewer - = assignedBy - else - | {{_ 'add'}} + if assignedBy + +viewer + = assignedBy + else + | {{_ 'add'}} else if requestedBy +viewer = assignedBy -- cgit v1.2.3-1-g7c22