Commit Graph

1158 Commits

Author SHA1 Message Date
Usman Khalid
bc56ab7c13 Merge pull request #1057 from edx/usman/lms-1114-pdf-arrows
Disables the previous/next arrows on pdf books on the first/last pages
2013-09-27 12:50:38 -07:00
Giulio Gratta
d75cdda064 An assortment of small OE changes, both for ICE and standard
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
2013-09-27 11:29:06 -07:00
Usman Khalid
5ca778ef05 Display:none arrows in disabled state 2013-09-27 21:06:34 +05:00
Jason Bau
c1d555beef Merge pull request #1118 from edx/jbau/shoppingcart-stanford
Stanford paid course registration
2013-09-27 07:31:17 -07:00
Jason Bau
667a1eadb5 Stanford paid course registration
With tests, some settings changes
(all should default to not breaking anything for edx)

Added styling for shopping cart User Experience
- Styled shoppingcart list page
- Styled navigation shopping cart button
- Styled receipt page
- Styled course about page for shopping cart courses

Addressed HTML/SCSS issues

Remove offending body class and unnecessary sass changes

Addresses many review comments on stanford shopping cart

* framework for generating order instructions on receipt page
  in shoppingcart.models
* move user_cart_has_item into shoppingcart.models
* move min_course_price_for_currency into course_modes.models
* remove auto activation on purchase
* 2-space indents in templates
* etc

revert indentation on navigation.html for ease of review

pep8 pylint

move logging/error handling from shoppingcart view to model

Addressing @dave changes
2013-09-26 18:25:00 -07:00
Brian Talbot
b86ab28401 Merge pull request #1129 from edx/talbs/fix-lms-banners
edx.org/LMS: Use/Style Semantic Text in Login and Registration Banners
2013-09-26 14:06:24 -07:00
Giulio Gratta
68ce6ed1c8 Second batch of ORA UI fixes:
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback

Changes after comments:

- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file

More changes:

- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
2013-09-26 09:26:35 -07:00
Brian Talbot
982d22df38 edx.org/LMS: revises graphic-based login and registration banner text to render with system text 2013-09-25 16:00:08 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
marco
b7aead39e2 updated new post forum dropdown menu for use with chromevox 2013-09-23 18:47:06 -04:00
Brian Talbot
333e4a658c edx.org - replaces login/register semantically verbose fieldset and legend elements with simpler markup 2013-09-19 15:17:16 -04:00
Usman Khalid
59c5baeb1b Disables the previous/next arrows on pdf books on the first/last pages respectively 2013-09-19 20:50:05 +05:00
Brian Talbot
c0b710b8c8 Merge pull request #1039 from edx/talbs/fix-lms-contentwrapper
edx.org/LMS: FIX - Reverts Sass placeholder extend back to view-based selector
2013-09-18 08:51:35 -07:00
Brian Talbot
b6c4cacbec edx.org/LMS: reverts a Sass placeholder extend back to a class selector for view reference 2013-09-18 11:39:14 -04:00
Chris Dodge
b6cde36db5 Merge branch 'release'
Conflicts:
	CHANGELOG.rst
2013-09-18 11:33:40 -04:00
Brian Talbot
da7127e7ef LMS/Accounts: Converts many class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-17 16:11:26 -04:00
Frances Botsford
56a808c7ae a few missed placeholder conversions in verification sass 2013-09-17 13:57:13 -04:00
Diana Huang
d191847ff5 Merge branch 'release'
Conflicts:
	lms/static/sass/views/_verification.scss
2013-09-17 10:55:22 -04:00
Greg Price
9e4b24daa2 Merge pull request #924 from edx/gprice/fix-forum-sidebar-overlap
Fix forums nav sidebar overlapping content
2013-09-17 07:22:40 -07:00
Brian Talbot
c101465fe9 Verification: converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-16 16:18:51 -04:00
Brian Talbot
d600e437d6 Verification: hiding technical help copy when on requirements/prep view 2013-09-16 13:36:03 -04:00
Brian Talbot
c1134acf05 Verification: revises copy and layout of the review step's confirm/next actions UI 2013-09-16 13:36:03 -04:00
Brian Talbot
2680f8dfcc Verification: further revises webcam support w/in browser settings copy 2013-09-16 13:36:03 -04:00
Brian Talbot
882df8d319 Verification: adds in browser support links, icon-based button help tips, and technical support help info 2013-09-16 13:36:02 -04: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
Brian Talbot
edcd76c666 LMS: resolves header logo and global nav inheriting verification reset link styling 2013-09-13 16:39:48 -04: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
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
Greg Price
8a32f274be Fix forums nav sidebar overlapping content
Previously, when the window was scrolled down past the top of the
discussion content pane, scrolling right would cause the sidebar to
appear above the background of the content pane but below the text.
This is only an issue with very small windows or with the text size
increased significantly, which is why this came up in an accessibility
audit. Now the sidebar is fixed to the left side of the page instead
of the left side of the viewport.
2013-09-11 14:24:58 -04:00
Brian Talbot
253f8e2d15 Verification: revises UI header copy 2013-09-10 16:51:21 -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
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
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
Frances Botsford
a8989f2fe6 adjusting go to course button for vcert receipt 2013-09-05 12:40:37 -04:00