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

🐛Fix teacher dashboard course # progress

Browse source
This commit is contained in:
Matt Lott 2016-08-16 16:30:12 -07:00
parent 8054cd6cf0
commit efa4b2b158
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/lib/coursesHelper.coffee
View file

@ -45,6 +45,7 @@ module.exports =
users = _.map userIDs, (id) -> users = _.map userIDs, (id) ->
students.get(id) students.get(id)
return { return {
courseName: course.get('name')
courseNumber: courseIndex + 1 courseNumber: courseIndex + 1
levelNumber: levelIndex + 1 levelNumber: levelIndex + 1
levelName: level.get('name') levelName: level.get('name')
@ -74,6 +75,7 @@ module.exports =
users = _.map userIDs, (id) -> users = _.map userIDs, (id) ->
students.get(id) students.get(id)
return { return {
courseName: course.get('name')
courseNumber: courseIndex + 1 courseNumber: courseIndex + 1
levelNumber: levelIndex + 1 levelNumber: levelIndex + 1
levelName: level.get('name') levelName: level.get('name')

2
app/locale/en.coffee
View file

@ -1444,7 +1444,7 @@
edit: "edit" edit: "edit"
edit_2: "Edit" edit_2: "Edit"
remove: "remove" remove: "remove"
latest_completed: "Latest Completed" latest_completed: "Latest completed" # {change}
sort_by: "Sort by" sort_by: "Sort by"
progress: "Progress" progress: "Progress"
completed: "Completed" completed: "Completed"

11
app/styles/courses/teacher-class-view.sass
View file

@ -142,13 +142,13 @@
overflow: hidden overflow: hidden
text-overflow: ellipsis text-overflow: ellipsis
white-space: nowrap white-space: nowrap
.level-name .level-name
white-space: nowrap white-space: nowrap
overflow: ellipsis overflow: ellipsis
font-weight: bold font-weight: bold
// line-height: 20px font-size: 14px
.sort-button .sort-button
border: none border: none
background: none background: none
@ -296,7 +296,10 @@
background: #fafafa background: #fafafa
border: thin solid #979797 border: thin solid #979797
text-align: center text-align: center
#join-url-input
font-size: 14px
button button
height: 50px height: 50px
width: 210px width: 210px

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

@ -159,11 +159,9 @@ mixin breadcrumbs
mixin longLevelName(data) mixin longLevelName(data)
if data if data
div.level-name div.level-name
span(data-i18n="courses.course") span= data.courseName + ': '
span= ' ' + data.courseNumber + ', ' span(data-i18n='play_level.level')
span(data-i18n="play_level.level") span.spl= data.levelNumber
span= ' ' + data.levelNumber + ': '
span= data.levelName
else else
div.level-name(data-i18n='teacher.not_applicable') div.level-name(data-i18n='teacher.not_applicable')