format date differently if date is today

src/main/java/com/commafeed/frontend/pages/BasePage.java

@@ -92,6 +92,7 @@ public abstract class BasePage extends WebPage {
 			response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
 			response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
 			response.render(JavaScriptHeaderItem.forUrl("js/directives.js"));
+			response.render(JavaScriptHeaderItem.forUrl("js/filters.js"));
 			response.render(JavaScriptHeaderItem.forUrl("js/services.js"));
 
 		}

src/main/webapp/WEB-INF/wro.xml

@@ -13,6 +13,7 @@
 		<js minimize="false">/vendor/nginfinitescroll/*.js</js>
 		<js minimize="false">/vendor/ngupload/*.js</js>
 		<js minimize="false">/vendor/spinjs/*.js</js>
+		<js minimize="false">/vendor/momentjs/*.js</js>
 		
 		<css minimize="false">/vendor/bootstrap/*.css</css>
 		<css minimize="false">/vendor/angularui/*.css</css>

src/main/webapp/js/controllers.js

@@ -268,7 +268,7 @@ module.controller('CategoryDetailsCtrl', ['$scope', '$state', '$stateParams', 'F
 		if ($scope.isMeta()) {
 			$scope.category = {
 				id : $stateParams._id,
-				name : $stateParams._id,
+				name : $stateParams._id
 			};
 			return;
 		}

src/main/webapp/js/filters.js

@@ -0,0 +1,15 @@
+var module = angular.module('commafeed.filters', []);
+
+module.filter('entryDate', function() {
+	return function(timestamp) {
+		var d = moment(timestamp);
+		var now = moment();
+		var formatted;
+		if (d.date() === now.date() && Math.abs(d.diff(now)) < 86400000) {
+			formatted = d.fromNow();
+	    } else {
+	    	formatted = d.format('YYYY-MM-DD HH:mm');
+	    }
+	    return formatted;
+	};
+});

src/main/webapp/js/main.js

@@ -1,6 +1,7 @@
 var app = angular.module('commafeed', [ 'ui', 'ui.bootstrap', 'ui.state',
 		'commafeed.directives', 'commafeed.controllers', 'commafeed.services',
-		'ngSanitize', 'ngUpload', 'infinite-scroll', 'ngGrid' ]);
+		'commafeed.filters', 'ngSanitize', 'ngUpload', 'infinite-scroll',
+		'ngGrid' ]);
 
 app.config([ '$routeProvider', '$stateProvider', '$urlRouterProvider',
 		function($routeProvider, $stateProvider, $urlRouterProvider) {

src/main/webapp/templates/feeds.view.html

@@ -16,7 +16,7 @@
 					<favicon url="entry.feedLink" />
 					{{entry.feedName}}
 				</span>
-				<span class="entry-date">{{entry.date | date: 'yyyy-MM-dd HH:mm'}}</span>
+				<span class="entry-date">{{entry.date | entryDate}}</span>
 				<span class="entry-name" ng-class="{unread: entry.read == false, shrink: true}" ng-bind-html-unsafe="entry.title"></span>
 				
 			</a>