From d54bd804e47a83286a87950c223c5598d3ff84c8 Mon Sep 17 00:00:00 2001
From: David Burles <dburles@gmail.com>
Date: Mon, 15 Sep 2014 12:42:17 +1000
Subject: [PATCH] added incoming posts notification button

---
 client/helpers/handlebars.js                |  5 +++++
 client/views/posts/posts_digest.html        |  3 +++
 client/views/posts/posts_digest.js          |  4 ++++
 client/views/posts/posts_list.html          |  9 +++++----
 client/views/posts/posts_list.js            |  9 ++++++++-
 client/views/posts/posts_list_incoming.html |  9 +++++++++
 client/views/posts/posts_list_incoming.js   |  5 +++++
 lib/router.js                               | 22 ++++++++++++++++++---
 8 files changed, 58 insertions(+), 8 deletions(-)
 create mode 100644 client/views/posts/posts_list_incoming.html
 create mode 100644 client/views/posts/posts_list_incoming.js

diff --git a/client/helpers/handlebars.js b/client/helpers/handlebars.js
index 25739ab84..4593061c1 100644
--- a/client/helpers/handlebars.js
+++ b/client/helpers/handlebars.js
@@ -67,4 +67,9 @@ UI.registerHelper("sanitize", function(content) {
   console.log('cleaning up…')
   console.log(content)
   return cleanUp(content);
+});
+
+UI.registerHelper('pluralize', function(count, string) {
+  string = count === 1 ? string : string + 's';
+  return i18n.t(string);
 });
\ No newline at end of file
diff --git a/client/views/posts/posts_digest.html b/client/views/posts/posts_digest.html
index 1101b29ed..f2a9dec35 100644
--- a/client/views/posts/posts_digest.html
+++ b/client/views/posts/posts_digest.html
@@ -11,6 +11,9 @@
     {{/if}}
     </div>
   </div>
+  
+  {{> postsListIncoming count=postsIncoming.count}}
+
   {{#if hasPosts}}
     <div class="posts grid list">
       {{#each posts}}
diff --git a/client/views/posts/posts_digest.js b/client/views/posts/posts_digest.js
index 58dd76ee7..1a45c67f0 100644
--- a/client/views/posts/posts_digest.js
+++ b/client/views/posts/posts_digest.js
@@ -60,3 +60,7 @@ Template[getTemplate('posts_digest')].rendered = function(){
   $('body').css('min-height',distanceFromTop+160);
   $('.more-button').css('top', distanceFromTop+"px");  
 }
+
+Template[getTemplate('posts_digest')].created = function() {
+  Session.set('listPopulatedAt', new Date());
+};
\ No newline at end of file
diff --git a/client/views/posts/posts_list.html b/client/views/posts/posts_list.html
index 48bf25cd1..f84b60466 100644
--- a/client/views/posts/posts_list.html
+++ b/client/views/posts/posts_list.html
@@ -1,9 +1,10 @@
 <template name="posts_list">
+  {{> postsListIncoming count=postsListIncoming.count}}
   <div class="posts-wrapper grid grid-module">
-  	<div class="posts list">
-  		{{#each posts}}
-  			{{> UI.dynamic template=post_item}}
-  		{{/each}}
+    <div class="posts list">
+      {{#each posts}}
+        {{> UI.dynamic template=post_item}}
+      {{/each}}
     </div>
   </div>
   {{> UI.dynamic template=postsLoadMore}}
diff --git a/client/views/posts/posts_list.js b/client/views/posts/posts_list.js
index 581f6033d..67b89cf31 100644
--- a/client/views/posts/posts_list.js
+++ b/client/views/posts/posts_list.js
@@ -14,5 +14,12 @@ Template[getTemplate('posts_list')].helpers({
   },
   postsLoadMore: function () {
     return getTemplate('postsLoadMore');
+  },
+  postsIncoming: function () {
+    return getTemplate('postsIncoming');
   }
-});
\ No newline at end of file
+});
+
+Template[getTemplate('posts_list')].created = function() {
+  Session.set('listPopulatedAt', new Date());
+};
\ No newline at end of file
diff --git a/client/views/posts/posts_list_incoming.html b/client/views/posts/posts_list_incoming.html
new file mode 100644
index 000000000..9cfcea21f
--- /dev/null
+++ b/client/views/posts/posts_list_incoming.html
@@ -0,0 +1,9 @@
+<template name="postsListIncoming">
+  {{#if count}}
+    <a class="more-button show-new grid-module" href="">
+      <span>
+        {{i18n "View"}} {{count}} {{i18n "new"}} {{pluralize count "post"}}
+      </span>
+    </a>
+  {{/if}}
+</template>
\ No newline at end of file
diff --git a/client/views/posts/posts_list_incoming.js b/client/views/posts/posts_list_incoming.js
new file mode 100644
index 000000000..f8f337812
--- /dev/null
+++ b/client/views/posts/posts_list_incoming.js
@@ -0,0 +1,5 @@
+Template[getTemplate('postsListIncoming')].events({
+  'click .show-new': function(e, instance) {
+    Session.set('listPopulatedAt', new Date());
+  }
+});
\ No newline at end of file
diff --git a/lib/router.js b/lib/router.js
index 47a208e14..2624b8e44 100644
--- a/lib/router.js
+++ b/lib/router.js
@@ -308,12 +308,19 @@ PostsListController = FastRender.RouteController.extend({
     }
 
     var parameters = getParameters(this._terms),
-        posts = Posts.find(parameters.find, parameters.options);
-        postsCount = posts.count();
+      postsCount = Posts.find(parameters.find, parameters.options).count();
+
+    parameters.find.createdAt = { $lte: Session.get('listPopulatedAt') };
+    var posts = Posts.find(parameters.find, parameters.options);
+    
+    // Incoming posts
+    parameters.find.createdAt = { $gt: Session.get('listPopulatedAt') };
+    var postsIncoming = Posts.find(parameters.find, parameters.options);
 
     Session.set('postsLimit', this._terms.limit);
 
     return {
+      postsListIncoming: postsIncoming,
       postsList: posts,
       postsCount: postsCount,
       ready: this.postsListSub.ready
@@ -366,8 +373,17 @@ PostsDigestController = FastRender.RouteController.extend({
         },
         parameters = getParameters(terms);
     Session.set('currentDate', currentDate);
+
+    parameters.find.createdAt = { $lte: Session.get('listPopulatedAt') };
+    var posts = Posts.find(parameters.find, parameters.options);
+
+    // Incoming posts
+    parameters.find.createdAt = { $gt: Session.get('listPopulatedAt') };
+    var postsIncoming = Posts.find(parameters.find, parameters.options);
+
     return {
-      posts: Posts.find(parameters.find, parameters.options)
+      postsIncoming: postsIncoming,
+      posts: posts
     };
   }
 });