Commit Graph

1043 Commits

Author SHA1 Message Date
Ahsan Ulhaq
7787974dd5 Order of Credit Eligibility line items
Displayed eligibility line items on the Progress page of a Credit course
in the order of appearance in the courseware.

ECOM-1782
2015-07-01 13:40:39 +05:00
Matt Drayer
700eb8b702 mattdrayer/fix-progress/template: Improved web certificates support 2015-06-26 10:43:26 -04:00
Will Daly
75d194e279 Update credit eligibility
* Update credit eligibility when a user satisfies an eligibility requirement.
* Refactor set_credit_requirement_status arguments.
* Use django-simple-history to track requirement status changes.
* Refactor progress page by moving credit into a helper function and adding comments.
2015-06-24 15:19:27 -07:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page
ECOM-1523
2015-06-22 18:36:54 +05:00
Dino Cikatic
af7521b240 SOL-994 fix js loading if search features disabled 2015-06-17 14:53:45 +02:00
Awais Qureshi
52e8d71fb9 Merge pull request #8489 from edx/awais786/ECOM-1683-remove-cert-regen-code
ECOM-1683 removing regen-cert code.
2015-06-17 14:51:19 +05:00
frances botsford
f66261c9f2 Merge pull request #8309 from edx/frances/responsive-lms-cleanup
Responsive LMS cleanup
2015-06-16 23:10:49 -04:00
Frances Botsford
03d5589e97 first wave cleanup of fixed width at page level in LMS 2015-06-16 16:09:04 -04:00
Awais
4d5a4b035d ECOM-1683 removing regen-cert code. 2015-06-16 20:08:57 +05:00
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
2015-06-16 16:19:33 +05:00
Andy Armstrong
1689004189 Create a common paginated list view
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
2015-06-15 13:51:09 -04:00
Edward Zarecor
c12c5c926d fixing post-release merge conflicts with DKH 2015-06-10 16:56:21 -04:00
Giulio Gratta
0b741aa3c4 BUGFIX: fix FA4 conversion for a few icons
- course-about sidebar info icon -> correct icon: "fa-info-circle"
- wiki search add file -> correct icon: "fa-plus-circle"
- wiki history paragraph info -> correct icon: "fa-info-circle"
2015-06-09 10:18:35 -07:00
Chris Dodge
e47c97b465 make courses.html also honor the ENABLE_COURSE_DISCOVERY feature flag 2015-06-08 07:46:55 -04:00
asadiqbal
6f0606a00b asadiqbal08/SOL-961: Student-generated certificate flow shows "download" certificate button 2015-06-07 20:44:42 -04:00
Nimisha Asthagiri
d240785b17 MA-722 Render xBlock API Support 2015-06-05 11:18:48 -04:00
Tim Krones
f711a32e3d TNL-1652: Allow instructors to obtain CSV file listing students who may
enroll in a course but have not signed up yet.
2015-06-04 20:50:04 +02:00
David Baumgold
34addd8fa8 Group imports together in Mako templates 2015-06-03 12:36:47 -04:00
Andy Armstrong
94e1c42314 Add extensible course view types for edX platform 2015-06-02 13:12:40 -04:00
Calen Pennington
3b9c13e059 Merge pull request #8225 from UQ-UQx/master
Initial chromeless template (for LTI Provider)
2015-06-02 08:41:46 -04:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Andrew Dekker
d88e5b0b3f Initial chromeless template
Initially for LTI embedding, but generic and reusable.
2015-05-28 14:27:14 +10:00
Awais
d0df626685 ECOM-1494 removing code from models. 2015-05-27 16:32:26 +05:00
Sarina Canelake
c7424dd7ae Supply default url for XQA server 2015-05-19 14:19:04 -04:00
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
2015-05-18 14:37:32 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
Ahsan Ulhaq
7922858526 No role inside of courseware
AC-108
2015-05-15 11:23:34 +05:00
Awais
19ab698f4c ECOM-1284 enabling re-generate certs. 2015-04-30 14:15:33 +05:00
Sarina Canelake
aed9ba8a38 Merge pull request #7818 from mcgachey/mcgachey-lti-render
[LTI Provider] Wiring up LTI views to the courseware template
2015-04-29 10:34:09 -04:00
Phil McGachey
854c9637f1 [LTI Provider] Addressing review comments 2015-04-28 10:35:44 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
marjev
939a3672d4 (SOL-531)(SOL-532)Course Cards update; A link to course discovery page has been added to the OpenEdX homepage 2015-04-14 14:58:06 +02:00
David Ormsbee
91b5521d3a Remove timer_expiration_duration (leftover from Pearson proctored exams). 2015-03-27 20:54:36 -04:00
Will Daly
30058b913c Merge pull request #7425 from edx/clrux/ux-1784-generate-certificates
Styling for automatic cert generation on Progress page
2015-03-23 11:23:43 -04:00
Chris Rodriguez
f8da29b9cf Styling for automatic cert generation on Progress page 2015-03-23 10:44:33 -04:00
Usman Khalid
d59be9949e Use cohort settings from CourseCohortSettings.
TNL-1258
2015-03-23 09:43:00 +05:00
Martyn James
af14d222fc Merge pull request #7085 from edx/dcikatic/SOL-258
SOL-258 Removing preview and content type from search list for sequence ...
2015-03-10 11:55:33 -04:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Dino Cikatic
bfa625ea78 SOL-258 Removing preview and content type from search list for sequence type 2015-03-09 16:28:04 +01:00
ahsan-ul-haq
00899dd908 Merge pull request #7118 from edx/ahsan/tnl-1554-missing-accessible-label-with-lms-nav-elements
Missing accessible label in lms <nav> elements.
2015-03-05 16:59:52 +05:00
Ahsan Ulhaq
2caafb22f1 Missing accessible label in lms <nav> elements.
many of the nav elements in the lms dont have the accessible labels

