Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,363 Commits 1 Branch 0 Tags
e8f067de8f2be4c7864ad1bdf4e0794de175e0dc
Commit Graph

144 Commits

Author SHA1 Message Date
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00:00
Julia Hansbrough
1a3f4cb8f8 Moved can_refund logic to CourseEnrollment 2013-11-04 18:48:43 +00:00
Julia Hansbrough
b0fcadad31 Moved #unenroll-modal to different template 2013-11-04 18:38:49 +00:00
Julia Hansbrough
045e69f3c5 Can check verified-ness and expiration date 2013-11-04 18:37:54 +00:00
Brian Talbot
0d01179ffc LMS: revises semantics and styling for dashboard messages 2013-10-29 15:17:56 -04:00
Diana Huang
ee52e0232e Put in a dummy verification status into the dashboard. 2013-10-29 15:13:45 -04:00
Brian Talbot
e78654f99d LMS: revises verified track upgrade UI on dashboard 2013-10-28 14:59:15 -04:00
Diana Huang
23762a1569 Move more logic into the views 
Also includes some tests

Story: LMS-1127
 2013-10-25 15:29:44 -04:00
Diana Huang
115ccf87de Add in new hooks for the dashboard into the upgrade path. 2013-10-25 15:21:42 -04:00
Adam Palay
dec40c7d56 makes ajustments to modals on page load 2013-10-23 16:36:14 -04:00
Usman Khalid
91fbc6610e dashboard.html: Made strings translatable 2013-10-23 14:52:13 +05:00
Adam Palay
83b11a881c optimize keyboard focus management on dashboard's modals 
add license to a11y_tools.js

add tests, some reorganization of js tests

skip "toBeFocused" tests for now
 2013-10-22 13:26:18 -04:00
Brian Talbot
96cd85d824 LMS: converts close modal controls to use HTML <button> element 2013-10-16 16:14:29 -04:00
Diana Huang
1871bca4ca Add roles and labels to the dialogs on the dashboard. 
LMS-1310
 2013-10-16 13:26:32 -04:00
Diana Huang
ed5168ec61 Move more dashboard logic into the views 2013-10-03 16:22:00 -04:00
Diana Huang
7ba38c0ff3 Refactor out logic for individual course listings. 2013-10-03 14:08:38 -04:00
Diana Huang
51f44e02a6 Delete Pearson code from the dashboard page. 2013-10-03 11:53:08 -04:00
Usman Khalid
316b4eee95 Merge pull request #1073 from edx/usman/lms1026-find-courses-link-optional 
Added setting to disable 'find courses' links
 2013-09-27 12:40:07 -07:00
Usman Khalid
724fc5adbd Updated copy in dashboard 2013-09-26 15:04:43 +05:00
Renzo Lucioni
ac0e65ab2a Update CHANGELOG 2013-09-25 16:26:04 -04:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Usman Khalid
3ff203d11f Renamed setting ENABLE_STUDENT_SELF_ENROLLMENT to COURSES_ARE_BROWSABLE 2013-09-23 15:04:11 +00:00
Usman Khalid
d2cd8a6a58 Added setting to disable find courses links 2013-09-20 15:59:34 +05:00
Adam
75b7514c4f Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings 
Features/fmo/lms i18n strings
 2013-09-19 12:05:35 -07:00
Felipe Montoya
0c44ec1996 String extraction at input value attributes is done with single quotes 2013-09-19 13:54:35 -05:00
Felipe Montoya
893d22515d Something for the user dashboard 2013-09-19 10:52:29 -05:00
James Tauber
c6dfd97eeb Merge pull request #902 from antoviaque/accessibility 
Help Modal - Accessibility Fixes
 2013-09-13 08:21:47 -07:00
Felipe Montoya
a5fd04a95d i18n: submit buttons at dashboard 2013-09-12 18:12:49 -05:00
Xavier Antoviaque
23eab5c5bd accessibility: Replace close modal button <div> by <a> link (LMS-582) 
The close button for the modal dialog was marked up as a paragraph,
containing a graphical text character, inside two div elements, with an
associated click event. This made the button unusable for keyboard
users.

Replaced <divs> with a link element (<a role="button"), adapted the CSS
accordingly, and updated the existing <a> modal close buttons.
 2013-09-09 16:43:44 -03:00
