Skip to content

Commit

Permalink
Revert "SAK-43270 Added submitters image to Sakai Grader (sakaiprojec…
Browse files Browse the repository at this point in the history
…t#7933)"

This reverts commit e7ab655.
  • Loading branch information
ern committed Feb 26, 2020
1 parent e7ab655 commit 45560fc
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 44 deletions.
34 changes: 7 additions & 27 deletions library/src/morpheus-master/sass/modules/grader/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,7 @@ sakai-grader {
padding: 5px;
margin-bottom: 5px;

.left-block {
flex: 0 0 auto;
#grader-settings-wrapper {
display: inline-block;
margin-left: 20px;
}
}
.left-block { flex: 0 0 auto; }
.assessment-info { display: inline-block; font-weight: bold; }
.assessment-title { font-size: larger; }

Expand Down Expand Up @@ -44,26 +38,18 @@ sakai-grader {
flex: 1 1 auto;
font-weight: bold;
text-align: center;
div { display: inline-block; }
}

.grader-navigator {
flex: 0 0 auto;
text-align: center;
text-decoration: none;
select {
display: inline-block;
margin: 0px 0px 0px 8px;
&:focus { outline: 0;}
}
.grader-navigator a { text-decoration: none; font-weight: bold; }
.profile-image {
margin-right: 6px;
img {
height: 26px;
}
}
}
.grader-navigator select {
display: inline-block;
margin: 0px 20px 0px 20px;
&:focus { outline: 0;}
}
.grader-navigator a { text-decoration: none; font-weight: bold; }
}

.grader-container {
Expand Down Expand Up @@ -109,11 +95,6 @@ sakai-grader {
color: green;
}

.profile-image {
margin-right: 6px;
img { width: 64px; }
}

.active-indicator {
display: inline-block;
background: green;
Expand Down Expand Up @@ -207,7 +188,6 @@ sakai-grader {

.attachments-header {
margin-top: 7px;
font-weight: bold;
}

.attachment-link {
Expand Down
1 change: 0 additions & 1 deletion webcomponents/bundle/src/main/bundle/grader.properties
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,3 @@ number_grade_label=Numeric grade input field
checkgrade_label=Checkmark grade input box
comment_present=There is a comment on this submission
notes_present=There are private notes on this submission
profile_image='s profile image
28 changes: 12 additions & 16 deletions webcomponents/tool/src/main/frontend/grader/sakai-grader.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
<div class="course-title">${portal.siteTitle}</div>
<div class="assessment-title">${this.gradableTitle}</div>
</div>
<div id="grader-settings-wrapper">
<div style="display: inline-block; margin-left: 20px;">
<a id="settings-link" href="javascript;" @click=${this.toggleSettings} title="${this.i18n["settings"]}">
<fa-icon size="1.3em" i-class="fas cogs" path-prefix="/webcomponents/assets" />
</a>
Expand All @@ -117,7 +117,7 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
</div>
</div>
<div class="total-block">
<div>
<div style="display: inline-block;">
<div class="total-label">${this.i18n["graded"]}</div>
<div class="total-graded">${this.totalGraded} / ${this.submissions.length}</div>
</div>
Expand All @@ -132,7 +132,6 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
<select aria-label="${this.i18n["student_selector_label"]}" @change=${this.studentSelected}>
${this.submissions.map(s => html`<option value="${s.id}" .selected=${this.submission.id === s.id}>${s.groupId ? s.groupTitle : s.firstSubmitterName}</option>`)}
</select>
<span class="profile-image"><img src="/direct/profile/${this.submission.firstSubmitterId}/image/official?siteId=${portal.siteId}" alt="${this.submission.firstSubmitterName}${this.i18n["profile_image"]}"/></span>
`}
<a href="javascript:;" @click=${this.fireNext}><fa-icon size="2em" i-class="fas arrow-circle-right" path-prefix="/webcomponents/assets" style="vertical-align: middle;" /></a>
</div>
Expand Down Expand Up @@ -173,22 +172,19 @@ class SakaiGrader extends gradableDataMixin(SakaiElement) {
${this.submission.id !== "dummy" ? html`
<div class="grader ${this.graderOnLeft ? "on-left" : ""}">
<div class="submitted-block">
<div style="display: flex;">
<div class="profile-image" style="flex: 1;"><img src="/direct/profile/${this.submission.firstSubmitterId}/image/official?siteId=${portal.siteId}" alt="${this.submission.firstSubmitterName}${this.i18n["profile_image"]}" /></div>
<div class="submitted-time" style="flex: 4;">
${this.submission.submittedTime ? html`
<span class="submitter-name">${this.renderSubmitter()}</span><span> ${this.i18n["on"]}</span>
<span class="submitted-time">${this.submission.submittedTime}</span>
${this.submission.late ? html`<span class="grader-late">${this.i18n["late"]}</span>` : ""}
${this.submission.returned ? html`<span class="grader-returned fa fa-eye" title="${this.i18n["returned_tooltip"]}" />` : ""}
${this.submission.submittedText && this.submission.submittedTime ? html`<div class="attachments-header"><a href="javascript;" @click=${this.displaySubmittedText}>${this.i18n["submitted_text"]}</a></div>` : ""}
` : html`
<span>${this.i18n["no_submission_for"]} ${this.renderSubmitter()}</span>
`}
</div>
<div class="submitted-time">
${this.submission.submittedTime ? html`
<span>${this.i18n["submitted_by"]} </span><span class="submitter-name">${this.renderSubmitter()}</span><span> ${this.i18n["on"]} </span>
<span class="submitted-time">${this.submission.submittedTime}</span>
${this.submission.late ? html`<span class="grader-late">${this.i18n["late"]}</span>` : ""}
${this.submission.returned ? html`<span class="grader-returned fa fa-eye" title="${this.i18n["returned_tooltip"]}" />` : ""}
` : html`
<span>${this.i18n["no_submission_for"]} ${this.renderSubmitter()}</span>
`}
</div>
${this.submission.groupId && this.submission.submittedTime ? html`<div class="grader-group-members">${this.submission.groupMembers}</div>` : ""}
<div class="attachments">
${this.submission.submittedText && this.submission.submittedTime ?html`<div><a href="javascript;" @click=${this.displaySubmittedText}>${this.i18n["submitted_text"]}</a></div>` : ""}
${this.submission.submittedAttachments.length > 0 ? html`
<div class="attachments-header">${this.i18n["submitted_attachments"]}:</div>
${Object.keys(this.submission.submittedAttachments).map(k => html`
Expand Down

0 comments on commit 45560fc

Please sign in to comment.