diff --git a/client/less/main.less b/client/less/main.less index aa70867894..31da81da7e 100644 --- a/client/less/main.less +++ b/client/less/main.less @@ -689,6 +689,12 @@ iframe.iphone { transition: background .2s ease-in-out, border .2s ease-in-out; } +.population-table { + @media (max-width: 767px) { + font-size: 16px; + } +} + @media (max-width: 991px) { .navbar-header { float: none; diff --git a/server/boot/challenge.js b/server/boot/challenge.js index 13e0563589..4a6aeeecf4 100644 --- a/server/boot/challenge.js +++ b/server/boot/challenge.js @@ -579,6 +579,7 @@ module.exports = function(app) { res.render('challengeMap/show', { blocks, daysRunning, + globalCompletedCount: numberWithCommas(5612952 + (Math.floor((Date.now() - 1446268581061) / 3000))), camperCount, lastCompleted, title: "A map of all Free Code Camp's Challenges" diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade index c33348c259..5b4974b4e3 100644 --- a/server/views/challengeMap/show.jade +++ b/server/views/challengeMap/show.jade @@ -10,27 +10,36 @@ block content else img.img-responsive.img-center.border-radius-5(src='https://s3.amazonaws.com/freecodecamp/wide-social-banner.png') .col-xs-12.col-md-8.col-md-offset-2 - h2.text-center - span.text-primary #{camperCount}   - | campers have joined our community - br - | since we launched   - span.text-primary #{daysRunning}   - | days ago. + h2 + table.population-table.img-center + tr + td Established:  + td + span.text-primary #{daysRunning}  + | days ago + tr + td Population:  + td + span.text-primary #{camperCount}  + | campers + tr + td Completed:  + td + span.text-primary #{globalCompletedCount}  + | challenges + + + .spacer - if (user && user.progressTimestamps.length > 5) - #tshirt-notice.col-xs-12.col-md-8.col-md-offset-2.hidden - h2.text-center Get our first-edition t-shirt. - br - span.text-success Only available until Oct 29! - img.thumbnail.img-center.img-responsive(src="http://i.imgur.com/o07uuOL.png") - p.text-justify Our community has voted. Get our winning design emblazoned on a durable, American-made American Apparel shirt (available in women's and men's sizes).  - a(href="https://teespring.com/free-code-camp-shirt-eu" target="_blank") Also ships from Europe - | . - a.button.btn.btn-block.signup-btn(href="https://teespring.com/get-free-code-camp-t-shirt" target="_blank") Get yours + if (user && user.progressTimestamps.length > 100) + #map-notice.col-xs-12.col-md-8.col-md-offset-2.hidden + h2.text-center We have a subreddit + img.thumbnail.img-center.img-responsive(src="http://i.imgur.com/lyd0bfM.jpg") + h4.text-center We welcome you to come ask questions and share your thoughts with our entire open source community. + a.button.btn.btn-block.btn-primary(href="https://reddit.com/r/freecodecamp" target="_blank") Check it out .button-spacer .text-center - a#hideTshirtNoticeButton(href='#') Hide this forever + a#hide-map-notice-button(href='#') Hide this .spacer .row .col-xs-12.col-sm-8.col-sm-offset-2 @@ -131,14 +140,14 @@ block content var username = !{JSON.stringify(user && user.username || '')}; var lastCompleted = !{JSON.stringify(lastCompleted || false)} $(document).ready(function () { - if (!localStorage || !localStorage.hideTshirtNotice) { - $("#tshirt-notice").removeClass("hidden"); + if (!localStorage || !localStorage.hideRedditNotice) { + $("#map-notice").removeClass("hidden"); } - $("#hideTshirtNoticeButton").on("click", function() { - $("#tshirt-notice").addClass('animated fadeOut'); + $("#hide-map-notice-button").on("click", function() { + $("#map-notice").addClass('animated fadeOut'); setTimeout(function() { - $("#tshirt-notice").hide(); + $("#map-notice").hide(); }, 1000); - localStorage.hideTshirtNotice = "true"; + localStorage.hideRedditNotice = "true"; }); });