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

Merge pull request #3216 from QuincyLarson/unauthenticated-buttons

Browse Source 
Help, Pair and Bug buttons for unauthenticated campers
This commit is contained in:
Berkeley Martinez
2015-09-09 20:38:36 -07:00
parent 7ab36aa785 c70fe77952
commit 40f53fc7c8
5 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/views/coursewares/showBonfire.jade
View File

@ -82,7 +82,7 @@ block content
alert(type='danger') alert(type='danger')
span.ion-close-circled span.ion-close-circled
| Username not found | Username not found
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-block.btn-lg#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
.button-spacer .button-spacer
@ -99,8 +99,12 @@ block content
label.btn.btn-success#trigger-issue-modal label.btn.btn-success#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
|   Bug |   Bug
if (!user)
.button-spacer
a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
script.
var userLoggedIn = false;
.button-spacer .button-spacer
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView
textarea#codeOutput(style='display: none;') textarea#codeOutput(style='display: none;')

31
server/views/coursewares/showHTML.jade
View File

@ -30,24 +30,23 @@ block content
for sentence in details for sentence in details
p.wrappable.negative-10!= sentence p.wrappable.negative-10!= sentence
.negative-bottom-margin-30 .negative-bottom-margin-30
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-lg.btn-block#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
if (user) .button-spacer
.button-spacer .btn-group.input-group.btn-group-justified
.btn-group.input-group.btn-group-justified label.btn.btn-success#trigger-reset-modal
label.btn.btn-success#trigger-reset-modal i.fa.fa-refresh
i.fa.fa-refresh |   Reset
|   Reset label.btn.btn-success#trigger-help-modal
label.btn.btn-success#trigger-help-modal i.fa.fa-medkit
i.fa.fa-medkit |   Help
|   Help label.btn.btn-success#trigger-issue-modal
label.btn.btn-success#trigger-issue-modal i.fa.fa-bug
i.fa.fa-bug |   Bug
|   Bug script.
script. var userLoggedIn = true;
var userLoggedIn = true; if (!user)
else
.button-spacer .button-spacer
a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
script. script.

7
server/views/coursewares/showJS.jade
View File

@ -35,7 +35,7 @@ block content
.form-group.text-center.negative-10 .form-group.text-center.negative-10
.col-xs-12 .col-xs-12
// extra field to distract password tools like lastpass from injecting css into our username field // extra field to distract password tools like lastpass from injecting css into our username field
label.negative-10.btn.btn-primary.btn-block#submitButton label.negative-10.btn.btn-primary.btn-lg.btn-block#submitButton
i.fa.fa-play i.fa.fa-play
|   Run tests (ctrl + enter) |   Run tests (ctrl + enter)
.button-spacer .button-spacer
@ -49,6 +49,11 @@ block content
label.btn.btn-success#trigger-issue-modal label.btn.btn-success#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
|   Bug |   Bug
if (!user)
.button-spacer
a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress
script.
var userLoggedIn = false;
.button-spacer .button-spacer
form.code form.code
.form-group.codeMirrorView .form-group.codeMirrorView

28
server/views/coursewares/showVideo.jade
View File

@ -15,22 +15,22 @@ block content
.col-xs-12.col-sm-12.col-md-8 .col-xs-12.col-sm-12.col-md-8
.embed-responsive.embed-responsive-16by9 .embed-responsive.embed-responsive-16by9
iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
br .spacer
if (user) if (user)
a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter) a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter)
else
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) I've completed this challenge (ctrl + enter)
script. script.
var userLoggedIn = true; var userLoggedIn = true;
.button-spacer .button-spacer
.btn-group.input-group.btn-group-justified .btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#trigger-help-modal-modal .btn.btn-success.btn-big#trigger-help-modal
i.fa.fa-medkit i.fa.fa-medkit
|   Get help |   Get help
.btn.btn-success.btn-big#trigger-issue-modal .btn.btn-success.btn-big#trigger-issue-modal
i.fa.fa-bug i.fa.fa-bug
|   Report a bug |   Report a bug
.button-spacer if (!user)
else
a.animated.fadeIn.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
.button-spacer .button-spacer
a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script. script.
@ -66,7 +66,7 @@ block content
.animated.zoomInDown.delay-half .animated.zoomInDown.delay-half
span.completion-icon.ion-checkmark-circled.text-primary span.completion-icon.ion-checkmark-circled.text-primary
if (user) if (user)
a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) Go to my next challenge a.btn.btn-lg.btn-primary.btn-block#next-courseware-button(name='_csrf', value=_csrf) I've completed this challenge (ctrl + enter)
script. script.
$('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler); $('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler);
@ -76,7 +76,7 @@ block content
i.fa.fa-twitter   i.fa.fa-twitter  
= phrase = phrase
else else
a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge a.animated.fadeIn.btn.btn-lg.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) I've completed this challenge (ctrl + enter)
script. script.
$('body').bind('keypress', controlEnterHandler); $('body').bind('keypress', controlEnterHandler);
script. script.

28
server/views/coursewares/showZiplineOrBasejump.jade
View File

@ -18,22 +18,26 @@ block content
br br
if (user) if (user)
a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter) a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter)
.button-spacer
.btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#trigger-help-modal
i.fa.fa-medkit
|   Help
.btn.btn-success.btn-big#trigger-pair-modal
i.fa.fa-user-plus
|   Pair
.btn.btn-success.btn-big#trigger-issue-modal
i.fa.fa-bug
|   Bug
.button-spacer
script. script.
var userLoggedIn = true; var userLoggedIn = true;
else else
a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter) a.btn.btn-big.btn-primary.btn-block(href='/challenges/next-challenge?id=' + challengeId) Go to my next challenge (ctrl + enter)
<<<<<<< HEAD
.button-spacer
.btn-group.input-group.btn-group-justified
.btn.btn-success.btn-big#trigger-help-modal
i.fa.fa-medkit
| &nbsp; Help
.btn.btn-success.btn-big#trigger-pair-modal
i.fa.fa-user-plus
| &nbsp; Pair
.btn.btn-success.btn-big#trigger-issue-modal
i.fa.fa-bug
| &nbsp; Bug
if (!user)
.button-spacer
=======
>>>>>>> staging
a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress
script. script.
var userLoggedIn = false; var userLoggedIn = false;