codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 00:31:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-07-29 14:40:19 -07:00
commit fe4ac0aac3
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/locale/en.coffee
View file

@ -89,7 +89,6 @@
goto_classes: "Go to My Classes" goto_classes: "Go to My Classes"
view_profile: "View My Profile" view_profile: "View My Profile"
view_progress: "View Progress" view_progress: "View Progress"
check_out_wiki: "Check out our new Educator Wiki"
want_coco: "Want CodeCombat at your school?" want_coco: "Want CodeCombat at your school?"
form_select_role: "Select primary role" form_select_role: "Select primary role"
form_select_range: "Select class size" form_select_range: "Select class size"

3
app/templates/courses/teacher-class-view.jade
View file

@ -122,7 +122,8 @@ block content
li(class=(activeTab === "#enrollment-status-tab" ? 'active' : '')) li(class=(activeTab === "#enrollment-status-tab" ? 'active' : ''))
a.course-progress-tab-btn(href='#enrollment-status-tab') a.course-progress-tab-btn(href='#enrollment-status-tab')
.small-details.text-center(data-i18n='teacher.enrollment_status') .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 .tab-spacer
li(class=(activeTab === "#student-projects-tab" ? 'active' : '')) li(class=(activeTab === "#student-projects-tab" ? 'active' : ''))
a.course-progress-tab-btn(href='#student-projects-tab') a.course-progress-tab-btn(href='#student-projects-tab')

5
app/templates/new-home-view.jade
View file

@ -18,10 +18,7 @@ mixin box
div 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") 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 div
if view.isTeacherWithDemo 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
h6(data-i18n="new_home.want_coco") 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") button.btn.btn-primary.btn-lg.request-demo(data-event-action="Homepage Request Demo CTA", data-i18n="new_home.request_demo")

2
app/views/courses/TeacherClassView.coffee
View file

@ -352,7 +352,7 @@ module.exports = class TeacherClassView extends RootView
coursePlaytimeMap[courseID] ?= 0 coursePlaytimeMap[courseID] ?= 0
coursePlaytimeMap[courseID] += session.get('playtime') or 0 coursePlaytimeMap[courseID] += session.get('playtime') or 0
playtimeString = if playtime is 0 then "0" else moment.duration(playtime, 'seconds').humanize() 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 coursePlaytimeMap[course.id] ?= 0
coursePlaytimes = [] coursePlaytimes = []
for courseID, playtime of coursePlaytimeMap for courseID, playtime of coursePlaytimeMap