Remove unnecessary template mixin vars

templates/account-channels.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/channels")
+            +navdefaultlinks()
-          +navloginlogout("/account/channels")
+          +navloginlogout()
       section#mainpage
         .container
           if !loggedIn

templates/account-edit.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/edit")
+            +navdefaultlinks()
-          +navloginlogout("/account/edit")
+          +navloginlogout()
       section#mainpage
         .container
           if !loggedIn

templates/account-passwordrecover.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/passwordrecover/")
+            +navdefaultlinks()
-          +navloginlogout("/account/passwordrecover/")
+          +navloginlogout()
       section#mainpage
         .container
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3

templates/account-passwordreset.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/passwordreset")
+            +navdefaultlinks()
-          +navloginlogout("/account/passwordreset")
+          +navloginlogout()
       section#mainpage
         .container
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3

templates/account-profile.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/profile")
+            +navdefaultlinks()
-          +navloginlogout("/account/profile")
+          +navloginlogout()
       section#mainpage
         .container
           if !loggedIn

templates/acp.pug

@@ -11,12 +11,12 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/acp")
+            +navdefaultlinks()
             li#nav-acp-section.dropdown
               a#nav-acp-dd-toggle.dropdown-toggle(data-toggle="dropdown", href="javascript:void(0)") Menu
                 span.caret
               ul.dropdown-menu
-          +navloginlogout("/acp")
+          +navloginlogout()
       section#mainpage
         .container
           .row

templates/channel.pug

@@ -12,9 +12,8 @@ html(lang="en")
         include nav
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
-          - var cname = `/${channelPath}/${channelName}`
           ul.nav.navbar-nav
-            +navdefaultlinks(cname)
+            +navdefaultlinks()
             li: a(href="javascript:void(0)", onclick="javascript:showUserOptions()") Options
             li: a#showchansettings(href="javascript:void(0)", onclick="javascript:showChannelSettings()") Channel Settings
             li.dropdown
@@ -24,7 +23,7 @@ html(lang="en")
                 li: a(href="#" onclick="javascript:chatOnly()") Chat Only
                 li: a(href="#" onclick="javascript:removeVideo(event)") Remove Video
             +navsuperadmin(true)
-          +navloginlogout(cname)
+          +navloginlogout()
       section#mainpage
         .container
           #motdrow.row

templates/contact.pug

@@ -13,8 +13,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/contact")
+            +navdefaultlinks()
-          +navloginlogout("/contact")
+          +navloginlogout()
       section#mainpage
         .container
           .col-md-8.col-md-offset-2

templates/csrferror.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks(path)
+            +navdefaultlinks()
-          +navloginlogout(path)
+          +navloginlogout()
 
       section#mainpage.container
         .col-md-12

templates/google_drive_userscript.pug

@@ -10,8 +10,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/google_drive_userscript")
+            +navdefaultlinks()
-          +navloginlogout("/google_drive_userscript")
+          +navloginlogout()
       section#mainpage
         .container
           .col-md-8.col-md-offset-2

templates/httperror.pug

@@ -21,8 +21,8 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks(path)
+            +navdefaultlinks()
-          +navloginlogout(path)
+          +navloginlogout()
 
       section#mainpage.container
         .col-md-12

templates/index.pug

@@ -10,9 +10,9 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/")
+            +navdefaultlinks()
             +navsuperadmin(false)
-          +navloginlogout("/")
+          +navloginlogout()
       section#mainpage
         .container
           .col-lg-9.col-md-9

templates/login.pug

@@ -10,9 +10,9 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/login")
+            +navdefaultlinks()
           if loggedIn
-            +navlogoutform("/")
+            +navlogoutform()
       section#mainpage.container
         if wasAlreadyLoggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3

templates/logout.pug

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

templates/nav.pug

@@ -1,13 +1,3 @@
-- var links = { "/": "Home" };
-
-mixin navlink(page, title, active)
-  if active
-    li.active
-      a(href=page)= title
-  else
-    li
-      a(href=page)= title
-
 mixin navheader()
   .navbar-header
     button.navbar-toggle(type="button", data-toggle="collapse", data-target="#nav-collapsible")
@@ -16,12 +6,9 @@ mixin navheader()
       span.icon-bar
     a.navbar-brand(href="/")= siteTitle
 
-mixin navdefaultlinks(page)
+mixin navdefaultlinks()
-  each t, p in links
+  li
-    if p == page
+    a(href="/") Home
-      +navlink(p, t, true)
-    else
-      +navlink(p, t, false)
   li.dropdown
     a.dropdown-toggle(href="#", data-toggle="dropdown") Account
       b.caret
@@ -43,13 +30,13 @@ mixin navsuperadmin(newTab)
     else
       li: a(href="/acp") ACP
 
-mixin navloginlogout(redirect)
+mixin navloginlogout()
   if loggedIn
-    +navlogoutform(redirect)
+    +navlogoutform()
   else
-    +navloginform(redirect)
+    +navloginform()
 
-mixin navloginform(redirect)
+mixin navloginform()
   if loginDomain == null
     - loginDomain = ""
   .visible-lg
@@ -72,7 +59,7 @@ mixin navloginform(redirect)
       a#register.navbar-link(href="/register") Register
 
 
-mixin navlogoutform(redirect)
+mixin navlogoutform()
   form#logoutform.navbar-text.pull-right(action="/logout", method="post")
     input(type="hidden", name="_csrf", value=csrfToken)
     span#welcome Welcome, #{loginName}

templates/register.pug

@@ -10,9 +10,9 @@ html(lang="en")
         +navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/register")
+            +navdefaultlinks()
           if loggedIn
-            +navlogoutform("/register")
+            +navlogoutform()
       section#mainpage.container
         if loggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3