diff --git a/packages/rocketchat-lib/settings/server/publication.coffee b/packages/rocketchat-lib/settings/server/publication.coffee index 92dab9b981a..d8577ba6a8b 100644 --- a/packages/rocketchat-lib/settings/server/publication.coffee +++ b/packages/rocketchat-lib/settings/server/publication.coffee @@ -1,6 +1,13 @@ -Meteor.publish 'settings', -> +Meteor.publish 'settings', (ids = []) -> console.log '[publish] settings'.green - return Settings.find { public: true }, { fields: _id: 1, value: 1 } + filter = + public: true + + if ids.length > 0 + filter._id = + $in: ids + + return Settings.find filter, { fields: _id: 1, value: 1 } Meteor.publish 'admin-settings', -> console.log '[publish] admin-settings'.green diff --git a/packages/rocketchat-livechat/app/client/lib/collections.coffee b/packages/rocketchat-livechat/app/client/lib/collections.coffee index 0d898f513dc..48b9e6fcd37 100644 --- a/packages/rocketchat-livechat/app/client/lib/collections.coffee +++ b/packages/rocketchat-livechat/app/client/lib/collections.coffee @@ -1,2 +1,3 @@ @ChatMessage = new Meteor.Collection null @ChatRoom = new Meteor.Collection 'rocketchat_room' +@Settings = new Meteor.Collection 'rocketchat_settings' diff --git a/packages/rocketchat-livechat/app/client/stylesheets/main.less b/packages/rocketchat-livechat/app/client/stylesheets/main.less index 22398ff6c29..c43ea669f2b 100644 --- a/packages/rocketchat-livechat/app/client/stylesheets/main.less +++ b/packages/rocketchat-livechat/app/client/stylesheets/main.less @@ -45,7 +45,6 @@ input:focus { top: 0; bottom: 0; .title { - background-color: #C1272D; border-top-right-radius: 5px; border-top-left-radius: 5px; color: #FFF; diff --git a/packages/rocketchat-livechat/app/client/views/room.coffee b/packages/rocketchat-livechat/app/client/views/room.coffee index 897072d5e27..4a856e8cc01 100644 --- a/packages/rocketchat-livechat/app/client/views/room.coffee +++ b/packages/rocketchat-livechat/app/client/views/room.coffee @@ -2,6 +2,14 @@ Template.room.helpers messages: -> return ChatMessage.find { rid: visitor.getRoom(), t: { '$ne': 't' } }, { sort: { ts: 1 } } + title: -> + return '' unless Template.instance().subscriptionsReady() + return Settings.findOne('Livechat_title')?.value or 'Rocket.Chat' + + color: -> + return 'transparent' unless Template.instance().subscriptionsReady() + return Settings.findOne('Livechat_title_color')?.value or '#C1272D' + Template.room.events 'keyup .input-message': (event) -> Template.instance().chatMessages.keyup(visitor.getRoom(), event, Template.instance()) @@ -28,6 +36,8 @@ Template.room.onCreated -> visitor.setRoom room._id RoomHistoryManager.getMoreIfIsEmpty room._id + self.subscribe 'settings', ['Livechat_title', 'Livechat_title_color'] + self.atBottom = true Template.room.onRendered -> diff --git a/packages/rocketchat-livechat/app/client/views/room.html b/packages/rocketchat-livechat/app/client/views/room.html index 89b8dfc09e6..4edc9dce073 100644 --- a/packages/rocketchat-livechat/app/client/views/room.html +++ b/packages/rocketchat-livechat/app/client/views/room.html @@ -1,7 +1,7 @@