-
${_("Heading 1")}
+${_("Heading")}
- 
+ })
-
@@ -56,7 +91,7 @@
H1
+H3
=====
${_("Multiple Choice")}
-
+ })
( ) red
@@ -67,7 +102,7 @@
${_("Checkboxes")}
-
+ })
[x] earth
@@ -78,7 +113,7 @@
${_("Text Input")}
-
+ })
= dog
@@ -89,7 +124,7 @@ or= mouse
${_("Numerical Input")}
-
+ })
= 3.14 +- 2%
@@ -99,7 +134,7 @@ or= mouse
${_("Dropdown")}
-
+ })
[[wrong, (right)]]
@@ -114,7 +149,7 @@ or= mouse
${_("Explanation")}
-
+ })
[explanation] A short explanation of the answer. [explanation]
diff --git a/common/lib/xmodule/xmodule/css/editor/edit.scss b/common/lib/xmodule/xmodule/css/editor/edit.scss
index c31c9656f7..d8cb28f966 100644
--- a/common/lib/xmodule/xmodule/css/editor/edit.scss
+++ b/common/lib/xmodule/xmodule/css/editor/edit.scss
@@ -13,14 +13,21 @@
padding: ($baseline/4);
border-bottom-color: #a5aaaf;
- a {
- display: block;
+ button {
+ display: inline-block;
@include float(left);
- padding: 3px ($baseline/2) 7px;
+ padding: 3px ($baseline/2) 5px;
margin-left: 7px;
+ border: 0;
border-radius: 2px;
+ background: transparent;
- &:hover, &:focus {
+ .icon {
+ height: 21px;
+ }
+
+ &:hover,
+ &:focus {
background: rgba(255, 255, 255, .5);
}
}
@@ -60,4 +67,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss
index ac6f3f90ff..a3c6576e9a 100644
--- a/common/lib/xmodule/xmodule/css/problem/edit.scss
+++ b/common/lib/xmodule/xmodule/css/problem/edit.scss
@@ -7,6 +7,7 @@
margin-top: -4px;
padding: 3px 9px;
font-size: 12px;
+ color: $link-color;
&.current {
border: 1px solid $lightGrey !important;
@@ -16,7 +17,8 @@
pointer-events: none;
cursor: none;
- &:hover, &:focus {
+ &:hover,
+ &:focus {
box-shadow: 0 0 0 0 !important;
background-color: $white;
}
@@ -79,11 +81,15 @@
}
.col {
- float: left;
+ display: block;
&.sample {
width: 60px;
margin-right: 30px;
+
+ .icon {
+ height: ($baseline * 1.5);
+ }
}
}
@@ -110,40 +116,5 @@
width: 26px;
height: 21px;
vertical-align: middle;
- background: url('#{$static-path}/images/problem-editor-icons.png') no-repeat;
+ color: $base-font-color;
}
-
-.problem-editor-icon.heading1 {
- width: 18px;
- background-position: -265px 0;
-}
-
-.problem-editor-icon.multiple-choice {
- background-position: 0 0;
-}
-
-.problem-editor-icon.checks {
- background-position: -56px 0;
-}
-
-.problem-editor-icon.string {
- width: 28px;
- background-position: -111px 0;
-}
-
-.problem-editor-icon.number {
- width: 24px;
- background-position: -168px 0;
-}
-
-.problem-editor-icon.dropdown {
- width: 17px;
- background-position: -220px 0;
-}
-
-.problem-editor-icon.explanation {
- width: 17px;
- background-position: -307px 0;
-}
-
-
diff --git a/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html b/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html
index d7edb42a79..d7d6d952d2 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/crowdsource_hinter.html
@@ -8,9 +8,9 @@
-
+
Numerical Input
-
+
(1/1 point)
diff --git a/common/lib/xmodule/xmodule/js/fixtures/jsinput_problem.html b/common/lib/xmodule/xmodule/js/fixtures/jsinput_problem.html
index 94a1d8f729..1d48e92e3a 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/jsinput_problem.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/jsinput_problem.html
@@ -1,4 +1,4 @@
-Custom Javascript Display and Grading
+Custom Javascript Display and Grading
diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem_content.html b/common/lib/xmodule/xmodule/js/fixtures/problem_content.html
index 3e7d2107b7..60c0c78a7c 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/problem_content.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/problem_content.html
@@ -1,4 +1,4 @@
-Problem Header
+Problem Header
diff --git a/common/lib/xmodule/xmodule/js/fixtures/problem_content_1240.html b/common/lib/xmodule/xmodule/js/fixtures/problem_content_1240.html
index 0538ae498f..cb6aab2541 100644
--- a/common/lib/xmodule/xmodule/js/fixtures/problem_content_1240.html
+++ b/common/lib/xmodule/xmodule/js/fixtures/problem_content_1240.html
@@ -1,4 +1,4 @@
-Problem Header
+Problem Header
diff --git a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
index 575b4c4246..a10ad3d4e4 100644
--- a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
+++ b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee
@@ -258,9 +258,9 @@ describe 'MarkdownEditingDescriptor', ->
""")
it 'converts multiple choice shuffle to xml', ->
data = MarkdownEditingDescriptor.markdownToXml("""A multiple choice problem presents radio buttons for student input. Students can only select a single option presented. Multiple Choice questions have been the subject of many areas of research due to the early invention and adoption of bubble sheets.
-
+
One of the main elements that goes into a good multiple choice question is the existence of good distractors. That is, each of the alternate responses presented to the student should be the result of a plausible mistake that a student might make.
-
+
What Apple device competed with the portable CD player?
(!x@) The iPad
(@) Napster
@@ -268,16 +268,16 @@ describe 'MarkdownEditingDescriptor', ->
( ) The vegetable peeler
( ) Android
(@) The Beatles
-
+
[Explanation]
The release of the iPod allowed consumers to carry their entire music library with them in a format that did not rely on fragile and energy-intensive spinning disks.
[Explanation]
""")
expect(data).toEqual("""
A multiple choice problem presents radio buttons for student input. Students can only select a single option presented. Multiple Choice questions have been the subject of many areas of research due to the early invention and adoption of bubble sheets.
-
+
One of the main elements that goes into a good multiple choice question is the existence of good distractors. That is, each of the alternate responses presented to the student should be the result of a plausible mistake that a student might make.
-
+
What Apple device competed with the portable CD player?
@@ -289,11 +289,11 @@ describe 'MarkdownEditingDescriptor', ->
The Beatles
-
+
Explanation
-
+
The release of the iPod allowed consumers to carry their entire music library with them in a format that did not rely on fragile and energy-intensive spinning disks.
@@ -326,7 +326,7 @@ describe 'MarkdownEditingDescriptor', ->
c
-
+
yatta
@@ -335,7 +335,7 @@ describe 'MarkdownEditingDescriptor', ->
z
-
+
testa
@@ -344,13 +344,13 @@ describe 'MarkdownEditingDescriptor', ->
iii
-
+
Explanation
-
+
When the student is ready, the explanation appears.
-
+
""")
@@ -513,25 +513,25 @@ describe 'MarkdownEditingDescriptor', ->
-
+
Explanation
-
+
Test Explanation.
-
+
""")
it 'handles multiple questions with labels', ->
data = MarkdownEditingDescriptor.markdownToXml("""
France is a country in Europe.
-
+
>>What is the capital of France?<<
= Paris
-
+
Germany is a country in Europe, too.
-
+
>>What is the capital of Germany?<<
( ) Bonn
( ) Hamburg
@@ -540,14 +540,14 @@ describe 'MarkdownEditingDescriptor', ->
""")
expect(data).toEqual("""
France is a country in Europe.
-
+
What is the capital of France?
-
+
Germany is a country in Europe, too.
-
+
What is the capital of Germany?
@@ -557,8 +557,8 @@ describe 'MarkdownEditingDescriptor', ->
Donut
-
-
+
+
""")
it 'tests multiple questions with only one label', ->
data = MarkdownEditingDescriptor.markdownToXml("""
@@ -577,14 +577,14 @@ describe 'MarkdownEditingDescriptor', ->
""")
expect(data).toEqual("""
France is a country in Europe.
-
+
What is the capital of France?
-
+
Germany is a country in Europe, too.
-
+
What is the capital of Germany?
@@ -594,8 +594,8 @@ describe 'MarkdownEditingDescriptor', ->
Donut
-
-
+
+
""")
it 'tests malformed labels', ->
data = MarkdownEditingDescriptor.markdownToXml("""
@@ -612,12 +612,12 @@ describe 'MarkdownEditingDescriptor', ->
""")
expect(data).toEqual("""
France is a country in Europe.
-
+
>>What is the capital of France?<
-
+
blahWhat is the capital of Germany?
@@ -627,8 +627,8 @@ describe 'MarkdownEditingDescriptor', ->
Donut
-
-
+
+
""")
it 'adds labels to formulae', ->
data = MarkdownEditingDescriptor.markdownToXml("""
@@ -641,8 +641,8 @@ describe 'MarkdownEditingDescriptor', ->
-
-
+
+
""")
# test oddities
it 'converts headers and oddities to xml', ->
@@ -710,7 +710,7 @@ describe 'MarkdownEditingDescriptor', ->
""")
expect(data).toEqual("""
Not a header
- A header
+ A header
Multiple choice w/ parentheticals
diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
index 0419e096dc..2e791633a4 100644
--- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
+++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee
@@ -23,7 +23,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
@setCurrentEditor(@markdown_editor)
# Add listeners for toolbar buttons (only present for markdown editor)
@element.on('click', '.xml-tab', @onShowXMLButton)
- @element.on('click', '.format-buttons a', @onToolbarButton)
+ @element.on('click', '.format-buttons button', @onToolbarButton)
@element.on('click', '.cheatsheet-toggle', @toggleCheatsheet)
# Hide the XML text area
$(@element.find('.xml-box')).hide()
@@ -131,7 +131,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
###
save: ->
@element.off('click', '.xml-tab', @changeEditor)
- @element.off('click', '.format-buttons a', @onToolbarButton)
+ @element.off('click', '.format-buttons button', @onToolbarButton)
@element.off('click', '.cheatsheet-toggle', @toggleCheatsheet)
if @current_editor == @markdown_editor
{
@@ -202,7 +202,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
xml = xml.replace(/\r\n/g, '\n');
// replace headers
- xml = xml.replace(/(^.*?$)(?=\n\=\=+$)/gm, '$1
');
+ xml = xml.replace(/(^.*?$)(?=\n\=\=+$)/gm, '$1
');
xml = xml.replace(/\n^\=\=+$/gm, '');
// Pull out demand hints, || a hint ||
@@ -264,8 +264,8 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor
// ]]
//
//
- //
diff --git a/lms/templates/lti.html b/lms/templates/lti.html
index 4e496ee4a3..faf55d6aef 100644
--- a/lms/templates/lti.html
+++ b/lms/templates/lti.html
@@ -3,10 +3,10 @@ import json
from django.utils.translation import ugettext as _
%>
-
+
## Translators: "External resource" means that this learning module is hosted on a platform external to the edX LMS
${display_name} (${_('External resource')})
-
+
% if has_score and weight:
@@ -51,9 +51,9 @@ from django.utils.translation import ugettext as _
>
% endif
% elif not hide_launch:
-
+
${_('Please provide launch_url. Click "Edit", and fill in the required fields.')}
-
+
% endif
% if has_score and comment:
diff --git a/lms/templates/problem.html b/lms/templates/problem.html
index 94c961bfed..f124e5e0c1 100644
--- a/lms/templates/problem.html
+++ b/lms/templates/problem.html
@@ -1,9 +1,9 @@
<%! from django.utils.translation import ugettext as _ %>
<%namespace name='static' file='static_content.html'/>
-
+
${ problem['name'] }
-
+
diff --git a/lms/templates/video.html b/lms/templates/video.html
index 8df4b34895..c5fb463102 100644
--- a/lms/templates/video.html
+++ b/lms/templates/video.html
@@ -1,7 +1,7 @@
<%! from django.utils.translation import ugettext as _ %>
% if display_name is not UNDEFINED and display_name is not None:
- ${display_name}
+ ${display_name}
% endif
- ${_('No playable video sources found.')}
+ ${_('No playable video sources found.')}