Merge branch 'master' into ical

2013-02-16 16:20:34 -05:00
parent 6348819ba5 78d0519b95
commit 29fecb36c8
4 changed files with 9 additions and 2 deletions
@@ -156,6 +156,7 @@ setupGrowlNotifications = (model) ->
    #don't show notifications if user dead
    return if user.get('stats.lvl') == 0
    $.bootstrapGrowl html,
+      ele: '#notification-area',
      type: type # (null, 'info', 'error', 'success')
      top_offset: 20
      align: 'right' # ('left', 'right', or 'center')