Victor Shnayder
67fecd3e5e
Merge pull request #1662 from MITx/feature/abarrett/annotation-styling-fixes
...
Annotation styling fixes
2013-04-02 18:36:19 -07:00
Valera Rozuvan
0884051b32
Fixed bug where in firefox a marked poll button was not highlighted in blue.
2013-03-19 19:29:09 +02:00
Arthur Barrett
1b08071fdc
merged from master and resolved conflict with annotatable module.
2013-03-18 15:51:27 -04:00
Arthur Barrett
7507f91d22
Added TODO and explanation for the top-level scss variables.
2013-03-18 15:43:43 -04:00
Arthur Barrett
d860b167d6
fixed tooltip positioning for non-overlapping spans in studio
2013-03-12 14:09:56 -04:00
Arthur Barrett
946af8e189
Merge branch 'master' into feature/abarrett/annotation-styling-fixes
2013-03-11 16:27:55 -04:00
Victor Shnayder
84f05f9f61
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/foldit_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
common/lib/xmodule/xmodule/tests/test_conditional.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
2013-03-08 00:40:18 -05:00
Arthur Barrett
60b060263c
refactor highlight css to prevent issues with cascade
2013-03-07 16:02:22 -05:00
Arthur Barrett
f5c3775b5d
fixed the annotation tooltip line height so it is the same in studio and the lms.
2013-03-07 12:21:47 -05:00
Will Daly
e86ed0db91
Merge branch 'master' into fix/will/mc_checkbox_bug
2013-03-07 12:07:34 -05:00
Arthur Barrett
4d136f8d3b
fixed annotation tooltip styling issue in studio
2013-03-07 11:52:10 -05:00
Will Daly
e841f29352
Updated CSS and template for choicegroup response
...
so that: a) checks/x marks appear after each option
for radio buttons, b) checks/x marks appear for the
entire problem (not individual options) for checkbox
buttons.
Also fixed issue with checks appearing on the next line
by changing <text> to display:inline instead of display:block
2013-03-07 10:17:03 -05:00
Victor Shnayder
fb350ed1e3
Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule
...
Feature/abarrett/annotatable xmodule DO NOT MERGE
2013-03-06 12:05:27 -08:00
Arthur Barrett
ddbab36439
Added instructions/documentation to the studio template for content authors.
2013-03-06 14:33:04 -05:00
Arthur Barrett
fd49aceb29
fixed highlight style for cascade.
2013-03-06 13:36:11 -05:00
Arthur Barrett
9b32400b3a
tweaked commentary textarea size so it looks correct in ff
2013-03-06 13:18:52 -05:00
Arthur Barrett
3393e6385d
set a default height on the commentary textbox to show 5 lines of text
2013-03-06 00:05:36 -05:00
Arthur Barrett
2ed7394f27
visually distinguish instructions from guided discussion section
2013-03-06 00:05:28 -05:00
Calen Pennington
1bfb933518
Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged
...
Conflicts:
cms/djangoapps/contentstore/tests/test_contentstore.py
cms/djangoapps/contentstore/views.py
cms/templates/edit_subsection.html
cms/templates/overview.html
cms/templates/unit.html
cms/templates/widgets/header.html
common/djangoapps/course_groups/tests/tests.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/capa_module.py
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/js/src/.gitignore
common/lib/xmodule/xmodule/mako_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/store_utilities.py
common/lib/xmodule/xmodule/modulestore/xml_exporter.py
common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
common/lib/xmodule/xmodule/peer_grading_module.py
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/tests/test_capa_module.py
common/lib/xmodule/xmodule/tests/test_self_assessment.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/grades.py
lms/djangoapps/courseware/models.py
lms/djangoapps/courseware/views.py
lms/djangoapps/open_ended_grading/tests.py
2013-03-04 16:33:40 -05:00
David Ormsbee
9d2a2cbc2f
Merge pull request #1555 from MITx/feature/jkarni/foldit-api
...
Feature/jkarni/foldit api
2013-03-04 11:40:43 -08:00
Arthur Barrett
b0abfa07c8
style the guided discussion text so it is boxed like the instructions text.
2013-03-04 14:23:41 -05:00
Victor Shnayder
88bfdd01ce
Merge pull request #1561 from MITx/feature/will/move_correct_mark_for_multiple_choice
...
Feature/will/move correct mark for multiple choice
2013-03-01 12:52:26 -08:00
Arthur Barrett
3d4510ab0c
fixed sass compiler issue with annotatable xmodule on cms
2013-02-28 18:35:32 -05:00
Victor Shnayder
136946a334
Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule
2013-02-28 18:22:13 -05:00
cahrens
2be42b8f51
Don't require text tag around multiple choice/checkbox answers.
...
https://edx.lighthouseapp.com/projects/102637/tickets/196
2013-02-28 13:33:04 -05:00
Arthur Barrett
44a68e6903
added partially correct icon from marco
2013-02-27 14:36:14 -05:00
Arthur Barrett
9f8e172be9
show the status mark next to the submitted tag instead of at the bottom of the problem.
2013-02-27 13:35:10 -05:00
Will Daly
9fe305e02b
Modified ChoiceGroup to display correct/incorrect indicators
...
(check or x) next to the option the user selected (check boxes or radio
buttons).
2013-02-27 13:05:29 -05:00
Arthur Barrett
25fb210338
move return link to problem header
2013-02-27 12:45:58 -05:00
Arthur Barrett
18233ef0d7
bolded the section titles and added unittest skeleton for module
2013-02-26 12:15:43 -05:00
Julian Arni
edba0978cf
Included styling and template
2013-02-25 18:18:46 -05:00
Arthur Barrett
1f160d6ef4
added a box around the instructions text
2013-02-25 16:29:19 -05:00
Arthur Barrett
1721793e99
moved annotation return styling effect to css
2013-02-25 12:33:43 -05:00
Arthur Barrett
e736ed34f5
added ability to hide/show instructions, if present
2013-02-25 11:29:59 -05:00
Valera Rozuvan
653154f11e
UI changes.
2013-02-25 12:33:49 +02:00
Arthur Barrett
66ddfa295d
more refactoring and work on annotationinput (should be working now).
2013-02-22 16:33:28 -05:00
Arthur Barrett
840f7839fa
added save and render functionality to annotationinput
2013-02-22 12:48:22 -05:00
Arthur Barrett
3970ea33e1
return from capa problem
2013-02-21 22:54:50 -05:00
Arthur Barrett
a8178de497
Added styling to the annotationinput capa problem.
2013-02-21 13:52:22 -05:00
Arthur Barrett
af2bfa9d4e
Saving work in progress on v2 with capa template for annotation problem.
2013-02-20 16:30:19 -05:00
Arthur Barrett
2f68cba24d
merged from master
2013-02-20 11:07:46 -05:00
Arthur Barrett
34cc112cfb
Saving work in progress on annotations v2 with classification problems.
2013-02-19 14:18:56 -05:00
Christina Roberts
94a28f600b
Merge pull request #1510 from MITx/bug/btalbot/html-strongspan
...
xmodule scss - resolved studio bug #191
2013-02-19 09:09:47 -08:00
Diana Huang
f4addddf42
Merge pull request #1484 from MITx/feature/vik/improve-oe-ui
...
Feature/vik/improve oe ui
2013-02-19 07:27:29 -08:00
Brian Talbot
6d2ada5084
xmodule scss - resolved some general span styling that would override basic em or strong type styling
2013-02-19 09:59:36 -05:00
Arthur Barrett
72d9c1d7d2
Saving work-in-progress of guided classification exercise.
2013-02-18 19:02:54 -05:00
Arthur Barrett
24f519e32f
Moved the return link above the inline discussion and updated the header styling so the hide annotations button is right-aligned with the help icon.
2013-02-15 13:46:38 -05:00
Alexander Kryklia
059b9f66e3
poll and conditional finished
2013-02-15 18:48:39 +02:00
Arthur Barrett
2848df8282
Style changes to comments: increase font size, width. Improved scrolling between spans and discussions.
2013-02-14 12:43:11 -05:00
Vik Paruchuri
9e5eca1417
Swap b tag for span
2013-02-13 11:29:18 -05:00
