From aaa38a507001c8cdaa157279e1c397a151c4b4aa Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 21 Feb 2014 17:58:43 -0800 Subject: [PATCH] fix(static): move About => Features --- src/routes/pages.js | 4 ++-- views/shared/footer.jade | 2 +- views/static/{about.jade => features.jade} | 2 +- views/static/layout.jade | 7 +++---- views/static/videos.jade | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) rename views/static/{about.jade => features.jade} (99%) diff --git a/src/routes/pages.js b/src/routes/pages.js index 20902b09a3..6bba13845e 100644 --- a/src/routes/pages.js +++ b/src/routes/pages.js @@ -33,8 +33,8 @@ router.get('/static/api', middleware.locals, function(req, res) { res.render('static/api', {env: res.locals.habitrpg}); }); -router.get('/static/about', middleware.locals, function(req, res) { - res.render('static/about', {env: res.locals.habitrpg}); +router.get('/static/features', middleware.locals, function(req, res) { + res.render('static/features', {env: res.locals.habitrpg}); }); router.get('/static/videos', middleware.locals, function(req, res) { diff --git a/views/shared/footer.jade b/views/shared/footer.jade index 216b641b13..4941d4e871 100644 --- a/views/shared/footer.jade +++ b/views/shared/footer.jade @@ -18,7 +18,7 @@ footer.footer(ng-controller='FooterCtrl') |  =env.t('companyDonate') li - a(href='/static/about')=env.t('companyAbout') + a(href='/static/features')=env.t('companyAbout') li a(target='_blank', href='http://blog.habitrpg.com/')=env.t('companyBlog') li diff --git a/views/static/about.jade b/views/static/features.jade similarity index 99% rename from views/static/about.jade rename to views/static/features.jade index b86dd503ef..14a850c988 100644 --- a/views/static/about.jade +++ b/views/static/features.jade @@ -2,7 +2,7 @@ extends ./layout block vars - var layoutEnv = env - - var menuItem = 'about' + - var menuItem = 'features' block title title=env.t('companyAbout') diff --git a/views/static/layout.jade b/views/static/layout.jade index 1d4593760f..ed596f2df0 100644 --- a/views/static/layout.jade +++ b/views/static/layout.jade @@ -30,11 +30,10 @@ html(ng-app='habitrpgStatic') a.navbar-brand(href='/static/front') HabitRPG .collapse.navbar-collapse(collapse="isNavbarCollapsed") ul.nav.navbar-nav - li(class='#{menuItem=="about" ? "active" : ""}') - //a(href='/static/about')=env.t('learnMore') - a(href='/static/about') About + li(class='#{menuItem=="features" ? "active" : ""}') + a(href='/static/features')=env.t('companyAbout') li(class='#{menuItem=="videos" ? "active" : ""}') - a(href='/static/videos') Videos + a(href='/static/videos')=env.t('companyVideos') li a(href='http://blog.habitrpg.com/')=env.t('companyBlog') li(class='#{menuItem=="plans" ? "active" : ""}') diff --git a/views/static/videos.jade b/views/static/videos.jade index 6b4d161f09..a0082e1542 100644 --- a/views/static/videos.jade +++ b/views/static/videos.jade @@ -2,10 +2,10 @@ extends ./layout block vars - var layoutEnv = env - - var menuItem = 'about' + - var menuItem = 'videos' block title - title=env.t('companyAbout') + title=env.t('companyVideos') block content .row