Change login sessions

templates/login.jade

@@ -12,7 +12,7 @@ html(lang="en")
           ul.nav.navbar-nav
             mixin navdefaultlinks("/login")
           if loggedIn
-            mixin navlogoutform()
+            mixin navlogoutform("/")
       section#mainpage.container
         if wasAlreadyLoggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
@@ -27,7 +27,7 @@ html(lang="en")
             h2 Login
             form(role="form", action="/login", method="post")
               if redirect
-                input(type="hidden", name="redirect", value=redirect)
+                input(type="hidden", name="dest", value=redirect)
               .form-group
                 label(for="username") Username
                 input#username.form-control(type="text", name="name")

templates/logout.jade

@@ -11,7 +11,7 @@ html(lang="en")
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
             mixin navdefaultlinks("/logout")
-          mixin navloginform()
+          mixin navloginform("/")
       section#mainpage.container
         .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
           .alert.alert-info.center.messagebox

templates/nav.jade

@@ -27,13 +27,13 @@ mixin navdefaultlinks(page)
       b.caret
     ul.dropdown-menu
       if loggedIn
-        li: a(href="/logout?redirect=#{page}") Logout
+        li: a(href="/logout?dest=#{page}") Logout
         li.divider
         li: a(href="/account/channels") Channels
         li: a(href="/account/profile") Profile
         li: a(href="/account/edit") Change Password/Email
       else
-        li: a(href="/login") Login
+        li: a(href="/login?dest=#{page}") Login
         li: a(href="/register") Register
 
 mixin navloginlogout(redirect)
@@ -47,7 +47,7 @@ mixin navloginform(redirect)
     - loginDomain = ""
   .visible-lg
     form#loginform.navbar-form.navbar-right(action="#{loginDomain}/login", method="post")
-      input(type="hidden", name="redirect", value=redirect)
+      input(type="hidden", name="dest", value=redirect)
       .form-group
         input#username.form-control(type="text", name="name", placeholder="Username")
       .form-group
@@ -60,19 +60,13 @@ mixin navloginform(redirect)
       button#login.btn.btn-default(type="submit") Login
   .visible-md
     p#loginform.navbar-text.pull-right
-      a#login.navbar-link(href="#{loginDomain}/login?redirect=#{redirect}") Log in
+      a#login.navbar-link(href="#{loginDomain}/login?dest=#{redirect}") Log in
       span  · 
       a#register.navbar-link(href="/register") Register
 
 
 mixin navlogoutform(redirect)
-  if loginDomain == null
-    - loginDomain = ""
-  if redirect
-    - url = "logout?redirect=" + redirect
-  else
-    - url = "logout"
   p#logoutform.navbar-text.pull-right
     span#welcome Welcome, #{loginName}
     span  · 
-    a#logout.navbar-link(href="#{loginDomain}/#{url}") Logout
+    a#logout.navbar-link(href="/logout?dest=#{redirect}") Logout