Commit a71860d4 by Alan Boudreault

Changed the mrq incorrect and correct marks to font-awesome exclamation

parent 6d576e07
...@@ -12,18 +12,20 @@ ...@@ -12,18 +12,20 @@
} }
.mentoring .choices .choice-result { .mentoring .choices .choice-result {
padding-right: 40px; padding-right: 10px;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
.mentoring .choices .choice-result.correct { .mentoring .choices .choice-result.correct {
background-image: url({{ correct_icon_url }}); color: #006600
cursor: pointer;
} }
.mentoring .choices .choice-result.incorrect { .mentoring .choices .choice-result.incorrect {
background-image: url({{ incorrect_icon_url }}); margin-right: 10px;
cursor: pointer; padding-left: 10px;
padding-right: 10px;
color: #ff0000;
} }
.mentoring .choices .choice-tips, .mentoring .choices .choice-tips,
......
...@@ -53,7 +53,7 @@ function MRQBlock(runtime, element) { ...@@ -53,7 +53,7 @@ function MRQBlock(runtime, element) {
}; };
if (result.message) { if (result.message) {
messageDOM.html('<div class="message-content"><div class="close"></div>' + messageDOM.html('<div class="message-content"><div class="close"></div>' +
result.message + '</div>'); result.message + '</div>');
showPopup(messageDOM); showPopup(messageDOM);
} }
...@@ -66,9 +66,9 @@ function MRQBlock(runtime, element) { ...@@ -66,9 +66,9 @@ function MRQBlock(runtime, element) {
choiceTipsCloseDOM; choiceTipsCloseDOM;
if (choice.completed) { if (choice.completed) {
choiceResultDOM.removeClass('incorrect').addClass('correct'); choiceResultDOM.removeClass('incorrect icon-exclamation').addClass('correct icon-ok');
} else { } else {
choiceResultDOM.removeClass('correct').addClass('incorrect'); choiceResultDOM.removeClass('correct icon-ok').addClass('incorrect icon-exclamation');
} }
choiceTipsDOM.html(choice.tips); choiceTipsDOM.html(choice.tips);
......
...@@ -85,10 +85,6 @@ class QuestionnaireAbstractBlock(LightChild): ...@@ -85,10 +85,6 @@ class QuestionnaireAbstractBlock(LightChild):
fragment = Fragment(html) fragment = Fragment(html)
fragment.add_css(render_template('public/css/questionnaire.css', { fragment.add_css(render_template('public/css/questionnaire.css', {
'self': self, 'self': self,
'correct_icon_url': self.runtime.local_resource_url(self.xblock_container,
'public/img/correct-icon.png'),
'incorrect_icon_url': self.runtime.local_resource_url(self.xblock_container,
'public/img/incorrect-icon.png'),
'close_icon_url': self.runtime.local_resource_url(self.xblock_container, 'close_icon_url': self.runtime.local_resource_url(self.xblock_container,
'public/img/close.png'), 'public/img/close.png'),
})) }))
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="choices-list"> <div class="choices-list">
{% for choice in custom_choices %} {% for choice in custom_choices %}
<div class="choice"> <div class="choice">
<span class="choice-result"></span> <span class="choice-result icon-2x"></span>
<label class="choice-label"> <label class="choice-label">
<input class="choice-selector" type="checkbox" name="{{ self.name }}" value="{{ choice.value }}"{% if choice.value in self.student_choices %} checked{% endif %}> {{ choice.content }} <input class="choice-selector" type="checkbox" name="{{ self.name }}" value="{{ choice.value }}"{% if choice.value in self.student_choices %} checked{% endif %}> {{ choice.content }}
</label> </label>
......
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