From ac36c0146f51713d584faaa4a81b5a4a14462a96 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 2 Dec 2015 14:19:46 -0800 Subject: [PATCH 1/6] Quick fix for StudentLoginModal error when username or password is not included --- app/views/courses/StudentLogInModal.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/courses/StudentLogInModal.coffee b/app/views/courses/StudentLogInModal.coffee index 6f1fa85f4..cad9e3a57 100644 --- a/app/views/courses/StudentLogInModal.coffee +++ b/app/views/courses/StudentLogInModal.coffee @@ -26,6 +26,10 @@ module.exports = class StudentSignInModal extends ModalView auth.loginUser data, (jqxhr) => error = jqxhr.responseJSON[0] message = _.filter([error.property, error.message]).join(' ') + if message is 'Missing credentials' + message = 'Enter both username and password' + # TODO: Make the server return better error message + message = _.string.capitalize(message) @disableModalInProgress(@$el) @$('#errors-alert').text(message).removeClass('hide') From 8cc37ed034bbb12d5401307e7bf698af7f27b75e Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 2 Dec 2015 14:25:08 -0800 Subject: [PATCH 2/6] Add recovery link to StudentLogInModal --- app/templates/courses/student-log-in-modal.jade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/templates/courses/student-log-in-modal.jade b/app/templates/courses/student-log-in-modal.jade index 307e71f47..3d29aa5f4 100644 --- a/app/templates/courses/student-log-in-modal.jade +++ b/app/templates/courses/student-log-in-modal.jade @@ -24,5 +24,7 @@ block modal-body-content input#log-in-btn.btn.btn-default(data-i18n="[value]login.log_in", type="submit") p a#create-new-account-link(data-i18n="login.signup_switch") + p + a(data-toggle="coco-modal", data-target="core/RecoverModal", data-i18n="login.forgot_password") Forgot your password? block modal-footer-content \ No newline at end of file From f88f4ee9ff3fad74b494ac2388d06181cd034456 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 2 Dec 2015 14:28:40 -0800 Subject: [PATCH 3/6] Tweak buttons on /hoc --- app/templates/courses/hour-of-code-view.jade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/courses/hour-of-code-view.jade b/app/templates/courses/hour-of-code-view.jade index 59475db10..08685b915 100644 --- a/app/templates/courses/hour-of-code-view.jade +++ b/app/templates/courses/hour-of-code-view.jade @@ -34,7 +34,7 @@ block content p strong Hi adventurer, welcome back! p - a#continue-playing-btn.btn.btn-default(href=view.continuePlayingLink()) Continue playing + a#continue-playing-btn.btn.btn-success.btn-lg(href=view.continuePlayingLink()) Continue Playing p em.spr span.spr Last Played: @@ -44,13 +44,13 @@ block content p strong More options: p - button#start-new-game-btn.btn.btn-default Start New Game + button#start-new-game-btn.btn.btn-default.btn-lg Start New Game if me.isAnonymous() p - OR - p - button#log-in-btn.btn.btn-default(data-i18n="login.log_in") + button#log-in-btn.btn.btn-default.btn-lg(data-i18n="login.log_in") #begin-hoc-area.hide h2.text-center(data-i18n="common.loading") From 750086cac88f2414f919817081b34848d780faa8 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 2 Dec 2015 14:30:28 -0800 Subject: [PATCH 4/6] Tweak logout link copy --- app/templates/courses/hour-of-code-view.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/courses/hour-of-code-view.jade b/app/templates/courses/hour-of-code-view.jade index 08685b915..0bdeb07e8 100644 --- a/app/templates/courses/hour-of-code-view.jade +++ b/app/templates/courses/hour-of-code-view.jade @@ -18,7 +18,7 @@ block content strong= me.get('name') || me.get('email') p - span.spr This isn't you? + span.spr Not you? a#log-out-link Logout hr From f43c3b0160389ce77e7f84e38d8c0b33429d9d72 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Wed, 2 Dec 2015 14:37:09 -0800 Subject: [PATCH 5/6] Add language icons to choose language modal --- app/styles/courses/choose-language-modal.sass | 4 +++- app/templates/courses/choose-language-modal.jade | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/styles/courses/choose-language-modal.sass b/app/styles/courses/choose-language-modal.sass index f2257b25f..6871c8e8f 100644 --- a/app/styles/courses/choose-language-modal.sass +++ b/app/styles/courses/choose-language-modal.sass @@ -1,7 +1,9 @@ #choose-language-modal button margin: 20px 0 10px + img + width: 30px .progress width: 50% - margin: 50px 25% \ No newline at end of file + margin: 50px 25% diff --git a/app/templates/courses/choose-language-modal.jade b/app/templates/courses/choose-language-modal.jade index 3e90b8211..e59366773 100644 --- a/app/templates/courses/choose-language-modal.jade +++ b/app/templates/courses/choose-language-modal.jade @@ -8,10 +8,14 @@ block modal-header-content block modal-body-content #choice-area.text-center - button.lang-choice-btn.btn.btn-success.btn-lg(data-language='python') Python + button.lang-choice-btn.btn.btn-success.btn-lg(data-language='python') + img(src="/images/common/code_languages/python_small.png") + span.spl Python p(data-i18n="choose_hero.python_blurb") - button.lang-choice-btn.btn.btn-default(data-language='javascript') JavaScript + button.lang-choice-btn.btn.btn-default(data-language='javascript') + img(src="/images/common/code_languages/javascript_small.png") + span.spl JavaScript p(data-i18n="choose_hero.javascript_blurb") #saving-progress.progress.progress-striped.active.hide From 80253305fbb70b81f42ca87c3f014676deaaa994 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Wed, 2 Dec 2015 14:57:06 -0800 Subject: [PATCH 6/6] Add ?simulate=true option for testing background simulations --- app/views/play/level/PlayLevelView.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/play/level/PlayLevelView.coffee b/app/views/play/level/PlayLevelView.coffee index 4dd490fe7..6f2f49a8d 100644 --- a/app/views/play/level/PlayLevelView.coffee +++ b/app/views/play/level/PlayLevelView.coffee @@ -424,7 +424,7 @@ module.exports = class PlayLevelView extends RootView @simulator.fetchAndSimulateOneGame() shouldSimulate: -> - return false # Performance is too bad right now, gotta fix it first. + return @getQueryVariable('simulate') is true # Performance is too bad right now, gotta fix it first. # Crude heuristics are crude. defaultCores = 2 cores = window.navigator.hardwareConcurrency or defaultCores # Available on Chrome/Opera, soon Safari