github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 13:37:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #477 from floatinghotpot/bugfix-notification

Browse source 
Bugfix, and optimize icon for notification
This commit is contained in:
Maxime Quandalle 2016-01-08 12:18:59 +01:00
commit 67e7b6a139
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/components/boards/boardHeader.jade
View file

@ -24,10 +24,10 @@ template(name="boardHeaderBar")
i.fa.fa-eye
span {{_ 'watching'}}
if $eq watchLevel "tracking"
i.fa.fa-user
i.fa.fa-bell
span {{_ 'tracking'}}
if $eq watchLevel "muted"
i.fa.fa-times-circle
i.fa.fa-bell-slash
span {{_ 'muted'}}
.board-header-btns.right
@ -50,10 +50,10 @@ template(name="boardHeaderBar")
i.fa.fa-eye
span {{_ 'watching'}}
if $eq watchLevel "tracking"
i.fa.fa-user
i.fa.fa-bell
span {{_ 'tracking'}}
if $eq watchLevel "muted"
i.fa.fa-times-circle
i.fa.fa-bell-slash
span {{_ 'muted'}}
a.board-header-btn.js-open-filter-view(
@ -132,7 +132,7 @@ template(name="boardChangeWatchPopup")
li
with "tracking"
a.js-select-watch
i.fa.fa-user.colorful
i.fa.fa-bell.colorful
| {{_ 'tracking'}}
if watchCheck
i.fa.fa-check
@ -140,7 +140,7 @@ template(name="boardChangeWatchPopup")
li
with "muted"
a.js-select-watch
i.fa.fa-times-circle.colorful
i.fa.fa-bell-slash.colorful
| {{_ 'muted'}}
if watchCheck
i.fa.fa-check

2
client/components/boards/boardHeader.js
View file

@ -43,7 +43,7 @@ Template.boardChangeTitlePopup.events({
BlazeComponent.extendComponent({
watchLevel() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
return currentBoard.getWatchLevel(Meteor.userId());
return currentBoard && currentBoard.getWatchLevel(Meteor.userId());
},
isStarred() {

6
client/components/main/layouts.styl
View file

@ -276,13 +276,13 @@ kbd
.fa.fa-times-thin:before
content: '\00d7';
.fa.fa-globe.colorful
.fa.fa-globe.colorful, .fa.fa-bell.colorful
color: #4caf50
.fa.fa-lock.colorful, .fa.fa-times-circle.colorful
.fa.fa-lock.colorful, .fa.fa-bell-slash.colorful
color: #f44336
.fa.fa-user.colorful, .fa.fa-eye.colorful, .fa.fa-circle.colorful
.fa.fa-eye.colorful
color: #4336f4
.pop-over .pop-over-list li a:not(.disabled):hover

2
client/components/users/userHeader.jade
View file

@ -44,7 +44,7 @@ template(name="editNotificationPopup")
span.sub-name {{_ 'notify-watch'}}
li
a.js-toggle-tag-notify-participate
i.fa.fa-user.colorful
i.fa.fa-bell.colorful
| {{_ 'tracking'}}
if hasTag "notify-participate"
i.fa.fa-check