diff --git a/client/views/app/sideNav/channels.coffee b/client/views/app/sideNav/channels.coffee index 59896c8fe3b..5d5bc4e0163 100644 --- a/client/views/app/sideNav/channels.coffee +++ b/client/views/app/sideNav/channels.coffee @@ -5,9 +5,6 @@ Template.channels.helpers rooms: -> return ChatSubscription.find { t: { $in: ['c']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 } - total: -> - return ChatSubscription.find({ t: { $in: ['c']}, f: { $ne: true } }).count() - Template.channels.events 'click .add-room': (e, instance) -> SideNav.setFlex "createChannelFlex" diff --git a/client/views/app/sideNav/channels.html b/client/views/app/sideNav/channels.html index 804fc9ae3ff..d8dde6a7226 100644 --- a/client/views/app/sideNav/channels.html +++ b/client/views/app/sideNav/channels.html @@ -3,15 +3,12 @@ {{_ "Channels"}} - {{#if total}} - - {{else}} -

{{_ "No_channels_yet" }}

- {{/if}} - + {{_ "More_channels"}} .. diff --git a/client/views/app/sideNav/directMessages.coffee b/client/views/app/sideNav/directMessages.coffee index ae604bae529..f948a98497e 100644 --- a/client/views/app/sideNav/directMessages.coffee +++ b/client/views/app/sideNav/directMessages.coffee @@ -1,5 +1,3 @@ Template.directMessages.helpers rooms: -> return ChatSubscription.find { t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 } - total: -> - return ChatSubscription.find({ t: { $in: ['d']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 }).fetch().length diff --git a/client/views/app/sideNav/directMessages.html b/client/views/app/sideNav/directMessages.html index 68c7afa62bd..2687a550035 100644 --- a/client/views/app/sideNav/directMessages.html +++ b/client/views/app/sideNav/directMessages.html @@ -1,14 +1,13 @@ diff --git a/client/views/app/sideNav/privateGroups.coffee b/client/views/app/sideNav/privateGroups.coffee index d5579a28fcc..a671c809899 100644 --- a/client/views/app/sideNav/privateGroups.coffee +++ b/client/views/app/sideNav/privateGroups.coffee @@ -1,10 +1,9 @@ Template.privateGroups.helpers tRoomMembers: -> return t('Members_placeholder') + rooms: -> return ChatSubscription.find { t: { $in: ['p']}, f: { $ne: true } }, { sort: 't': 1, 'name': 1 } - total: -> - return ChatSubscription.find({ t: { $in: ['p']}, f: { $ne: true } }).count() Template.privateGroups.events 'click .add-room': (e, instance) -> diff --git a/client/views/app/sideNav/privateGroups.html b/client/views/app/sideNav/privateGroups.html index 4d5ac7a340a..0574bf7c08f 100644 --- a/client/views/app/sideNav/privateGroups.html +++ b/client/views/app/sideNav/privateGroups.html @@ -3,15 +3,11 @@ {{_ "Private_Groups"}} - {{#if total}} - - {{else}} -

{{_ "No_groups_yet" }}

- {{/if}} - - +