#23 Refactoring, (Adding EJS filters...). Page Titles support, so this …

…closes #43
marceloboeira · Sep 17, 2014 · f291574 · f291574
1 parent 0a16297
commit f291574
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 17 deletions.
diff --git a/api/controllers/IndexController.js b/api/controllers/IndexController.js
@@ -9,7 +9,7 @@ module.exports = {
 
   index: function (req, res) {
   	Paste.find().populate('owner').sort({ createdAt: 'desc' }).limit(10).exec(function(err, lp) {
-  		return res.view({lastPastes: lp});
+  		return res.view({title:'Index_1',lastPastes: lp});
   	});
   }
 };

diff --git a/api/controllers/PasteController.js b/api/controllers/PasteController.js
@@ -4,7 +4,8 @@ module.exports = {
  		var id = req.param('id');			
 		Paste.findOne(id).populate('owner').exec(function(err, paste){	 	
 			if (err || !paste) return res.notFound();
-			return res.view({ paste: paste });
+			return res.view({title: paste.name,
+											 paste: paste });
 		});
   }	
 };

diff --git a/api/controllers/UserController.js b/api/controllers/UserController.js
@@ -10,11 +10,13 @@ module.exports = {
 				if (err || !user) {
 					User.findOne({username:username}).populate('keys').populate('pastes').exec(function(err, user) {
 						if (err || !user) return res.notFound();
-						return res.view({user: user});
+						return res.view({user: user,
+													 title: res.__('%s Profile', user.name)});
 					});
 				}
 				else {
-					return res.view({user: user});	
+					return res.view({user: user,
+													 title: res.__('%s Profile', user.name)});
 				}
 		});
 	},

diff --git a/api/services/FilterService.js b/api/services/FilterService.js
@@ -3,18 +3,31 @@
  *
  * @see https://github.com/vimia/blew/issues/23
  */
-module.exports = {
 
-	/** 
-	 * Apply moment.js at server-side as a  filter
-	 * 
-	 * @param d - Dirty Date
-	 * @return 'x days ago' 
-	 */
-	dateFromNow: function(d) {
-		var moment = require('moment');
-		return moment(d).fromNow();
-	}
-	//TODO - Date Component creator..
+
+var filters = require('ejs').filters;
+
+/** 
+ * Apply moment.js at server-side as a  filter
+ * 
+ * @param d - Dirty Date
+ * @return 'x days ago' 
+ */
+filters.dateFromNow = function(d) {
+	var moment = require('moment');
+	return moment(d).fromNow();
+},
+
+/** 
+ * Create default title
+ * 
+ * @param t - to Append Title
+ * @return nice pageTitle 
+ */
+filters.pageTitle = function(a, t) {
+	return ((t != undefined && t != null) ? (t + " | ") : " ") + a ;
 }
 
+// Make Global
+module.exports = filters;
+
diff --git a/views/layout/default.ejs b/views/layout/default.ejs
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= __('projectName') %></title>
+    <title><%=: __('projectName') | pageTitle: title  %></title>
 
     <!-- Viewport mobile tag for sensible mobile support -->
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

diff --git a/views/layout/pjax.ejs b/views/layout/pjax.ejs
@@ -1,3 +1,4 @@
 <!-- pjax-content-->
+<title><%=: __('projectName') | pageTitle: title  %></title>
 <%- body %>
 <!-- pjax-end -->