diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:59:57 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-10-01 09:59:57 +0300 |
| commit | d213d37dabe352ededa836ce947b11279704e828 (patch) | |
| tree | 4d454adf0f80032439ba5f20dc3775d499a1a11d /client/components/main | |
| parent | a003161fa74a52f8567be6238d6890a88d091d54 (diff) | |
| parent | a88ac6113e5f7f428d0f021bbcb213cc517c177e (diff) | |
| download | wekan-d213d37dabe352ededa836ce947b11279704e828.tar.gz wekan-d213d37dabe352ededa836ce947b11279704e828.tar.bz2 wekan-d213d37dabe352ededa836ce947b11279704e828.zip | |
Merge branch 'improve-announcement' of https://github.com/nztqa/wekan into nztqa-improve-announcement
Diffstat (limited to 'client/components/main')
| -rw-r--r-- | client/components/main/header.jade | 7 | ||||
| -rw-r--r-- | client/components/main/header.js | 14 | ||||
| -rw-r--r-- | client/components/main/header.styl | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/client/components/main/header.jade b/client/components/main/header.jade index bd0af880..613dd736 100644 --- a/client/components/main/header.jade +++ b/client/components/main/header.jade @@ -49,6 +49,13 @@ template(name="header") if appIsOffline +offlineWarning + if hasAnnouncement + .announcement + p + i.fa.fa-bullhorn + | #{announcement} + i.fa.fa-times-circle.js-close-announcement + template(name="offlineWarning") .offline-warning p diff --git a/client/components/main/header.js b/client/components/main/header.js index 49acbfef..c8f415df 100644 --- a/client/components/main/header.js +++ b/client/components/main/header.js @@ -10,8 +10,22 @@ Template.header.helpers({ appIsOffline() { return !Meteor.status().connected; }, + + hasAnnouncement() { + const announcements = Announcements.findOne(); + return announcements && announcements.enabled; + }, + + announcement() { + $('.announcement').show(); + const announcements = Announcements.findOne(); + return announcements && announcements.body; + }, }); Template.header.events({ 'click .js-create-board': Popup.open('headerBarCreateBoard'), + 'click .js-close-announcement'() { + $('.announcement').hide(); + }, }); diff --git a/client/components/main/header.styl b/client/components/main/header.styl index 0e35d38a..191e8893 100644 --- a/client/components/main/header.styl +++ b/client/components/main/header.styl @@ -197,6 +197,7 @@ li height: 28px +.announcement, .offline-warning width: 100% text-align: center |