Commit Graph

1927 Commits

Author SHA1 Message Date
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
2013-09-16 10:27:13 -07:00
Brian Talbot
91f9338e06 Merge pull request #982 from edx/talbs/fix-lms-header
LMS: FIX - Header Logo and Global Nav Styling
2013-09-16 07:35:20 -07:00
Giulio Gratta
fe59a8ce62 Implementing NYT's ICE track changes to Open Ended Assessements
Squashed commits to facilitate cherry-picking.  Committers and
original commit messages are:
- ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
* Refactor peer_grading_problem to lookup track_changes variable by problem location.
* Whitelist ICE insert, delete tags
* Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* Introduction ICE means we need its inline tags to get passed through
  to the feedback target, but we don't want malicious peer feedback
  providers introducing <script>, etc, so we use lxml.html.clean to
  scrub peer grading input.
* Adds feedback URL autoheating.
* Allows ICE <insert> and <delete> tags but not others.

~ add helptext re: EXPERIMENTAL FEATURES

~ address a bunch of @VikParuchuri review comments on ICE for OEE
  ~ remove extraneous code
  ~ change to new xmodule accessors
  ~ refactor filtering

~ fix broken test test_peer_grading_problem

~ Create track_changes.coffee and remove <script> from
  peer_grading_problem.html
~ Remove all reliance on id in favor of local scoping and classes

~ bring up test coverage somewhat

~ remove superflous $.scrollTo

~ TODO: Filtering
2013-09-15 09:49:28 -07:00
Diana Huang
47ce9082e4 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
2013-09-13 17:15:44 -04:00
Brian Talbot
edcd76c666 LMS: resolves header logo and global nav inheriting verification reset link styling 2013-09-13 16:39:48 -04:00
Greg Price
e360f1d54f Merge pull request #950 from edx/gprice/dialog-role
Add ARIA dialog role to Markdown editor dialogs
2013-09-13 10:42:58 -07:00
James Tauber
c6dfd97eeb Merge pull request #902 from antoviaque/accessibility
Help Modal - Accessibility Fixes
2013-09-13 08:21:47 -07:00
Diana Huang
90951a7bdb Merge branch 'release'
Conflicts:
	CHANGELOG.rst
	common/lib/xmodule/xmodule/js/fixtures/lti.html
	common/lib/xmodule/xmodule/js/spec/lti/constructor.js
	common/lib/xmodule/xmodule/js/src/lti/lti.js
	common/lib/xmodule/xmodule/lti_module.py
	lms/djangoapps/courseware/features/certificates.py
	lms/djangoapps/courseware/mock_lti_server/mock_lti_server.py
	lms/djangoapps/courseware/tests/test_lti.py
	lms/djangoapps/shoppingcart/models.py
	lms/envs/aws.py
2013-09-12 16:03:39 -04:00
Diana Huang
14e0a4a038 Show order errors in page instead of in an alert. 2013-09-12 14:58:34 -04:00
Greg Price
67053feec1 Add ARIA dialog role to Markdown editor dialogs 2013-09-12 10:47:47 -04:00
Diana Huang
8839a2053e Wait until the flash object is loaded before looking for a camera. 2013-09-12 09:09:35 -04:00
David Ormsbee
8278357c74 Hook up interface to Software Secure for identity validation. 2013-09-11 23:59:37 -04:00
David Ormsbee
f9067cbe4d Merge pull request #940 from edx/ormsbee/flash_detect_camera
Detect cameras and flash
2013-09-11 18:58:57 -07:00
Diana Huang
7ab5ae925d Add in the ability to detect webcams and flash. Show error messages. 2013-09-11 18:39:18 -04:00
David Ormsbee
e498ad522a Add hasCamera() method to flash camera detection 2013-09-11 18:39:17 -04:00
Renzo Lucioni
9fd4f69e76 Instrument verified cert flow 2013-09-11 16:51:46 -04:00
Greg Price
9faa55d336 Merge pull request #921 from edx/gprice/forum-nav-accessibility
Improve forums nav accessibility
2013-09-11 11:47:56 -07:00
Brian Talbot
253f8e2d15 Verification: revises UI header copy 2013-09-10 16:51:21 -04:00
David Ormsbee
e8a48d6144 Update JS to reflect new link IDs to unbreak the top nav status indicator. 2013-09-10 16:41:29 -04:00
Greg Price
f20333ef4e Remove some cruft from forums SASS 2013-09-10 14:46:54 -04:00
Greg Price
6ecbba7230 Improve accessibility of forums navigation elements
The home icon and discussion topic drop-down icon now have text that is
visible only to screen readers. The visual change between the icon and the
topic name with down-arrow is now achieved with the CSS visible property
instead of the opacity property, so only one at a time will be visible to
screen readers as well as visually.
2013-09-10 14:21:17 -04:00
David Ormsbee
dea1878efe Require that permission be given for Flash camera before we process snapshots. 2013-09-10 14:17:58 -04:00
David Ormsbee
ba1f17e54b Merge pull request #913 from edx/ormsbee/certs_small_ux
Small UI fixes
2013-09-10 10:34:32 -07:00
David Ormsbee
740e5bace7 Prevent being able to click on disabled button in IE.
Enable display of course org, num in receipt page.
2013-09-10 13:32:52 -04:00
Brian Talbot
d066692bce Verification: revising textarea reset formatting and increasing close modal control size 2013-09-10 13:03:25 -04:00
Frances Botsford
18b4b0b03f modal functionality for edit name on vcerts 2013-09-10 13:03:09 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Xavier Antoviaque
23eab5c5bd accessibility: Replace close modal button <div> by <a> link (LMS-582)
The close button for the modal dialog was marked up as a paragraph,
containing a graphical text character, inside two div elements, with an
associated click event. This made the button unusable for keyboard
users.

