Commit Graph

6923 Commits

Author SHA1 Message Date
Carlos de la Guardia
f9351ef830 MIT: CCX. Code Quality Fixes
Remove duplicated course listings template code on the student dashboard.
2015-04-10 23:30:27 -04:00
Carlos de la Guardia
b315b4d747 MIT: CCX. Fixes for issues identified in code review
Switch to font awesome icons, to fix issue with toggling collapsible sections of the schedule in ccx coach dashboard

Ensure access check takes place after descriptor is bound to the user, or field override checks will never happen
2015-04-10 23:30:26 -04:00
cewing
7f691e4a92 MIT: CCX. Rename POC to CCX
Final official name is Custom Courses for EdX (CCX), rename all code to remove previous name.

Rename the FEATURE constant used to identify this feature

Rename the middleware for the CCX change

rename the constant used for storing the current poc id on the session.

rename the _PocContext threading local

rename the override provider in all places where it is referenced

`PersonalOnlineCoursesOverrideProvider` -> `CustomCoursesForEdxOverrideProvider`

generally rename symbols from overrides.py to replace `poc` with `ccx` where possible without changing model names or attributes

rename more symbols from poc to ccx
rename util functions from app utils module

general symbol renaming poc -> ccx in views.py and related url changes

Rename the coach role wherever it is used.

reword poc_coach to ccx_coach

UI rename

replace POC with CCX globally

template context variable renamed

rename poc_ to ccx_ in urls and all related locations (views, js, scss etc)

remove pocs migrations

Final massive renaming, including models.  Re-built migration.

cleaning up a few tailing references

Fix reference typo in schedule template JS

undo modifications made on the fly in test setup to ensure that our tests are properly isolated from the rest of the system tests.

Fixes jazkarta/edx-platform#38

Clean up some leftover strings and comments

fixing more strings and comments in python files

fix a naming error in the schedule tab that was causing problems in deleting courseware items.

Fixes jazkarta/edx-platform#36

updating tests and utility code to match changes in infrastructure from latest rebase
2015-04-10 23:30:25 -04:00
Carlos de la Guardia
97748e56ea MIT: CCX. Fix test failures
Django double-importing overwrites the TESTUSER object, invalidating identity comparisons.  Use a string instead to avoid the problem.

The get_current_poc function operates using a threadlocal and so no longer requires the user as an argument
2015-04-10 23:28:09 -04:00
cewing
0b184881f5 MIT: CCX. Implement display of CCXs in user-facing templates such as dashboard
Show the display name for the POC in the menu for switching.

Remove the MOOC: prefix from the MOOC title to avoid truncation issues.

Incorporate the display name of the POC into the display of course org/number/name at the top of the page in the default theme.

Provide warning on the grading policy page in system warning style.

Provide a PocMembership model api that returns PocMemberships for a user.  Default to active memberships.

Build generator that yields triplets of poc, membership and course for each poc membership a user has.

This is an analog of the `get_course_enrollment_pairs` in common/djangoapps/students/views.py and is used in the student dashboard to provide pocs as options for a student to view.

refactor to use model api instead of inline code.

provide pocs as possible targets for a student to visit from their dashboard.

Unset the current active poc when visiting the dashboard so as to avoid needing to switch active pocs when viewing a plain course.  This ensures we can leave template code for the display of courses unchanged.

Update templates to show pocs in a course-like view on a student's dashboard.

Revert a portion of the template change so that the poc title will still render properly when a poc is being viewed.
2015-04-10 23:28:09 -04:00
Carlos de la Guardia
bb7eed58db MIT: CCX. Refactore using backbone.js 2015-04-10 23:28:00 -04:00
Carlos de la Guardia
91aa7b06ce MIT: CCX. Handle setting dates for blocks
Add date widget for setting start and due dates for the course sections, plus simple server side validation for avoiding db corruption from bad dates

Add immediate feedback for date validation errors
2015-04-10 23:19:47 -04:00
cewing
98b663dc69 MIT: CCX. Implement mechanism for switching POC and MOOC views
Ensure there is a consistent key for the session dict that will store the value of the poc_id if one is active.  If none is active, the mooc is assumed to be active.

