diff --git a/app/lib/LevelLoader.coffee b/app/lib/LevelLoader.coffee index 297fd4b89..0ab93f5c6 100644 --- a/app/lib/LevelLoader.coffee +++ b/app/lib/LevelLoader.coffee @@ -83,7 +83,7 @@ module.exports = class LevelLoader extends CocoClass @level.get = -> return 'hero' if arguments[0] is 'type' originalGet.apply @, arguments - if (@courseID and not @level.isType('course', 'course-ladder')) or window.serverConfig.picoCTF + if (@courseID and not @level.isType('course', 'course-ladder', 'game-dev', 'web-dev')) or window.serverConfig.picoCTF # Because we now use original hero levels for both hero and course levels, we fake being a course level in this context. originalGet = @level.get @level.get = -> diff --git a/app/templates/play/level/control_bar.jade b/app/templates/play/level/control_bar.jade index 2f6c56148..61607bef6 100644 --- a/app/templates/play/level/control_bar.jade +++ b/app/templates/play/level/control_bar.jade @@ -7,7 +7,7 @@ .levels-link-area a.levels-link(href=homeLink || "/") .glyphicon.glyphicon-play - span(data-i18n=me.isSessionless() ? "nav.courses" : (ladderGame ? "general.ladder" : "nav.play")).home-text Levels + span(data-i18n=me.isSessionless() ? "nav.courses" : (ladderGame ? "general.ladder" : "nav.play")).home-text .level-name-area-container .level-name-area diff --git a/app/templates/play/level/modal/hero-victory-modal.jade b/app/templates/play/level/modal/hero-victory-modal.jade index 345af217a..ccd9fe1d4 100644 --- a/app/templates/play/level/modal/hero-victory-modal.jade +++ b/app/templates/play/level/modal/hero-victory-modal.jade @@ -127,6 +127,8 @@ block modal-footer-content button.btn.btn-illustrated.btn-success.leaderboard-button.btn-lg(data-dismiss="modal", data-i18n="leaderboard.view_other_solutions") View Other Solutions else if showReturnToCourse button.btn.btn-illustrated.btn-warning.return-to-course-button.btn-lg(data-dismiss="modal", data-i18n="play_level.victory_go_home") Go Home + else if level.isType('game-dev', 'web-dev') + button.btn.btn-illustrated.btn-primary.btn-lg ... if showHourOfCodeDoneButton .hour-of-code-done diff --git a/app/templates/play/level/modal/progress-view.jade b/app/templates/play/level/modal/progress-view.jade index 269e3c7e7..725efe66a 100644 --- a/app/templates/play/level/modal/progress-view.jade +++ b/app/templates/play/level/modal/progress-view.jade @@ -39,6 +39,17 @@ h2.text-uppercase= i18n(view.nextLevel.attributes, 'name').replace('Course: ', '') div!= view.nextLevelDescription + + .well.well-sm.well-parchment + h3.text-uppercase + | Share this level so your friends and family can play it: + + .row + .col-sm-8 + input.text-h4.semibold.form-control.input-lg#share-level-input(value='lkasjdflkjasdf') + .col-sm-3 + button#share-level-btn.btn.btn-lg.btn-success.btn-illustrated + span(data-i18n='') Copy URL .row .col-sm-5.col-sm-offset-2 diff --git a/app/views/core/CocoView.coffee b/app/views/core/CocoView.coffee index 3ec65e5f0..3450ac721 100644 --- a/app/views/core/CocoView.coffee +++ b/app/views/core/CocoView.coffee @@ -496,6 +496,13 @@ module.exports = class CocoView extends Backbone.View playSound: (trigger, volume=1) -> Backbone.Mediator.publish 'audio-player:play-sound', trigger: trigger, volume: volume + tryCopy: -> + try + document.execCommand('copy') + catch err + message = 'Oops, unable to copy' + noty text: message, layout: 'topCenter', type: 'error', killer: false + mobileRELong = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i mobileREShort = /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i diff --git a/app/views/courses/CourseDetailsView.coffee b/app/views/courses/CourseDetailsView.coffee index 84b128df6..c910460e8 100644 --- a/app/views/courses/CourseDetailsView.coffee +++ b/app/views/courses/CourseDetailsView.coffee @@ -85,7 +85,7 @@ module.exports = class CourseDetailsView extends RootView @levelConceptMap = {} for level in @levels.models @levelConceptMap[level.get('original')] ?= {} - for concept in level.get('concepts') + for concept in level.get('concepts') or [] @levelConceptMap[level.get('original')][concept] = true if level.isType('course-ladder') @arenaLevel = level diff --git a/app/views/courses/TeacherClassView.coffee b/app/views/courses/TeacherClassView.coffee index 05318572a..ae30639f7 100644 --- a/app/views/courses/TeacherClassView.coffee +++ b/app/views/courses/TeacherClassView.coffee @@ -227,13 +227,6 @@ module.exports = class TeacherClassView extends RootView @$('#join-url-input').val(@state.get('joinURL')).select() @tryCopy() - tryCopy: -> - try - document.execCommand('copy') - catch err - message = 'Oops, unable to copy' - noty text: message, layout: 'topCenter', type: 'error', killer: false - onClickUnarchive: -> window.tracker?.trackEvent 'Teachers Class Unarchive', category: 'Teachers', classroomID: @classroom.id, ['Mixpanel'] @classroom.save { archived: false } diff --git a/app/views/play/level/ControlBarView.coffee b/app/views/play/level/ControlBarView.coffee index 895c6f0fc..bda779e4d 100644 --- a/app/views/play/level/ControlBarView.coffee +++ b/app/views/play/level/ControlBarView.coffee @@ -97,13 +97,7 @@ module.exports = class ControlBarView extends CocoView @homeViewArgs.push leagueType @homeViewArgs.push leagueID @homeLink += "/#{leagueType}/#{leagueID}" - else if @level.isType('hero', 'hero-coop') or window.serverConfig.picoCTF - @homeLink = '/play' - @homeViewClass = 'views/play/CampaignView' - campaign = @level.get 'campaign' - @homeLink += '/' + campaign - @homeViewArgs.push campaign - else if @level.isType('course') + else if @level.isType('course') or @courseID @homeLink = '/courses' @homeViewClass = 'views/courses/CoursesView' if @courseID @@ -113,8 +107,12 @@ module.exports = class ControlBarView extends CocoView if @courseInstanceID @homeLink += "/#{@courseInstanceID}" @homeViewArgs.push @courseInstanceID - #else if @level.isType('game-dev') # TODO - #else if @level.isType('web-dev') # TODO + else if @level.isType('hero', 'hero-coop', 'game-dev', 'web-dev') or window.serverConfig.picoCTF + @homeLink = '/play' + @homeViewClass = 'views/play/CampaignView' + campaign = @level.get 'campaign' + @homeLink += '/' + campaign + @homeViewArgs.push campaign else @homeLink = '/' @homeViewClass = 'views/HomeView' diff --git a/app/views/play/level/modal/ProgressView.coffee b/app/views/play/level/modal/ProgressView.coffee index d8d46a90a..57a6b48a5 100644 --- a/app/views/play/level/modal/ProgressView.coffee +++ b/app/views/play/level/modal/ProgressView.coffee @@ -11,6 +11,7 @@ module.exports = class ProgressView extends CocoView 'click #done-btn': 'onClickDoneButton' 'click #next-level-btn': 'onClickNextLevelButton' 'click #ladder-btn': 'onClickLadderButton' + 'click #share-level-btn': 'onClickShareLevelButton' initialize: (options) -> @level = options.level @@ -31,3 +32,7 @@ module.exports = class ProgressView extends CocoView onClickLadderButton: -> @trigger 'ladder' + + onClickShareLevelButton: -> + @$('#share-level-input').val('alskdjfla').select() + @tryCopy()