From efa4b2b158e42fefc2de1ce6baa0498c7aac4eac Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Tue, 16 Aug 2016 16:30:12 -0700 Subject: [PATCH] :bug:Fix teacher dashboard course # progress --- app/lib/coursesHelper.coffee | 2 ++ app/locale/en.coffee | 2 +- app/styles/courses/teacher-class-view.sass | 11 +++++++---- app/templates/courses/teacher-class-view.jade | 8 +++----- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/app/lib/coursesHelper.coffee b/app/lib/coursesHelper.coffee index a6186ada5..7f2f9dbc2 100644 --- a/app/lib/coursesHelper.coffee +++ b/app/lib/coursesHelper.coffee @@ -45,6 +45,7 @@ module.exports = users = _.map userIDs, (id) -> students.get(id) return { + courseName: course.get('name') courseNumber: courseIndex + 1 levelNumber: levelIndex + 1 levelName: level.get('name') @@ -74,6 +75,7 @@ module.exports = users = _.map userIDs, (id) -> students.get(id) return { + courseName: course.get('name') courseNumber: courseIndex + 1 levelNumber: levelIndex + 1 levelName: level.get('name') diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 1385e564c..db4553908 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -1444,7 +1444,7 @@ edit: "edit" edit_2: "Edit" remove: "remove" - latest_completed: "Latest Completed" + latest_completed: "Latest completed" # {change} sort_by: "Sort by" progress: "Progress" completed: "Completed" diff --git a/app/styles/courses/teacher-class-view.sass b/app/styles/courses/teacher-class-view.sass index 66f880ce5..375571689 100644 --- a/app/styles/courses/teacher-class-view.sass +++ b/app/styles/courses/teacher-class-view.sass @@ -142,13 +142,13 @@ overflow: hidden text-overflow: ellipsis white-space: nowrap - + .level-name white-space: nowrap overflow: ellipsis font-weight: bold - // line-height: 20px - + font-size: 14px + .sort-button border: none background: none @@ -296,7 +296,10 @@ background: #fafafa border: thin solid #979797 text-align: center - + + #join-url-input + font-size: 14px + button height: 50px width: 210px diff --git a/app/templates/courses/teacher-class-view.jade b/app/templates/courses/teacher-class-view.jade index ad32438aa..223937695 100644 --- a/app/templates/courses/teacher-class-view.jade +++ b/app/templates/courses/teacher-class-view.jade @@ -159,11 +159,9 @@ mixin breadcrumbs mixin longLevelName(data) if data div.level-name - span(data-i18n="courses.course") - span= ' ' + data.courseNumber + ', ' - span(data-i18n="play_level.level") - span= ' ' + data.levelNumber + ': ' - span= data.levelName + span= data.courseName + ': ' + span(data-i18n='play_level.level') + span.spl= data.levelNumber else div.level-name(data-i18n='teacher.not_applicable')