Add mooc_name, mooc_url and active to the dict for each poc membership.

Update the navigation template to show link to mooc if poc is active, or to poc if not.

Ensure the switch_active_pocs view is covered well with tests.
2015-04-10 23:16:44 -04:00
Chris Rossi
eecefec8a0 MIT: CCX. Implement coach customization of grading policy for a CCX
Story #35 As a coach I can see and edit the json for the grading policy.

Story #34 Recalculate grading policy

Repair the broken test for grading by providing an explicit POC context for the request to run in
2015-04-10 23:15:29 -04:00
cewing
6cfc3a025f MIT: CCX. Implement individual student enrollments 2015-04-10 23:12:35 -04:00
Chris Rossi
630d1ce0d4 MIT: CCX. Implement coach interactions with student grades
Story #4: Coaches sees grades.

Story #9: Coach downloads grades.
2015-04-10 23:12:14 -04:00
Chris Rossi
a2cb7fd276 MIT: CCX. Implement Custom Courses for Edx.
This feature provides the ability to designate a "coach" who can create customized runs of an existing course, invite students to participate, and manage students through the run of the course.

In this squashed commit we implement the initial scifi, add the 'POC Coach' course role, refine the scifi, add migrations for models, create POCs, enforce POC Coach role, provide panels for Coach Dashboard, set up rudimentary display of course outline, add and remove units, show/hide all units, and save schedule changes, set dates when adding units, edit dates on units already added and provide some tests.