Replaced <divs> with a link element (<a role="button"), adapted the CSS
accordingly, and updated the existing <a> modal close buttons.
2013-09-09 16:43:44 -03:00
David Ormsbee
34d0fe1554 Merge pull request #890 from edx/ormsbee/verifyuser3
User verification / validated certificates feature
2013-09-09 11:30:09 -07:00
Brian Talbot
422c6282e4 LMS: adds in pseudo-state styling for disabled buttons/links (by attribute or standard class names) 2013-09-09 11:43:55 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3
Conflicts:
	lms/envs/common.py
2013-09-09 10:18:25 -04:00
Brian Talbot
79a9c8677a Verification: revises presentation of customized certificate receipt ciew 2013-09-06 17:23:43 -04:00
Brian Talbot
0c552141f2 LMS: revises right justification space of verified indicator on Student Dashboard 2013-09-06 12:12:58 -04:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
Diana Huang
20d72ea703 Clean up views and start work on edit name modal. 2013-09-05 15:20:48 -04:00
Brian Talbot
f4bdd73839 Verification: adds in verified/enrollment status into dashboard course listings 2013-09-05 14:29:11 -04:00
Brian Talbot
f686990b02 LMS: adds in additional abstract border-variables with logical scale 2013-09-05 14:29:10 -04:00
Brian Talbot
f2e55a3d6a Verification: abstracting out specific color-based Sass variables to be *somewhat* friendly to theming 2013-09-05 14:29:10 -04:00
David Ormsbee
22480b821a Fix reset button for photo capture 2013-09-05 14:15:13 -04:00
Frances Botsford
a8989f2fe6 adjusting go to course button for vcert receipt 2013-09-05 12:40:37 -04:00
Frances Botsford
304a329b08 initial receipt html and styling for vcert 2013-09-05 12:24:03 -04:00
Brian Talbot
9c96fcf4cd edx.org: ensures that the iframe-based register button has a transparent background 2013-09-05 10:00:34 -04:00
Brian Talbot
70cdc9a705 edx.org: addresses vertical scrollbar on course register button when placed in iframe 2013-09-05 08:49:02 -04:00
Brian Talbot
5c8e7337a8 edx.org: revises course register button background for all cases (verified, riught column, and bottom of page) 2013-09-04 16:06:44 -04:00
Brian Talbot
d4e849d2b2 edx.org: adds custom styling for register button in case of verified option/content displayed 2013-09-04 15:30:10 -04:00
Brian Talbot
732ac1783f edx.org: adds background to register button's html body element for visual blending in course detail view 2013-09-04 14:40:53 -04:00
Frances Botsford
db57118f7d i18n and updated secondary action buttons on the photo page 2013-09-04 14:35:48 -04:00
Jason Bau
ec989e4999 Address review comments for lms_link_to_cms
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
Diana Huang
18a497e150 Fix merge conflict in sass 2013-09-04 11:22:52 -04:00