From 9ef3f0ec50c965396a2271182dd27dc5b6539081 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Thu, 13 Nov 2014 12:21:23 -0500
Subject: correct style Vvalls -> VValls everywhere

---
 server/lib/auth/mail.js   | 4 ++--
 server/lib/middleware.js  | 4 ++--
 server/lib/util.js        | 2 +-
 server/lib/views/index.js | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'server')

diff --git a/server/lib/auth/mail.js b/server/lib/auth/mail.js
index 0ba6d5d..eac4007 100644
--- a/server/lib/auth/mail.js
+++ b/server/lib/auth/mail.js
@@ -6,7 +6,7 @@ var email = require("emailjs"),
 
 var mail = {
 	
-	from: 'Vvalls <info@vvalls.com>',
+	from: 'VValls <info@vvalls.com>',
 	templates: {},
 	
 	init: function(){
@@ -40,7 +40,7 @@ var mail = {
 			 text:    mail.templates.welcome.text(user),
 			 from:    mail.from,
 			 to:      user.email,
-			 subject: "Welcome to Vvalls",
+			 subject: "Welcome to VValls",
 			 attachment: [
 					{ data: mail.templates.welcome.html(user), alternative: true },
 			 ]
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index 870451a..60f2e46 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -41,10 +41,10 @@ var middleware = {
 		res.locals.config = config
 		res.locals.profile = null
     res.locals.ogImage = ""
-    res.locals.ogTitle = "Vvalls"
+    res.locals.ogTitle = "VValls"
     res.locals.ogUrl = "http://vvalls.com/"
     res.locals.ogDescription = "3D gallery space, fully customizable"
-    res.locals.ogAuthor = "Vvalls"
+    res.locals.ogAuthor = "VValls"
 		res.locals.opt = {}
 		next()
 	},
diff --git a/server/lib/util.js b/server/lib/util.js
index 0a71cb7..1f63a30 100644
--- a/server/lib/util.js
+++ b/server/lib/util.js
@@ -31,7 +31,7 @@ util.escapeRegExp = function (s) {
 	return s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&")
 }
 util.htmlize = function(s) {
-  return ("<p>" + s.replace(/\n/g,"</p><p>") + "</p>").replace(/<p><\/p>/, "<br>")
+  return s.replace(/\n/g,"<br>")
 }
 
 util.cleanQuery = function (query) {
diff --git a/server/lib/views/index.js b/server/lib/views/index.js
index b3a15c2..31cb1db 100644
--- a/server/lib/views/index.js
+++ b/server/lib/views/index.js
@@ -169,7 +169,7 @@ var views = module.exports = {
 			  isOwnProfile: isOwnProfile,
 				profile: user,
 				projects: projects || [],
-				ogTitle: "Vvalls: Profile of " + user.displayName,
+				ogTitle: "VValls: Profile of " + user.displayName,
         ogUrl: "http://vvalls.com/profile/" + user.username + "/",
         ogImage: user.photo,
 			})
-- 
cgit v1.2.3-70-g09d2