gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'calculator' into staging

Browse Source 
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
This commit is contained in:
Quincy Larson
2015-06-14 01:10:48 -07:00
parent b6fc2551d9 3979dc42b9
commit 43f347bae0
6 changed files with 694 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
server/views/challengeMap/show.jade
View File

@@ -98,22 +98,21 @@ block content
li.large-p.negative-10
a(href="/challenges/#{challenge.name}")= challenge.name
//#announcementModal.modal(tabindex='-1')
// .modal-dialog.animated.fadeInUp.fast-animation
// .modal-content
// .modal-header.challenge-list-header Join our Saturday Summit!
// a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
// .modal-body
// h3.text-left Saturday at Noon EDT: We'll live-stream our Saturday Summit on Twitch.tv.
// h3.text-left We'll announce our new Front End Development Certificate Program (it's free, of course) and our new "Free Code Camp On The Go" app.  
// a(href='http://www.freecodecamp.com/twitch', target='_blank') Add us to your calendar here
// | .
// a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='http://twitch.tv/freecodecamp', target='_blank') Follow us on Twitch.tv
// a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up!
//script.
// $(document).ready(function () {
// if (!localStorage || !localStorage.day234) {
// $('#announcementModal').modal('show');
// localStorage.day234 = "true";
// }
// });
#announcementModal.modal(tabindex='-1')
.modal-dialog.animated.fadeInUp.fast-animation
.modal-content
.modal-header.challenge-list-header Add us to your LinkedIn profile
a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') ×
.modal-body
h3.text-left LinkedIn now recognizes Free Code Camp as a university.
img.img-responsive.img-center(src='https://www.evernote.com/l/AHTzkHwtg-BHj57bqqDL7WFF8WgrI5V8cxwB/image.png')
h3.text-left It takes less than a minute to add Free Code Camp to your LinkedIn profile.
a.btn.btn-lg.btn-info.btn-block(name='_csrf', value=_csrf, aria-hidden='true', href='/linkedin', target='_blank') Show me how to do this
a.btn.btn-lg.btn-primary.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Thanks for the heads-up
script.
$(document).ready(function () {
if (!localStorage || !localStorage.linkedIn) {
$('#announcementModal').modal('show');
localStorage.linkedIn = "true";
}
});