diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade index 740696c0f..208753243 100644 --- a/client/components/boards/boardHeader.jade +++ b/client/components/boards/boardHeader.jade @@ -14,41 +14,41 @@ template(name="boardHeaderBar") with currentBoard if currentUser.isBoardAdmin a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title) - i.fa.fa-pencil-square-o + | โœ๏ธ - a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}" - title="{{#if isStarred}}{{_ 'star-board-short-unstar'}}{{else}}{{_ 'star-board-short-star'}}{{/if}}" aria-label="{{#if isStarred}}{{_ 'star-board-short-unstar'}}{{else}}{{_ 'star-board-short-star'}}{{/if}}") - i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}") - if showStarCounter - span - = currentBoard.stars + a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}" + title="{{#if isStarred}}{{_ 'star-board-short-unstar'}}{{else}}{{_ 'star-board-short-star'}}{{/if}}" aria-label="{{#if isStarred}}{{_ 'star-board-short-unstar'}}{{else}}{{_ 'star-board-short-star'}}{{/if}}") + | {{#if isStarred}}โญ{{else}}โ˜†{{/if}} + if showStarCounter + span + = currentBoard.stars - a.board-header-btn( - class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}" - title="{{_ currentBoard.permission}}") - i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}") - span {{_ currentBoard.permission}} + a.board-header-btn( + class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}" + title="{{_ currentBoard.permission}}") + | {{#if currentBoard.isPublic}}๐ŸŒ{{else}}๐Ÿ”’{{/if}} + span {{_ currentBoard.permission}} - a.board-header-btn.js-watch-board( - title="{{_ watchLevel }}") - if $eq watchLevel "watching" - i.fa.fa-eye - if $eq watchLevel "tracking" - i.fa.fa-bell - if $eq watchLevel "muted" - i.fa.fa-bell-slash - span {{_ watchLevel}} - a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}") - i.fa.fa-sort - span {{#if isSortActive }}{{_ 'sort-is-on'}}{{else}}{{_ 'sort-cards'}}{{/if}} + a.board-header-btn.js-watch-board( + title="{{_ watchLevel }}") + if $eq watchLevel "watching" + | ๐Ÿ‘๏ธ + if $eq watchLevel "tracking" + | ๐Ÿ”” + if $eq watchLevel "muted" + | ๐Ÿ”• + span {{_ watchLevel}} + a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}") + | {{sortCardsIcon}} + span {{#if isSortActive }}{{_ 'sort-is-on'}}{{else}}{{_ 'sort-cards'}}{{/if}} if isSortActive a.board-header-btn-close.js-sort-reset(title="{{_ 'remove-sort'}}") - i.fa.fa-times-thin + | โŒ else a.board-header-btn.js-log-in( title="{{_ 'log-in'}}") - i.fa.fa-sign-in + | ๐Ÿšช span {{_ 'log-in'}} .board-header-btns.center @@ -59,40 +59,40 @@ template(name="boardHeaderBar") if currentUser with currentBoard a.board-header-btn(class="{{#if currentUser.isBoardAdmin}}js-edit-board-title{{else}}is-disabled{{/if}}" title="{{_ 'edit'}}" value=title) - i.fa.fa-pencil-square-o + | โœ๏ธ - a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}" - title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}") - i.fa(class="fa-star{{#unless isStarred}}-o{{/unless}}") + a.board-header-btn.js-star-board(class="{{#if isStarred}}is-active{{/if}}" + title="{{#if isStarred}}{{_ 'click-to-unstar'}}{{else}}{{_ 'click-to-star'}}{{/if}} {{_ 'starred-boards-description'}}") + | {{#if isStarred}}โญ{{else}}โ˜†{{/if}} - a.board-header-btn( - class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}" - title="{{_ currentBoard.permission}}") - i.fa(class="{{#if currentBoard.isPublic}}fa-globe{{else}}fa-lock{{/if}}") + a.board-header-btn( + class="{{#if currentUser.isBoardAdmin}}js-change-visibility{{else}}is-disabled{{/if}}" + title="{{_ currentBoard.permission}}") + | {{#if currentBoard.isPublic}}๐ŸŒ{{else}}๐Ÿ”’{{/if}} - a.board-header-btn.js-watch-board( - title="{{_ watchLevel }}") - if $eq watchLevel "watching" - i.fa.fa-eye - if $eq watchLevel "tracking" - i.fa.fa-bell - if $eq watchLevel "muted" - i.fa.fa-bell-slash - a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}") - i.fa.fa-sort + a.board-header-btn.js-watch-board( + title="{{_ watchLevel }}") + if $eq watchLevel "watching" + | ๐Ÿ‘๏ธ + if $eq watchLevel "tracking" + | ๐Ÿ”” + if $eq watchLevel "muted" + | ๐Ÿ”• + a.board-header-btn(title="{{_ 'sort-cards'}}" class="{{#if isSortActive }}emphasis{{else}} js-sort-cards {{/if}}") + | {{sortCardsIcon}} if isSortActive a.board-header-btn-close.js-sort-reset(title="{{_ 'remove-sort'}}") - i.fa.fa-times-thin + | โŒ else a.board-header-btn.js-log-in( title="{{_ 'log-in'}}") - i.fa.fa-sign-in + | ๐Ÿšช if isSandstorm if currentUser a.board-header-btn.js-open-archived-board - i.fa.fa-archive + | ๐Ÿ“ฆ //if showSort // a.board-header-btn.js-open-sort-view(title="{{_ 'sort-desc'}}") @@ -102,56 +102,56 @@ template(name="boardHeaderBar") a.board-header-btn.js-open-filter-view( title="{{#if Filter.isActive}}{{_ 'filter-on-desc'}}{{else}}{{_ 'filter'}}{{/if}}" class="{{#if Filter.isActive}}emphasis{{/if}}") - i.fa.fa-filter + | ๐Ÿ”ฝ if Filter.isActive a.board-header-btn-close.js-filter-reset(title="{{_ 'filter-clear'}}") - i.fa.fa-times-thin + | โŒ a.board-header-btn.js-open-search-view(title="{{_ 'search'}}") - i.fa.fa-search + | ๐Ÿ” unless currentBoard.isTemplatesBoard a.board-header-btn.js-toggle-board-view( title="{{_ 'board-view'}}") - i.fa.fa-caret-down + | โ–ผ if $eq boardView 'board-view-swimlanes' - i.fa.fa-th-large + | ๐ŸŠ if $eq boardView 'board-view-lists' - i.fa.fa-trello + | ๐Ÿ“‹ if $eq boardView 'board-view-cal' - i.fa.fa-calendar + | ๐Ÿ“… if canModifyBoard a.board-header-btn.js-multiselection-activate( title="{{#if MultiSelection.isActive}}{{_ 'multi-selection-on'}}{{else}}{{_ 'multi-selection'}}{{/if}}" class="{{#if MultiSelection.isActive}}emphasis{{/if}}") - i.fa.fa-check-square-o - if MultiSelection.isActive - a.board-header-btn-close.js-multiselection-reset(title="{{_ 'filter-clear'}}") - i.fa.fa-times-thin + | โ˜‘๏ธ + if MultiSelection.isActive + a.board-header-btn-close.js-multiselection-reset(title="{{_ 'filter-clear'}}") + | โŒ .separator a.board-header-btn.js-toggle-sidebar(title="{{_ 'sidebar-open'}} {{_ 'or'}} {{_ 'sidebar-close'}}") - i.fa.fa-navicon + | โ˜ฐ template(name="boardVisibilityList") ul.pop-over-list li with "private" a.js-select-visibility - i.fa.fa-lock.colorful + | ๐Ÿ”’ | {{_ 'private'}} if visibilityCheck - i.fa.fa-check + | โœ… span.sub-name {{_ 'private-desc'}} if notAllowPrivateVisibilityOnly li with "public" a.js-select-visibility - i.fa.fa-globe.colorful + | ๐ŸŒ | {{_ 'public'}} if visibilityCheck - i.fa.fa-check + | โœ… span.sub-name {{_ 'public-desc'}} template(name="boardChangeVisibilityPopup") @@ -162,26 +162,26 @@ template(name="boardChangeWatchPopup") li with "watching" a.js-select-watch - i.fa.fa-eye.colorful + | ๐Ÿ‘๏ธ | {{_ 'watching'}} if watchCheck - i.fa.fa-check + | โœ… span.sub-name {{_ 'watching-info'}} li with "tracking" a.js-select-watch - i.fa.fa-bell.colorful + | ๐Ÿ”” | {{_ 'tracking'}} if watchCheck - i.fa.fa-check + | โœ… span.sub-name {{_ 'tracking-info'}} li with "muted" a.js-select-watch - i.fa.fa-bell-slash.colorful + | ๐Ÿ”• | {{_ 'muted'}} if watchCheck - i.fa.fa-check + | โœ… span.sub-name {{_ 'muted-info'}} template(name="boardChangeViewPopup") @@ -189,24 +189,24 @@ template(name="boardChangeViewPopup") li with "board-view-swimlanes" a.js-open-swimlanes-view - i.fa.fa-th-large.colorful + | ๐ŸŠ | {{_ 'board-view-swimlanes'}} if $eq Utils.boardView "board-view-swimlanes" - i.fa.fa-check + | โœ… li with "board-view-lists" a.js-open-lists-view - i.fa.fa-trello.colorful + | ๐Ÿ“‹ | {{_ 'board-view-lists'}} if $eq Utils.boardView "board-view-lists" - i.fa.fa-check + | โœ… li with "board-view-cal" a.js-open-cal-view - i.fa.fa-calendar.colorful + | ๐Ÿ“… | {{_ 'board-view-cal'}} if $eq Utils.boardView "board-view-cal" - i.fa.fa-check + | โœ… template(name="createBoard") form @@ -218,11 +218,11 @@ template(name="createBoard") else p.quiet if $eq visibility.get 'public' - span.fa.fa-globe.colorful + span ๐ŸŒ = " " | {{{_ 'board-public-info'}}} else - span.fa.fa-lock.colorful + span ๐Ÿ”’ = " " | {{{_ 'board-private-info'}}} a.js-change-visibility {{_ 'change'}}. @@ -246,10 +246,10 @@ template(name="createBoard") // li // a.js-sort-by(name="{{value.name}}") // if $eq sortby value.name -// i(class="fa {{Direction}}") +// | {{#if $eq Direction "fa-arrow-up"}}โฌ†๏ธ{{else}}โฌ‡๏ธ{{/if}} // | {{_ value.label }}{{_ value.shortLabel}} // if $eq sortby value.name -// i(class="fa fa-check") +// | โœ… template(name="boardChangeTitlePopup") form @@ -269,14 +269,22 @@ template(name="boardCreateRulePopup") template(name="cardsSortPopup") ul.pop-over-list li - a.js-sort-due {{_ 'due-date'}} + a.js-sort-due + | ๐Ÿ“… + | {{_ 'due-date'}} hr li - a.js-sort-title {{_ 'title-alphabetically'}} + a.js-sort-title + | ๐Ÿ”ค + | {{_ 'title-alphabetically'}} hr li - a.js-sort-created-desc {{_ 'created-at-newest-first'}} + a.js-sort-created-desc + | โฌ‡๏ธ + | {{_ 'created-at-newest-first'}} hr li - a.js-sort-created-asc {{_ 'created-at-oldest-first'}} + a.js-sort-created-asc + | โฌ†๏ธ + | {{_ 'created-at-oldest-first'}} diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js index 39f5a50a3..d11857f3e 100644 --- a/client/components/boards/boardHeader.js +++ b/client/components/boards/boardHeader.js @@ -164,6 +164,23 @@ Template.boardHeaderBar.helpers({ isSortActive() { return Session.get('sortBy') ? true : false; }, + sortCardsIcon() { + const sortBy = Session.get('sortBy'); + if (!sortBy) { + return '๐Ÿƒ'; // Card icon when nothing is selected + } + + // Determine which sort option is active based on sortBy object + if (sortBy.dueAt) { + return '๐Ÿ“…'; // Due date icon + } else if (sortBy.title) { + return '๐Ÿ”ค'; // Alphabet icon + } else if (sortBy.createdAt) { + return sortBy.createdAt === 1 ? 'โฌ†๏ธ' : 'โฌ‡๏ธ'; // Up/down arrow based on direction + } + + return '๐Ÿƒ'; // Default card icon + }, }); Template.boardChangeViewPopup.events({ diff --git a/client/components/cards/cardCustomFields.jade b/client/components/cards/cardCustomFields.jade index cefeaac88..35afa772b 100644 --- a/client/components/cards/cardCustomFields.jade +++ b/client/components/cards/cardCustomFields.jade @@ -6,10 +6,10 @@ template(name="cardCustomFieldsPopup") span.full-name = name if hasCustomField - i.fa.fa-check + | โœ… hr a.quiet-button.full.js-settings - i.fa.fa-cog + | โš™๏ธ span {{_ 'settings'}} template(name="cardCustomField") @@ -22,7 +22,7 @@ template(name="cardCustomField-text") = value .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form else a.js-open-inlined-form if value @@ -41,7 +41,7 @@ template(name="cardCustomField-number") input(type="number" value=data.value) .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form else a.js-open-inlined-form if value @@ -66,7 +66,7 @@ template(name="cardCustomField-currency") input(type="text" value=data.value autofocus) .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form else a.js-open-inlined-form if value @@ -113,7 +113,7 @@ template(name="cardCustomField-dropdown") = name .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form else a.js-open-inlined-form if value @@ -134,7 +134,7 @@ template(name="cardCustomField-stringtemplate") input.js-card-customfield-stringtemplate-item.last(type="text" value="" placeholder="{{_ 'custom-field-stringtemplate-item-placeholder'}}" autofocus) .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form else a.js-open-inlined-form if value diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 34b1c88bb..b3d44a52b 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -202,7 +202,7 @@ template(name="cardDetails") | {{! XXX Hack to hide syntaxic coloration /// }} if canModifyCard a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}") - i.fa.fa-plus + | โž• if currentUser.isWorker unless assigneeSelected a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}") @@ -212,7 +212,7 @@ template(name="cardDetails") if currentBoard.allowsRequestedBy .card-details-item.card-details-item-name h3.card-details-item-title - i.fa.fa-shopping-cart + | ๐Ÿ›’ | {{_ 'requested-by'}} if canModifyCard unless currentUser.isWorker @@ -255,7 +255,7 @@ template(name="cardDetails") if currentBoard.allowsCardSortingByNumber .card-details-item.card-details-sort-order h3.card-details-item-title - i.fa.fa-sort + | ๐Ÿ”ข | {{_ 'sort'}} if canModifyCard +inlinedForm(classNames="js-card-details-sort") @@ -268,7 +268,7 @@ template(name="cardDetails") if currentBoard.allowsShowLists .card-details-item.card-details-show-lists h3.card-details-item-title - i.fa.fa-list + | ๐Ÿ“‹ | {{_ 'list'}} select.js-select-card-details-lists(disabled="{{#unless canModifyCard}}disabled{{/unless}}") each currentBoard.lists @@ -294,7 +294,7 @@ template(name="cardDetails") hr .card-details-item.card-details-item-customfield h3.card-details-item-title - i.fa.fa-list-alt + | ๐Ÿ“‹-alt = definition.name +cardCustomField @@ -305,14 +305,14 @@ template(name="cardDetails") else input.toggle-switch(type="checkbox" id="toggleCustomFieldsGridButton") label.toggle-label(for="toggleCustomFieldsGridButton") - a.fa.fa-plus.js-custom-fields.card-details-item.custom-fields(title="{{_ 'custom-fields'}}") + a.js-custom-fields.card-details-item.custom-fields(title="{{_ 'custom-fields'}}") if getVoteQuestion hr .vote-title div.flex h3 - i.fa.fa-thumbs-up + | ๐Ÿ‘ | {{_ 'vote-question'}} if getVoteEnd +voteEndDate @@ -330,11 +330,11 @@ template(name="cardDetails") if showVotingButtons button.card-details-green.js-vote.js-vote-positive(class="{{#if voteState}}voted{{/if}}") if voteState - i.fa.fa-thumbs-up + | ๐Ÿ‘ | {{_ 'vote-for-it'}} button.card-details-red.js-vote.js-vote-negative(class="{{#if $eq voteState false}}voted{{/if}}") if $eq voteState false - i.fa.fa-thumbs-down + | ๐Ÿ‘Ž | {{_ 'vote-against'}} if getPokerQuestion @@ -342,7 +342,7 @@ template(name="cardDetails") .poker-title div.flex h3 - i.fa.fa-thumbs-up + | ๐Ÿ‘ | {{_ 'poker-question'}} if getPokerEnd +pokerEndDate @@ -532,7 +532,7 @@ template(name="cardDetails") button.card-details-red.js-poker-replay(class="{{#if $eq voteState false}}voted{{/if}}") {{_ 'poker-replay'}} div.estimation-add button.js-poker-estimation - i.fa.fa-plus + | โž• | {{_ 'set-estimation'}} input(type=text,autofocus value=getPokerEstimation,id="pokerEstimation") @@ -542,18 +542,18 @@ template(name="cardDetails") if currentBoard.allowsDescriptionTitle hr h3.card-details-item-title - i.fa.fa-align-left + | ๐Ÿ“ | {{_ 'description'}} if currentBoard.allowsDescriptionText +inlinedCardDescription(classNames="card-description js-card-description") +descriptionForm .edit-controls.clearfix button.primary(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form else if currentBoard.allowsDescriptionText a.js-open-inlined-form(title="{{_ 'edit'}}" value=title) - i.fa.fa-pencil-square-o + | โœ๏ธ a.js-open-inlined-form(title="{{_ 'edit'}}" value=title) if getDescription +viewer @@ -583,7 +583,7 @@ template(name="cardDetails") if currentBoard.allowsAttachments hr h3.card-details-item-title - i.fa.fa-paperclip + | ๐Ÿ“Ž | {{_ 'attachments'}} if Meteor.settings.public.attachmentsUploadMaxSize | {{_ 'max-upload-filesize'}} {{Meteor.settings.public.attachmentsUploadMaxSize}} @@ -599,7 +599,7 @@ template(name="cardDetails") unless currentUser.isNoComments .comment-title h3.card-details-item-title - i.fa.fa-comment-o + | ๐Ÿ’ฌ | {{_ 'comments'}} if currentBoard.allowsComments @@ -614,7 +614,7 @@ template(name="cardDetails") unless currentUser.isNoComments .activity-title h3.card-details-item-title - i.fa.fa-history + | ๐Ÿ“œ | {{ _ 'activities'}} if currentUser.isBoardMember .material-toggle-switch(title="{{_ 'show-activities'}}") @@ -634,41 +634,41 @@ template(name="cardDetails") +activities(card=this mode="card") template(name="editCardTitleForm") - a.fa.fa-copy(title="{{_ 'copy-text-to-clipboard'}}") + a(title="{{_ 'copy-text-to-clipboard'}}") span.copied-tooltip {{_ 'copied'}} textarea.js-edit-card-title(rows='1' autofocus dir="auto") = getTitle .edit-controls.clearfix button.primary.confirm.js-submit-edit-card-title-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form template(name="editCardRequesterForm") input.js-edit-card-requester(type='text' autofocus value=getRequestedBy dir="auto") .edit-controls.clearfix button.primary.confirm.js-submit-edit-card-requester-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form template(name="editCardAssignerForm") input.js-edit-card-assigner(type='text' autofocus value=getAssignedBy dir="auto") .edit-controls.clearfix button.primary.confirm.js-submit-edit-card-assigner-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form template(name="editCardSortOrderForm") input.js-edit-card-sort(type='text' autofocus value=sort dir="auto") .edit-controls.clearfix button.primary.confirm.js-submit-edit-card-sort-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form template(name="cardDetailsActionsPopup") ul.pop-over-list li a.js-toggle-watch-card if isWatching - i.fa.fa-eye + | ๐Ÿ‘๏ธ | {{_ 'unwatch'}} else - i.fa.fa-eye-slash + | ๐Ÿ‘๏ธ-slash | {{_ 'watch'}} hr if canModifyCard @@ -679,16 +679,16 @@ template(name="cardDetailsActionsPopup") //li: a.js-attachments {{_ 'card-edit-attachments'}} li a.js-start-voting - i.fa.fa-thumbs-up + | ๐Ÿ‘ | {{_ 'card-edit-voting'}} li a.js-start-planning-poker - i.fa.fa-thumbs-up + | ๐Ÿ‘ | {{_ 'card-edit-planning-poker'}} if currentUser.isBoardAdmin li a.js-custom-fields - i.fa.fa-list-alt + | ๐Ÿ“‹-alt | {{_ 'card-edit-custom-fields'}} //li: a.js-received-date {{_ 'editCardReceivedDatePopup-title'}} //li: a.js-start-date {{_ 'editCardStartDatePopup-title'}} @@ -696,75 +696,75 @@ template(name="cardDetailsActionsPopup") //li: a.js-end-date {{_ 'editCardEndDatePopup-title'}} li a.js-spent-time - i.fa.fa-clock-o + | ๐Ÿ• | {{_ 'editCardSpentTimePopup-title'}} li a.js-set-card-color - i.fa.fa-paint-brush + | ๐ŸŽจ | {{_ 'setCardColorPopup-title'}} li a.js-toggle-show-list-on-minicard if showListOnMinicard - i.fa.fa-eye + | ๐Ÿ‘๏ธ | {{_ 'hide-list-on-minicard'}} else - i.fa.fa-eye-slash + | ๐Ÿ‘๏ธ-slash | {{_ 'show-list-on-minicard'}} hr ul.pop-over-list li a.js-export-card - i.fa.fa-share-alt + | ๐Ÿ“ค | {{_ 'export-card'}} hr ul.pop-over-list li a.js-move-card-to-top - i.fa.fa-arrow-up + | โฌ†๏ธ | {{_ 'moveCardToTop-title'}} li a.js-move-card-to-bottom - i.fa.fa-arrow-down + | โฌ‡๏ธ | {{_ 'moveCardToBottom-title'}} hr ul.pop-over-list if currentUser.isBoardAdmin li a.js-move-card - i.fa.fa-arrow-right + | โžก๏ธ | {{_ 'moveCardPopup-title'}} unless currentUser.isWorker li a.js-copy-card - i.fa.fa-copy + | ๐Ÿ“‹ | {{_ 'copyCardPopup-title'}} unless currentUser.isWorker ul.pop-over-list li a.js-copy-checklist-cards - i.fa.fa-copy - i.fa.fa-copy + | ๐Ÿ“‹ + | ๐Ÿ“‹ | {{_ 'copyManyCardsPopup-title'}} unless archived hr ul.pop-over-list li a.js-archive - i.fa.fa-arrow-right - i.fa.fa-archive + | โžก๏ธ + | ๐Ÿ“ฆ | {{_ 'archive-card'}} hr ul.pop-over-list li a.js-more - i.fa.fa-link + | ๐Ÿ”— | {{_ 'cardMorePopup-title'}} template(name="exportCardPopup") ul.pop-over-list li a(href="{{exportUrlCardPDF}}",, download="{{exportFilenameCardPDF}}") - i.fa.fa-share-alt + | ๐Ÿ“ค | {{_ 'export-card-pdf'}} template(name="moveCardPopup") @@ -867,7 +867,7 @@ template(name="cardMorePopup") span.clearfix span {{_ 'link-card'}} = ' ' - i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}") + | {{#if board.isPublic}}๐ŸŒ{{else}}๐Ÿ”’{{/if}} input.inline-input(type="text" id="cardURL" readonly value="{{ originRelativeUrl }}" autofocus="autofocus") button.js-copy-card-link-to-clipboard(class="btn" id="clipboard") {{_ 'copy-card-link-to-clipboard'}} .copied-tooltip {{_ 'copied'}} @@ -943,12 +943,12 @@ template(name="cardStartVotingPopup") .materialCheckBox#vote-public(name="vote-public" class="{{#if votePublic}}is-checked{{/if}}") span {{_ 'vote-public'}} .check-div.flex - i.fa.fa-hourglass-end + | โฐ a.js-end-date span | {{_ 'card-end'}} unless getVoteEnd - i.fa.fa-plus + | โž• if getVoteEnd +voteEndDate @@ -989,12 +989,12 @@ template(name="cardStartPlanningPokerPopup") .materialCheckBox#poker-allow-non-members(name="poker-allow-non-members" class="{{#if pokerAllowNonBoardMembers}}is-checked{{/if}}") span {{_ 'allowNonBoardMembers'}} .check-div.flex - i.fa.fa-hourglass-end + | โฐ a.js-end-date span | {{_ 'card-end'}} unless getPokerEnd - i.fa.fa-plus + | โž• if getPokerEnd +pokerEndDate diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index e943e338f..3adccaf43 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -1,14 +1,14 @@ template(name="checklists") .checklists-title h3.card-details-item-title - i.fa.fa-check + | โœ… | {{_ 'checklists'}} if canModifyCard +inlinedForm(autoclose=false classNames="js-add-checklist" cardId = cardId position="top") +addChecklistItemForm else a.add-checklist-top.js-open-inlined-form(title="{{_ 'add-checklist'}}") - i.fa.fa-plus + | โž• if currentUser.isBoardMember .material-toggle-switch(title="{{_ 'hide-finished-checklist'}}") //span.toggle-switch-title @@ -28,7 +28,7 @@ template(name="checklists") +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=false) else a.add-checklist.js-open-inlined-form(title="{{_ 'add-checklist'}}") - i.fa.fa-plus + | โž• template(name="checklistDetail") .js-checklist.checklist.nodragscroll @@ -38,7 +38,7 @@ template(name="checklistDetail") .checklist-title span if canModifyCard - a.fa.fa-navicon.checklist-details-menu.js-open-checklist-details-menu(title="{{_ 'checklistActionsPopup-title'}}") + a.checklist-details-menu.js-open-checklist-details-menu(title="{{_ 'checklistActionsPopup-title'}}") if canModifyCard h4.title.js-open-inlined-form.is-editable @@ -63,12 +63,12 @@ template(name="checklistDeletePopup") button.js-confirm.negate.full(type="submit") {{_ 'delete'}} template(name="addChecklistItemForm") - a.fa.fa-copy(title="{{_ 'copy-text-to-clipboard'}}") + a(title="{{_ 'copy-text-to-clipboard'}}") span.copied-tooltip {{_ 'copied'}} textarea.js-add-checklist-item(rows='1' autofocus) .edit-controls.clearfix button.primary.confirm.js-submit-add-checklist-item-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form(title="{{_ 'close-add-checklist-item'}}") + a.js-close-inlined-form(title="{{_ 'close-add-checklist-item'}}") if showNewlineBecomesNewChecklistItem .material-toggle-switch(title="{{_ 'newlineBecomesNewChecklistItem'}}") input.toggle-switch(type="checkbox" id="toggleNewlineBecomesNewChecklistItem") @@ -81,7 +81,7 @@ template(name="addChecklistItemForm") | {{_ 'originOrder'}} template(name="editChecklistItemForm") - a.fa.fa-copy(title="{{_ 'copy-text-to-clipboard'}}") + a(title="{{_ 'copy-text-to-clipboard'}}") span.copied-tooltip {{_ 'copied'}} textarea.js-edit-checklist-item(rows='1' autofocus dir="auto") if $eq type 'item' @@ -90,12 +90,12 @@ template(name="editChecklistItemForm") = checklist.title .edit-controls.clearfix button.primary.confirm.js-submit-edit-checklist-item-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form(title="{{_ 'close-edit-checklist-item'}}") + a.js-close-inlined-form(title="{{_ 'close-edit-checklist-item'}}") span(title=createdAt) {{ moment createdAt }} if canModifyCard a.js-delete-checklist-item {{_ "delete"}}... a.js-convert-checklist-item-to-card - i.fa.fa-copy + | ๐Ÿ“‹ | {{_ 'convertChecklistItemToCardPopup-title'}} template(name="checklistItems") @@ -105,7 +105,7 @@ template(name="checklistItems") +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true position="top") else a.add-checklist-item.js-open-inlined-form(title="{{_ 'add-checklist-item'}}") - i.fa.fa-plus + | โž• .checklist-items.js-checklist-items each item in checklist.items +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist) @@ -117,7 +117,7 @@ template(name="checklistItems") +addChecklistItemForm(checklist=checklist showNewlineBecomesNewChecklistItem=true) else a.add-checklist-item.js-open-inlined-form(title="{{_ 'add-checklist-item'}}") - i.fa.fa-plus + | โž• template(name='checklistItemDetail') .js-checklist-item.checklist-item(class="{{#if item.isFinished }}is-checked{{#if checklist.hideCheckedChecklistItems}} invisible{{/if}}{{/if}}{{#if checklist.hideAllChecklistItems}} is-checked invisible{{/if}}" @@ -140,16 +140,16 @@ template(name="checklistActionsPopup") ul.pop-over-list li a.js-delete-checklist.delete-checklist - i.fa.fa-trash + | ๐Ÿ—‘๏ธ | {{_ "delete"}} ... a.js-move-checklist.move-checklist - i.fa.fa-arrow-right + | โžก๏ธ | {{_ "moveChecklist"}} ... a.js-copy-checklist.copy-checklist - i.fa.fa-copy + | ๐Ÿ“‹ | {{_ "copyChecklist"}} ... a.js-hide-checked-checklist-items - i.fa.fa-eye-slash + | ๐Ÿ™ˆ | {{_ "hideCheckedChecklistItems"}} ... .material-toggle-switch(title="{{_ 'hide-checked-items'}}") if checklist.hideCheckedChecklistItems @@ -158,7 +158,7 @@ template(name="checklistActionsPopup") input.toggle-switch(type="checkbox" id="toggleHideCheckedChecklistItems_{{checklist._id}}") label.toggle-label(for="toggleHideCheckedChecklistItems_{{checklist._id}}") a.js-hide-all-checklist-items - i.fa.fa-ban + | ๐Ÿšซ | {{_ "hideAllChecklistItems"}} ... .material-toggle-switch(title="{{_ 'hideAllChecklistItems'}}") if checklist.hideAllChecklistItems diff --git a/client/components/cards/labels.jade b/client/components/cards/labels.jade index 8d12dc488..d49c939d2 100644 --- a/client/components/cards/labels.jade +++ b/client/components/cards/labels.jade @@ -6,7 +6,7 @@ template(name="formLabel") .palette-colors: each labels span.card-label.palette-color.js-palette-color(class="card-label-{{color}}") if(isSelected color) - i.fa.fa-check + | โœ… template(name="createLabelPopup") form.create-label @@ -28,7 +28,8 @@ template(name="cardLabelsPopup") ul.edit-labels-pop-over each board.labels li.js-card-label-item - a.card-label-edit-button.fa.fa-pencil.js-edit-label + a.card-label-edit-button.js-edit-label + | โœ๏ธ if isTouchScreenOrShowDesktopDragHandles span.fa.label-handle(class="fa-arrows" title="{{_ 'dragLabel'}}") span.card-label.card-label-selectable.js-select-label.card-label-wrapper(class="card-label-{{color}}" @@ -36,5 +37,5 @@ template(name="cardLabelsPopup") +viewer = name if(isLabelSelected ../_id) - i.card-label-selectable-icon.fa.fa-check + | โœ… a.quiet-button.full.js-add-label {{_ 'label-create'}} diff --git a/client/components/cards/resultCard.jade b/client/components/cards/resultCard.jade index ae6e90722..f2bd16657 100644 --- a/client/components/cards/resultCard.jade +++ b/client/components/cards/resultCard.jade @@ -13,7 +13,7 @@ template(name="resultCard") .broken-cards-null | NULL if getBoard.archived - i.fa.fa-archive + | ๐Ÿ“ฆ li.result-card-context.result-card-context-separator = ' ' | {{_ 'context-separator'}} @@ -27,7 +27,7 @@ template(name="resultCard") .broken-cards-null | NULL if getSwimlane.archived - i.fa.fa-archive + | ๐Ÿ“ฆ li.result-card-context.result-card-context-separator = ' ' | {{_ 'context-separator'}} @@ -41,4 +41,4 @@ template(name="resultCard") .broken-cards-null | NULL if getList.archived - i.fa.fa-archive + | ๐Ÿ“ฆ diff --git a/client/components/cards/subtasks.jade b/client/components/cards/subtasks.jade index 7e8f58d04..ceb860e6e 100644 --- a/client/components/cards/subtasks.jade +++ b/client/components/cards/subtasks.jade @@ -1,6 +1,6 @@ template(name="subtasks") h3.card-details-item-title - i.fa.fa-sitemap + | ๐ŸŒ | {{_ 'subtasks'}} if currentUser.isBoardAdmin if toggleDeleteDialog.get @@ -16,7 +16,7 @@ template(name="subtasks") +addSubtaskItemForm else a.js-open-inlined-form(title="{{_ 'add-subtask'}}") - i.fa.fa-plus + | โž• template(name="subtaskDetail") .js-subtasks.subtask @@ -26,7 +26,7 @@ template(name="subtaskDetail") .subtask-title span if canModifyCard - a.fa.fa-navicon.subtask-details-menu.js-open-subtask-details-menu(title="{{_ 'subtaskActionsPopup-title'}}") + a.subtask-details-menu.js-open-subtask-details-menu(title="{{_ 'subtaskActionsPopup-title'}}") if canModifyCard h2.title.js-open-inlined-form.is-editable +viewer @@ -40,7 +40,7 @@ template(name="addSubtaskItemForm") textarea.js-add-subtask-item(rows='1' autofocus dir="auto") .edit-controls.clearfix button.primary.confirm.js-submit-add-subtask-item-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form template(name="editSubtaskItemForm") textarea.js-edit-subtask-item(rows='1' autofocus dir="auto") @@ -50,7 +50,7 @@ template(name="editSubtaskItemForm") = subtask.title .edit-controls.clearfix button.primary.confirm.js-submit-edit-subtask-item-form(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form span(title=createdAt) {{ moment createdAt }} if canModifyCard if currentUser.isBoardAdmin @@ -68,7 +68,7 @@ template(name="subtasksItems") +addSubtaskItemForm else a.add-subtask-item.js-open-inlined-form - i.fa.fa-plus + | โž• | {{_ 'add-subtask-item'}}... template(name='subtaskItemDetail') @@ -92,10 +92,10 @@ template(name="subtaskActionsPopup") ul.pop-over-list li a.js-view-subtask(title="{{ subtask.title }}") - i.fa.fa-eye + | ๐Ÿ‘๏ธ | {{_ "view-it"}} if currentUser.isBoardAdmin a.js-delete-subtask.delete-subtask - i.fa.fa-trash + | ๐Ÿ—‘๏ธ | {{_ "delete"}} ... diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 5c686b5ff..db5f86c2f 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -7,7 +7,8 @@ template(name="listHeader") else if isMiniScreen if currentList - a.list-header-left-icon.fa.fa-angle-left.js-unselect-list + a.list-header-left-icon.js-unselect-list + | โ—€๏ธ else if collapsed if showCardsCountForList cards.length @@ -78,62 +79,63 @@ template(name="editListTitleForm") input.list-name-input.full-line(type="text" value=title autofocus) .edit-controls.clearfix button.primary.confirm(type="submit") {{_ 'save'}} - a.fa.fa-times-thin.js-close-inlined-form + a.js-close-inlined-form + | โŒ template(name="listActionPopup") ul.pop-over-list li a.js-add-card.list-header-plus-bottom - i.fa.fa-plus - i.fa.fa-arrow-down + | โž• + | โฌ‡๏ธ | {{_ 'add-card-to-bottom-of-list'}} hr ul.pop-over-list li a.js-set-list-width - i.fa.fa-arrows-h + | โ†”๏ธ | {{_ 'set-list-width'}} ul.pop-over-list li a.js-toggle-watch-list if isWatching - i.fa.fa-eye + | ๐Ÿ‘๏ธ | {{_ 'unwatch'}} else - i.fa.fa-eye-slash + | ๐Ÿ™ˆ | {{_ 'watch'}} unless currentUser.isCommentOnly unless currentUser.isWorker ul.pop-over-list li a.js-set-color-list - i.fa.fa-paint-brush + | ๐ŸŽจ | {{_ 'set-color-list'}} ul.pop-over-list if cards.length li a.js-select-cards - i.fa.fa-check-square + | โ˜‘๏ธ | {{_ 'list-select-cards'}} if currentUser.isBoardAdmin ul.pop-over-list li a.js-set-wip-limit - i.fa.fa-ban + | ๐Ÿšซ | {{#if isWipLimitEnabled }}{{_ 'edit-wip-limit'}}{{else}}{{_ 'setWipLimitPopup-title'}}{{/if}} unless currentUser.isWorker hr ul.pop-over-list li a.js-close-list - i.fa.fa-arrow-right - i.fa.fa-archive + | โžก๏ธ + | ๐Ÿ“ฆ | {{_ 'archive-list'}} hr ul.pop-over-list li a.js-more - i.fa.fa-link + | ๐Ÿ”— | {{_ 'listMorePopup-title'}} template(name="boardLists") @@ -150,7 +152,7 @@ template(name="listMorePopup") span.clearfix span {{_ 'link-list'}} = ' ' - i.fa.colorful(class="{{#if board.isPublic}}fa-globe{{else}}fa-lock{{/if}}") + | {{#if board.isPublic}}๐ŸŒ{{else}}๐Ÿ”’{{/if}} input.inline-input(type="text" readonly value="{{ rootUrl }}") | {{_ 'added'}} span.date(title=list.createdAt) {{ moment createdAt 'LLL' }} @@ -170,7 +172,7 @@ template(name="setWipLimitPopup") ul.pop-over-list li: a.js-enable-wip-limit {{_ 'enable-wip-limit'}} if isWipLimitEnabled - i.fa.fa-check + | โœ… if isWipLimitEnabled p input.wip-limit-value(type="number" value="{{ wipLimitValue }}" min="1" max="99") @@ -198,7 +200,7 @@ template(name="setListWidthPopup") br a.js-auto-width-board( title="{{#if isAutoWidth}}{{_ 'click-to-disable-auto-width'}}{{else}}{{_ 'click-to-enable-auto-width'}}{{/if}}") - i.fa(class="fa-solid fa-{{#if isAutoWidth}}compress{{else}}expand{{/if}}") + | {{#if isAutoWidth}}๐Ÿ—œ๏ธ{{else}}๐Ÿ“{{/if}} span {{_ 'auto-list-width'}} template(name="listWidthErrorPopup") @@ -212,6 +214,6 @@ template(name="setListColorPopup") // note: we use the swimlane palette to have more than just the border span.card-label.palette-color.js-palette-color(class="card-details-{{color}}") if(isSelected color) - i.fa.fa-check + | โœ… button.primary.confirm.js-submit {{_ 'save'}} button.js-remove-color.negate.wide.right {{_ 'unset-color'}} diff --git a/client/components/main/dueCards.jade b/client/components/main/dueCards.jade index a1970839e..09480be23 100644 --- a/client/components/main/dueCards.jade +++ b/client/components/main/dueCards.jade @@ -1,23 +1,23 @@ template(name="dueCardsHeaderBar") if currentUser h1 - i.fa.fa-calendar + | ๐Ÿ“… | {{_ 'dueCards-title'}} .board-header-btns.left a.board-header-btn.js-due-cards-view-change(title="{{_ 'dueCardsViewChange-title'}}") - i.fa.fa-caret-down + | โ–ผ if $eq dueCardsView 'me' - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'dueCardsViewChange-choice-me'}} if $eq dueCardsView 'all' - i.fa.fa-users + | ๐Ÿ‘ฅ | {{_ 'dueCardsViewChange-choice-all'}} template(name="dueCardsModalTitle") if currentUser h2 - i.fa.fa-keyboard-o + | โŒจ๏ธ | {{_ 'dueCards-title'}} template(name="dueCards") @@ -40,18 +40,18 @@ template(name="dueCardsViewChangePopup") li with "dueCardsViewChange-choice-me" a.js-due-cards-view-me - i.fa.fa-user.colorful + | ๐Ÿ‘ค | {{_ 'dueCardsViewChange-choice-me'}} if $eq Utils.dueCardsView "me" - i.fa.fa-check + | โœ… hr li with "dueCardsViewChange-choice-all" a.js-due-cards-view-all - i.fa.fa-users.colorful + | ๐Ÿ‘ฅ | {{_ 'dueCardsViewChange-choice-all'}} span.sub-name +viewer | {{_ 'dueCardsViewChange-choice-all-description' }} if $eq Utils.dueCardsView "all" - i.fa.fa-check + | โœ… diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index 4d7117ca3..802a8745d 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -1,6 +1,8 @@ template(name="editor") - a.fa.fa-brands.fa-markdown(title="{{_ 'convert-to-markdown'}}") - a.fa.fa-copy(title="{{_ 'copy-text-to-clipboard'}}") + a(title="{{_ 'convert-to-markdown'}}") + | ๐Ÿ“ + a(title="{{_ 'copy-text-to-clipboard'}}") + | ๐Ÿ“‹ span.copied-tooltip {{_ 'copied'}} textarea.editor( dir="auto" diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade index 4b1faa718..da00bbf03 100644 --- a/client/components/main/globalSearch.jade +++ b/client/components/main/globalSearch.jade @@ -1,20 +1,21 @@ template(name="globalSearchHeaderBar") if currentUser h1 - i.fa.fa-search + | ๐Ÿ” | {{_ 'globalSearch-title'}} template(name="globalSearchModalTitle") if currentUser h2 - i.fa.fa-keyboard-o + | โŒจ๏ธ | {{_ 'globalSearch-title'}} template(name="resultsPaged") if resultsHeading.get h1 = resultsHeading.get - a.fa.fa-link(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}") + a(title="{{_ 'link-to-search' }}" href="{{ getSearchHref }}") + | ๐Ÿ”— each card in results.get +resultCard(card) table.global-search-footer @@ -41,7 +42,8 @@ template(name="globalSearch") value="{{ query.get }}" autofocus dir="auto" ) - a.js-new-search.fa.fa-eraser + a.js-new-search + | ๐Ÿงน if debug.get.show h1 Debug if debug.get.showSelector diff --git a/client/components/main/header.css b/client/components/main/header.css index cb6be4e88..6bb1043f3 100644 --- a/client/components/main/header.css +++ b/client/components/main/header.css @@ -58,7 +58,7 @@ float: left; overflow: hidden; line-height: 28px; - margin: 0 2px; + margin: 0 12px; } #header #header-main-bar .board-header-btn i.fa { float: left; diff --git a/client/components/main/keyboardShortcuts.jade b/client/components/main/keyboardShortcuts.jade index bde408195..1eee1d220 100644 --- a/client/components/main/keyboardShortcuts.jade +++ b/client/components/main/keyboardShortcuts.jade @@ -1,12 +1,12 @@ template(name="shortcutsHeaderBar") h1 a.back-btn(href="{{pathFor 'home'}}") - i.fa.fa-chevron-left + | โ—€๏ธ | {{_ 'keyboard-shortcuts'}} template(name="shortcutsModalTitle") h2 - i.fa.fa-keyboard-o + | โŒจ๏ธ | {{_ 'keyboard-shortcuts'}} template(name="keyboardShortcuts") diff --git a/client/components/main/myCards.jade b/client/components/main/myCards.jade index df0199ac6..86105ced4 100644 --- a/client/components/main/myCards.jade +++ b/client/components/main/myCards.jade @@ -3,23 +3,23 @@ template(name="myCardsHeaderBar") h1 //a.back-btn(href="{{pathFor 'home'}}") // i.fa.fa-chevron-left - i.fa.fa-list + | ๐Ÿ“‹ | {{_ 'my-cards'}} .board-header-btns.left a.board-header-btn.js-my-cards-view-change(title="{{_ 'myCardsViewChange-title'}}") - i.fa.fa-caret-down + | โ–ผ if $eq myCardsView 'boards' - i.fa.fa-trello + | ๐Ÿ“‹ | {{_ 'myCardsViewChange-choice-boards'}} if $eq myCardsView 'table' - i.fa.fa-table + | ๐Ÿ“Š | {{_ 'myCardsViewChange-choice-table'}} template(name="myCardsModalTitle") if currentUser h2 - i.fa.fa-keyboard-o + | โŒจ๏ธ | {{_ 'my-cards'}} template(name="myCards") @@ -102,15 +102,15 @@ template(name="myCardsViewChangePopup") li with "myCardsViewChange-choice-boards" a.js-my-cards-view-boards - i.fa.fa-trello.colorful + | ๐Ÿ“‹ | {{_ 'myCardsViewChange-choice-boards'}} if $eq Utils.myCardsView "boards" - i.fa.fa-check + | โœ… hr li with "myCardsViewChange-choice-table" a.js-my-cards-view-table - i.fa.fa-table.colorful + | ๐Ÿ“Š | {{_ 'myCardsViewChange-choice-table'}} if $eq Utils.myCardsView "table" - i.fa.fa-check + | โœ… diff --git a/client/components/notifications/notifications.jade b/client/components/notifications/notifications.jade index c58db37ca..75391f349 100644 --- a/client/components/notifications/notifications.jade +++ b/client/components/notifications/notifications.jade @@ -1,5 +1,6 @@ template(name='notifications') #notifications.board-header-btns.right - a.notifications-drawer-toggle.fa.fa-bell(class="{{#if $gt unreadNotifications 0}}alert{{/if}}" title="{{_ 'notifications'}}") + a.notifications-drawer-toggle(class="{{#if $gt unreadNotifications 0}}alert{{/if}}" title="{{_ 'notifications'}}") + | ๐Ÿ”” if $.Session.get 'showNotificationsDrawer' +notificationsDrawer(unreadNotifications=unreadNotifications) diff --git a/client/components/rules/actions/boardActions.jade b/client/components/rules/actions/boardActions.jade index 0a09d98e8..6f63635fa 100644 --- a/client/components/rules/actions/boardActions.jade +++ b/client/components/rules/actions/boardActions.jade @@ -10,7 +10,7 @@ template(name="boardActions") div.trigger-text | {{_'r-its-list'}} div.trigger-button.js-add-gen-move-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -38,7 +38,7 @@ template(name="boardActions") div.trigger-dropdown input(id="swimlaneName",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-add-spec-move-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -49,7 +49,7 @@ template(name="boardActions") div.trigger-text | {{_'r-card'}} div.trigger-button.js-add-arch-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -58,7 +58,7 @@ template(name="boardActions") div.trigger-dropdown input(id="swimlane-name",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-add-swimlane-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -75,7 +75,7 @@ template(name="boardActions") div.trigger-dropdown input(id="swimlane-name2",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-create-card-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -99,7 +99,7 @@ template(name="boardActions") div.trigger-dropdown input(id="swimlaneName-link",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-link-card-action.js-goto-rules - i.fa.fa-plus + | โž• diff --git a/client/components/rules/actions/cardActions.jade b/client/components/rules/actions/cardActions.jade index aa31ca6da..baaf883af 100644 --- a/client/components/rules/actions/cardActions.jade +++ b/client/components/rules/actions/cardActions.jade @@ -16,7 +16,7 @@ template(name="cardActions") div.trigger-text | {{_'r-to-current-datetime'}} div.trigger-button.js-set-date-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -30,7 +30,7 @@ template(name="cardActions") option(value="endAt") {{_'r-df-end-at'}} option(value="receivedAt") {{_'r-df-received-at'}} div.trigger-button.js-remove-datevalue-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -46,7 +46,7 @@ template(name="cardActions") option(value="#{_id}") = name div.trigger-button.js-add-label-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -59,14 +59,14 @@ template(name="cardActions") div.trigger-dropdown input(id="member-name",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-add-member-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content div.trigger-text | {{_'r-remove-all'}} div.trigger-button.js-add-removeall-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -77,12 +77,12 @@ template(name="cardActions") class="card-details-{{cardColorButton}}") | {{_ cardColorButtonText }} div.trigger-button.js-set-color-action.js-goto-rules - i.fa.fa-plus + | โž• template(name="setCardActionsColorPopup") form.edit-label .palette-colors: each colors span.card-label.palette-color.js-palette-color(class="card-details-{{color}}") if(isSelected color) - i.fa.fa-check + | โœ… button.primary.confirm.js-submit {{_ 'save'}} diff --git a/client/components/rules/actions/checklistActions.jade b/client/components/rules/actions/checklistActions.jade index 0c2e04f13..399483ec8 100644 --- a/client/components/rules/actions/checklistActions.jade +++ b/client/components/rules/actions/checklistActions.jade @@ -10,7 +10,7 @@ template(name="checklistActions") div.trigger-dropdown input(id="checklist-name",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-add-checklist-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -23,7 +23,7 @@ template(name="checklistActions") div.trigger-dropdown input(id="checklist-name2",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-add-checkall-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item @@ -41,7 +41,7 @@ template(name="checklistActions") div.trigger-dropdown input(id="checklist-name3",type=text,placeholder="{{_'r-name'}}") div.trigger-button.js-add-check-item-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -54,7 +54,7 @@ template(name="checklistActions") div.trigger-dropdown input(id="checklist-items",type=text,placeholder="{{_'r-items-list'}}") div.trigger-button.js-add-checklist-items-action.js-goto-rules - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content diff --git a/client/components/rules/actions/mailActions.jade b/client/components/rules/actions/mailActions.jade index 7be78c751..098629e10 100644 --- a/client/components/rules/actions/mailActions.jade +++ b/client/components/rules/actions/mailActions.jade @@ -8,4 +8,4 @@ template(name="mailActions") input(id="email-subject",type=text,placeholder="{{_'r-subject'}}") textarea(id="email-msg") div.trigger-button.trigger-button-email.js-mail-action.js-goto-rules - i.fa.fa-plus + | โž• diff --git a/client/components/rules/ruleDetails.jade b/client/components/rules/ruleDetails.jade index 57d52006d..d0c10e559 100644 --- a/client/components/rules/ruleDetails.jade +++ b/client/components/rules/ruleDetails.jade @@ -1,7 +1,7 @@ template(name="ruleDetails") .rules h2 - i.fa.fa-magic + | โœจ | {{_ 'r-rule-details' }} .triggers-content .triggers-body @@ -20,5 +20,5 @@ template(name="ruleDetails") = action div.rules-back button.js-goback - i.fa.fa-chevron-left + | โ—€๏ธ | {{_ 'back'}} diff --git a/client/components/rules/rulesActions.jade b/client/components/rules/rulesActions.jade index 26deae185..bcc5d7ff0 100644 --- a/client/components/rules/rulesActions.jade +++ b/client/components/rules/rulesActions.jade @@ -1,19 +1,19 @@ template(name="rulesActions") h2 - i.fa.fa-magic + | โœจ | {{_ 'r-rule' }} "#{data.ruleName.get}" - {{_ 'r-add-action'}} .triggers-content .triggers-body .triggers-side-menu ul li.active.js-set-board-actions - i.fa.fa-columns + | ๐Ÿ“Š li.js-set-card-actions - i.fa.fa-sticky-note + | ๐Ÿ“ li.js-set-checklist-actions - i.fa.fa-check + | โœ… li.js-set-mail-actions - i.fa.fa-at + | @ .triggers-main-body if ($eq currentActions.get 'board') +boardActions(ruleName=data.ruleName triggerVar=data.triggerVar) @@ -25,5 +25,5 @@ template(name="rulesActions") +mailActions(ruleName=data.ruleName triggerVar=data.triggerVar) div.rules-back button.js-goback - i.fa.fa-chevron-left + | โ—€๏ธ | {{_ 'back'}} diff --git a/client/components/rules/rulesList.jade b/client/components/rules/rulesList.jade index 3c59a19f3..f13255cb1 100644 --- a/client/components/rules/rulesList.jade +++ b/client/components/rules/rulesList.jade @@ -1,7 +1,7 @@ template(name="rulesList") .rules h2 - i.fa.fa-magic + | โœจ | {{_ 'r-board-rules' }} ul.rules-list @@ -11,27 +11,27 @@ template(name="rulesList") = title div.rules-btns-group button.js-goto-details - i.fa.fa-eye + | ๐Ÿ‘๏ธ | {{_ 'r-view-rule'}} if currentUser.isAdmin button.js-delete-rule - i.fa.fa-trash-o + | ๐Ÿ—‘๏ธ | {{_ 'r-delete-rule'}} else if currentUser.isBoardAdmin button.js-delete-rule - i.fa.fa-trash-o + | ๐Ÿ—‘๏ธ | {{_ 'r-delete-rule'}} else li.no-items-message {{_ 'r-no-rules' }} if currentUser.isAdmin div.rules-add button.js-goto-trigger - i.fa.fa-plus + | โž• | {{_ 'r-add-rule'}} input(type=text,placeholder="{{_ 'r-new-rule-name' }}",id="ruleTitle") else if currentUser.isBoardAdmin div.rules-add button.js-goto-trigger - i.fa.fa-plus + | โž• | {{_ 'r-add-rule'}} input(type=text,placeholder="{{_ 'r-new-rule-name' }}",id="ruleTitle") diff --git a/client/components/rules/rulesTriggers.jade b/client/components/rules/rulesTriggers.jade index 03cf0e8fe..e34c1dfb5 100644 --- a/client/components/rules/rulesTriggers.jade +++ b/client/components/rules/rulesTriggers.jade @@ -1,17 +1,17 @@ template(name="rulesTriggers") h2 - i.fa.fa-magic + | โœจ | {{_ 'r-rule' }} "#{data.ruleName.get}" - {{_ 'r-add-trigger'}} .triggers-content .triggers-body .triggers-side-menu ul li.active.js-set-board-triggers - i.fa.fa-columns + | ๐Ÿ“Š li.js-set-card-triggers - i.fa.fa-sticky-note + | ๐Ÿ“ li.js-set-checklist-triggers - i.fa.fa-check + | โœ… .triggers-main-body if showBoardTrigger.get +boardTriggers @@ -21,5 +21,5 @@ template(name="rulesTriggers") +checklistTriggers div.rules-back button.js-goback - i.fa.fa-chevron-left + | โ—€๏ธ | {{_ 'back'}} diff --git a/client/components/rules/triggers/boardTriggers.jade b/client/components/rules/triggers/boardTriggers.jade index cf13f8594..d9d2c4e17 100644 --- a/client/components/rules/triggers/boardTriggers.jade +++ b/client/components/rules/triggers/boardTriggers.jade @@ -4,7 +4,7 @@ template(name="boardTriggers") div.trigger-text | {{_'r-when-a-card'}} div.trigger-inline-button.js-open-card-title-popup - i.fa.fa-filter + | ๐Ÿ” div.trigger-text | {{_'r-is'}} div.trigger-text @@ -18,39 +18,39 @@ template(name="boardTriggers") div.trigger-dropdown input(id="create-swimlane-name",type=text,placeholder="{{_'r-swimlane-name'}}") div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-create-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item#trigger-three div.trigger-content div.trigger-text | {{_'r-when-a-card'}} div.trigger-inline-button.js-open-card-title-popup - i.fa.fa-filter + | ๐Ÿ” div.trigger-text | {{_'r-is-moved'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-gen-moved-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item#trigger-four div.trigger-content div.trigger-text | {{_'r-when-a-card'}} div.trigger-inline-button.js-open-card-title-popup - i.fa.fa-filter + | ๐Ÿ” div.trigger-text | {{_'r-is'}} div.trigger-dropdown @@ -66,21 +66,21 @@ template(name="boardTriggers") div.trigger-dropdown input(id="create-swimlane-name-2",type=text,placeholder="{{_'r-swimlane-name'}}") div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-moved-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item#trigger-five div.trigger-content div.trigger-text | {{_'r-when-a-card'}} div.trigger-inline-button.js-open-card-title-popup - i.fa.fa-filter + | ๐Ÿ” div.trigger-text | {{_'r-is'}} div.trigger-dropdown @@ -88,14 +88,14 @@ template(name="boardTriggers") option(value="archived") {{_'r-archived'}} option(value="unarchived") {{_'r-unarchived'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-arch-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content diff --git a/client/components/rules/triggers/cardTriggers.jade b/client/components/rules/triggers/cardTriggers.jade index ba4276a51..60c024452 100644 --- a/client/components/rules/triggers/cardTriggers.jade +++ b/client/components/rules/triggers/cardTriggers.jade @@ -10,14 +10,14 @@ template(name="cardTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-gen-label-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -37,14 +37,14 @@ template(name="cardTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-spec-label-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -57,14 +57,14 @@ template(name="cardTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-gen-member-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item @@ -82,14 +82,14 @@ template(name="cardTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-spec-member-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -104,11 +104,11 @@ template(name="cardTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-attachment-trigger.js-goto-action - i.fa.fa-plus + | โž• diff --git a/client/components/rules/triggers/checklistTriggers.jade b/client/components/rules/triggers/checklistTriggers.jade index 841ec6f7d..b6c16f1de 100644 --- a/client/components/rules/triggers/checklistTriggers.jade +++ b/client/components/rules/triggers/checklistTriggers.jade @@ -10,14 +10,14 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-gen-check-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item @@ -35,14 +35,14 @@ template(name="checklistTriggers") div.trigger-text | {{_'r-a-card'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-spec-check-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -53,14 +53,14 @@ template(name="checklistTriggers") option(value="completed") {{_'r-completed'}} option(value="uncompleted") {{_'r-made-incomplete'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-gen-comp-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -75,14 +75,14 @@ template(name="checklistTriggers") option(value="completed") {{_'r-completed'}} option(value="uncompleted") {{_'r-made-incomplete'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-spec-comp-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -93,14 +93,14 @@ template(name="checklistTriggers") option(value="checked") {{_'r-checked'}} option(value="unchecked") {{_'r-unchecked'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-gen-check-item-trigger.js-goto-action - i.fa.fa-plus + | โž• div.trigger-item div.trigger-content @@ -115,11 +115,11 @@ template(name="checklistTriggers") option(value="checked") {{_'r-checked'}} option(value="unchecked") {{_'r-unchecked'}} div.trigger-button.trigger-button-person.js-show-user-field - i.fa.fa-user + | ๐Ÿ‘ค div.user-details.hide-element div.trigger-text | {{_'r-by'}} div.trigger-dropdown input(class="user-name",type=text,placeholder="{{_'username'}}") div.trigger-button.js-add-spec-check-item-trigger.js-goto-action - i.fa.fa-plus + | โž• diff --git a/client/components/settings/adminReports.jade b/client/components/settings/adminReports.jade index 1d6e35b16..e474ee465 100644 --- a/client/components/settings/adminReports.jade +++ b/client/components/settings/adminReports.jade @@ -8,27 +8,27 @@ template(name="adminReports") ul li a.js-report-broken(data-id="report-broken") - i.fa.fa-chain-broken + | ๐Ÿ”— | {{_ 'broken-cards'}} li a.js-report-files(data-id="report-files") - i.fa.fa-paperclip + | ๐Ÿ“Ž | {{_ 'filesReportTitle'}} li a.js-report-rules(data-id="report-rules") - i.fa.fa-magic + | โœจ | {{_ 'rulesReportTitle'}} li a.js-report-boards(data-id="report-boards") - i.fa.fa-magic + | โœจ | {{_ 'boardsReportTitle'}} li a.js-report-cards(data-id="report-cards") - i.fa.fa-magic + | โœจ | {{_ 'cardsReportTitle'}} .main-body diff --git a/client/components/settings/attachments.jade b/client/components/settings/attachments.jade index 31a0e219f..111bd4db8 100644 --- a/client/components/settings/attachments.jade +++ b/client/components/settings/attachments.jade @@ -8,7 +8,7 @@ template(name="attachments") ul li a.js-move-attachments(data-id="move-attachments") - i.fa.fa-arrow-right + | โžก๏ธ | {{_ 'attachment-move'}} .main-body @@ -80,17 +80,17 @@ template(name="moveAttachment") td if $neq version.storageName "fs" button.js-move-storage-fs - i.fa.fa-arrow-right + | โžก๏ธ | {{_ 'attachment-move-storage-fs'}} if $neq version.storageName "gridfs" if version.storageName button.js-move-storage-gridfs - i.fa.fa-arrow-right + | โžก๏ธ | {{_ 'attachment-move-storage-gridfs'}} if $neq version.storageName "s3" if version.storageName button.js-move-storage-s3 - i.fa.fa-arrow-right + | โžก๏ธ | {{_ 'attachment-move-storage-s3'}} diff --git a/client/components/settings/informationBody.jade b/client/components/settings/informationBody.jade index 6b0265a29..6907ac9d0 100644 --- a/client/components/settings/informationBody.jade +++ b/client/components/settings/informationBody.jade @@ -5,14 +5,14 @@ template(name='information') else .content-title span - i.fa.fa-info-circle + | โ„น๏ธ | {{_ 'info'}} .content-body .side-menu ul li.active a.js-setting-menu(data-id="information-display") - i.fa.fa-info-circle + | โ„น๏ธ | {{_ 'info'}} .main-body +statistics diff --git a/client/components/settings/peopleBody.jade b/client/components/settings/peopleBody.jade index afd918b8e..bd5641067 100644 --- a/client/components/settings/peopleBody.jade +++ b/client/components/settings/peopleBody.jade @@ -9,34 +9,34 @@ template(name="people") +spinner else if orgSetting.get span - i.fa.fa-sitemap + | ๐ŸŒ unless isMiniScreen | {{_ 'organizations'}} input#searchOrgInput(placeholder="{{_ 'search'}}") button#searchOrgButton - i.fa.fa-search + | ๐Ÿ” | {{_ 'search'}} .ext-box-right span {{#unless isMiniScreen}}{{_ 'org-number'}}{{/unless}} #{orgNumber} else if teamSetting.get span - i.fa.fa-users + | ๐Ÿ‘ฅ unless isMiniScreen | {{_ 'teams'}} input#searchTeamInput(placeholder="{{_ 'search'}}") button#searchTeamButton - i.fa.fa-search + | ๐Ÿ” | {{_ 'search'}} .ext-box-right span {{#unless isMiniScreen}}{{_ 'team-number'}}{{/unless}} #{teamNumber} else if peopleSetting.get span - i.fa.fa-user + | ๐Ÿ‘ค unless isMiniScreen | {{_ 'people'}} input#searchInput(placeholder="{{_ 'search'}}") button#searchButton - i.fa.fa-search + | ๐Ÿ” | {{_ 'search'}} .divLockedUsersFilter .flex-container @@ -47,17 +47,17 @@ template(name="people") option(value="active") {{_ 'admin-people-filter-active'}} option(value="inactive") {{_ 'admin-people-filter-inactive'}} button#unlockAllUsers.unlock-all-btn - i.fa.fa-unlock + | ๐Ÿ”“ | {{_ 'accounts-lockout-unlock-all'}} .ext-box-right span {{#unless isMiniScreen}}{{_ 'people-number'}}{{/unless}} #{peopleNumber} .divAddOrRemoveTeam#divAddOrRemoveTeam button#addOrRemoveTeam - i.fa.fa-edit + | โœ๏ธ | {{_ 'add'}} / {{_ 'delete'}} {{_ 'teams'}} else if lockedUsersSetting.get span - i.fa.fa-lock.text-red + | ๐Ÿ”’.text-red unless isMiniScreen | {{_ 'accounts-lockout-locked-users'}} @@ -66,19 +66,19 @@ template(name="people") ul li.active a.js-org-menu(data-id="org-setting") - i.fa.fa-sitemap + | ๐ŸŒ | {{_ 'organizations'}} li a.js-team-menu(data-id="team-setting") - i.fa.fa-users + | ๐Ÿ‘ฅ | {{_ 'teams'}} li a.js-people-menu(data-id="people-setting") - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'people'}} li a.js-locked-users-menu(data-id="locked-users-setting") - i.fa.fa-lock.text-red + | ๐Ÿ”’.text-red | {{_ 'accounts-lockout-locked-users'}} .main-body if loading.get @@ -163,17 +163,17 @@ template(name="selectAllUser") template(name="newOrgRow") a.new-org - i.fa.fa-plus-square + | โž• | {{_ 'new'}} template(name="newTeamRow") a.new-team - i.fa.fa-plus-square + | โž• | {{_ 'new'}} template(name="newUserRow") a.new-user - i.fa.fa-plus-square + | โž• | {{_ 'new'}} template(name="orgRow") @@ -209,10 +209,10 @@ template(name="orgRow") | {{_ 'no'}} td a.edit-org - i.fa.fa-edit + | โœ๏ธ | {{_ 'edit'}} a.more-settings-org - i.fa.fa-ellipsis-h + | โ‹ฏ template(name="teamRow") tr @@ -243,10 +243,10 @@ template(name="teamRow") | {{_ 'no'}} td a.edit-team - i.fa.fa-edit + | โœ๏ธ | {{_ 'edit'}} a.more-settings-team - i.fa.fa-ellipsis-h + | โ‹ฏ template(name="peopleRow") tr @@ -258,14 +258,14 @@ template(name="peopleRow") input.selectUserChkBox(type="checkbox", id="{{userData._id}}") td.account-status if isUserLocked - i.fa.fa-lock.text-red.js-toggle-lock-status(data-user-id=userData._id, data-is-locked="true", title="{{_ 'accounts-lockout-click-to-unlock'}}") + | ๐Ÿ”’.text-red.js-toggle-lock-status(data-user-id=userData._id, data-is-locked="true", title="{{_ 'accounts-lockout-click-to-unlock'}}") else - i.fa.fa-unlock.text-green.js-toggle-lock-status(data-user-id=userData._id, data-is-locked="false", title="{{_ 'accounts-lockout-user-unlocked'}}") + | ๐Ÿ”“.text-green.js-toggle-lock-status(data-user-id=userData._id, data-is-locked="false", title="{{_ 'accounts-lockout-user-unlocked'}}") td.account-active-status if userData.loginDisabled - i.fa.fa-ban.text-red.js-toggle-active-status(data-user-id=userData._id, data-is-active="false", title="{{_ 'admin-people-user-inactive'}}") + | ๐Ÿšซ.text-red.js-toggle-active-status(data-user-id=userData._id, data-is-active="false", title="{{_ 'admin-people-user-inactive'}}") else - i.fa.fa-check-circle.text-green.js-toggle-active-status(data-user-id=userData._id, data-is-active="true", title="{{_ 'admin-people-user-active'}}") + | โœ….text-green.js-toggle-active-status(data-user-id=userData._id, data-is-active="true", title="{{_ 'admin-people-user-active'}}") if userData.loginDisabled td.username {{ userData.username }} else if isUserLocked @@ -335,10 +335,10 @@ template(name="peopleRow") td {{ userData.teamsUserBelongs }} td a.edit-user - i.fa.fa-edit + | โœ๏ธ | {{_ 'edit'}} a.more-settings-user - i.fa.fa-ellipsis-h + | โ‹ฏ template(name="editOrgPopup") form @@ -448,8 +448,8 @@ template(name="editUserPopup") option(value="{{value}}") {{_ value}} label | {{_ 'organizations'}} - i.fa.fa-plus-square#addUserOrg - i.fa.fa-minus-square#removeUserOrg + | โž•#addUserOrg + | โž–#removeUserOrg select.js-orgs#jsOrgs option(value="-1") {{_ 'organizations'}} : each value in orgsDatas @@ -458,8 +458,8 @@ template(name="editUserPopup") input#jsUserOrgIdsInPut.js-userOrgIds.hide(type="hidden" value=user.orgIdsUserBelongs) label | {{_ 'teams'}} - i.fa.fa-plus-square#addUserTeam - i.fa.fa-minus-square#removeUserTeam + | โž•#addUserTeam + | โž–#removeUserTeam select.js-teams#jsTeams option(value="-1") {{_ 'teams'}} : each value in teamsDatas @@ -591,8 +591,8 @@ template(name="newUserPopup") option(value="{{value}}") {{_ value}} label | {{_ 'organizations'}} - i.fa.fa-plus-square#addUserOrgNewUser - i.fa.fa-minus-square#removeUserOrgNewUser + | โž•#addUserOrgNewUser + | โž–#removeUserOrgNewUser select.js-orgsNewUser#jsOrgsNewUser option(value="-1") {{_ 'organizations'}} : each value in orgsDatas @@ -601,8 +601,8 @@ template(name="newUserPopup") input#jsUserOrgIdsInPutNewUser.js-userOrgIdsNewUser.hide(type="text" value=user.orgIdsUserBelongs) label | {{_ 'teams'}} - i.fa.fa-plus-square#addUserTeamNewUser - i.fa.fa-minus-square#removeUserTeamNewUser + | โž•#addUserTeamNewUser + | โž–#removeUserTeamNewUser select.js-teamsNewUser#jsTeamsNewUser option(value="-1") {{_ 'teams'}} : each value in teamsDatas @@ -636,7 +636,7 @@ template(name="settingsOrgPopup") // to impersonate organization? // li // a.impersonate-org - // i.fa.fa-user + // | ๐Ÿ‘ค // | {{_ 'impersonate-org'}} // // @@ -659,7 +659,7 @@ template(name="settingsUserPopup") ul.pop-over-list li a.impersonate-user - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'impersonate-user'}} br hr diff --git a/client/components/settings/settingHeader.jade b/client/components/settings/settingHeader.jade index 41434270e..cbbb9b03b 100644 --- a/client/components/settings/settingHeader.jade +++ b/client/components/settings/settingHeader.jade @@ -5,31 +5,31 @@ template(name="settingHeaderBar") .setting-header-btns.left if currentUser a.setting-header-btn.settings(href="{{pathFor 'setting'}}") - i.fa(class="fa-cog") + | โš™๏ธ span {{_ 'settings'}} a.setting-header-btn.people(href="{{pathFor 'people'}}") - i.fa(class="fa-users") + | ๐Ÿ‘ฅ span {{_ 'people'}} a.setting-header-btn.informations(href="{{pathFor 'admin-reports'}}") - i.fa(class="fa-list") + | ๐Ÿ“‹ span {{_ 'reports'}} a.setting-header-btn.informations(href="{{pathFor 'attachments'}}") - i.fa(class="fa-paperclip") + | ๐Ÿ“Ž span {{_ 'attachments'}} a.setting-header-btn.informations(href="{{pathFor 'translation'}}") - i.fa(class="fa-font") + | ๐Ÿ”ค span {{_ 'translation'}} a.setting-header-btn.informations(href="{{pathFor 'information'}}") - i.fa(class="fa-info-circle") + | โ„น๏ธ span {{_ 'info'}} else a.setting-header-btn.js-log-in( title="{{_ 'log-in'}}") - i.fa.fa-sign-in + | ๐Ÿšช span {{_ 'log-in'}} diff --git a/client/components/settings/translationBody.jade b/client/components/settings/translationBody.jade index 46d41d011..deb721a22 100644 --- a/client/components/settings/translationBody.jade +++ b/client/components/settings/translationBody.jade @@ -9,12 +9,12 @@ template(name="translation") +spinner else if translationSetting.get span - i.fa.fa-font + | ๐Ÿ”ค unless isMiniScreen | {{_ 'translation'}} input#searchTranslationInput(placeholder="{{_ 'search'}}") button#searchTranslationButton - i.fa.fa-search + | ๐Ÿ” | {{_ 'search'}} .ext-box-right span {{#unless isMiniScreen}}{{_ 'translation-number'}}{{/unless}} #{translationNumber} @@ -24,7 +24,7 @@ template(name="translation") ul li.active a.js-translation-menu(data-id="translation-setting") - i.fa.fa-font + | ๐Ÿ”ค | {{_ 'translation'}} .main-body if loading.get @@ -47,7 +47,7 @@ template(name="translationGeneral") template(name="newTranslationRow") a.new-translation - i.fa.fa-plus-square + | โž• | {{_ 'new'}} template(name="translationRow") @@ -57,10 +57,10 @@ template(name="translationRow") td {{translationData.translationText}} td a.edit-translation - i.fa.fa-edit + | โœ๏ธ | {{_ 'edit'}} a.more-settings-translation - i.fa.fa-ellipsis-h + | โ‹ฏ template(name="editTranslationPopup") form diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade index c9b7625eb..138d4b8bf 100644 --- a/client/components/sidebar/sidebar.jade +++ b/client/components/sidebar/sidebar.jade @@ -187,14 +187,14 @@ template(name="boardInfoOnMyBoardsPopup") a.flex.js-field-has-cardcounterlist(class="{{#if allowsCardCounterList}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCardCounterList}}is-checked{{/if}}") span - i.fa.fa-sign-out + | ๐Ÿšช | {{_ 'show-card-counter-per-list'}} unless currentSetting.hideBoardMemberList div.check-div a.flex.js-field-has-boardmemberlist(class="{{#if allowsBoardMemberList}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsBoardMemberList}}is-checked{{/if}}") span - i.fa.fa-hourglass-start + | โณ | {{_ 'show-board_members-avatar'}} template(name="boardCardSettingsPopup") @@ -204,149 +204,149 @@ template(name="boardCardSettingsPopup") a.flex.js-field-has-receiveddate(class="{{#if allowsReceivedDate}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsReceivedDate}}is-checked{{/if}}") span - i.fa.fa-sign-out + | ๐Ÿšช | {{_ 'card-received'}} div.check-div a.flex.js-field-has-startdate(class="{{#if allowsStartDate}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsStartDate}}is-checked{{/if}}") span - i.fa.fa-hourglass-start + | โณ | {{_ 'card-start'}} div.check-div a.flex.js-field-has-duedate(class="{{#if allowsDueDate}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsDueDate}}is-checked{{/if}}") span - i.fa.fa-sign-in + | ๐Ÿšช | {{_ 'card-due'}} div.check-div a.flex.js-field-has-enddate(class="{{#if allowsEndDate}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsEndDate}}is-checked{{/if}}") span - i.fa.fa-hourglass-end + | โฐ | {{_ 'card-end'}} div.check-div a.flex.js-field-has-members(class="{{#if allowsMembers}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsMembers}}is-checked{{/if}}") span - i.fa.fa-users + | ๐Ÿ‘ฅ | {{_ 'members'}} div.check-div a.flex.js-field-has-creator(class="{{#if allowsCreator}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCreator}}is-checked{{/if}}") span - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'creator'}} div.check-div a.flex.js-field-has-creator-on-minicard(class="{{#if allowsCreatorOnMinicard}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCreatorOnMinicard}}is-checked{{/if}}") span - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'creator-on-minicard'}} div.check-div a.flex.js-field-has-assignee(class="{{#if allowsAssignee}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsAssignee}}is-checked{{/if}}") span - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'assignee'}} div.check-div a.flex.js-field-has-assigned-by(class="{{#if allowsAssignedBy}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsAssignedBy}}is-checked{{/if}}") span - i.fa.fa-shopping-cart + | ๐Ÿ›’ | {{_ 'assigned-by'}} div.check-div a.flex.js-field-has-requested-by(class="{{#if allowsRequestedBy}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsRequestedBy}}is-checked{{/if}}") span - i.fa.fa-user-plus + | ๐Ÿ‘คโž• | {{_ 'requested-by'}} div.check-div a.flex.js-field-has-card-sorting-by-number(class="{{#if allowsCardSortingByNumber}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCardSortingByNumber}}is-checked{{/if}}") span - i.fa.fa-sort + | ๐Ÿ”ข | {{_ 'card-sorting-by-number'}} div.check-div a.flex.js-field-has-card-sorting-by-number-on-minicard(class="{{#if allowsCardSortingByNumberOnMinicard}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCardSortingByNumberOnMinicard}}is-checked{{/if}}") span - i.fa.fa-sort + | ๐Ÿ”ข | {{_ 'card-sorting-by-number-on-minicard'}} div.check-div a.flex.js-field-has-card-show-lists(class="{{#if allowsShowLists}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsShowLists}}is-checked{{/if}}") span - i.fa.fa-list + | ๐Ÿ“‹ | {{_ 'card-show-lists'}} div.check-div a.flex.js-field-has-labels(class="{{#if allowsLabels}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsLabels}}is-checked{{/if}}") span - i.fa.fa-tags + | ๐Ÿท๏ธ | {{_ 'labels'}} div.check-div a.flex.js-field-has-card-show-lists-on-minicard(class="{{#if allowsShowListsOnMinicard}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsShowListsOnMinicard}}is-checked{{/if}}") span - i.fa.fa-list + | ๐Ÿ“‹ | {{_ 'card-show-lists-on-minicard'}} div.check-div a.flex.js-field-has-card-number(class="{{#if allowsCardNumber}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCardNumber}}is-checked{{/if}}") span - i.fa.fa-hashtag + | #๏ธโƒฃ | {{_ 'card'}} | {{_ 'number'}} div.check-div a.flex.js-field-has-description-title(class="{{#if allowsDescriptionTitle}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsDescriptionTitle}}is-checked{{/if}}") span - i.fa.fa-align-left + | ๐Ÿ“ | {{_ 'description'}} | {{_ 'title'}} div.check-div a.flex.js-field-has-description-text(class="{{#if allowsDescriptionText}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsDescriptionText}}is-checked{{/if}}") span - i.fa.fa-align-left + | ๐Ÿ“ | {{_ 'description'}} | {{_ 'custom-field-text'}} div.check-div a.flex.js-field-has-description-text-on-minicard(class="{{#if allowsDescriptionTextOnMinicard}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsDescriptionTextOnMinicard}}is-checked{{/if}}") span - i.fa.fa-align-left + | ๐Ÿ“ | {{_ 'description-on-minicard'}} div.check-div a.flex.js-field-has-checklists(class="{{#if allowsChecklists}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsChecklists}}is-checked{{/if}}") span - i.fa.fa-check + | โœ… | {{_ 'checklists'}} div.check-div a.flex.js-field-has-subtasks(class="{{#if allowsSubtasks}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsSubtasks}}is-checked{{/if}}") span - i.fa.fa-sitemap + | ๐ŸŒ | {{_ 'subtasks'}} div.check-div a.flex.js-field-has-attachments(class="{{#if allowsAttachments}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsAttachments}}is-checked{{/if}}") span - i.fa.fa-paperclip + | ๐Ÿ“Ž | {{_ 'attachments'}} div.check-div a.flex.js-field-has-badge-attachment-on-minicard(class="{{#if allowsBadgeAttachmentOnMinicard}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsBadgeAttachmentOnMinicard}}is-checked{{/if}}") span - i.fa.fa-paperclip + | ๐Ÿ“Ž | {{_ 'badge-attachment-on-minicard'}} div.check-div a.flex.js-field-has-cover-attachment-on-minicard(class="{{#if allowsCoverAttachmentOnMinicard}}is-checked{{/if}}") .materialCheckBox(class="{{#if allowsCoverAttachmentOnMinicard}}is-checked{{/if}}") span - i.fa.fa-book - i.fa.fa-picture-o + | ๐Ÿ“– + | ๐Ÿ–ผ๏ธ | {{_ 'cover-attachment-on-minicard'}} //div.check-div // a.flex.js-field-has-comments(class="{{#if allowsComments}}is-checked{{/if}}") diff --git a/client/components/sidebar/sidebarCustomFields.jade b/client/components/sidebar/sidebarCustomFields.jade index d55379957..1cc270681 100644 --- a/client/components/sidebar/sidebarCustomFields.jade +++ b/client/components/sidebar/sidebarCustomFields.jade @@ -4,7 +4,8 @@ template(name="customFieldsSidebar") li div.minicard-wrapper.js-minicard div.minicard - a.fa.fa-pencil.js-edit-custom-field.minicard-edit-button + a.js-edit-custom-field.minicard-edit-button + | โœ๏ธ div.minicard-title +viewer =name @@ -13,7 +14,7 @@ template(name="customFieldsSidebar") if currentUser.isBoardMember hr a.sidebar-btn.js-open-create-custom-field - i.fa.fa-plus + | โž• span {{_ 'createCustomField'}} template(name="createCustomFieldPopup") diff --git a/client/components/sidebar/sidebarFilters.jade b/client/components/sidebar/sidebarFilters.jade index 52a859744..918711b09 100644 --- a/client/components/sidebar/sidebarFilters.jade +++ b/client/components/sidebar/sidebarFilters.jade @@ -5,19 +5,19 @@ template(name="filterSidebar") h3 - i.fa.fa-trello + | ๐Ÿ“‹ | {{_ 'list-filter-label'}} ul.sidebar-list form.js-list-filter input(type="text") hr h3 - i.fa.fa-list-alt + | ๐Ÿ“‹ | {{_ 'filter-card-title-label'}} input.js-field-card-filter(type="text") hr h3 - i.fa.fa-tags + | ๐Ÿท๏ธ | {{_ 'filter-labels-label'}} ul.sidebar-list li(class="{{#if Filter.labelIds.isSelected undefined}}active{{/if}}") @@ -25,7 +25,7 @@ template(name="filterSidebar") span.sidebar-list-item-description | {{_ 'filter-no-label'}} if Filter.labelIds.isSelected undefined - i.fa.fa-check + | โœ… each currentBoard.labels li a.name.js-toggle-label-filter @@ -39,7 +39,7 @@ template(name="filterSidebar") i.fa.fa-check hr h3 - i.fa.fa-users + | ๐Ÿ‘ฅ | {{_ 'filter-member-label'}} ul.sidebar-list li(class="{{#if Filter.members.isSelected undefined}}active{{/if}}") @@ -47,7 +47,7 @@ template(name="filterSidebar") span.sidebar-list-item-description | {{_ 'filter-no-member'}} if Filter.members.isSelected undefined - i.fa.fa-check + | โœ… each currentBoard.activeMembers with getUser userId li(class="{{#if Filter.members.isSelected _id}}active{{/if}}") @@ -57,10 +57,10 @@ template(name="filterSidebar") = profile.fullname | ({{ username }}) if Filter.members.isSelected _id - i.fa.fa-check + | โœ… hr h3 - i.fa.fa-user + | ๐Ÿ‘ค | {{_ 'filter-assignee-label'}} ul.sidebar-list li(class="{{#if Filter.assignees.isSelected undefined}}active{{/if}}") @@ -78,11 +78,11 @@ template(name="filterSidebar") = profile.fullname | ({{ username }}) if Filter.assignees.isSelected _id - i.fa.fa-check + | โœ… hr h3 - i.fa.fa-list-alt + | ๐Ÿ“… | {{_ 'filter-dates-label' }} ul.sidebar-list li(class="{{#if Filter.dueAt.isSelected 'noDate'}}active{{/if}}") @@ -123,7 +123,7 @@ template(name="filterSidebar") i.fa.fa-check hr h3 - i.fa.fa-list-alt + | ๐Ÿ“‹ | {{_ 'filter-custom-fields-label'}} ul.sidebar-list li(class="{{#if Filter.customFields.isSelected undefined}}active{{/if}}") @@ -131,7 +131,7 @@ template(name="filterSidebar") span.sidebar-list-item-description | {{_ 'filter-no-custom-fields'}} if Filter.customFields.isSelected undefined - i.fa.fa-check + | โœ… each currentBoard.customFields li(class="{{#if Filter.customFields.isSelected _id}}active{{/if}}") a.name.js-toggle-custom-fields-filter @@ -163,15 +163,15 @@ template(name="filterSidebar") if Filter.isActive hr a.sidebar-btn.js-clear-all - i.fa.fa-filter + | ๐Ÿ” span {{_ 'filter-clear'}} a.sidebar-btn.js-filter-to-selection - i.fa.fa-check-square-o + | โ˜‘๏ธ span {{_ 'filter-to-selection'}} template(name="multiselectionSidebar") h3 - i.fa.fa-tags + | ๐Ÿท๏ธ | {{_ 'multi-selection-label'}} ul.sidebar-list each currentBoard.labels @@ -184,12 +184,12 @@ template(name="multiselectionSidebar") else span.quiet {{_ "label-default" (_ (concat "color-" color))}} if allSelectedElementHave 'label' _id - i.fa.fa-check + | โœ… else if someSelectedElementHave 'label' _id - i.fa.fa-ellipsis-h + | โ‹ฏ hr h3 - i.fa.fa-users + | ๐Ÿ‘ฅ | {{_ 'multi-selection-member'}} ul.sidebar-list each currentBoard.activeMembers @@ -201,16 +201,16 @@ template(name="multiselectionSidebar") = profile.fullname | ({{ username }}) if allSelectedElementHave 'member' _id - i.fa.fa-check + | โœ… else if someSelectedElementHave 'member' _id - i.fa.fa-ellipsis-h + | โ‹ฏ if currentUser.isBoardAdmin hr a.sidebar-btn.js-move-selection - i.fa.fa-share + | ๐Ÿ“ค span {{_ 'move-selection'}} a.sidebar-btn.js-archive-selection - i.fa.fa-archive + | ๐Ÿ“ฆ span {{_ 'archive-selection'}} template(name="disambiguateMultiLabelPopup") diff --git a/client/components/swimlanes/miniswimlane.jade b/client/components/swimlanes/miniswimlane.jade index d4be85994..890187795 100644 --- a/client/components/swimlanes/miniswimlane.jade +++ b/client/components/swimlanes/miniswimlane.jade @@ -3,6 +3,6 @@ template(name="miniswimlane") class="minicard-{{colorClass}}") .minicard-title .handle - .fa.fa-arrows + | โ†•๏ธ +viewer = title diff --git a/client/components/swimlanes/swimlaneHeader.jade b/client/components/swimlanes/swimlaneHeader.jade index 109076e45..bd9245e05 100644 --- a/client/components/swimlanes/swimlaneHeader.jade +++ b/client/components/swimlanes/swimlaneHeader.jade @@ -39,9 +39,11 @@ template(name="swimlaneFixedHeader") // i.fa.fa-arrow-down.swimlane-header-collapse-down unless isTouchScreen if isShowDesktopDragHandles - a.swimlane-header-handle.handle.fa.fa-arrows.js-swimlane-header-handle + a.swimlane-header-handle.handle.js-swimlane-header-handle + | โ†•๏ธ if isTouchScreen - a.swimlane-header-miniscreen-handle.handle.fa.fa-arrows.js-swimlane-header-handle + a.swimlane-header-miniscreen-handle.handle.js-swimlane-header-handle + | โ†•๏ธ template(name="editSwimlaneTitleForm") .list-composer diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index b2d83ceac..29d8fb62d 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -60,7 +60,8 @@ template(name="addListForm") option(value="{{_id}}" selected=currentBoard.getLastList.title) {{title}} .edit-controls.clearfix button.primary.confirm(type="submit") {{_ 'save'}} - .fa.fa-times-thin.js-close-inlined-form + .js-close-inlined-form + | โŒ unless currentBoard.isTemplatesBoard unless currentBoard.isTemplateBoard span.quiet