Skip to content

P
problem-builder
Commit 4d76960a by Xavier Antoviaque
Options

Merge pull request #26 from open-craft/assessment-styletweaks 

Assessment style tweaks
parents d9f20975 49eee8b1
Showing with 59 additions and 49 deletions
problem_builder/public/css/mentoring.css
...@@ -5,9 +5,6 @@ ...@@ -5,9 +5,6 @@
.mentoring .messages, .mentoring .messages,
.mentoring .assessment-messages { .mentoring .assessment-messages {
display: none; display: none;
margin-top: 10px;
border-top: 2px solid #eaeaea;
padding: 12px 0px 20px;
} }
.mentoring .messages .title1, .mentoring .messages .title1,
...@@ -74,7 +71,7 @@ ...@@ -74,7 +71,7 @@
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: 600;
} }
.mentoring .attempts > span { .mentoring .attempts > span {
...@@ -121,6 +118,10 @@ ...@@ -121,6 +118,10 @@
margin-right: 10px; margin-right: 10px;
} }
.mentoring .grade .grade-result {
margin: 20px;
}
.mentoring .grade .checkmark-incorrect { .mentoring .grade .checkmark-incorrect {
margin-left: 10px; margin-left: 10px;
margin-right: 20px; margin-right: 20px;
...@@ -158,6 +159,11 @@ ...@@ -158,6 +159,11 @@
.mentoring .results-section { .mentoring .results-section {
float: left; float: left;
} }
.mentoring .results-section p {
margin: 4px;
}
.mentoring .clear { .mentoring .clear {
display: block; display: block;
clear: both; clear: both;
......
problem_builder/templates/html/mentoring_grade.html
...@@ -4,51 +4,55 @@ ...@@ -4,51 +4,55 @@
<% }} else {{ %> <% }} else {{ %>
<p><%= gettext("Note: if you retake this assessment, only your final score counts.") %></p> <p><%= gettext("Note: if you retake this assessment, only your final score counts.") %></p>
<% }} %> <% }} %>
<h2>
<%= _.template(gettext("You scored {percent}% on this assessment."), {percent: score}, {interpolate: /\{(.+?)\}/g}) %>
</h2>
<hr/>
<span class="assessment-checkmark icon-2x checkmark-correct icon-ok fa fa-check"></span> <div class="grade-result">
<div class="results-section"> <h2>
<p> <%= _.template(gettext("You scored {percent}% on this assessment."), {percent: score}, {interpolate: /\{(.+?)\}/g}) %>
<%= _.template( </h2>
ngettext( <hr/>
"You answered 1 question correctly.",
"You answered {number_correct} questions correctly.", <span class="assessment-checkmark icon-2x checkmark-correct icon-ok fa fa-check"></span>
correct_answer <div class="results-section">
), {number_correct: correct_answer}, {interpolate: /\{(.+?)\}/g}) <p>
%> <%= _.template(
</p> ngettext(
<%= runDetails('correct') %> "You answered 1 question correctly.",
</div> "You answered {number_correct} questions correctly.",
<div class="clear"></div> correct_answer
<span class="assessment-checkmark icon-2x checkmark-partially-correct icon-ok fa fa-check"></span> ), {number_correct: correct_answer}, {interpolate: /\{(.+?)\}/g})
<div class="results-section"> %>
<p> </p>
<%= _.template( <%= runDetails('correct') %>
ngettext( </div>
"You answered 1 question partially correctly.", <div class="clear"></div>
"You answered {number_partially_correct} questions partially correctly.", <span class="assessment-checkmark icon-2x checkmark-partially-correct icon-ok fa fa-check"></span>
partially_correct_answer <div class="results-section">
), {number_partially_correct: partially_correct_answer}, {interpolate: /\{(.+?)\}/g}) <p>
%> <%= _.template(
</p> ngettext(
<%= runDetails('partial') %> "You answered 1 question partially correctly.",
</div> "You answered {number_partially_correct} questions partially correctly.",
<div class="clear"></div> partially_correct_answer
<span class="assessment-checkmark icon-2x checkmark-incorrect icon-exclamation fa fa-exclamation"></span> ), {number_partially_correct: partially_correct_answer}, {interpolate: /\{(.+?)\}/g})
<div class="results-section"> %>
<p> </p>
<%= _.template( <%= runDetails('partial') %>
ngettext( </div>
"You answered 1 question incorrectly.", <div class="clear"></div>
"You answered {number_incorrect} questions incorrectly.", <span class="assessment-checkmark icon-2x checkmark-incorrect icon-exclamation fa fa-exclamation"></span>
incorrect_answer <div class="results-section">
), {number_incorrect: incorrect_answer}, {interpolate: /\{(.+?)\}/g}) <p>
%> <%= _.template(
</p> ngettext(
<%= runDetails('incorrect') %> "You answered 1 question incorrectly.",
"You answered {number_incorrect} questions incorrectly.",
incorrect_answer
), {number_incorrect: incorrect_answer}, {interpolate: /\{(.+?)\}/g})
%>
</p>
<%= runDetails('incorrect') %>
</div>
<div class="clear"></div>
<hr/>
</div> </div>
<div class="clear"></div>
</script> </script>
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