We also provide mechanisms for invitation and enrollment in a POC (to become CCX) and control the display of blocks to students in a POC.
2015-04-10 23:10:48 -04:00
alawibaba
7b29dd4c04 Fixed readability nit. 2015-04-10 14:49:40 -04:00
alawibaba
a6a2fd95bf Added more precise alerting to video beacon experiment. 2015-04-10 14:37:31 -04:00
Aamir
a83d068600 Merge pull request #7617 from edx/aamir-khan/ECOM-1290-redirect-to-courseware-new
ECOM-1290: added the redirection back to courseware after re-verificatio...
2015-04-10 20:53:45 +05:00
aamir-khan
ca08b979b3 ECOM-1290: added the redirection back to courseware after re-verification 2015-04-10 19:44:35 +05:00
Awais
b464542e63 ECOM-1183 fixing the 2015-04-10 19:40:48 +05:00
zubair-arbi
2c10eeb3aa update track selection page, use only min price for course modes
ECOM-1228
2015-04-10 11:53:31 +05:00
Marko Jevtić
42896452a1 Merge pull request #7576 from edx/mjevtic/more_search_results
Fixes show more results section of the lms courseware search
2015-04-08 18:49:57 +02:00
Chris
468d538e0c Merge pull request #7584 from edx/clrux/UX-1911-a11y-remove-nav
Changes the nav element to a div
2015-04-08 11:25:32 -04:00
Chris Rodriguez
62cc1436ad LMS: changing lists to divs for certain items in the payment flow 2015-04-08 10:07:10 -04:00
Phil McGachey
bc293b0517 [LTI Provider] Made reverifications parameter to courseware optional 2015-04-07 10:39:26 -04:00
Chris Rodriguez
ea13689c6f LMS: changing nav element in payment flow to div element for a11y improvements 2015-04-07 10:04:21 -04:00
marjev
7f45900cbc Fixes show more results section of the lms courseware search 2015-04-07 08:34:11 +00:00
Phil McGachey
3f7d637779 [LTI Provider] Adding options to suppress chrome for embedding courseware 2015-04-03 13:23:33 -04:00
Chris Rodriguez
2b9dafeccb Correcting heading levels 2015-04-03 13:21:48 -04:00
Marco Morales
ebdcc3bb6a Add social sharing feature (Twitter, Facebook) to student dashboard 2015-04-02 23:05:13 -04:00
Adam
9ad4b71688 Merge pull request #7572 from edx/release
Release
2015-04-02 17:24:50 -04:00
Will Daly
464bcf336e Show certificates for all verified modes 2015-04-02 11:21:54 -04:00
Awais
1d8b0e3e89 ECOM-1205-adding models and tests 2015-04-02 14:55:41 +05:00
Ahsan Ulhaq
a96acd2f2f iframe elements require a meaningful title attribute
TNL-1675
2015-04-01 18:29:55 +05:00
Sarina Canelake
c1f3f558f2 Merge pull request #7524 from louyihua/underscore_extraction
Fix string extraction error in underscore files
2015-03-31 14:30:44 -04:00
louyihua
46342a3f48 Fix string extraction error in underscore files
The written style ```interpolate(gettext('some text'), {...}, ...)``` will will cause the string inside gettext() not be extracted.
So a separate line is needed for ```gettext``` when gettext function is directly called inside a call to the interpolate function.
2015-04-01 01:23:36 +08:00
Matt Drayer
d9611dcd9f Merge pull request #7382 from edx/mattdrayer/SOL-461
mattdrayer/SOL-461: Student dashboard clean-up
2015-03-31 10:53:45 -04:00
David Ormsbee
2fea7b4ce5 Merge pull request #7510 from edx/ormsbee/remove_timer_expiration_duration
Remove timer_expiration_duration (leftover from Pearson proctored exams)
2015-03-31 10:45:03 -04:00
Marco Morales
bd5b0b31a0 Matt - javascript and test changes, Marco - styling feedback from initial reviews 2015-03-31 08:47:17 -04:00
Christine Lytwynec
41d7d52bc6 Merge pull request #7515 from edx/clytwynec/lms-onload-beacon
Fix code comment showing in rendered page
2015-03-30 10:03:22 -04:00
Christine Lytwynec
b33edbc060 Fix code comment showing in rendered page 2015-03-30 09:05:28 -04:00
David Ormsbee
91b5521d3a Remove timer_expiration_duration (leftover from Pearson proctored exams). 2015-03-27 20:54:36 -04:00
Christine Lytwynec
4d6c47c456 Merge pull request #7503 from edx/clytwynec/lms-onload-beacon
onload performance beacon for LMS pages
2015-03-27 16:28:30 -04:00
Christine Lytwynec
06b3110ea0 onload performance beacon for LMS pages 2015-03-27 11:08:25 -04:00
Matt Drayer
58618d8cee Updated dashboard HTML, dropdown menu interactions, and tests 2015-03-26 12:50:26 -04:00
Brian Talbot
67168869f5 Adjust styling for Open edX footer details 2015-03-26 10:15:51 -04:00
David Baumgold
89252ec12d Put Open edX logo in LMS edx.org footer 2015-03-26 10:14:37 -04:00
David Baumgold
6840ced41f Fix whitespace
Don't mix tabs and spaces!
2015-03-25 13:24:58 -04:00
Marco Morales
dfcb3f2b6e Dashboard styling cleanup/changes, including:
- reversing the positions of the sidebar and course listing
- html for new social icons (not currently wired up)
- new actions dropdown for unenrollment and email settings
- partial reorganization of dashboard.scss styles
- text fix for unenrollment
- added missing endif, p/hgroup closures
- reverted la.course-item
- removed extra operator
- fixed broken bok choy test
2015-03-25 10:51:45 -04:00
Will Daly
735b400998 Login/Registration page can skip track selection.
Add querystring param "course_mode" to the login/registration
page so the user can skip track selection.

This supports upcoming changes to the course details page
that allow the user to choose the track when clicking
"enroll", which will replace the functionality of the track
selection page.
2015-03-25 09:15:31 -04:00
Mark Sadecki
e1251bfecd Merge pull request #7416 from edx/cptvitamin/UX-1838-dashboard-heading-structure-n-context
adds additional context for SR users and corrects heading order
2015-03-24 13:51:33 -04:00
Ahsan Ulhaq
2e0d35f180 Remove submission buttons from aria-live region
added a new aria-live region and added problem html into that.
Removed submission buttons out of the aria-live div scope.

TNL-1699
2015-03-24 13:41:07 +05:00
Will Daly
c6eef03258 Update aria label on edX footer 2015-03-23 12:15:24 -04:00