Rename notice -> announcement

This commit is contained in:
nztqa 2017-10-01 12:43:15 +09:00
parent aa1876f94c
commit a88ac6113e
9 changed files with 39 additions and 39 deletions

View file

@ -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;
},
});

View file

@ -15,7 +15,7 @@ template(name="setting")
li
a.js-setting-menu(data-id="account-setting") {{_ 'accounts'}}
li
a.js-setting-menu(data-id="notice-setting") {{_ 'admin-notice'}}
a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
.main-body
if loading.get
+spinner
@ -25,8 +25,8 @@ template(name="setting")
+email
else if accountSetting.get
+accountSettings
else if noticeSetting.get
+administratorNoticeSettings
else if announcementSetting.get
+announcementSettings
template(name="general")
ul#registration-setting.setting-detail
@ -101,18 +101,18 @@ template(name='accountSettings')
li
button.js-accounts-save.primary {{_ 'save'}}
template(name='administratorNoticeSettings')
ul#notice-setting.setting-detail
template(name='announcementSettings')
ul#announcement-setting.setting-detail
li
a.flex.js-toggle-activemessage
.materialCheckBox(class="{{#if currentSetting.enabled}}is-checked{{/if}}")
span {{_ 'admin-notice-active'}}
span {{_ 'admin-announcement-active'}}
li
.admin-notice(class="{{#if currentSetting.enabled}}{{else}}hide{{/if}}")
.admin-announcement(class="{{#if currentSetting.enabled}}{{else}}hide{{/if}}")
ul
li
.title {{_ 'admin-notice-title'}}
textarea#admin-notice.form-control= currentSetting.body
.title {{_ 'admin-announcement-title'}}
textarea#admin-announcement.form-control= currentSetting.body
li
button.js-notice-save.primary {{_ 'save'}}
button.js-announcement-save.primary {{_ 'save'}}

View file

@ -1,7 +1,7 @@
Meteor.subscribe('setting');
Meteor.subscribe('mailServer');
Meteor.subscribe('accountSettings');
Meteor.subscribe('notices');
Meteor.subscribe('announcements');
BlazeComponent.extendComponent({
onCreated() {
@ -10,7 +10,7 @@ BlazeComponent.extendComponent({
this.generalSetting = new ReactiveVar(true);
this.emailSetting = new ReactiveVar(false);
this.accountSetting = new ReactiveVar(false);
this.noticeSetting = new ReactiveVar(false);
this.announcementSetting = new ReactiveVar(false);
},
setError(error) {
@ -67,7 +67,7 @@ BlazeComponent.extendComponent({
this.generalSetting.set('registration-setting' === targetID);
this.emailSetting.set('email-setting' === targetID);
this.accountSetting.set('account-setting' === targetID);
this.noticeSetting.set('notice-setting' === targetID);
this.announcementSetting.set('announcement-setting' === targetID);
}
},
@ -166,12 +166,12 @@ BlazeComponent.extendComponent({
},
currentSetting(){
return Notices.findOne();
return Announcements.findOne();
},
saveMessage() {
const message = $('#admin-notice').val().trim();
Notices.update(Notices.findOne()._id, {
const message = $('#admin-announcement').val().trim();
Announcements.update(Announcements.findOne()._id, {
$set: { 'body': message },
});
},
@ -179,21 +179,21 @@ BlazeComponent.extendComponent({
toggleActive(){
this.setLoading(true);
const isActive = this.currentSetting().enabled;
Notices.update(Notices.findOne()._id, {
Announcements.update(Announcements.findOne()._id, {
$set:{ 'enabled': !isActive},
});
this.setLoading(false);
if(isActive){
$('.admin-notice').slideUp();
$('.admin-announcement').slideUp();
}else{
$('.admin-notice').slideDown();
$('.admin-announcement').slideDown();
}
},
events() {
return [{
'click a.js-toggle-activemessage': this.toggleActive,
'click button.js-notice-save': this.saveMessage,
'click button.js-announcement-save': this.saveMessage,
}];
},
}).register('administratorNoticeSettings');
}).register('announcementSettings');

View file

@ -65,7 +65,7 @@
span
padding: 0 0.5rem
.admin-notice,
.admin-announcement,
.invite-people
padding-left 20px;
li