From 26f1d6bb395feb3c5f551ef98b1bb6f72de3aca2 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Thu, 2 Apr 2015 17:41:38 -0600 Subject: [PATCH] feat(static): secondary statics reflect front. merge front.old into features --- common/locales/en/front.json | 2 +- common/locales/en/subscriber.json | 2 +- website/views/static/features.jade | 24 ++++++++++++++ website/views/static/front.bk.jade | 52 ------------------------------ website/views/static/front.jade | 10 +++--- website/views/static/layout.jade | 8 ++--- 6 files changed, 35 insertions(+), 63 deletions(-) delete mode 100644 website/views/static/front.bk.jade diff --git a/common/locales/en/front.json b/common/locales/en/front.json index 8295b0150d..232c6eb51b 100644 --- a/common/locales/en/front.json +++ b/common/locales/en/front.json @@ -77,7 +77,7 @@ "mobileAndroid": "Android", "footerCompany": "Company", "companyDonate": "Donate", - "companyAbout": "Features", + "companyAbout": "How it Works", "companyVideos": "Videos", "companyBlog": "Blog", "companyExtensions": "Extensions", diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json index ac39f51a05..c033ea6088 100644 --- a/common/locales/en/subscriber.json +++ b/common/locales/en/subscriber.json @@ -19,7 +19,7 @@ "supportDevsText": "This open source project can use all the help it can get. Help us keep Habit alive!", "monthUSD": "USD / Month", "organization": "Organization", - "groupPlans": "Group Plans", + "groupPlans": "Corporate Plans", "indivPlan1": "For individuals, HabitRPG is free to play. Even for small interest groups, free (or cheap)", "indivPlan2": "can be used to motivate participants in behavioral modification. Think writing groups, art challenges, and more.", "groupText1": "But some group leaders will want more control, privacy, security, and support. Examples of such groups are families, health and wellness groups, employee groups, and more. These plans provide private instances of HabitRPG for your group or organization, secure and independent of", diff --git a/website/views/static/features.jade b/website/views/static/features.jade index 542f76d00c..9fbb9b31fa 100644 --- a/website/views/static/features.jade +++ b/website/views/static/features.jade @@ -89,3 +89,27 @@ block content a.btn.btn-primary(href='/static/videos')=env.t('watchVideos') + hr + p.lead=env.t('landingp1') + h2=env.t('landingp2header') + //images in these parts could be useful, too + //if there's a language workaround, image headers? people like pictures! + p.lead + =env.t('landingp2') + |  + h2=env.t('landingp3header') + //I'm not sold on "Consquences as the title here. Anyone got a better idea? + p.lead + =env.t('landingp3') + |  + h2=env.t('landingp4header') + p.lead=env.t('landingp4') + //- TODO + h2=env.t('landingend') + p.lead + =env.t('landingend2') + a(href="FEATURESPAGEHERE")=env.t('landingfeatureslink') + =env.t('landingend3') + a(href="ENTERPRISEPAGEHERE")=env.t('landingadminlink') + |  + =env.t('landingend4') \ No newline at end of file diff --git a/website/views/static/front.bk.jade b/website/views/static/front.bk.jade deleted file mode 100644 index bbd25b9603..0000000000 --- a/website/views/static/front.bk.jade +++ /dev/null @@ -1,52 +0,0 @@ -extends ./layout -//-Trick needed to pass 'env' to ./layout -block vars - - var layoutEnv = env - - var menuItem = 'home' - -block title - title=env.t('titleFront') - -block content - div(ng-controller='RootCtrl') - include ../shared/header/avatar - include ../shared/modals/members - - .marketing - //we need to use something that's not jumbotron for this, but still keep it centered - //could someone write something else to make it pretty? - img(src='/common/img/logo/habitrpg_pixel.png', alt='HabitRPG logo') - //this image needs to be replaced by something more enticing, that shows off the features of hRPG - //while acting similarly to a logo - h1#tagline=env.t('tagline') - p.lead - button.btn.btn-primary.btn-lg#frontpage-play-button(ng-click='playButtonClick()')=env.t('playButton') - hr - img(src='/marketing/devices.png') - //we'd want the tagline centered, for sure, and a bit more pop, but without using jumbotron - //it could also be part of the image, as long as the alt text included it - //in fact, I think I really want it on the image, rather than as text, but language issues - br - p.lead=env.t('landingp1') - h2=env.t('landingp2header') - //images in these parts could be useful, too - //if there's a language workaround, image headers? people like pictures! - p.lead - =env.t('landingp2') - |  - h2=env.t('landingp3header') - //I'm not sold on "Consquences as the title here. Anyone got a better idea? - p.lead - =env.t('landingp3') - |  - h2=env.t('landingp4header') - p.lead=env.t('landingp4') - //- TODO - h2=env.t('landingend') - p.lead - =env.t('landingend2') - a(href="FEATURESPAGEHERE")=env.t('landingfeatureslink') - =env.t('landingend3') - a(href="ENTERPRISEPAGEHERE")=env.t('landingadminlink') - |  - =env.t('landingend4') diff --git a/website/views/static/front.jade b/website/views/static/front.jade index 64031a751e..557e1ed0f8 100644 --- a/website/views/static/front.jade +++ b/website/views/static/front.jade @@ -46,15 +46,15 @@ html(ng-app='habitrpg', ng-controller='RootCtrl') #bs-example-navbar-collapse-1.collapse.navbar-collapse ul.nav.navbar-nav.navbar-right li - a(href='/static/front') How it works + a(href='/static/features')=env.t('companyAbout') li - a(href='/static/plans') Corporate plans + a(href='/static/plans')=env.t('groupPlans') li - a(href='http://blog.habitrpg.com/') Blog + a(href='http://blog.habitrpg.com/')=env.t('companyBlog') li - a(href='/static/press-kit') Press Kit + a(href='/static/press-kit')=env.t('presskit') li - a(href='/static/contact') Contact Us + a(href='/static/contact')=env.t('contactUs') li button#header-play-button.btn.btn-primary.navbar-btn.navbar-right(ng-click='playButtonClick()') Play HabitRPG #intro diff --git a/website/views/static/layout.jade b/website/views/static/layout.jade index 2b712d49f4..566e23bed8 100644 --- a/website/views/static/layout.jade +++ b/website/views/static/layout.jade @@ -44,14 +44,14 @@ html(ng-app='habitrpg') ul.nav.navbar-nav li(class='#{menuItem=="features" ? "active" : ""}') a(href='/static/features')=env.t('companyAbout') - li(class='#{menuItem=="videos" ? "active" : ""}') + //-li(class='#{menuItem=="videos" ? "active" : ""}') a(href='/static/videos')=env.t('companyVideos') - li - a(href='http://blog.habitrpg.com/')=env.t('companyBlog') li(class='#{menuItem=="plans" ? "active" : ""}') a(href='/static/plans')=env.t('groupPlans') + li + a(href='http://blog.habitrpg.com/')=env.t('companyBlog') li(class='#{menuItem=="pressKit" ? "active" : ""}') - a(href='/static/press-kit') Press Kit + a(href='/static/press-kit')=env.t('presskit') li(class='#{menuItem=="contact" ? "active" : ""}') a(href='/static/contact')=env.t('contactUs')