From 4ba38019d269935c9ebca338018ae2799db387cc Mon Sep 17 00:00:00 2001 From: <> Date: Sat, 28 Feb 2015 18:02:59 +1000 Subject: [PATCH 1/6] fixed nav.jade for login/register --- templates/nav.jade | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/nav.jade b/templates/nav.jade index 5fbc2607..9dcc24e8 100644 --- a/templates/nav.jade +++ b/templates/nav.jade @@ -27,14 +27,14 @@ mixin navdefaultlinks(page) b.caret ul.dropdown-menu if loggedIn - li: a(href="/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout + li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout li.divider - li: a(href="/account/channels") Channels - li: a(href="/account/profile") Profile - li: a(href="/account/edit") Change Password/Email + li: a(href="#{loginDomain}/account/channels") Channels + li: a(href="#{loginDomain}/account/profile") Profile + li: a(href="#{loginDomain}/account/edit") Change Password/Email else - li: a(href="/login?dest=#{encodeURIComponent(baseUrl + page)}") Login - li: a(href="/register") Register + li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login + li: a(href="#{loginDomain}/register") Register mixin navloginlogout(redirect) if loggedIn @@ -62,7 +62,7 @@ mixin navloginform(redirect) .visible-md p#loginform.navbar-text.pull-right a#login.navbar-link(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + redirect)}") Log in - span  ·  + span  · d a#register.navbar-link(href="/register") Register @@ -70,4 +70,4 @@ mixin navlogoutform(redirect) p#logoutform.navbar-text.pull-right span#welcome Welcome, #{loginName} span  ·  - a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout + a#logout.navbar-link(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout \ No newline at end of file From 5b9e51f70a8366bb69cc5beec4d97140d4015b59 Mon Sep 17 00:00:00 2001 From: <> Date: Sat, 28 Feb 2015 18:13:58 +1000 Subject: [PATCH 2/6] fix nav 2 --- templates/nav.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/nav.jade b/templates/nav.jade index 9dcc24e8..0f9d3038 100644 --- a/templates/nav.jade +++ b/templates/nav.jade @@ -27,13 +27,13 @@ mixin navdefaultlinks(page) b.caret ul.dropdown-menu if loggedIn - li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout + li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + redirect)}") Logout li.divider li: a(href="#{loginDomain}/account/channels") Channels li: a(href="#{loginDomain}/account/profile") Profile li: a(href="#{loginDomain}/account/edit") Change Password/Email else - li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login + li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + redirect)}") Login li: a(href="#{loginDomain}/register") Register mixin navloginlogout(redirect) From 11c92c93685b8e287394837086ac86272c1374b3 Mon Sep 17 00:00:00 2001 From: <> Date: Sat, 28 Feb 2015 18:20:24 +1000 Subject: [PATCH 3/6] fix nav 3 --- templates/nav.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/nav.jade b/templates/nav.jade index 0f9d3038..946a4581 100644 --- a/templates/nav.jade +++ b/templates/nav.jade @@ -27,13 +27,13 @@ mixin navdefaultlinks(page) b.caret ul.dropdown-menu if loggedIn - li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + redirect)}") Logout + li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout li.divider li: a(href="#{loginDomain}/account/channels") Channels li: a(href="#{loginDomain}/account/profile") Profile li: a(href="#{loginDomain}/account/edit") Change Password/Email else - li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + redirect)}") Login + li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login li: a(href="#{loginDomain}/register") Register mixin navloginlogout(redirect) @@ -70,4 +70,4 @@ mixin navlogoutform(redirect) p#logoutform.navbar-text.pull-right span#welcome Welcome, #{loginName} span  ·  - a#logout.navbar-link(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout \ No newline at end of file + a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout \ No newline at end of file From bad0d5b5f7da75b41b985d33507094a87c1128cb Mon Sep 17 00:00:00 2001 From: <> Date: Sat, 28 Feb 2015 18:26:49 +1000 Subject: [PATCH 4/6] fix nav again lol --- templates/nav.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/nav.jade b/templates/nav.jade index 946a4581..d6ad1e65 100644 --- a/templates/nav.jade +++ b/templates/nav.jade @@ -27,10 +27,10 @@ mixin navdefaultlinks(page) b.caret ul.dropdown-menu if loggedIn - li: a(href="#{loginDomain}/logout?dest=#{encodeURIComponent(baseUrl + page)}") Logout + li: a(href="/logout?dest=#{encodeURIComponent(baseUrl + page)}&_csrf=#{csrfToken}") Logout li.divider - li: a(href="#{loginDomain}/account/channels") Channels - li: a(href="#{loginDomain}/account/profile") Profile + li: a(href="/account/channels") Channels + li: a(href="/account/profile") Profile li: a(href="#{loginDomain}/account/edit") Change Password/Email else li: a(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + page)}") Login From 1f01036ba02e2245f8f2098f3f5082686cd16a16 Mon Sep 17 00:00:00 2001 From: <> Date: Sat, 28 Feb 2015 18:37:32 +1000 Subject: [PATCH 5/6] fix random d at end of line --- templates/nav.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nav.jade b/templates/nav.jade index d6ad1e65..c77ac4ed 100644 --- a/templates/nav.jade +++ b/templates/nav.jade @@ -62,7 +62,7 @@ mixin navloginform(redirect) .visible-md p#loginform.navbar-text.pull-right a#login.navbar-link(href="#{loginDomain}/login?dest=#{encodeURIComponent(baseUrl + redirect)}") Log in - span  · d + span  ·  a#register.navbar-link(href="/register") Register From 1ef47c82951d2a382bdb32acb112700534353f34 Mon Sep 17 00:00:00 2001 From: <> Date: Sat, 28 Feb 2015 18:51:30 +1000 Subject: [PATCH 6/6] fix deleted new line --- templates/nav.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/nav.jade b/templates/nav.jade index c77ac4ed..2ee3586c 100644 --- a/templates/nav.jade +++ b/templates/nav.jade @@ -70,4 +70,5 @@ mixin navlogoutform(redirect) p#logoutform.navbar-text.pull-right span#welcome Welcome, #{loginName} span  ·  - a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout \ No newline at end of file + a#logout.navbar-link(href="/logout?dest=#{encodeURIComponent(baseUrl + redirect)}&_csrf=#{csrfToken}") Logout + \ No newline at end of file