Merge branch 'code_reorg'

1 files changed, 21 insertions, 2 deletions

diff --git a/routes/sessions.js b/routes/sessions.js
index f038b484..6f04d2fd 100644
--- a/routes/sessions.js
+++ b/routes/sessions.js
@@ -2,7 +2,15 @@
   module.exports = function(passport) {
     return {
       "new": function(req, res) {
-        return res.render('sessions/new');
+        return res.render('sessions/new', {
+          layout: 'layout',
+          js: (function() {
+            return global.js;
+          }),
+          css: (function() {
+            return global.css;
+          })
+        });
       },
       create: function(req, res, next) {
         return passport.authenticate('local', function(err, user, info) {
@@ -11,6 +19,13 @@
           }
           if (!user) {
             return res.render('sessions/new', {
+              layout: 'layout',
+              js: (function() {
+                return global.js;
+              }),
+              css: (function() {
+                return global.css;
+              }),
               badpw: true
             });
           }
@@ -19,7 +34,11 @@
             if (err) {
               return next(err);
             }
-            url = "/" + user.username + "/edit";
+            if (/edit/.test(req.headers['referer'])) {
+              url = "/" + user.username + "/edit";
+            } else {
+              url = "/" + user.username;
+            }
             return res.redirect(url);
           });
         })(req, res, next);