From 885de88d35f0fa653ccf18f098acc4d8b01d0328 Mon Sep 17 00:00:00 2001 From: "John R. Supplee" Date: Fri, 1 Jan 2021 01:04:53 +0200 Subject: [PATCH] more my cards * add user menu entry (needs icon) * format list * add new translation slugs to English and Arabic --- client/components/cards/checklists.js | 4 ++-- client/components/main/myCards.jade | 10 +++++----- client/components/main/myCards.styl | 6 +++++- client/components/users/userHeader.jade | 4 ++++ client/components/users/userHeader.js | 3 +++ i18n/ar.i18n.json | 8 ++++++-- i18n/en.i18n.json | 6 +++++- 7 files changed, 30 insertions(+), 11 deletions(-) diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index 04ededceb..164753354 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -224,11 +224,11 @@ Template.checklists.helpers({ }); Template.addChecklistItemForm.onRendered(() => { - autosize($('textarea.js-add-checklist-item')) + autosize($('textarea.js-add-checklist-item')); }); Template.editChecklistItemForm.onRendered(() => { - autosize($('textarea.js-edit-checklist-item')) + autosize($('textarea.js-edit-checklist-item')); }); Template.checklistDeleteDialog.onCreated(() => { diff --git a/client/components/main/myCards.jade b/client/components/main/myCards.jade index 58252b485..e7405822e 100644 --- a/client/components/main/myCards.jade +++ b/client/components/main/myCards.jade @@ -11,19 +11,19 @@ template(name="myCardsModalTitle") template(name="myCards") .wrapper - h2 User Id - p= userId - //p= query.assignees - h1 My Cards each board in cardsFind .board-title + | {{_ 'board' }}: = board.title each swimlane in board.swimlanes .swimlane-title + | {{_ 'swimlane' }}: = swimlane.title each list in swimlane.lists .list-title + | {{_ 'list' }}: = list.title each card in list.cards - .card-details-title + .card-title + | {{_ 'card' }}: = card.title diff --git a/client/components/main/myCards.styl b/client/components/main/myCards.styl index 3dd7da74a..72b402391 100644 --- a/client/components/main/myCards.styl +++ b/client/components/main/myCards.styl @@ -32,4 +32,8 @@ .list-title margin-top: 5px font-weight: bold - margin-left: 2em + margin-left: 1.6em + +.card-title + margin-top: 5px + margin-left: 1.8em diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index d0adf29d2..b6c15125e 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -13,6 +13,10 @@ template(name="headerUserBar") template(name="memberMenuPopup") ul.pop-over-list with currentUser + li + a.js-my-cards(href="{{pathFor 'my-cards'}}") + i.fa.fa-user + | {{_ 'my-cards'}} li a.js-edit-profile i.fa.fa-user diff --git a/client/components/users/userHeader.js b/client/components/users/userHeader.js index af554d9f5..8d0fc6176 100644 --- a/client/components/users/userHeader.js +++ b/client/components/users/userHeader.js @@ -25,6 +25,9 @@ Template.memberMenuPopup.helpers({ }); Template.memberMenuPopup.events({ + 'click .js-my-cards'() { + Popup.close(); + }, 'click .js-edit-profile': Popup.open('editProfile'), 'click .js-change-settings': Popup.open('changeSettings'), 'click .js-change-avatar': Popup.open('changeAvatar'), diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 4e6b2d079..3a883e8c4 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -137,6 +137,7 @@ "boardChangeWatchPopup-title": "تغيير المتابعة", "boardMenuPopup-title": "Board Settings", "boardChangeViewPopup-title": "عرض اللوحات", + "board": "لوحة", "boards": "لوحات", "board-view": "عرض اللوحات", "board-view-cal": "التقويم", @@ -148,6 +149,7 @@ "cancel": "إلغاء", "card-archived": "البطاقة منقولة الى الارشيف", "board-archived": "اللوحات منقولة الى الارشيف", + "card": "نطاقة", "card-comments-title": "%s تعليقات لهذه البطاقة", "card-delete-notice": "هذا حذف أبديّ . سوف تفقد كل الإجراءات المنوطة بهذه البطاقة", "card-delete-pop": "سيتم إزالة جميع الإجراءات من تبعات النشاط، وأنك لن تكون قادرا على إعادة فتح البطاقة. لا يوجد التراجع.", @@ -403,6 +405,7 @@ "leave-board-pop": "Are you sure you want to leave __boardTitle__? You will be removed from all cards on this board.", "leaveBoardPopup-title": "مغادرة اللوحة ؟", "link-card": "ربط هذه البطاقة", + "list": "قائمة", "list-archive-cards": "Move all cards in this list to Archive", "list-archive-cards-pop": "This will remove all the cards in this list from the board. To view cards in Archive and bring them back to the board, click “Menu” > “Archive”.", "list-move-cards": "نقل بطاقات هذه القائمة", @@ -827,7 +830,7 @@ "saturday": "Saturday", "sunday": "Sunday", "status": "Status", - "swimlane": "Swimlane", + "swimlane": "خط السباحة", "owner": "Owner", "last-modified-at": "Last modified at", "last-activity": "Last activity", @@ -844,5 +847,6 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "بطاقاتي" } diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 9fbb4ed34..e96bbb3cb 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -844,5 +844,9 @@ "displayName": "Display Name", "shortName": "Short Name", "website": "Website", - "person": "Person" + "person": "Person", + "my-cards": "My Cards", + "card": "Card", + "list": "List", + "board": "Board" }