Skip to content

E
edx-platform
Commit b817f4ca by Vik Paruchuri
Options

Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui

parents f8dab92b 72bb93d4
Showing with 75 additions and 63 deletions
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
......@@ -266,8 +266,6 @@ div.combined-rubric-container {
h4 {
padding-top: $baseline/2;
border-color: lightgray;
border-top: 1px solid;
}
span.rubric-category {
......@@ -892,7 +890,6 @@ section.open-ended-child {
.oe-tools {
display: inline-block;
padding-left: $baseline;
width: 100%;
border-radius: 5px;
......@@ -910,7 +907,7 @@ section.open-ended-child {
.rubric-previous-button {
margin-right: $baseline/4;
}
.rubric-next-button {
margin-left: $baseline/4;
}
......
common/lib/xmodule/xmodule/js/fixtures/combined-open-ended.html
......@@ -42,7 +42,7 @@
</div>
</div>
<div class="oe-tools response-tools">
<span class="oe-tools-label">Response: </span>
<span class="oe-tools-label"></span>
<input type="button" value="Reset" class="reset-button" name="reset" style="display: none;">
</div>
<input type="button" value="Next Step" class="next-step-button" name="reset" style="display: none;">
......
common/lib/xmodule/xmodule/js/fixtures/rubric.html
......@@ -78,7 +78,7 @@
</div>
</div>
<div class="oe-tools response-tools">
<span class="oe-tools-label">Response: </span>
<span class="oe-tools-label"></span>
<input type="button" value="Reset" class="reset-button" name="reset" style="display: inline-block;">
</div>
</div>
......
lms/static/sass/course/_staff_grading.scss
......@@ -36,10 +36,10 @@ div.peer-grading{
&.submission-container{
@include clearfix;
overflow-y: auto;
height: auto;
max-height: 300px;
height: auto;
border: 1px solid #ddd;
background: #F6F6F6;
background: #f6f6f6;
}
}
......@@ -47,7 +47,6 @@ div.peer-grading{
margin: 0;
padding: 2px;
min-width: 50px;
background-color: white;
text-size: 1.5em;
}
......@@ -63,7 +62,7 @@ div.peer-grading{
}
.problem-list {
width:100%;
width: 100%;
table-layout: auto;
text-align: center;
......@@ -193,6 +192,20 @@ div.peer-grading {
border-radius: $baseline/2;
padding: 0;
.peer-grading-tools {
padding: $baseline;
}
.error-container {
margin: $baseline;
border-radius: $baseline/4;
padding: $baseline/2;
}
.interstitial-page, .calibration -feedback, .calibration-interstitial-page {
padding: $baseline;
}
.prompt-wrapper {
padding: $baseline;
}
......
lms/templates/combinedopenended/combined_open_ended.html
......@@ -38,7 +38,7 @@
% endfor
</div>
<div class="oe-tools response-tools">
<span class="oe-tools-label">${_("Response: ")}</span>
<span class="oe-tools-label"></span>
<input type="button" value="${_('Reset')}" class="reset-button" name="reset"/>
</div>
</div>
......
lms/templates/peer_grading/peer_grading.html
......@@ -2,59 +2,61 @@
<section class="container peer-grading-container">
<div class="peer-grading" data-ajax-url="${ajax_url}" data-use-single-location="${use_single_location}">
<div class="error-container">${error_text}</div>
<h1>${_("Peer Grading")}</h1>
<h2>${_("Instructions")}</h2>
<p>${_("Here are a list of problems that need to be peer graded for this course.")}</p>
% if success:
% if len(problem_list) == 0:
<div class="message-container">
${_("Nothing to grade!")}
</div>
%else:
<div class="problem-list-container">
<table class="problem-list">
<tr>
<th>${_("Problem Name")}</th>
<th>${_("Due date")}</th>
<th>${_("Graded")}</th>
<th>${_("Available")}</th>
<th>${_("Required")}</th>
<th>${_("Progress")}</th>
<div class="peer-grading-tools">
<h1 class="peer-grading-title">${_("Peer Grading")}</h1>
<h2 class="peer-grading-instructions">${_("Instructions")}</h2>
<p>${_("Here are a list of problems that need to be peer graded for this course.")}</p>
% if success:
% if len(problem_list) == 0:
<div class="message-container">
${_("Nothing to grade!")}
</div>
%else:
<div class="problem-list-container">
<table class="problem-list">
<tr>
<th>${_("Problem Name")}</th>
<th>${_("Due date")}</th>
<th>${_("Graded")}</th>
<th>${_("Available")}</th>
<th>${_("Required")}</th>
<th>${_("Progress")}</th>
</tr>
%for problem in problem_list:
<tr data-graded="${problem['num_graded']}" data-required="${problem['num_required']}">
<td class="problem-name">
%if problem['closed']:
${problem['problem_name']}
%else:
<a href="#problem" data-location="${problem['location']}" class="problem-button">${problem['problem_name']}</a>
%endif
</td>
<td>
% if problem['due']:
${problem['due']}
% else:
${_("No due date")}
% endif
</td>
<td>
${problem['num_graded']}
</td>
<td>
${problem['num_pending']}
</td>
<td>
${problem['num_required']}
</td>
<td>
<div class="progress-bar">
</div>
</td>
</tr>
%for problem in problem_list:
<tr data-graded="${problem['num_graded']}" data-required="${problem['num_required']}">
<td class="problem-name">
%if problem['closed']:
${problem['problem_name']}
%else:
<a href="#problem" data-location="${problem['location']}" class="problem-button">${problem['problem_name']}</a>
%endif
</td>
<td>
% if problem['due']:
${problem['due']}
% else:
${_("No due date")}
% endif
</td>
<td>
${problem['num_graded']}
</td>
<td>
${problem['num_pending']}
</td>
<td>
${problem['num_required']}
</td>
<td>
<div class="progress-bar">
</div>
</td>
</tr>
%endfor
</table>
</div>
%endfor
</table>
</div>
%endif
%endif
%endif
</div>
</div>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment