mirror of
https://github.com/wekan/wekan.git
synced 2026-01-17 23:15:28 +01:00
Number of cards per list and sum of custom number field in list head.
Thanks to xet7 ! Fixes #3796
This commit is contained in:
parent
4292302c3c
commit
e569c2957e
29 changed files with 239 additions and 142 deletions
|
|
@ -20,10 +20,10 @@
|
|||
height: 3vw;
|
||||
}
|
||||
#notifications-drawer .notification .read-status .activity-type {
|
||||
margin: 2vh 0 0;
|
||||
width: 2.2vw;
|
||||
height: 2.2vw;
|
||||
font-size: clamp(14px, 2.5vw, 17px);
|
||||
margin: 8px 0 0;
|
||||
width: 1.2em;
|
||||
height: 1.2em;
|
||||
font-size: clamp(14px, 2vw, 17px);
|
||||
display: block;
|
||||
color: #bbb;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ template(name='notification')
|
|||
+activity(activity=activityData mode='none')
|
||||
if read
|
||||
.remove
|
||||
a.fa.fa-trash
|
||||
a(title="{{_ 'delete'}}") 🗑️
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
template(name='notificationIcon')
|
||||
if($in activityType 'deleteAttachment' 'addAttachment')
|
||||
i.fa.fa-paperclip.activity-type(title="attachment")
|
||||
span.activity-type(title="attachment") 📎
|
||||
else if($in activityType 'createBoard' 'importBoard')
|
||||
i.fa.fa-chalkboard.activity-type(title="board")
|
||||
span.activity-type(title="board") 🗂️
|
||||
|
||||
else if($in activityType 'createCard' 'importCard' 'moveCard')
|
||||
+cardNotificationIcon
|
||||
|
|
@ -19,17 +19,17 @@ template(name='notificationIcon')
|
|||
//- DRY and consistant
|
||||
|
||||
else if($in activityType 'checkedItem' 'uncheckedItem' 'addChecklistItem' 'removedChecklistItem')
|
||||
i.fa.fa-check-square.activity-type(title="checklist item")
|
||||
span.activity-type(title="checklist item") ☑️
|
||||
else if($in activityType 'addComment')
|
||||
i.fa.fa-comment-o.activity-type(title="comment")
|
||||
span.activity-type(title="comment") 💬
|
||||
else if($in activityType 'createCustomField' 'setCustomField' 'unsetCustomField')
|
||||
i.fa.fa-code.activity-type(title="custom field")
|
||||
span.activity-type(title="custom field") 🧩
|
||||
else if($in activityType 'addedLabel' 'removedLabel')
|
||||
i.fa.fa-tag.activity-type(title="label")
|
||||
span.activity-type(title="label") 🏷️
|
||||
else if($in activityType 'a-startAt' 'a-receivedAt')
|
||||
i.fa.fa-clock-o.activity-type(title="date")
|
||||
span.activity-type(title="date") ⏰
|
||||
else if($in activityType 'a-dueAt' 'a-endAt')
|
||||
i.fa.fa-clock-o.activity-type(title="date")
|
||||
span.activity-type(title="date") ⏰
|
||||
|
||||
else if($in activityType 'createList' 'removeList' 'archivedList')
|
||||
+listNotificationIcon
|
||||
|
|
@ -41,17 +41,17 @@ template(name='notificationIcon')
|
|||
//- elswhere in the app we use fa-trello to indicate lists...
|
||||
//- i personally like fa-columns a bit better
|
||||
else if($in activityType 'unjoinMember' 'addBoardMember' 'joinMember' 'removeBoardMember')
|
||||
i.fa.fa-user.activity-type(title="member")
|
||||
span.activity-type(title="member") 👤
|
||||
else if($in activityType 'createSwimlane' 'archivedSwimlane')
|
||||
i.fa.fa-th-large.activity-type(title="swimlane")
|
||||
span.activity-type(title="swimlane") 🧭
|
||||
else
|
||||
i.fa.fa-bug.activity-type(title="can't find icon for #{activityType}")
|
||||
span.activity-type(title="can't find icon for #{activityType}") 🐞
|
||||
|
||||
template(name='cardNotificationIcon')
|
||||
i.fa.fa-clone.activity-type(title="card")
|
||||
span.activity-type(title="card") 🗒️
|
||||
|
||||
template(name='checklistNotificationIcon')
|
||||
i.fa.fa-list.activity-type(title="checklist")
|
||||
span.activity-type(title="checklist") 📝
|
||||
|
||||
template(name='listNotificationIcon')
|
||||
i.fa.fa-columns.activity-type(title="list")
|
||||
span.activity-type(title="list") 📋
|
||||
|
|
|
|||
|
|
@ -55,9 +55,6 @@ section#notifications-drawer .remove-read {
|
|||
section#notifications-drawer .remove-read:hover {
|
||||
color: #eb4646 !important;
|
||||
}
|
||||
section#notifications-drawer .remove-read:hover i.fa {
|
||||
color: inherit;
|
||||
}
|
||||
section#notifications-drawer ul.notifications {
|
||||
display: block;
|
||||
padding: 0px 16px 0px 16px;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ template(name='notificationsDrawer')
|
|||
h5 {{_ 'notifications'}}
|
||||
if($gt unreadNotifications 0)
|
||||
|(#{unreadNotifications})
|
||||
a.fa.fa-times-thin.close
|
||||
a.close ❌
|
||||
ul.notifications
|
||||
each transformedProfile.notifications
|
||||
+notification(activityData=activityObj index=dbIndex read=read)
|
||||
|
|
@ -16,5 +16,5 @@ template(name='notificationsDrawer')
|
|||
a.all-read {{_ 'mark-all-as-read'}}
|
||||
if ($and ($.Session.get 'showReadNotifications') ($gt readNotifications 0))
|
||||
a.remove-read
|
||||
i.fa.fa-trash
|
||||
| 🗑️
|
||||
| {{_ 'remove-all-read'}}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue