Start rewriting channel.js

templates/login.jade

@@ -12,13 +12,15 @@ html(lang="en")
           ul.nav.navbar-nav
             mixin navdefaultlinks("/login")
           if loggedIn
-            mixin navlogoutform("/login")
+            if redirect
+              mixin navlogoutform(redirect)
+            else
+              mixin navlogoutform("/login")
       section#mainpage.container
         if wasAlreadyLoggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
             .alert.alert-info.messagebox.center
               h3(style="margin: 5px auto") Logged in as #{loginName}
-              // TODO Link to My Account page
         else if !loggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
             if loginError
@@ -27,6 +29,8 @@ html(lang="en")
                 p= loginError
             h2 Login
             form(role="form", action="/login", method="post")
+              if redirect
+                input(type="hidden", name="redirect", value=redirect)
               .form-group
                 label(for="username") Username
                 input#username.form-control(type="text", name="name")

templates/nav.jade

@@ -55,7 +55,7 @@ mixin navloginform(redirect)
 
 mixin navlogoutform(redirect)
   if redirect
-    - url = "/logout?redirect=#{redirect}"
+    - url = "/logout?redirect=" + redirect
   else
     - url = "/logout"
   p#logoutform.navbar-text.pull-right