Merge pull request #87 from Raistlfiren/hotfix-active

Updated links to active state when selected...
FAForever · Apr 11, 2017 · 877fa73 · 877fa73
2 parents 9a96a17 + 0835daa
commit 877fa73
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 13 deletions.
diff --git a/public/styles/partials/_layout.sass b/public/styles/partials/_layout.sass
@@ -58,6 +58,9 @@ h3
 .btn
   white-space: normal
 
+.main-navigation .active > a
+    background-color: #333333
+
 @media (max-width: 1330px)
   .navbar-header
     float: none

diff --git a/routes/views/accounts/get/changEmail.js b/routes/views/accounts/get/changEmail.js
@@ -4,7 +4,7 @@ exports = module.exports = function(req, res) {
 
 	// locals.section is used to set the currently selected
 	// item in the header navigation.
-	locals.section = 'changEmail';
+	locals.section = 'account';
 
 	locals.formData = req.body || {};
 

diff --git a/routes/views/accounts/get/changePassword.js b/routes/views/accounts/get/changePassword.js
@@ -4,7 +4,7 @@ exports = module.exports = function(req, res) {
 
 	// locals.section is used to set the currently selected
 	// item in the header navigation.
-	locals.section = 'changePassword';
+	locals.section = 'account';
 
 	locals.formData = req.body || {};
 

diff --git a/routes/views/accounts/get/changeUsername.js b/routes/views/accounts/get/changeUsername.js
@@ -4,7 +4,7 @@ exports = module.exports = function(req, res) {
 
 	// locals.section is used to set the currently selected
 	// item in the header navigation.
-	locals.section = 'changeUsername';
+	locals.section = 'account';
 
 	locals.formData = req.body || {};
 

diff --git a/routes/views/accounts/get/connectSteam.js b/routes/views/accounts/get/connectSteam.js
@@ -3,6 +3,7 @@ var flash = {};
 
 exports = module.exports = function(req, res) {
 
+    locals.section = 'account';
 	var overallRes = res;
 
 	request.post({

diff --git a/routes/views/accounts/get/linkSteam.js b/routes/views/accounts/get/linkSteam.js
@@ -6,7 +6,7 @@ exports = module.exports = function(req, res) {
 
 	// locals.section is used to set the currently selected
 	// item in the header navigation.
-	locals.section = 'linkSteam';
+	locals.section = 'account';
 
 	locals.formData = req.body || {};
 

diff --git a/routes/views/accounts/get/register.js b/routes/views/accounts/get/register.js
@@ -4,7 +4,7 @@ exports = module.exports = function(req, res) {
 
 	// locals.section is used to set the currently selected
 	// item in the header navigation.
-	locals.section = 'register';
+    locals.section = 'account';
 
 	locals.formData = req.body || {};
 

diff --git a/routes/views/accounts/get/resetPassword.js b/routes/views/accounts/get/resetPassword.js
@@ -4,7 +4,7 @@ exports = module.exports = function(req, res) {
 
 	// locals.section is used to set the currently selected
 	// item in the header navigation.
-	locals.section = 'resetPassword';
+    locals.section = 'account';
 
 	locals.formData = req.body || {};
 

diff --git a/routes/views/blog.js b/routes/views/blog.js
@@ -8,7 +8,7 @@ exports = module.exports = function(req, res) {
 	var locals = res.locals;
 
 	// Init locals
-	locals.section = 'blog';
+	locals.section = 'news';
 	locals.title = 'FAForever News';
 	locals.data = {
 		posts: []

diff --git a/routes/views/post.js b/routes/views/post.js
@@ -6,7 +6,7 @@ exports = module.exports = function(req, res) {
 	var locals = res.locals;
 
 	// Set locals
-	locals.section = 'blog';
+	locals.section = 'news';
 	locals.filters = {
 		post: req.params.slug
 	};

diff --git a/templates/layouts/default.pug b/templates/layouts/default.pug
@@ -66,16 +66,16 @@ html
             ul.main-navigation
               li.mobile-nav-logo-wrapper: a(href="/", class="mobile-nav-logo")
                 img(src="/images/faf-logo.png")
-              li: a(href='/news')
+              li(class=(section == 'news' ? 'active' : null)): a(href='/news')
                 i.fa.fa-rss
                 span News
-              li: a(href='/competitive/tournaments')
+              li(class=(section == 'competitive' ? 'active' : null)): a(href='/competitive/tournaments')
                 i.fa.fa-trophy
                 span Competitive
-              li: a(href='/calendar')
+              li(class=(section == 'calendar' ? 'active' : null)): a(href='/calendar')
                 i.fa.fa-calendar
                 span Calendar
-              li: a(href='/contribution')
+              li(class=(section == 'contribution' ? 'active' : null)): a(href='/contribution')
                 i.fa.fa-heart
                 span Contribute
               li.close-mobile-nav: button.toggle-nav
@@ -86,7 +86,7 @@ html
                 a(href='/client' class='nav-download-client')
                   i.fa.fa-download
                   span Download
-              li.dropdown
+              li(class=(section == 'account' ? 'active' : null)).dropdown
                 a.dropdown-toggle.nav-account-dropdown(href='#' data-toggle='dropdown' role='button')
                   i.fa.fa-user
                   // Update fontawesome, uncomment below.