From 3edafd6c679783dc175b53e09f489254d45a668e Mon Sep 17 00:00:00 2001 From: helioguardabaxo Date: Sat, 12 Sep 2020 13:33:29 -0300 Subject: [PATCH 1/5] This PR add 'Template' label and modify placeholder in template search --- client/components/lists/listBody.jade | 2 ++ i18n/en.i18n.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade index 94b558e61..8962c5c62 100644 --- a/client/components/lists/listBody.jade +++ b/client/components/lists/listBody.jade @@ -105,6 +105,8 @@ template(name="searchElementPopup") each boards option(value="{{_id}}") {{title}} form.js-search-term-form + label + | {{_ 'template'}} input(type="text" name="searchTerm" placeholder="{{_ 'search-example'}}" autofocus dir="auto") .list-body.search-card-results .minicards.clearfix.js-minicards diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index ab6faff61..51dbc5421 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -465,7 +465,7 @@ "search": "Search", "rules": "Rules", "search-cards": "Search from card/list titles, descriptions and custom fields on this board", - "search-example": "Text to search for?", + "search-example": "Text your search and press Enter", "select-color": "Select Color", "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list", "setWipLimitPopup-title": "Set WIP Limit", From 0aab2b30854bf6d70b74a52d88aeaa29c47bebb8 Mon Sep 17 00:00:00 2001 From: helioguardabaxo Date: Sat, 12 Sep 2020 16:11:54 -0300 Subject: [PATCH 2/5] Put card custom field check in the same line --- client/components/cards/cardCustomFields.jade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/components/cards/cardCustomFields.jade b/client/components/cards/cardCustomFields.jade index c0e14d084..e4e485357 100644 --- a/client/components/cards/cardCustomFields.jade +++ b/client/components/cards/cardCustomFields.jade @@ -4,8 +4,7 @@ template(name="cardCustomFieldsPopup") li.item(class="") a.name.js-select-field(href="#") span.full-name - +viewer - = name + = name if hasCustomField i.fa.fa-check hr From 9357ce8a266180c201b8fcf31e85f74b923a0112 Mon Sep 17 00:00:00 2001 From: helioguardabaxo Date: Sun, 13 Sep 2020 00:23:12 -0300 Subject: [PATCH 3/5] Card details layout improvements --- client/components/cards/cardDetails.jade | 59 +++++++++++++----------- client/components/cards/cardDetails.styl | 23 ++++++--- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index f16b255e1..ff9e9148f 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -42,8 +42,24 @@ template(name="cardDetails") else p.warning {{_ 'card-archived'}} - .card-details-items + .card-details-items + 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 + if currentBoard.allowsReceivedDate + hr .card-details-item.card-details-item-received h3 i.fa.fa-sign-out @@ -97,6 +113,7 @@ template(name="cardDetails") //.card-details-items if currentBoard.allowsMembers + hr .card-details-item.card-details-item-members h3 i.fa.fa-users @@ -126,36 +143,15 @@ template(name="cardDetails") a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}") 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 - .card-details-item.card-details-item-customfield - h3.card-details-item-title - +viewer - = definition.name - +cardCustomField - //.card-details-items if getSpentTime .card-details-item.card-details-item-spent if getIsOvertime - h3.card-details-item-title {{_ 'overtime-hours'}} + h3 + card-details-item-title {{_ 'overtime-hours'}} else - h3.card-details-item-title {{_ 'spent-time-hours'}} + h3 + card-details-item-title {{_ 'spent-time-hours'}} +cardSpentTime //.card-details-items @@ -199,6 +195,17 @@ template(name="cardDetails") +viewer = getAssignedBy + //.card-details-items + if customFieldsWD + hr + each customFieldsWD + .card-details-item.card-details-item-customfield + h3 + card-details-item-title + i.fa.fa-list-alt + = definition.name + +cardCustomField + if getVoteQuestion hr .vote-title diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 2e910c6c6..05a3d24c4 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -89,7 +89,7 @@ avatar-radius = 50% .card-details padding: 0 flex-shrink: 0 - flex-basis: 510px + flex-basis: 600px will-change: flex-basis overflow-y: scroll overflow-x: hidden @@ -198,22 +198,31 @@ avatar-radius = 50% margin-right: 0.5em &:last-child margin-right: 0 - &.card-details-item-labels, + &.card-details-item-labels + display: block + word-wrap: break-word + max-width: 95% + flex-grow: 1 &.card-details-item-members, &.card-details-item-assignees, - &.card-details-item-received, - &.card-details-item-start, - &.card-details-item-due, - &.card-details-item-end, &.card-details-item-customfield, &.card-details-item-name display: block word-wrap: break-word - max-width: 48% + max-width: 36% + flex-grow: 1 + &.card-details-item-received, + &.card-details-item-start, + &.card-details-item-due, + &.card-details-item-end + display: block + word-wrap: break-word + max-width: 28% flex-grow: 1 .card-details-item-title font-size: 16px + font-weight: bold color: #000 .card-label From 6a6b76e084a35d0d6328665daa60b4f2eeafc4c2 Mon Sep 17 00:00:00 2001 From: helioguardabaxo Date: Sun, 13 Sep 2020 01:11:19 -0300 Subject: [PATCH 4/5] Bold minicard item title --- client/components/cards/cardDetails.jade | 59 ++++++++++++------------ client/components/cards/cardDetails.styl | 2 +- client/components/cards/checklists.jade | 2 +- client/components/cards/subtasks.jade | 2 +- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index ff9e9148f..0dc74a23d 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -45,9 +45,9 @@ template(name="cardDetails") .card-details-items if currentBoard.allowsLabels .card-details-item.card-details-item-labels - h3 + h3.card-details-item-title i.fa.fa-tags - card-details-item-title {{_ 'labels'}} + | {{_ '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) @@ -61,9 +61,9 @@ template(name="cardDetails") if currentBoard.allowsReceivedDate hr .card-details-item.card-details-item-received - h3 + h3.card-details-item-title i.fa.fa-sign-out - card-details-item-title {{_ 'card-received'}} + | {{_ 'card-received'}} if getReceived +cardReceivedDate else @@ -74,9 +74,9 @@ template(name="cardDetails") if currentBoard.allowsStartDate .card-details-item.card-details-item-start - h3 + h3.card-details-item-title i.fa.fa-hourglass-start - card-details-item-title {{_ 'card-start'}} + | {{_ 'card-start'}} if getStart +cardStartDate else @@ -87,9 +87,9 @@ template(name="cardDetails") if currentBoard.allowsDueDate .card-details-item.card-details-item-due - h3 + h3.card-details-item-title i.fa.fa-sign-in - card-details-item-title {{_ 'card-due'}} + | {{_ 'card-due'}} if getDue +cardDueDate else @@ -100,9 +100,9 @@ template(name="cardDetails") if currentBoard.allowsEndDate .card-details-item.card-details-item-end - h3 + h3.card-details-item-title i.fa.fa-hourglass-end - card-details-item-title {{_ 'card-end'}} + | {{_ 'card-end'}} if getEnd +cardEndDate else @@ -115,9 +115,9 @@ template(name="cardDetails") if currentBoard.allowsMembers hr .card-details-item.card-details-item-members - h3 + h3.card-details-item-title i.fa.fa-users - card-details-item-title {{_ 'members'}} + | {{_ 'members'}} each getMembers +userAvatar(userId=this cardId=../_id) | {{! XXX Hack to hide syntaxic coloration /// }} @@ -129,9 +129,9 @@ template(name="cardDetails") //if assigneeSelected if currentBoard.allowsAssignee .card-details-item.card-details-item-assignees - h3 + h3.card-details-item-title i.fa.fa-user - card-details-item-title {{_ 'assignee'}} + | {{_ 'assignee'}} each getAssignees +userAvatarAssignee(userId=this cardId=../_id) | {{! XXX Hack to hide syntaxic coloration /// }} @@ -147,19 +147,19 @@ template(name="cardDetails") if getSpentTime .card-details-item.card-details-item-spent if getIsOvertime - h3 - card-details-item-title {{_ 'overtime-hours'}} + h3.card-details-item-title + | {{_ 'overtime-hours'}} else - h3 - card-details-item-title {{_ 'spent-time-hours'}} + h3.card-details-item-title + | {{_ 'spent-time-hours'}} +cardSpentTime //.card-details-items if currentBoard.allowsRequestedBy .card-details-item.card-details-item-name - h3 + h3.card-details-item-title i.fa.fa-shopping-cart - card-details-item-title {{_ 'requested-by'}} + | {{_ 'requested-by'}} if canModifyCard unless currentUser.isWorker +inlinedForm(classNames="js-card-details-requester") @@ -177,9 +177,9 @@ template(name="cardDetails") if currentBoard.allowsAssignedBy .card-details-item.card-details-item-name - h3 + h3.card-details-item-title i.fa.fa-user-plus - card-details-item-title {{_ 'assigned-by'}} + | {{_ 'assigned-by'}} if canModifyCard unless currentUser.isWorker +inlinedForm(classNames="js-card-details-assigner") @@ -200,10 +200,9 @@ template(name="cardDetails") hr each customFieldsWD .card-details-item.card-details-item-customfield - h3 - card-details-item-title - i.fa.fa-list-alt - = definition.name + h3.card-details-item-title + i.fa.fa-list-alt + = definition.name +cardCustomField if getVoteQuestion @@ -241,9 +240,9 @@ template(name="cardDetails") unless currentUser.isWorker if currentBoard.allowsDescriptionTitle hr - h3 + h3.card-details-item-title i.fa.fa-align-left - card-details-item-title {{_ 'description'}} + | {{_ 'description'}} if currentBoard.allowsDescriptionText +inlinedCardDescription(classNames="card-description js-card-description") +editor(autofocus=true) @@ -283,7 +282,7 @@ template(name="cardDetails") +subtasks(cardId = _id) if currentBoard.allowsAttachments hr - h3 + h3.card-details-item-title i.fa.fa-paperclip | {{_ 'attachments'}} .card-checklist-attachmentGalery.card-attachmentGalery @@ -292,7 +291,7 @@ template(name="cardDetails") hr unless currentUser.isNoComments .activity-title - h3 + h3.card-details-item-title i.fa.fa-history | {{ _ 'activity'}} if currentUser.isBoardMember diff --git a/client/components/cards/cardDetails.styl b/client/components/cards/cardDetails.styl index 05a3d24c4..a2216390f 100644 --- a/client/components/cards/cardDetails.styl +++ b/client/components/cards/cardDetails.styl @@ -223,7 +223,7 @@ avatar-radius = 50% .card-details-item-title font-size: 16px font-weight: bold - color: #000 + color: #4d4d4d .card-label padding-top: 5px diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 25aa11b95..f14b076b3 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -1,6 +1,6 @@ template(name="checklists") .checklists-title - h3 + h3.card-details-item-title i.fa.fa-check | {{_ 'checklists'}} if currentUser.isBoardMember diff --git a/client/components/cards/subtasks.jade b/client/components/cards/subtasks.jade index df35bed31..ca7e5b734 100644 --- a/client/components/cards/subtasks.jade +++ b/client/components/cards/subtasks.jade @@ -1,5 +1,5 @@ template(name="subtasks") - h3 + h3.card-details-item-title i.fa.fa-sitemap | {{_ 'subtasks'}} if toggleDeleteDialog.get From fe40c5fd37a7c54240c080caf98b6130229f5d31 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 13 Sep 2020 10:53:13 +0300 Subject: [PATCH 5/5] Update English text --- i18n/en.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 51dbc5421..faf63917b 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -465,7 +465,7 @@ "search": "Search", "rules": "Rules", "search-cards": "Search from card/list titles, descriptions and custom fields on this board", - "search-example": "Text your search and press Enter", + "search-example": "Write text you search and press Enter", "select-color": "Select Color", "set-wip-limit-value": "Set a limit for the maximum number of tasks in this list", "setWipLimitPopup-title": "Set WIP Limit",