diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 9c8770392..f23728608 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -89,7 +89,6 @@ goto_classes: "Go to My Classes" view_profile: "View My Profile" view_progress: "View Progress" - check_out_wiki: "Check out our new Educator Wiki" want_coco: "Want CodeCombat at your school?" form_select_role: "Select primary role" form_select_range: "Select class size" diff --git a/app/templates/courses/teacher-class-view.jade b/app/templates/courses/teacher-class-view.jade index 589db7faa..37cbb69e0 100644 --- a/app/templates/courses/teacher-class-view.jade +++ b/app/templates/courses/teacher-class-view.jade @@ -122,7 +122,8 @@ block content li(class=(activeTab === "#enrollment-status-tab" ? 'active' : '')) a.course-progress-tab-btn(href='#enrollment-status-tab') .small-details.text-center(data-i18n='teacher.enrollment_status') - if _.find(view.courses.models, function(c) { return /dev/.test(c.get('slug')); }) + - var courses = view.classroom.get('courses').map(function(c) { return view.courses.get(c._id); }); + if _.find(courses, function(c) { return /dev/.test(c.get('slug')); }) .tab-spacer li(class=(activeTab === "#student-projects-tab" ? 'active' : '')) a.course-progress-tab-btn(href='#student-projects-tab') diff --git a/app/templates/new-home-view.jade b/app/templates/new-home-view.jade index f4c88d015..752b16224 100644 --- a/app/templates/new-home-view.jade +++ b/app/templates/new-home-view.jade @@ -18,10 +18,7 @@ mixin box div button.teacher-btn.btn.btn-forest.btn-lg.btn-block(data-event-action="Homepage Click My Classes CTA", data-i18n="new_home.goto_classes") div - if view.isTeacherWithDemo - h6(data-i18n="new_home.check_out_wiki") - button.wiki-btn.btn.btn-primary.btn-lg.btn-block(data-event-action="Homepage Click Educator Wiki CTA", data-i18n="nav.educator_wiki") - else + if !view.isTeacherWithDemo h6(data-i18n="new_home.want_coco") button.btn.btn-primary.btn-lg.request-demo(data-event-action="Homepage Request Demo CTA", data-i18n="new_home.request_demo") diff --git a/app/views/courses/TeacherClassView.coffee b/app/views/courses/TeacherClassView.coffee index 5cd64b0ec..604708367 100644 --- a/app/views/courses/TeacherClassView.coffee +++ b/app/views/courses/TeacherClassView.coffee @@ -352,7 +352,7 @@ module.exports = class TeacherClassView extends RootView coursePlaytimeMap[courseID] ?= 0 coursePlaytimeMap[courseID] += session.get('playtime') or 0 playtimeString = if playtime is 0 then "0" else moment.duration(playtime, 'seconds').humanize() - for course in @courses.models + for course in courses coursePlaytimeMap[course.id] ?= 0 coursePlaytimes = [] for courseID, playtime of coursePlaytimeMap