diff --git a/app.js b/app.js index 1c659ae638..1260e97973 100644 --- a/app.js +++ b/app.js @@ -107,6 +107,7 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) { base_url: base_url, port: port, use_port: use_port, + upload_path: '/public/uploads/', redis: { host: redis_host, port: redis_port diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index a2bad6083c..ac841639da 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -38,7 +38,7 @@ var userLabel = rightMenu.find('#user_label'); userLabel.attr('href','/users/'+data['username']); - userLabel.find('img').attr('src',data['picture']+"?s=24"); + userLabel.find('img').attr('src',data['picture']+"?s=24&default=identicon"); userLabel.find('span').html(data['username']); } else { diff --git a/public/src/forum/login.js b/public/src/forum/login.js index f63fc15c28..ff203625ab 100644 --- a/public/src/forum/login.js +++ b/public/src/forum/login.js @@ -2,8 +2,13 @@ // Alternate Logins var altLoginEl = document.querySelector('.alt-logins'); altLoginEl.addEventListener('click', function(e) { - if (e.target.nodeName === 'LI') { - document.location.href = e.target.getAttribute('data-url'); + var target; + switch(e.target.nodeName) { + case 'LI': target = e.target; break; + case 'I': target = e.target.parentNode; break; + } + if (target) { + document.location.href = target.getAttribute('data-url'); } }); }()); diff --git a/public/src/forum/register.js b/public/src/forum/register.js index 90768919a5..2112f1ec37 100644 --- a/public/src/forum/register.js +++ b/public/src/forum/register.js @@ -47,8 +47,13 @@ // Alternate Logins var altLoginEl = document.querySelector('.alt-logins'); altLoginEl.addEventListener('click', function(e) { - if (e.target.nodeName === 'LI') { - document.location.href = e.target.getAttribute('data-url'); + var target; + switch(e.target.nodeName) { + case 'LI': target = e.target; break; + case 'I': target = e.target.parentNode; break; + } + if (target) { + document.location.href = target.getAttribute('data-url'); } }); diff --git a/public/templates/admin/topics.tpl b/public/templates/admin/topics.tpl index 3a1e642e50..a70805a02c 100644 --- a/public/templates/admin/topics.tpl +++ b/public/templates/admin/topics.tpl @@ -18,9 +18,9 @@
- - - + + +

3 {topics.title} 24

diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl index 90f628fdce..078b03a7a8 100644 --- a/public/templates/topic.tpl +++ b/public/templates/topic.tpl @@ -16,7 +16,7 @@
-
+
{main_posts.username}
{main_posts.user_rep} @@ -56,7 +56,7 @@
- + {posts.user_rep}
@@ -73,7 +73,7 @@
{posts.post_rep}
- posted by {posts.username} {posts.relativeTime} ago + posted by {posts.username} {posts.relativeTime} ago | last edited by {posts.editor} {posts.relativeEditTime} ago
diff --git a/src/routes/user.js b/src/routes/user.js index b597d7f044..e65030e1af 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -138,6 +138,7 @@ var user = require('./../user.js'), filename = uid + '-' + filename; var uploadPath = config.upload_path + filename; + console.log(config); console.log('trying to upload to : '+ global.configuration['ROOT_DIRECTORY'] + uploadPath); diff --git a/src/user.js b/src/user.js index 99b3de12ae..5c1221ca40 100644 --- a/src/user.js +++ b/src/user.js @@ -332,8 +332,8 @@ var utils = require('./../public/src/utils.js'), User.createGravatarURLFromEmail = function(email) { if (!email) email = utils.generateUUID(); var md5sum = crypto.createHash('md5'); - md5sum.update(email).toLowerCase().trim(); - var gravatarURL = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex'); + md5sum.update(email.toLowerCase().trim()); + var gravatarURL = 'http://www.gravatar.com/avatar/' + md5sum.digest('hex') + '?default=identicon'; return gravatarURL; } diff --git a/src/webserver.js b/src/webserver.js index 8438d84267..13a5e7f091 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -244,7 +244,7 @@ var express = require('express'), return; } user.getUserField(uid, 'picture', function(picture) { - if (picture == null) res.redirect('http://www.gravatar.com/avatar/a938b82215dfc96c4cabeb6906e5f953'); + if (picture == null) res.redirect('http://www.gravatar.com/avatar/a938b82215dfc96c4cabeb6906e5f953&default=identicon'); res.redirect(picture); }); });