Commit Graph

1980 Commits

Author SHA1 Message Date
Brian Wilson
67a8ee1184 Revert remnants of disable-button, and how html editor is invoked. 2013-10-16 13:01:57 -04:00
Julia Hansbrough
8a30e9ba8f Legacy email tests, removed duplicate code, updated comments, fixed CSS 2013-10-16 13:01:57 -04:00
Julia Hansbrough
fd54b060d8 added self to authors style, changed GET to POST 2013-10-16 13:01:57 -04:00
Julia Hansbrough
c7d4270ad4 API tests, email tests, working notifications 2013-10-16 13:01:57 -04:00
Julia Hansbrough
b8aff26ce8 Merged in email confirmation modal 2013-10-16 13:01:57 -04:00
Julia Hansbrough
d8a857dba2 Changed GET to POST and xmodule HTML editor call, section CSS 2013-10-16 13:01:52 -04:00
Julia Hansbrough
867d3ba1da Implemented bulk email interface for new dashboard
Responses to Adam's comments; reset common.py, i18n compliance, deleted extraneous email.html file, fixed an HttpResponse, deleted unnecessary commented-out code, some small style tweaks
2013-10-16 13:01:14 -04:00
Julia Hansbrough
91c31e12d5 Implemented bulk email interface for new dashboard 2013-10-16 13:01:14 -04:00
marco
81a2ac413d Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
2013-10-01 17:05:02 -04:00
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
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
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
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
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
Usman Khalid
5ca778ef05 Display:none arrows in disabled state 2013-09-27 21:06:34 +05: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
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
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
Nick Parlante
d225b85d1a Port get-anonymized-id feature to new instructor dashboard 2013-09-25 13:52:05 -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
Adam Palay
920d1c9a40 make it so that mathplayer message only appears when mathjax is on the page 2013-09-20 15:05:47 -04:00
Greg Price
0d7f63060b Merge pull request #975 from edx/gprice/markdown-button-taborder
Improve accessibility for forums post toolbar
2013-09-20 10:38:57 -07:00
Brian Talbot
39c617216c Merge pull request #1059 from edx/talbs/fix-a11y-accounts
Accessibility: Account-based Template Follow-up
2013-09-20 10:13:21 -07:00
Diana Huang
94f6bb66d2 Hide the 'take photo' button when there isn't a camera. 2013-09-20 10:59:17 -04:00
Adam Palay
34362b88a6 add accessibility message if mathjax is detected
use ie conditional html tags to detect for compatible ie versions
2013-09-19 16:07:56 -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
Giulio Gratta
d4687aa6df 4 OE/ORA UI fixes to make it easier to use
- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
2013-09-17 16:13:36 -07: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
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use"
This reverts commit 3b29d6056e.
2013-09-16 20:22:18 -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