Skip to content

Commit

Permalink
save
Browse files Browse the repository at this point in the history
  • Loading branch information
Mumu Des Bois authored and thmslmr committed Jun 22, 2016
1 parent 7448ba3 commit bfcd7b7
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 6 deletions.
8 changes: 5 additions & 3 deletions client/animation/animation.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Template.inbox.uihooks({
wrapper = $(node).children('.wrapper2-animation');
wrapper.velocity('transition.slideLeftBigIn',{
duration: 500,

})
}else{
$(node).velocity('transition.slideLeftBigIn',{
Expand Down Expand Up @@ -56,7 +56,8 @@ Template.conversation.uihooks({
$(node).insertBefore(next);
wrapper = $(node).children('.wrapper-animation');
wrapper.velocity('transition.slideLeftBigIn',{
duration: 500
duration: 500,
display: 'flex'
});
},

Expand All @@ -81,7 +82,8 @@ Template.profile.uihooks({
insert: function(node, next, tp1) {
$(node).insertBefore(next);
$(node).velocity('transition.slideDownBigIn',{
duration: 500
duration: 500,
display : 'flex'
});
},

Expand Down
5 changes: 3 additions & 2 deletions client/controllers/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ registerHelper = {

n = _.flattenDeep(notices);
sort = _.sortBy(n, function(el){

return el.createdAt;
})
m = _.meanBy( n , function(el) { return el.grade; });
Expand All @@ -59,7 +59,8 @@ registerHelper = {
array : _.reverse(sort),
nb : n.length,
percent : round * 100 / 5 || 100,
average :round || '5'
average :round || '5',
noNotices : n.length == 0
};
},
userService : function(id){
Expand Down
3 changes: 3 additions & 0 deletions client/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,9 @@ Template.index.events({
},
'click .icon-menu' : function(){
$('.menu, .icon-menu').toggleClass('menu--open');
},
'click .menu a' : function(){
$('.menu, .icon-menu').removeClass('menu--open');
}
});

Expand Down
10 changes: 9 additions & 1 deletion client/controllers/profile.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ Template.profile.helpers({
return {
percent: this.grade*100/5
}
}
},

'nolessons' : function(){
return Lessons.find({
'private.owner' : this._id,
}).count() == 0

},


});

0 comments on commit bfcd7b7

Please sign in to comment.