From 0810591fe3c74a1351cede949a404343fc3e7e15 Mon Sep 17 00:00:00 2001 From: Calvin Montgomery Date: Tue, 22 Aug 2017 17:33:29 -0700 Subject: [PATCH] Remove unnecessary template mixin vars --- templates/account-channels.pug | 4 ++-- templates/account-edit.pug | 4 ++-- templates/account-passwordrecover.pug | 4 ++-- templates/account-passwordreset.pug | 4 ++-- templates/account-profile.pug | 4 ++-- templates/acp.pug | 4 ++-- templates/channel.pug | 5 ++--- templates/contact.pug | 4 ++-- templates/csrferror.pug | 4 ++-- templates/google_drive_userscript.pug | 4 ++-- templates/httperror.pug | 4 ++-- templates/index.pug | 4 ++-- templates/login.pug | 4 ++-- templates/logout.pug | 2 +- templates/nav.pug | 29 ++++++++------------------- templates/register.pug | 4 ++-- 16 files changed, 37 insertions(+), 51 deletions(-) diff --git a/templates/account-channels.pug b/templates/account-channels.pug index 286090f5..b1d6aa7b 100644 --- a/templates/account-channels.pug +++ b/templates/account-channels.pug @@ -10,8 +10,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks("/account/channels") - +navloginlogout("/account/channels") + +navdefaultlinks() + +navloginlogout() section#mainpage .container if !loggedIn diff --git a/templates/account-edit.pug b/templates/account-edit.pug index 53017dc1..bc8881b1 100644 --- a/templates/account-edit.pug +++ b/templates/account-edit.pug @@ -10,8 +10,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks("/account/edit") - +navloginlogout("/account/edit") + +navdefaultlinks() + +navloginlogout() section#mainpage .container if !loggedIn diff --git a/templates/account-passwordrecover.pug b/templates/account-passwordrecover.pug index f5067651..aff5cec9 100644 --- a/templates/account-passwordrecover.pug +++ b/templates/account-passwordrecover.pug @@ -10,8 +10,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks("/account/passwordrecover/") - +navloginlogout("/account/passwordrecover/") + +navdefaultlinks() + +navloginlogout() section#mainpage .container .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3 diff --git a/templates/account-passwordreset.pug b/templates/account-passwordreset.pug index 6ea703fe..ee536c2e 100644 --- a/templates/account-passwordreset.pug +++ b/templates/account-passwordreset.pug @@ -10,8 +10,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks("/account/passwordreset") - +navloginlogout("/account/passwordreset") + +navdefaultlinks() + +navloginlogout() section#mainpage .container .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3 diff --git a/templates/account-profile.pug b/templates/account-profile.pug index 56faf95d..3ecb9b05 100644 --- a/templates/account-profile.pug +++ b/templates/account-profile.pug @@ -10,8 +10,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks("/account/profile") - +navloginlogout("/account/profile") + +navdefaultlinks() + +navloginlogout() section#mainpage .container if !loggedIn diff --git a/templates/acp.pug b/templates/acp.pug index fa56a2c5..c2993f0d 100644 --- a/templates/acp.pug +++ b/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 diff --git a/templates/channel.pug b/templates/channel.pug index 6ed9f7fb..5de098bd 100644 --- a/templates/channel.pug +++ b/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 diff --git a/templates/contact.pug b/templates/contact.pug index f8d2af71..a69556bb 100644 --- a/templates/contact.pug +++ b/templates/contact.pug @@ -13,8 +13,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks("/contact") - +navloginlogout("/contact") + +navdefaultlinks() + +navloginlogout() section#mainpage .container .col-md-8.col-md-offset-2 diff --git a/templates/csrferror.pug b/templates/csrferror.pug index 017659c8..37da5485 100644 --- a/templates/csrferror.pug +++ b/templates/csrferror.pug @@ -10,8 +10,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks(path) - +navloginlogout(path) + +navdefaultlinks() + +navloginlogout() section#mainpage.container .col-md-12 diff --git a/templates/google_drive_userscript.pug b/templates/google_drive_userscript.pug index 1befdcd3..c0a1a45b 100644 --- a/templates/google_drive_userscript.pug +++ b/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") - +navloginlogout("/google_drive_userscript") + +navdefaultlinks() + +navloginlogout() section#mainpage .container .col-md-8.col-md-offset-2 diff --git a/templates/httperror.pug b/templates/httperror.pug index 97ea8e4d..1e922f4d 100644 --- a/templates/httperror.pug +++ b/templates/httperror.pug @@ -21,8 +21,8 @@ html(lang="en") +navheader() #nav-collapsible.collapse.navbar-collapse ul.nav.navbar-nav - +navdefaultlinks(path) - +navloginlogout(path) + +navdefaultlinks() + +navloginlogout() section#mainpage.container .col-md-12 diff --git a/templates/index.pug b/templates/index.pug index 2b93f641..794ee4e4 100644 --- a/templates/index.pug +++ b/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 diff --git a/templates/login.pug b/templates/login.pug index f4b4955b..f5125437 100644 --- a/templates/login.pug +++ b/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 diff --git a/templates/logout.pug b/templates/logout.pug index d19742f4..fbddb942 100644 --- a/templates/logout.pug +++ b/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 diff --git a/templates/nav.pug b/templates/nav.pug index 370222a1..23a51fa2 100644 --- a/templates/nav.pug +++ b/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) - each t, p in links - if p == page - +navlink(p, t, true) - else - +navlink(p, t, false) +mixin navdefaultlinks() + li + a(href="/") Home 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} diff --git a/templates/register.pug b/templates/register.pug index e369a02b..1061dbc7 100644 --- a/templates/register.pug +++ b/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