Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 08:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin'

Browse Source
This commit is contained in:
Julian Lam
2013-05-06 15:31:32 -04:00
parent 6b9b72a550 da837f662a
commit 4f38bb10e8
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/style.less
View File

@@ -281,12 +281,12 @@ footer.footer {
.account-picture-block{ .account-picture-block{
display:inline-block; display:inline-block;
margin-right:20px;
} }
.account-bio-block{ .account-bio-block{
display:inline-block; display:inline-block;
vertical-align:top; vertical-align:top;
margin-left:20px;
} }
.account-bio-label{ .account-bio-label{

7
src/webserver.js
View File

@@ -128,7 +128,14 @@ passport.deserializeUser(function(uid, done) {
for (var i=0, ii=routes.length; i<ii; i++) { for (var i=0, ii=routes.length; i<ii; i++) {
(function(route) { (function(route) {
app.get('/' + route, function(req, res) { app.get('/' + route, function(req, res) {
if ((route === 'login' || route ==='register') && (req.user && req.user.uid > 0)) {
res.redirect('/account');
return;
}
res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("' + route + '");});</script>' + templates['footer']); res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("' + route + '");});</script>' + templates['footer']);
}); });
}(routes[i])); }(routes[i]));