diff --git a/server/views/coursewares/showBonfire.jade b/server/views/coursewares/showBonfire.jade index a068e99171..2da36283e7 100644 --- a/server/views/coursewares/showBonfire.jade +++ b/server/views/coursewares/showBonfire.jade @@ -82,7 +82,7 @@ block content alert(type='danger') span.ion-close-circled | 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 |   Run tests (ctrl + enter) .button-spacer @@ -99,8 +99,12 @@ block content label.btn.btn-success#trigger-issue-modal i.fa.fa-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 - form.code .form-group.codeMirrorView textarea#codeOutput(style='display: none;') diff --git a/server/views/coursewares/showHTML.jade b/server/views/coursewares/showHTML.jade index 38248519aa..62e6c0e424 100644 --- a/server/views/coursewares/showHTML.jade +++ b/server/views/coursewares/showHTML.jade @@ -30,24 +30,23 @@ block content for sentence in details p.wrappable.negative-10!= sentence .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 |   Run tests (ctrl + enter) - if (user) - .button-spacer - .btn-group.input-group.btn-group-justified - label.btn.btn-success#trigger-reset-modal - i.fa.fa-refresh - |   Reset - label.btn.btn-success#trigger-help-modal - i.fa.fa-medkit - |   Help - label.btn.btn-success#trigger-issue-modal - i.fa.fa-bug - |   Bug - script. - var userLoggedIn = true; - else + .button-spacer + .btn-group.input-group.btn-group-justified + label.btn.btn-success#trigger-reset-modal + i.fa.fa-refresh + |   Reset + label.btn.btn-success#trigger-help-modal + i.fa.fa-medkit + |   Help + label.btn.btn-success#trigger-issue-modal + i.fa.fa-bug + |   Bug + script. + var userLoggedIn = true; + if (!user) .button-spacer a.btn.signup-btn.btn-block.btn-block(href='/login') Sign in so you can save your progress script. diff --git a/server/views/coursewares/showJS.jade b/server/views/coursewares/showJS.jade index d8ae56585a..a43e5251de 100644 --- a/server/views/coursewares/showJS.jade +++ b/server/views/coursewares/showJS.jade @@ -35,7 +35,7 @@ block content .form-group.text-center.negative-10 .col-xs-12 // 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 |   Run tests (ctrl + enter) .button-spacer @@ -49,6 +49,11 @@ block content label.btn.btn-success#trigger-issue-modal i.fa.fa-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 form.code .form-group.codeMirrorView diff --git a/server/views/coursewares/showVideo.jade b/server/views/coursewares/showVideo.jade index a26c158109..c4e7d8fa92 100644 --- a/server/views/coursewares/showVideo.jade +++ b/server/views/coursewares/showVideo.jade @@ -15,22 +15,22 @@ block content .col-xs-12.col-sm-12.col-md-8 .embed-responsive.embed-responsive-16by9 iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}') - br + .spacer if (user) 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. var userLoggedIn = true; - .button-spacer - .btn-group.input-group.btn-group-justified - .btn.btn-success.btn-big#trigger-help-modal-modal - i.fa.fa-medkit - |   Get help - .btn.btn-success.btn-big#trigger-issue-modal - i.fa.fa-bug - |   Report a bug - .button-spacer - 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 + .btn-group.input-group.btn-group-justified + .btn.btn-success.btn-big#trigger-help-modal + i.fa.fa-medkit + |   Get help + .btn.btn-success.btn-big#trigger-issue-modal + i.fa.fa-bug + |   Report a bug + if (!user) .button-spacer a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. @@ -66,7 +66,7 @@ block content .animated.zoomInDown.delay-half span.completion-icon.ion-checkmark-circled.text-primary 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. $('#complete-courseware-editorless-dialog').bind('keypress', modalControlEnterHandler); @@ -76,7 +76,7 @@ block content i.fa.fa-twitter   = phrase 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. $('body').bind('keypress', controlEnterHandler); script. diff --git a/server/views/coursewares/showZiplineOrBasejump.jade b/server/views/coursewares/showZiplineOrBasejump.jade index 056ba51f6b..2b565d9235 100644 --- a/server/views/coursewares/showZiplineOrBasejump.jade +++ b/server/views/coursewares/showZiplineOrBasejump.jade @@ -18,22 +18,26 @@ block content br if (user) 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. var userLoggedIn = true; else 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 + |   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 + if (!user) + .button-spacer +======= +>>>>>>> staging a.btn.btn-big.signup-btn.btn-block(href='/login') Sign in so you can save your progress script. var userLoggedIn = false;