From 13c75b3f1f6afd18dc62e7f338e2f44ca5a84172 Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Sun, 6 Dec 2015 20:35:54 -0800 Subject: [PATCH] Condense class student progress list --- app/styles/courses/classroom-view.sass | 14 +++++++++----- app/templates/courses/classroom-view.jade | 14 ++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/styles/courses/classroom-view.sass b/app/styles/courses/classroom-view.sass index 30175651d..7236f9ccc 100644 --- a/app/styles/courses/classroom-view.sass +++ b/app/styles/courses/classroom-view.sass @@ -1,18 +1,22 @@ #classroom-view - .enable-btn - margin-top: 1px - margin-bottom: 4px + hr + margin-top: 5px + margin-bottom: 10px #main-button-area .btn margin-left: 10px #student-stats-row - margin-bottom: 20px + margin-bottom: 10px + + .student-name + font-size: 20px + font-weight: bold .progress - margin-bottom: 5px + margin-bottom: 2px .progress-bar border-right: 1px solid grey diff --git a/app/templates/courses/classroom-view.jade b/app/templates/courses/classroom-view.jade index f971585fc..2034a166a 100644 --- a/app/templates/courses/classroom-view.jade +++ b/app/templates/courses/classroom-view.jade @@ -53,12 +53,14 @@ block content hr for user in view.users.models - if view.teacherMode - a.remove-student-link.pull-right.text-uppercase(data-user-id=user.id) - span.glyphicon.glyphicon-remove - span.spl remove student - - h2= user.broadName() + .row + .col-md-6 + .student-name= user.broadName() || 'Anoner' + .col-md-6 + if view.teacherMode + a.remove-student-link.pull-right.text-uppercase(data-user-id=user.id) + span.glyphicon.glyphicon-remove + span.spl remove student - var lastPlayedString = view.userLastPlayedString(user); - var playtime = view.userPlaytimeString(user); if lastPlayedString || playtime