From aa1876f94c71d252d427f298e9b37c87f2fe4127 Mon Sep 17 00:00:00 2001
From: nztqa <nztqa@users.noreply.github.com>
Date: Thu, 28 Sep 2017 16:57:04 +0900
Subject: Add message from service administrator

---
 client/components/main/header.jade |  7 +++++++
 client/components/main/header.js   | 14 ++++++++++++++
 client/components/main/header.styl |  1 +
 3 files changed, 22 insertions(+)

(limited to 'client/components/main')

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..3b724651 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 notice =  Notices.findOne();
+    return notice && notice.enabled;
+  },
+
+  announcement() {
+    $('.announcement').show();
+    const notice =  Notices.findOne();
+    return notice && notice.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
-- 
cgit v1.2.3-1-g7c22


From a88ac6113e5f7f428d0f021bbcb213cc517c177e Mon Sep 17 00:00:00 2001
From: nztqa <nztqa@users.noreply.github.com>
Date: Sun, 1 Oct 2017 12:43:15 +0900
Subject: Rename notice -> announcement

---
 client/components/main/header.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'client/components/main')

diff --git a/client/components/main/header.js b/client/components/main/header.js
index 3b724651..c8f415df 100644
--- a/client/components/main/header.js
+++ b/client/components/main/header.js
@@ -12,14 +12,14 @@ Template.header.helpers({
   },
 
   hasAnnouncement() {
-    const notice =  Notices.findOne();
-    return notice && notice.enabled;
+    const announcements =  Announcements.findOne();
+    return announcements && announcements.enabled;
   },
 
   announcement() {
     $('.announcement').show();
-    const notice =  Notices.findOne();
-    return notice && notice.body;
+    const announcements =  Announcements.findOne();
+    return announcements && announcements.body;
   },
 });
 
-- 
cgit v1.2.3-1-g7c22