Commit Graph

18200 Commits

Author SHA1 Message Date
Greg Price
c850be4ab9 Merge pull request #1167 from edx/fix/kevin/forums_accessibility 2013-09-27 14:18:09 -07:00
Greg Price
db325e78e3 Merge pull request #1169 from edx/gprice/forum-load-more-focus
Improvements in forums nav sidebar
2013-09-27 14:13:00 -07:00
Kevin Chugh
9a5e6f1fdd code review cleanup 2013-09-27 17:12:48 -04:00
Greg Price
cbbb5c7e7e Improve focus management of forums nav sidebar
Now, when the list is reset (e.g. by sorting), the first thread is
focused. When the "Load more" link is clicked, upon loading more
threads, focus moves to the thread immediately following the thread
that was previously last in the list.
2013-09-27 16:57:11 -04:00
Adam
031f331ab6 Merge pull request #1157 from edx/adam/a11y
make seq tooltips appear on focus
2013-09-27 13:41:01 -07:00
Kevin Chugh
d816d5fade update coffeescript to dynamically render sr spans 2013-09-27 16:24:30 -04:00
Adam Palay
202e4f94e7 make seq tooltips appear on focus
remove focus from tab when clicked
2013-09-27 16:22:46 -04:00
Greg Price
b12e502c02 Merge pull request #1168 from edx/fix/vik/num-results-template 2013-09-27 12:59:01 -07:00
Vik Paruchuri
4ab47c4d05 Fix mako syntax in rubric template. 2013-09-27 15:57:41 -04:00
Greg Price
f39886ef57 Ensure nav sidebar is sized correctly on page load 2013-09-27 15:34:32 -04:00
Greg Price
3e3ad4393e Merge pull request #1161 from edx/gprice/forums-labels
Add accessible labels for forum post body inputs
2013-09-27 11:37:45 -07:00
Greg Price
f4971e753b Add accessible labels for forum post body inputs 2013-09-27 13:47:45 -04:00
Greg Price
44b4204aa0 Merge pull request #1155 from edx/sarina/ins-dash-student-admin-2 2013-09-27 10:35:34 -07:00
Greg Price
6b5d12e491 Merge pull request #1159 from edx/gprice/forum-focus-color
Make discussion elements change color on focus
2013-09-27 09:55:14 -07:00
Sarina Canelake
3813e51cfb Add more feedback for instructors on Student Admin section of the dash. 2013-09-27 12:18:01 -04:00
Sarina Canelake
91d85f5c2a Enable alerts when a task succeeds.
Note: Alerts are pop-up boxes. Not sure if this is desireable, but I couldn't figure out
how to make a success message show up in the same place that error messages do.
2013-09-27 12:17:53 -04:00
Sarina Canelake
086f544a1a Fix, and add more, tests 2013-09-27 12:17:45 -04:00
Sarina Canelake
07e76b3b2f Enable use of student usernames on student admin page
This is in addition to email addresses, which also work.
2013-09-27 12:17:35 -04:00
Sarina Canelake
8a2bd25b7c Visual rearrangement of new dash "Student Admin" page 2013-09-27 12:17:24 -04:00
Greg Price
bf5a801fa8 Make discussion elements change color on focus
Previously, colors changed to afford interaction only on hover; now, all
elements with a hover color change behave the same way on focus.
2013-09-27 11:04:51 -04: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
Will Daly
9385b5764c Merge pull request #1143 from edx/will/skip-tests-with-comments
Use comments to skip tests instead of a tag
2013-09-27 05:33:49 -07:00
James Tauber
ef6d58ae80 Merge pull request #1005 from edx/jtauber/link-to-how-to-contribute
Include / Link to How To Contribute wiki page
2013-09-27 05:16:20 -07:00
Usman Khalid
1737984b34 Merge pull request #1122 from edx/usman/lms1167-pdfjs-update
PdfViewer: Added missing link to compatibility.js
2013-09-27 02:49:06 -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
Greg Price
7aea7369a7 Merge branch 'release' 2013-09-26 18:12:31 -04: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
Jay Zoldak
0858dfdeb3 Merge pull request #1141 from edx/zoldak/fix-problem-test
Wrap logic for selecting options in acceptance tests
2013-09-26 13:40:38 -07:00
Will Daly
3c88ccb4ff Use comments to skip tests instead of a tag 2013-09-26 16:37:25 -04:00
Jay Zoldak
8e6c0ea937 Wrap logic for selecting options in acceptance tests 2013-09-26 16:07:20 -04:00
Don Mitchell
2379e7c3fc Merge pull request #1029 from edx/dhm/migrate_mongo
Migrate courses from old mongo to split
2013-09-26 10:35:52 -07:00
Giulio Gratta
7d4ccf621e Merge pull request #1066 from edx/giulio/ORA-fixes-2
Second batch of ORA UI fixes (with an ICE bonus!)
2013-09-26 10:30:25 -07:00
Don Mitchell
f63aa0f547 Pylint and pep8 hygiene 2013-09-26 12:57:40 -04:00
Don Mitchell
59b31474ca Separate db config from modulestore config parms
use to instantiate loc_mapper
test loc_mapper injection into split modulestore
2013-09-26 12:57:40 -04:00
Don Mitchell
d328c53dff Cached course entry: separate structure from identity
Don't undo inheritance by unsetting course_entry structure
Do finer-grained cache clearing
2013-09-26 12:57:40 -04:00
Don Mitchell
c1789adfd9 Always return a Locator: cases weren't exhaustive. 2013-09-26 12:57:39 -04:00
Don Mitchell
934b3ca7c0 Check has_children before accessing children 2013-09-26 12:57:39 -04:00
Don Mitchell
b4fa316294 Migrate data from old mongo to split mongo
Create location mapping
Create draft and published course with proper content in split.
2013-09-26 12:57:39 -04:00
Giulio Gratta
bbd902f87e Last Changes before Merge
- Change variable name to make it more clear
2013-09-26 09:52:30 -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
Christina Roberts
42f286b325 Merge pull request #1069 from edx/christina/lock-assets
Add asset locking to the Studio asset page.
2013-09-26 07:54:29 -07:00
Don Mitchell
190b418387 Merge pull request #1121 from edx/dhm/timezone_display
Replace date lib w/ simpler tzAbbr
2013-09-26 07:43:22 -07:00
Greg Price
407efdaae6 Merge pull request #1136 from edx/hotfix/lms-a11y 2013-09-26 06:39:05 -07:00
Greg Price
f004e953fc Merge pull request #1135 from edx/hotfix/lms-startup 2013-09-26 06:37:44 -07:00
Brian Talbot
9f93c3c244 Merge pull request #1012 from edx/fix/frances/sass-debug-off
Dev Environment: Disabling Sass Debug Mode
2013-09-26 06:23:17 -07:00
Frances Botsford
111a6ae5b9 turning off sass debug mode in assets.rake 2013-09-26 09:22:52 -04:00
Nick Parlante
08cb469409 Merge pull request #1104 from edx/nick/anon-userids
Add "Download CSV of all student anonymized IDs" button to instructor dashboards
2013-09-25 20:58:34 -07:00
cahrens
2cbdaaee7d Updates based on switching to checkbox for locking. 2013-09-25 17:29:47 -04:00
Frances Botsford
79c2cdc7ba switching studio assets lock to use checkbox instead of link 2013-09-25 17:29:47 -04:00
cahrens
1d7f891145 Delete asset from cache. 2013-09-25 17:29:47 -04:00