summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-11-13 12:21:23 -0500
committerJules Laplace <jules@okfoc.us>2014-11-13 12:21:23 -0500
commit9ef3f0ec50c965396a2271182dd27dc5b6539081 (patch)
treeccb088748eef1ba1ab038e1559f8ed2285eac55e /server
parent28ade7d7f9e1c8e35de713a04303538140e22ea9 (diff)
correct style Vvalls -> VValls everywhere
Diffstat (limited to 'server')
-rw-r--r--server/lib/auth/mail.js4
-rw-r--r--server/lib/middleware.js4
-rw-r--r--server/lib/util.js2
-rw-r--r--server/lib/views/index.js2
4 files changed, 6 insertions, 6 deletions
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,
})