From dc4252a94d5409a0ba628a73ecbab538c8106ab4 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Sun, 16 Mar 2014 22:01:21 -0700 Subject: [PATCH 1/7] Moved the tips into the level loader screen and gave them i18n. --- app/templates/play/level/level_loading.jade | 10 ++++++++- .../play/level/level_loading_view.coffee | 22 +++++-------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app/templates/play/level/level_loading.jade b/app/templates/play/level/level_loading.jade index 8a1936f3f..5899823ca 100644 --- a/app/templates/play/level/level_loading.jade +++ b/app/templates/play/level/level_loading.jade @@ -10,4 +10,12 @@ .progress.progress-striped.active .progress-bar.progress-bar-success - h4= tip \ No newline at end of file + h4.tip(data-i18n='play_level.tip_insert_positions') You can Shift+Click a position on the map to insert it into the spell editor. + h4.tip(data-i18n='play_level.tip_toggle_play') You can toggle play/paused with Ctrl+P. + h4.tip(data-i18n='play_level.tip_scrub_shortcut') Press Ctrl+[ and Ctrl+] to rewind and fast-forward. + h4.tip(data-i18n='play_level.tip_open_source') CodeCombat is 100% open source! + h4.tip(data-i18n='play_level.tip_baby_coders') In the future, even babies will be Archmages. + h4.tip(data-i18n='play_level.tip_morale_improves') Loading will continue until morale improves. + h4.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013. + h4.tip(data-i18n='play_level.tip_js_beginning') JavaScript is just the beginning. + h4.tip(data-i18n='play_level.tip_all_species') We believe in equal opportunities to learn programming for all species. diff --git a/app/views/play/level/level_loading_view.coffee b/app/views/play/level/level_loading_view.coffee index 47ef06fbc..d933bb416 100644 --- a/app/views/play/level/level_loading_view.coffee +++ b/app/views/play/level/level_loading_view.coffee @@ -2,24 +2,17 @@ View = require 'views/kinds/CocoView' template = require 'templates/play/level/level_loading' -tips = [ - "Tip: you can shift+click a position on the map to insert it into the spell editor." - "You can toggle play/paused with ctrl+p." - "Pressing ctrl+[ and ctrl+] rewinds and fast-forwards." - "CodeCombat is 100% open source!" - "In the future, even babies will be Archmages." - "Loading will continue until morale improves." - "CodeCombat launched its beta in October, 2013." - "JavaScript is just the beginning." - "We believe in equal opportunities to learn programming for all species." -] - module.exports = class LevelLoadingView extends View id: "level-loading-view" template: template subscriptions: 'level-loader:progress-changed': 'onLevelLoaderProgressChanged' + + afterRender: -> + tips = @$el.find('.tip').addClass('secret') + tip = _.sample(tips) + $(tip).removeClass('secret') onLevelLoaderProgressChanged: (e) -> @progress = e.progress @@ -47,8 +40,3 @@ module.exports = class LevelLoadingView extends View onUnveilEnded: => return if @destroyed Backbone.Mediator.publish 'onLoadingViewUnveiled', view: @ - - getRenderData: (c={}) -> - super c - c.tip = _.sample tips - c From 5ddd2b9109f77bf68183ef592758408c7f526508 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Sun, 16 Mar 2014 22:11:21 -0700 Subject: [PATCH 2/7] Added a few more tips. --- app/templates/play/level/level_loading.jade | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/templates/play/level/level_loading.jade b/app/templates/play/level/level_loading.jade index 5899823ca..8523f32a0 100644 --- a/app/templates/play/level/level_loading.jade +++ b/app/templates/play/level/level_loading.jade @@ -19,3 +19,9 @@ h4.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013. h4.tip(data-i18n='play_level.tip_js_beginning') JavaScript is just the beginning. h4.tip(data-i18n='play_level.tip_all_species') We believe in equal opportunities to learn programming for all species. + h4.tip(data-i18n='play_level.tip_reticulating') Reticulating spines. + h4.tip(data-i18n='play_level.tip_autocast_setting') You can adjust autocast settings by clicking the gear on the cast button. + h4.tip(data-i18n='play_level.tip_guide_exists') Seeking help? Click the guide at the top of the page for useful info. + h4.tip + span(data-i18n='play_level.tip_harry') Yer a Wizard, + span= me.get('name') || 'Anoner' From 65c53a9e4355e902e319e74a0cd6c44da7476812 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Sun, 16 Mar 2014 22:17:56 -0700 Subject: [PATCH 3/7] Check anonymous for clicking link. --- app/views/play/ladder_view.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/play/ladder_view.coffee b/app/views/play/ladder_view.coffee index e0d25ea7f..068921627 100644 --- a/app/views/play/ladder_view.coffee +++ b/app/views/play/ladder_view.coffee @@ -127,18 +127,18 @@ module.exports = class LadderView extends RootView session = (s for s in @sessions.models when s.get('team') is teamID)[0] modal = new LadderPlayModal({}, @level, session, teamID) @openModalView modal - + showApologeticSignupModal: -> SignupModal = require 'views/modal/signup_modal' @openModalView(new SignupModal({showRequiredError:true})) onClickedLink: (e) -> link = $(e.target).closest('a').attr('href') - if link?.startsWith '/play/level' + if link?.startsWith('/play/level') and me.get('anonymous') e.stopPropagation() e.preventDefault() @showApologeticSignupModal() - + destroy: -> clearInterval @refreshInterval @simulator.destroy() From 1fa18fe2e0e6218cae3d8f1a62bf10424ea1edc9 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Sun, 16 Mar 2014 22:46:57 -0700 Subject: [PATCH 4/7] Added a border to the home view video. --- app/assets/images/pages/home/video_border.png | Bin 0 -> 18514 bytes app/styles/home.sass | 14 +++++++++++--- app/templates/home.jade | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 app/assets/images/pages/home/video_border.png diff --git a/app/assets/images/pages/home/video_border.png b/app/assets/images/pages/home/video_border.png new file mode 100644 index 0000000000000000000000000000000000000000..b07b2f2eb1b1e5f57c4d2ba7ec4e558575b6fb05 GIT binary patch literal 18514 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 b!2{I|=bXlC&awl|;lKkWjk}237BBu6`j}yX literal 0 HcmV?d00001 diff --git a/app/styles/home.sass b/app/styles/home.sass index 60e36802d..c240784a0 100644 --- a/app/styles/home.sass +++ b/app/styles/home.sass @@ -7,9 +7,17 @@ text-align: center margin-top: 0 - #trailer-wrapper iframe - display: block - margin: 0 auto + #trailer-wrapper + position: relative + iframe + display: block + margin: 0 auto + img + position: absolute + left: 10px + width: 976px + top: -7px + pointer-events: none .game-mode-wrapper position: relative diff --git a/app/templates/home.jade b/app/templates/home.jade index 7181e7485..fa043881f 100644 --- a/app/templates/home.jade +++ b/app/templates/home.jade @@ -6,6 +6,7 @@ block content #trailer-wrapper + img(src="/images/pages/home/video_border.png") hr From 729a016b1f00ca0a4fb835d6167fcf43906712df Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Sun, 16 Mar 2014 22:57:16 -0700 Subject: [PATCH 5/7] More tweaks to the video. --- app/styles/home.sass | 14 +++++++++----- app/templates/home.jade | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/styles/home.sass b/app/styles/home.sass index c240784a0..535bf43ca 100644 --- a/app/styles/home.sass +++ b/app/styles/home.sass @@ -9,14 +9,17 @@ #trailer-wrapper position: relative + margin: 0 auto 40px + width: 950px iframe display: block margin: 0 auto + position: relative + top: 8px img position: absolute - left: 10px - width: 976px - top: -7px + left: 0 + top: 0 pointer-events: none .game-mode-wrapper @@ -57,8 +60,9 @@ &:hover div color: lighten($yellow, 20%) &:hover img - filter: brightness(1.1) - -webkit-filter: brightness(1.1) + filter: brightness(1.2) + -webkit-filter: brightness(1.2) + box-shadow: 0 0 5px black #multiplayer-launch-modal .modal-dialog diff --git a/app/templates/home.jade b/app/templates/home.jade index fa043881f..0d7c5f0fd 100644 --- a/app/templates/home.jade +++ b/app/templates/home.jade @@ -5,7 +5,7 @@ block content h1#site-slogan(data-i18n="home.slogan") Learn to Code JavaScript by Playing a Game #trailer-wrapper - + img(src="/images/pages/home/video_border.png") hr From 7555dce1720a4b86ac54ca82b34ec1f5bdd68506 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 17 Mar 2014 00:05:45 -0700 Subject: [PATCH 6/7] Tweaked the loading page progress bar. --- app/styles/play/level/loading.sass | 15 ++++++-- app/templates/play/level/level_loading.jade | 34 +++++++++---------- .../play/level/level_loading_view.coffee | 1 + 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/app/styles/play/level/loading.sass b/app/styles/play/level/loading.sass index 71ec1b424..177334f72 100644 --- a/app/styles/play/level/loading.sass +++ b/app/styles/play/level/loading.sass @@ -32,7 +32,9 @@ width: $WIDTH margin-left: (-$WIDTH / 2) z-index: 100 - background-color: rgba(220, 255, 230, 0.5) + background-color: rgba(220, 255, 230, 0.6) + color: darkslategray + font-size: 15px border-radius: 30px padding: 10px text-align: center @@ -44,11 +46,20 @@ transition: top $UNVEIL_TIME cubic-bezier(0.285, -0.595, 0.670, -0.600) .load-progress - width: 100% + position: absolute + left: 2% + top: 0px + opacity: 0.6 + width: 96% + margin: 10px auto 0 .progress-bar width: 1% transition-duration: 1.2s + + #tip-wrapper + position: relative + z-index: 2 .left-wing, .right-wing width: 100% diff --git a/app/templates/play/level/level_loading.jade b/app/templates/play/level/level_loading.jade index 8523f32a0..2a3d59122 100644 --- a/app/templates/play/level/level_loading.jade +++ b/app/templates/play/level/level_loading.jade @@ -4,24 +4,24 @@ .loading-details - h2(data-i18n='play_level.loading_level') Loading Level - .load-progress .progress.progress-striped.active .progress-bar.progress-bar-success - h4.tip(data-i18n='play_level.tip_insert_positions') You can Shift+Click a position on the map to insert it into the spell editor. - h4.tip(data-i18n='play_level.tip_toggle_play') You can toggle play/paused with Ctrl+P. - h4.tip(data-i18n='play_level.tip_scrub_shortcut') Press Ctrl+[ and Ctrl+] to rewind and fast-forward. - h4.tip(data-i18n='play_level.tip_open_source') CodeCombat is 100% open source! - h4.tip(data-i18n='play_level.tip_baby_coders') In the future, even babies will be Archmages. - h4.tip(data-i18n='play_level.tip_morale_improves') Loading will continue until morale improves. - h4.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013. - h4.tip(data-i18n='play_level.tip_js_beginning') JavaScript is just the beginning. - h4.tip(data-i18n='play_level.tip_all_species') We believe in equal opportunities to learn programming for all species. - h4.tip(data-i18n='play_level.tip_reticulating') Reticulating spines. - h4.tip(data-i18n='play_level.tip_autocast_setting') You can adjust autocast settings by clicking the gear on the cast button. - h4.tip(data-i18n='play_level.tip_guide_exists') Seeking help? Click the guide at the top of the page for useful info. - h4.tip - span(data-i18n='play_level.tip_harry') Yer a Wizard, - span= me.get('name') || 'Anoner' + #tip-wrapper + strong.tip(data-i18n='play_level.tip_insert_positions') Shift+Click a point on the map to insert it into the spell editor. + strong.tip(data-i18n='play_level.tip_toggle_play') Toggle play/paused with Ctrl+P. + strong.tip(data-i18n='play_level.tip_scrub_shortcut') Ctrl+[ and Ctrl+] rewind and fast-forward. + strong.tip(data-i18n='play_level.tip_guide_exists') Click the guide at the top of the page for useful info. + strong.tip(data-i18n='play_level.tip_open_source') CodeCombat is 100% open source! + strong.tip(data-i18n='play_level.tip_beta_launch') CodeCombat launched its beta in October, 2013. + strong.tip(data-i18n='play_level.tip_js_beginning') JavaScript is just the beginning. + strong.tip(data-i18n='play_level.tip_autocast_setting') Adjust autocast settings by clicking the gear on the cast button. + + strong.tip.rare(data-i18n='play_level.tip_baby_coders') In the future, even babies will be Archmages. + strong.tip.rare(data-i18n='play_level.tip_morale_improves') Loading will continue until morale improves. + strong.tip.rare(data-i18n='play_level.tip_all_species') We believe in equal opportunities to learn programming for all species. + strong.tip.rare(data-i18n='play_level.tip_reticulating') Reticulating spines. + strong.tip.rare + span(data-i18n='play_level.tip_harry') Yer a Wizard, + span= me.get('name') || 'Anoner' diff --git a/app/views/play/level/level_loading_view.coffee b/app/views/play/level/level_loading_view.coffee index d933bb416..06fa8ae26 100644 --- a/app/views/play/level/level_loading_view.coffee +++ b/app/views/play/level/level_loading_view.coffee @@ -16,6 +16,7 @@ module.exports = class LevelLoadingView extends View onLevelLoaderProgressChanged: (e) -> @progress = e.progress + @progress = 0.01 if @progress < 0.01 @updateProgressBar() updateProgressBar: -> From db4ae0cd2d26bbfa64e3990bc463ca619500bb0e Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 17 Mar 2014 00:12:11 -0700 Subject: [PATCH 7/7] Made some tips show up more rarely. --- app/views/play/level/level_loading_view.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/play/level/level_loading_view.coffee b/app/views/play/level/level_loading_view.coffee index 06fa8ae26..c50107b6d 100644 --- a/app/views/play/level/level_loading_view.coffee +++ b/app/views/play/level/level_loading_view.coffee @@ -10,9 +10,11 @@ module.exports = class LevelLoadingView extends View 'level-loader:progress-changed': 'onLevelLoaderProgressChanged' afterRender: -> - tips = @$el.find('.tip').addClass('secret') + @$el.find('.tip.rare').remove() if _.random(1, 10) < 9 + tips = @$el.find('.tip').addClass('to-remove') tip = _.sample(tips) - $(tip).removeClass('secret') + $(tip).removeClass('to-remove') + @$el.find('.to-remove').remove() onLevelLoaderProgressChanged: (e) -> @progress = e.progress