Brian Talbot
f4bdd73839 Verification: adds in verified/enrollment status into dashboard course listings 2013-09-05 14:29:11 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Sarina Canelake
52d9320e62 Hide "Email Settings" from student dash if bulk email not enabled 
Some minor pep8 cleanup
 2013-08-29 12:40:33 -04:00
Sarina Canelake
65f7b098dd Bulk Email: Add design styling 
Switch to using decorators; refactor and cleanup tests.
 2013-08-29 12:40:32 -04:00
Kevin Luo
907bf6e1b7 Add bulk email feature for instructors, with optout option 
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.

Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
 2013-08-29 12:40:31 -04:00
Diana Huang
40393b21f7 Add in a new HTML class that represents the enrollment mode. 2013-08-27 09:42:25 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -04:00
Chris Dodge
f041ab1ccc fix rebase conflicts 2013-08-02 11:22:25 -04:00
Chris Dodge
3a2bb7ba01 add escaping 2013-08-02 09:51:41 -04:00
Chris Dodge
93df9c4c30 resolve merge conflicts 2013-08-02 09:41:02 -04:00
Adam Palay
69ffb6a87b replace edx with variable substitution 
fixes template errors

keep tos untranslated

formatting fixes
 2013-07-31 19:39:15 -04:00
Calen Pennington
e8ee29786f Remove news carousel and other unused pages 
Remove unused course_filter page

removes university_profile urls and templates

removes all university_profile views

remove news from templates/index
 2013-07-31 19:39:15 -04:00
Calen Pennington
0d3c44996a LMS i18n from Tsinghua 2013-07-31 19:39:15 -04:00
Giulio Gratta
86a1e4263d added alt tags to course cover images and find course page logo 2013-07-02 09:26:41 -07:00
Jason Bau
824fb9a311 The bulk of Shibboleth authentication for Stanford 
Highlights:
* The url '/shib-login/' interfaces with apache/mod_shib via
  request.META to handle shibboleth login and registrations
* Courses can designate 'enrollment_domains' to limit enrollment
  to users with a linked ExternalAuthMap verified by a particular
  identity provider
* Tests
* Logging

 Changes to be committed:

	new file:   common/djangoapps/external_auth/migrations/0001_initial.py
	new file:   common/djangoapps/external_auth/migrations/__init__.py
	new file:   common/djangoapps/external_auth/tests/test_shib.py
	modified:   common/djangoapps/external_auth/views.py
	modified:   common/djangoapps/student/views.py
	modified:   common/lib/xmodule/xmodule/course_module.py
	modified:   lms/djangoapps/courseware/access.py
	modified:   lms/djangoapps/courseware/tests/test_access.py
	modified:   lms/envs/common.py
	modified:   lms/envs/dev.py
	modified:   lms/envs/test.py
	modified:   lms/templates/courseware/course_about.html
	modified:   lms/templates/dashboard.html
	modified:   lms/templates/extauth_failure.html
	modified:   lms/templates/navigation.html
	modified:   lms/templates/register.html
	modified:   lms/templates/signup_modal.html
	modified:   lms/urls.py
	renamed:    lms/wsgi_apache.py -> lms/wsgi_apache_lms.py
 2013-06-19 00:48:18 -07:00
Nate Hardison
2ab00eefa7 Use the contact email setting instead of if/else 
Remove the Stanford-specific if/else hack to set the appropriate
contact email address and use the `CONTACT_EMAIL` setting instead.
 2013-06-05 10:27:24 -07:00
Nate Hardison
227271fec6 Theme the courseware dashboard 
Again, most of the work here is replacing "edX" with the
`PLATFORM_NAME` setting. Need to ensure that the `news` boolean is
indeed a falsy value as well, or just add a `theme_enabled()` test
to disable the news block entirely (since news is an edX-specific
feature).
 2013-06-05 10:27:23 -07:00
Greg Price
b8d2276de7 Remove dashboard links for unstarted courses 
If a course is not started, the course image and title on the dashboard link
to the course about page. Because the LMS course about pages do not exist
(i.e. 404) with the marketing site enabled, we simply do not use a link if
the course has not started.
 2013-05-16 15:06:48 -04:00
Diana Huang
a081ba4bbb Merge pull request #1934 from edx/diana/drupal/fix-lms-links 
Fix links between marketing site and courseware.
 2013-05-06 14:14:29 -07:00
Diana Huang
6110b54ca8 Address code review feedback 
* Fix indentation/line break issues
* Handle marketing root URL as a separate case in marketing_link
* Move link map to its own setting.
 2013-05-06 14:56:06 -04:00