summaryrefslogtreecommitdiffstats
path: root/client/components/boards
diff options
context:
space:
mode:
authorfloatinghotpot <rjfun.mobile@gmail.com>2016-01-08 11:44:20 +0800
committerfloatinghotpot <rjfun.mobile@gmail.com>2016-01-08 11:44:20 +0800
commit470832e798a307a9a8bb5076037fdf508211e08a (patch)
tree005e55f49bedab28b1beb8453802322872534ff7 /client/components/boards
parent1e8368dea53977292a8f49d3bef9032ab068627b (diff)
downloadwekan-470832e798a307a9a8bb5076037fdf508211e08a.tar.gz
wekan-470832e798a307a9a8bb5076037fdf508211e08a.tar.bz2
wekan-470832e798a307a9a8bb5076037fdf508211e08a.zip
Bugfix, and optimize icon for notification
Diffstat (limited to 'client/components/boards')
-rw-r--r--client/components/boards/boardHeader.jade12
-rw-r--r--client/components/boards/boardHeader.js2
2 files changed, 7 insertions, 7 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index ce8999c3..9fc36876 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -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
diff --git a/client/components/boards/boardHeader.js b/client/components/boards/boardHeader.js
index 055b6f27..9ed27406 100644
--- a/client/components/boards/boardHeader.js
+++ b/client/components/boards/boardHeader.js
@@ -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() {