Commit Graph

66 Commits

Author SHA1 Message Date
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
Marco Morales
b6164b5702 Merge pull request #7595 from jolyonb/jolyonb/printing_cleanup
Complete Printing Cleanup
2015-05-15 15:42:36 -04:00
Chris Rodriguez
d5d7fbf786 Moving no-outline use to be more global 2015-05-14 11:48:37 -04:00
Jolyon Bloomfield
1021151efd Complete printing cleanup, rebased into one 2015-05-13 18:31:38 -04:00
Chris Rodriguez
2637ac897d Changing id to class 2015-04-17 08:55:30 -04:00
Chris Rodriguez
cb1bfa53de Adding outline styles (none) to the sr focus div 2015-04-17 08:55:29 -04:00
Calen Pennington
a0bae0c794 Convert VerticalModule/VerticalDescriptor to a pure XBlock: VerticalBlock 2015-03-31 09:43:52 -04:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Marco Morales
38b7e4cc50 SASS compilation variable conventions update, focusing on basic colors, baseline variable usage for padding and margins, ui-depth extends, along with other small fixes. The intent with this is to not have any user-facing impact, and instead move us closer toward having files that use our newer sass conventions. 2015-01-05 17:30:13 -05:00
Omar Al-Ithawi
4f4349a63b Make staff debug info code to be always LTR 2014-10-23 14:26:56 +03:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug
add problem reset link to staff debug page
2014-05-09 13:29:29 -04:00
Carson Gee
b3ec4d1b6b Switching to new dashboard API and adding rescore to actions list 2014-05-08 19:03:14 -04:00
Frances Botsford
fd7142bcde dnd container page styling 2014-05-02 15:09:23 -04:00
Giulio Gratta
3456c1173b Added "Edit in CMS" links throughout courseware 2014-04-04 10:23:51 -07:00
Dave St.Germain
0773f0687d Answer checks should offer feedback to assistive tech. This commit adds
a page level javascript SR object to enable reading of alert messages.
LMS-2158
2014-03-20 09:53:44 -04:00
Dave St.Germain
4810bd6d1c Improved sequence navigation accessibility 2014-02-10 14:34:28 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Anton Stupak
65aa7d4f2e Fixes bug with Fullscreen mode and more.
Fixes subtitles hiding on slidermove and their height.
2013-08-01 20:50:16 +03:00
Frances Botsford
4187090dac removed non-existent sass extends from LMS: .table-wrapper, .dullify, .trans, .problem-set 2013-07-10 09:17:59 -04:00
David Baumgold
41374838cb Changed @include border-radius() to border-radius
The official border-radius mixins were deprecated and removed in Bourbon 3.0.
https://github.com/thoughtbot/bourbon/pull/95
2013-07-10 09:17:58 -04: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
Alexander Kryklia
059b9f66e3 poll and conditional finished 2013-02-15 18:48:39 +02:00
Victor Shnayder
5e44846596 Foldit integration.
- ops view for the desktop app to talk to
  - xmodule that talks to the foldit model and displays the student's state
  - grading tweak to make grade updates from an external service work:
    - Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Chris Dodge
7229a9cdaf perform a new merge from master, resolve conflicts 2013-01-03 10:43:03 -05:00
Calen Pennington
dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	lms/static/sass/course/courseware/_courseware.scss
2012-11-13 10:22:42 -05:00
Victor Shnayder
92ab5af627 bigger error messages 2012-11-12 16:23:40 -05:00
Victor Shnayder
6a313fd562 more css tweaks 2012-11-12 13:17:26 -05:00
Victor Shnayder
2b55c5906d css tweaks 2012-11-12 13:09:16 -05:00
Victor Shnayder
fb3b52b99f refactor + style self-assessment in progress 2012-11-08 18:01:09 -05:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Tom Giannattasio
4af134b28a fixed large collapsible text and triple toggle 2012-09-20 17:49:36 -04:00
Kyle Fiedler
5c76a1fbaf Added fix for sequence nav in vertical 2012-09-13 11:24:07 -04:00
Kyle Fiedler
1dceff78b5 Fix alignment in tables for ie 2012-09-12 16:01:38 -04:00
Kyle Fiedler
ec9521a9f5 removed list bullets from tutorials 2012-09-12 13:01:10 -04:00
Kyle Fiedler
3fd640aef3 Removed display none for histogram 2012-09-11 10:22:03 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -04:00
Tom Giannattasio
2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup 2012-08-23 10:04:00 -04:00
Tom Giannattasio
bd536f8aec Merge branch 'master' into feature/tomg/fall-design 2012-08-21 18:13:40 -04:00
Kyle Fiedler
3273de93fe make tutorial headers normal size 2012-08-21 16:01:48 -04:00
Tom Giannattasio
557975458c Merge branch 'master' into feature/tomg/fall-design 2012-08-21 14:50:15 -04:00
Tom Giannattasio
4e6d7babcc fixed wiki bugs; started sequence nav bugs 2012-08-21 12:51:33 -04:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
2012-08-20 18:57:46 -04:00
Tom Giannattasio
3ffcb2615f fix merge conflicts 2012-08-20 18:07:32 -04:00
Tom Giannattasio
a1ff34571e sequence nav changes were lost?! temporary fix 2012-08-20 18:01:57 -04:00
Tom Giannattasio
ee92ba0752 new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch 2012-08-20 17:56:51 -04:00
Kyle Fiedler
20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red 2012-08-20 15:45:05 -04:00