TNL-1554
2015-02-26 20:50:29 +05:00
Ahsan Ulhaq
ddc11c3bce changed view course as to Course View 2015-02-23 19:51:10 +05:00
Ahsan Ulhaq
d10c6c41ec <nav> for the courseware section does not include aria label
There is no accessible label provided for the <nav> in
courseware section.

TNL-1511
2015-02-23 19:28:56 +05:00
Awais
726b7f2cfe ECOM-1046 adding functionality for generating the certs.
ECOM-1046 minor change in code. rename file name.
2015-02-21 04:31:32 +05:00
Jean-Michel Claus
7cb495a166 TNL 713 (TNL-714, TNL-717, TNL-718): Added accessibility plugin. 2015-02-19 19:02:57 +02:00
Mark Sadecki
002dc0f553 Merge pull request #6926 from edx/cptvitamin/TNL-1371-fieldset-no-legend
[TNL-1371] Adds a SR only legend for fieldset and translates
2015-02-18 13:43:10 -05:00
Giulio Gratta
6a037d05f7 BUGFIX: shopping_cart_enabled + cosmetic price
- pass through registration price for use in template
- change conditional for add-to-cart to use registration price
- change conditional for sidebar price field to also include registration price
- remove expected failure in test
- add test for shopping_cart + course without mode
2015-02-17 07:50:59 -08:00
Mark Sadecki
8caf787519 [TNL-1371] Adds a SR only legend for fieldset and translates 2015-02-08 14:13:26 -05:00
Davorin Sego
3298971459 Search form accessibility 2015-02-04 10:49:44 +01:00
Giulio Gratta
560ce55896 Add cosmetic price field to studio & logic
- Price field added to Advanced Settings
- Function that decides which price to display
- Test added to check that the function outputs correct price
- Added feature flag and conditional to decide whether to display course price or not
- Feature Flag to show or hide course price on Course About page sidebar when not using shopping cart
2015-02-03 09:40:00 -08:00