Final touches

pull/1021/head
Marcelo Schmidt 10 years ago
parent 17136926c4
commit 8e554e4af9
  1. 3
      client/stylesheets/utils/_colors.import.less
  2. 4
      packages/rocketchat-message-star/client/actionButton.coffee
  3. 2
      packages/rocketchat-message-star/client/tabBar.coffee
  4. 3
      packages/rocketchat-message-star/client/views/starredMessages.coffee
  5. 12
      packages/rocketchat-message-star/client/views/starredMessages.html
  6. 8
      packages/rocketchat-message-star/client/views/stylesheets/messagestar.less
  7. 5
      packages/rocketchat-message-star/i18n/en.i18n.json
  8. 5
      packages/rocketchat-message-star/i18n/pt.i18n.json
  9. 27
      packages/rocketchat-message-star/package.js
  10. 2
      packages/rocketchat-message-star/server/settings.coffee

@ -1,5 +1,6 @@
.custom-scroll(@background, @thumb, @width: 8px) {
.custom-scroll(@background, @thumb, @width: 8px, @height: 8px) {
&::-webkit-scrollbar {
height: @height;
width: @width;
background: @background;
}

@ -2,7 +2,7 @@ Meteor.startup ->
RocketChat.MessageAction.addButton
id: 'star-message'
icon: 'icon-star-empty'
i18nLabel: 'rocketchat-message-star:Star_Message'
i18nLabel: 'Star_Message'
action: (event, instance) ->
message = @_arguments[1]
message.starred = Meteor.userId()
@ -16,7 +16,7 @@ Meteor.startup ->
RocketChat.MessageAction.addButton
id: 'unstar-message'
icon: 'icon-star'
i18nLabel: 'rocketchat-message-star:Unstar_Message'
i18nLabel: 'Unstar_Message'
action: (event, instance) ->
message = @_arguments[1]
message.starred = false

@ -1,5 +1,5 @@
Meteor.startup ->
RocketChat.callbacks.add 'enter-room', ->
console.log 'adding tabbar'
RocketChat.TabBar.addButton({ id: 'starred-messages', i18nTitle: 'rocketchat-message-star:Starred_Messages', icon: 'icon-star', template: 'starredMessages', order: 3 })
RocketChat.TabBar.addButton({ id: 'starred-messages', i18nTitle: 'Starred_Messages', icon: 'icon-star', template: 'starredMessages', order: 3 })
, RocketChat.callbacks.priority.MEDIUM, 'enter-room-tabbar-star'

@ -1,4 +1,7 @@
Template.starredMessages.helpers
hasMessages: ->
return StarredMessage.find({ rid: Session.get 'openedRoom' }, { sort: { ts: -1 } }).count() > 0
messages: ->
return StarredMessage.find { rid: Session.get 'openedRoom' }, { sort: { ts: -1 } }

@ -6,9 +6,15 @@
</div>
<ul class="starred-messages-list scrollable">
{{#if Template.subscriptionsReady}}
{{#each messages}}
{{#nrr nrrargs 'message' .}}{{/nrr}}
{{/each}}
{{#if hasMessages}}
{{#each messages}}
{{#nrr nrrargs 'message' .}}{{/nrr}}
{{/each}}
{{else}}
<li class="empty">
{{_ "No_starred_messages"}}
</li>
{{/if}}
{{else}}
{{> loading}}
{{/if}}

@ -1,5 +1,5 @@
.starred-messages-list {
margin-top: 30px;
padding: 30px 0;
.message-cog, .starred-messages-list .message-dropdown {
display: none;
@ -15,4 +15,10 @@
display: none;
}
}
li.empty {
color: #7f7f7f;
text-align: center;
margin-top: 60px;
}
}

@ -2,5 +2,6 @@
"Message_AllowStarring" : "Allow Message Starring",
"Star_Message": "Star Message",
"Unstar_Message": "Remove Star",
"Starred_Messages": "Starred Messages"
}
"Starred_Messages": "Starred Messages",
"No_starred_messages": "No starred messages"
}

@ -2,5 +2,6 @@
"Message_AllowStarring" : "Permitir Mensagens Favoritas",
"Star_Message": "Favoritar Message",
"Unstar_Message": "Remover Favorito",
"Stars": "Mensagens Favoritas"
}
"No_starred_messages": "Não há mensagens favoritas",
"Starred_Messages": "Mensagens Favoritas"
}

@ -10,23 +10,10 @@ Package.onUse(function(api) {
api.use([
'coffeescript',
'less',
'less@2.5.0',
'rocketchat:lib@0.0.1'
]);
// TAPi18n
api.use('templating', 'client');
var _ = Npm.require('underscore');
var fs = Npm.require('fs');
tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-message-star/i18n'), function(filename) {
if (fs.statSync('packages/rocketchat-message-star/i18n/' + filename).size > 16) {
return 'i18n/' + filename;
}
}));
api.use(["tap:i18n@1.5.1"], ["client", "server"]);
api.imply('tap:i18n');
api.addFiles("package-tap.i18n", ["client", "server"]);
api.addFiles([
'client/lib/StarredMessage.coffee',
'client/actionButton.coffee',
@ -44,7 +31,17 @@ Package.onUse(function(api) {
'server/startup/indexes.coffee'
], 'server');
// TAPi18n -- needs to be added last
// TAPi18n
api.use('templating', 'client');
var _ = Npm.require('underscore');
var fs = Npm.require('fs');
tapi18nFiles = _.compact(_.map(fs.readdirSync('packages/rocketchat-message-star/i18n'), function(filename) {
if (fs.statSync('packages/rocketchat-message-star/i18n/' + filename).size > 16) {
return 'i18n/' + filename;
}
}));
api.use(["tap:i18n@1.5.1"], ["client", "server"]);
api.imply('tap:i18n');
api.addFiles(tapi18nFiles, ["client", "server"]);
});

@ -1,2 +1,2 @@
Meteor.startup ->
RocketChat.settings.add 'Message_AllowStarring', true, { type: 'boolean', group: 'Message', public: true, i18nLabel: "rocketchat-message-star:Message_AllowStarring" }
RocketChat.settings.add 'Message_AllowStarring', true, { type: 'boolean', group: 'Message', public: true }

Loading…
Cancel
Save