Commit Graph

108 Commits

Author SHA1 Message Date
ahsan-ul-haq
77f98e1e77 Merge pull request #6954 from edx/ahsan/tnl-1383-ALT-text-describes-image-not-action
ALT text describes image, not action
2015-02-11 22:31:22 +05:00
Awais
57ef60de0a ECOM-1028 adding linked-in button , config model and migration for linked url.
ECOM-1028 update the migration and move the code into class method.
2015-02-11 19:09:30 +05:00
Ahsan Ulhaq
b727bf70c5 ALT text describes image, not action
At LMS dashboard course listing the course cover has alt
attribute that have course name and then Cover Page it describe
image not the action which is to take user to course home page

TNL-1383
2015-02-11 18:43:50 +05:00
Renzo Lucioni
80589eab36 Remove old payment and verification flow
Removes old payment and verification endpoints, views, templates, and tests, making the new split flow the default. The SEPARATE_VERIFICATION_FROM_PAYMENT feature flag is also removed.
2015-01-29 10:56:25 -05:00
Diana Huang
134d2f57b2 Show an error when a student needs to reverify
due to expiration.
2015-01-20 14:51:08 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
Renzo Lucioni
10cb7f10fa Fix cosmetic issues with the split payment and verification flow
Use honor code ribbon if verification status is not missing, submitted, or approved; title column on payment confirmation page holding dollar amounts more appropriately
2015-01-09 13:13:00 -05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
2015-01-06 15:24:12 -05:00
Will Daly
a90f7ab1bf Enter the new verification / payment flow using a GET param
Allow disabling of experiment
2014-12-30 13:36:25 -08:00
David Baumgold
4ec0295bab Improve i18n on the LMS dashboard course listing page
Adding translator comments to the dashboard.

Updating alt text to verification pending ribbon.

fix tests
2014-12-30 14:24:15 +00:00
Renzo Lucioni
3d717a895a Track upsell copy interaction, upgrade button and verify now button clicks on the dashboard 2014-12-19 17:03:14 -05:00
Renzo Lucioni
a268c91236 Hook up new payment/verification flow to dashboard, track selection page, and upgrade 2014-12-16 23:32:17 -05:00
Sarina Canelake
dc972eb2d6 Add additional context for translators 2014-12-02 20:56:08 -05:00
Sarina Canelake
98b9fb09cd Fix dashboard i18n 2014-12-02 20:56:07 -05:00
AlasdairSwan
962dc221d4 ECOM-677 ECOM-678 styled the new messages 2014-12-02 09:43:57 -05:00
Will Daly
464dfcfabc Show student verification status on the dashboard. 2014-12-02 09:42:24 -05:00
Oleg Marshev
21056b950e Use DATE_TIME format for course start or end time in student dashboard. 2014-10-22 16:23:32 +03:00
Will Daly
e7609597bc Change text of registration to enrollment 2014-10-20 12:32:57 -04:00
Ben Patterson
5703adb722 Merge branch 'release'
Includes rc/2014-10-14
2014-10-16 20:11:55 -04:00
Will Daly
5d77fab265 Merge pull request #5541 from edx/will/dashboard-js-shame
Dashboard template cleanup
2014-10-14 11:54:57 -04:00
Stephen Sanchez
c578302f73 Changing default donation amount 2014-10-10 09:51:40 -04:00
Will Daly
e0133b12a6 Move JavaScript from dashboard template into its own module
Make HTML comments Mako comments
2014-10-10 08:45:54 -04:00
stephensanchez
12ffe18085 Pull Request comments addressed. Tests fixed. 2014-10-08 21:26:09 +00:00
stephensanchez
0c6b3ba0c1 Changing the default value from 25.00 to 25 2014-10-08 19:48:14 +00:00
stephensanchez
4d68738c38 Adding new styles to the new donation button. 2014-10-08 19:34:25 +00:00
Will Daly
f8365a2d3b Add donation end-point
Make donations configurable

Added donation button to dashboard

Generalize merchant defined data for payment processor
2014-10-07 14:22:55 -04:00
stephensanchez
afaaca969a Adding new styles for dashboard notifications.
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
2014-10-07 15:44:47 +00:00
Calen Pennington
77a04daa07 Properly escape CourseKeys and UsageKeys in html templates
[LMS-11372]
[LMS-11370]
2014-10-01 10:26:52 -04:00
Renzo Lucioni
22f58be4aa Add tracking on expand of upsell message 2014-09-12 11:58:24 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Brian Talbot
5caaec7b82 LMS: adding rendering/styling support for initial professional ed course types on student dashboard 2014-08-12 18:45:10 +00:00
asadiqbal08
932010df59 refund message for purchased courses
Add little more logic for paid courses
2014-08-05 10:00:16 -04:00
marco
a129fd4a27 adjusted styling of dashboard profile area to remove heavier gradients and other small cleanups 2014-07-17 14:26:22 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support.
PR-615
2014-06-17 08:24:02 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
2014-05-13 15:30:56 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
2014-05-09 15:29:32 -04:00
Calen Pennington
d5029abfdc Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/templates.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
2014-05-07 12:49:55 -04:00
marcotuts
909d6db4a3 Merge pull request #3629 from edx/jrbl/oops-fix-dashboard-template
Fix dashboard template around final grade status
2014-05-07 10:57:54 -04:00
Joe Blaylock
825ac1cd42 Fix dashboard template around final grade status
* ae8847cd6e checked in buggy conditional in the dashboard templates
  that caused an empty 'details being wrapped up' box to display
  regardless of whether it was true.
* Simplify conditional so that we care only whether output of the view's
  _cert_info() says 'processing', which should be the value computed when
  either no cert status exists or when the certs are, in fact processing.

  This should mean that the "details being wrapped up" message is
  displayed when certs haven't run and the grade box is displayed the
  rest of the time.
2014-05-06 15:12:36 -07:00
Diana Huang
aa8ae81034 Show same thing on dash for audit and honor code students. 2014-05-06 17:52:43 -04:00
Adam Palay
5613f19994 add quotation mark to _dashboard_course_listing.html 2014-05-06 14:44:40 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Brian Talbot
316f25e6d5 LMS: copy change to refer to 'ID Verified' enrollment as 'Verified' in Dashboard UI 2014-05-05 19:34:23 +05:00
Brian Talbot
5365dbe2fb LMS: adding visual reinforcement of a user's enrollment type (per course) to Dashboard UI
LMS-1071
2014-05-05 19:34:23 +05:00
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
2014-05-02 14:34:21 -07:00
Victor Shnayder
821d5874a8 Issue certificates to all students who earn them, even if they are in an audit track
LMS-2573
2014-04-30 14:44:08 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release'
Conflicts:
	cms/templates/widgets/source-edit.html
2014-04-14 14:17:03 -04:00
Julia Hansbrough
d71aa87748 Revert refund instruction message 2014-04-08 19:34:55 +00:00
Sarina Canelake
9a352b9125 Unicode support for course names in reverification flow 2014-04-08 13:11:41 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00