Merge pull request #456 from 6IRCNet/3.0

Fix nav links for login/logout/account
This commit is contained in:
Calvin Montgomery 2015-02-28 02:53:13 -06:00
commit b64a97aa49
1 changed files with 5 additions and 4 deletions

View File

@ -27,14 +27,14 @@ mixin navdefaultlinks(page)
b.caret b.caret
ul.dropdown-menu ul.dropdown-menu
if loggedIn if loggedIn
li: a(href="/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout li: a(href="/logout?dest=#{encodeURIComponent(baseUrl + page)}&_csrf=#{csrfToken}") Logout
li.divider li.divider
li: a(href="/account/channels") Channels li: a(href="/account/channels") Channels
li: a(href="/account/profile") Profile li: a(href="/account/profile") Profile
li: a(href="/account/edit") Change Password/Email li: a(href="#{loginDomain}/account/edit") Change Password/Email
else else
li: a(href="/login?dest=#{encodeURIComponent(baseUrl + page)}") Login li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login
li: a(href="/register") Register li: a(href="#{loginDomain}/register") Register
mixin navloginlogout(redirect) mixin navloginlogout(redirect)
if loggedIn if loggedIn
@ -71,3 +71,4 @@ mixin navlogoutform(redirect)
span#welcome Welcome, #{loginName} span#welcome Welcome, #{loginName}
span  ·  span  · 
a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout