Commit Graph

6923 Commits

Author SHA1 Message Date
Andy Armstrong
82f7d6ee64 Convert /update_lang/ page to use Bootstrap
LEARNER-1922
2017-08-18 16:15:38 -04:00
Joshua Spayd
ab8717edbf Fix timer accessibility problems 2017-08-17 14:42:04 -07:00
Simon Chen
442bcae46e Merge pull request #15207 from teltek/teltek/bugfix/cookie-consent-navigation
Cookie consent page loaded from navigation template instead of footer…
2017-08-17 13:37:33 -04:00
mrey
e54c83fc8d Fix cookie consent page loaded from navigation template instead of footer template after rebasing master 2017-08-17 17:48:16 +02:00
mrey
86852206bc Cookie consent page loaded from navigation template instead of footer template.
Following the commit ae9c686912, we can see the cookie consent template was loaded from footer template.
The login and registration templates do not load footer, so the cookie consent template is not being loader either.
With this fix, the cookie consent template is being loaded from navigation template, so it is shown in login and registration pages as well.
2017-08-17 17:39:48 +02:00
Adeel Khan
e966188ba6 Improve ECOM connection on student dashboard via on demand ajax calls.
Fix course unenroll dialog's incorrect message rendering. LEARNER-2033
2017-08-17 18:18:04 +05:00
Sofiya Semenova
ffd72c1051 Merge pull request #15705 from edx/ssemenova/ed-526
EDUCATOR-526 Update view certificate button
2017-08-16 15:52:54 -04:00
Harry Rein
23640ad20d Minor Styling Fixed for Learner Profile
LEARNER-2238

- Assure change image only shows on hover
- Better UX for delete image, only shows on hover
- Fixing issue with bottom border when user does not have a country set
- Issues with location of pencil icon in dropdown edit modeApplying styling changes.
2017-08-16 10:18:45 -04:00
Sofiya Semenova
76f1df6b0e EDUCATOR-526 Update view cert button to only appear after availability
date has passed
2017-08-15 11:57:28 -07:00
Tyler Hallada
a9c1e1cf43 Squashed commit of the following:
commit 12880fa21eac0c2e69b2d832d42829f00484561d
Author: Tyler Hallada <thallada@edx.org>
Date:   Fri Aug 11 11:17:22 2017 -0400

    Tweak exam override messaging in progress.html

commit 6f90352dc27b3a199eea7efaf84b72df50f570a9
Merge: e0e9f83789 7c535f5fb9
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:38:13 2017 -0400

    Merge remote-tracking branch 'origin/master' into EDUCATOR-926

commit e0e9f83789efa837577cedbcd5807c6fdba249e4
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:35:26 2017 -0400

    Revert "Comment out actual override and log instead"

    This reverts commit 4953cf30d9.

commit 27d6b537c8915ecd1af8af51c8f9509db6ea0a26
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:56 2017 -0400

    Revert "Fix tests"

    This reverts commit 1b2fec2129.

commit cabddd504ddcb4f92aeed8b5fec4bff0d64a8de3
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:36 2017 -0400

    Revert "Remove override behavior and log instead"

    This reverts commit 1ab1880337.

commit dc9407f4606804e00d5aee4e80d309c7d7f9c437
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:15 2017 -0400

    Revert "Fix python tests and use proctoring 1.0.0"

    This reverts commit 842ce8365f.
2017-08-11 13:53:34 -04:00
Waheed Ahmed
f98a27ef8b Fix recent enrollment message and multiple donation boxes.
When purchasing multiple courses (especially with bundled Program purchase) the donation box shows up multiple times. Donation box should only show once regardless of number of courses purchased.

LEARNER-2125
2017-08-11 17:35:25 +05:00
McKenzie Welter
bf955d451b Merge pull request #15711 from edx/aj/LEARNER-1899
Added Program Purchase button to Programs dashboard with optional Program Completion
2017-08-10 14:32:37 -04:00
Albert St. Aubin
de6d48a698 Added Program Purchase button to the Programs dashboard
Learners can upgrade or enroll as verified in all remaining courses in a program from their programs dashboard

[LEARNER-1899]
2017-08-09 16:52:51 -04:00
Tyler Hallada
537966ab1e Merge branch 'master' into EDUCATOR-926 2017-08-09 16:22:09 -04:00
Harry Rein
e8bae62f04 UX improvements on learner profile.
LEARNER-1857

This story constitutes a large change to the UX of the learner profile.

Some specific changes include adding a flexible learner profile card, limiting the bio entry to only 300 characters and assuring that the page is responsive.
2017-08-09 13:57:42 -04:00
Tyler Hallada
623ea5eb40 Merge branch 'master' into EDUCATOR-926 2017-08-09 11:22:05 -04:00
Tyler Hallada
4953cf30d9 Comment out actual override and log instead 2017-08-09 11:19:31 -04:00
Ahsan Ulhaq
e298004287 Accessibility issues on LMS Dashboard Social links
LEARNER-2105
2017-08-08 15:24:27 +05:00
Tyler Hallada
8a851b3ec1 Color the override notice differently 2017-08-04 11:28:09 -04:00
Tyler Hallada
05de4a485b Add override notice to progress page 2017-08-03 16:32:17 -04:00
Saleem Latif
04c11cc176 Continue button is not appearing on registration page. 2017-08-03 13:36:39 +05:00
Uman Shahzad
cb034d4f2f Implement client-side registration form validation.
Input forms that need validation will have AJAX requests
performed to get validation decisions live.

All but a few important and common form fields perform
generic validation; these will need a back-end handler
in the future in order to have them validated through AJAX requests.

Information is conveyed on focus and blur for both
errors and successes.
2017-08-03 00:22:25 +05:00
Christina Roberts
20d67a5f7f Merge pull request #15690 from edx/christina/django-wiki-upgrade
Django-wiki upgrades.
2017-08-01 15:37:46 -04:00
cahrens
5077ab5897 Django-wiki upgrades.
EDUCATOR-784, EDUCATOR-1065
2017-08-01 14:10:58 -04:00
Calen Pennington
68df7b80e3 Add course_end to the list of experiment fields put in the DOM 2017-08-01 10:14:35 -04:00
Calen Pennington
1edd367008 Add course_start to the fields, and put all fields on the track selection page 2017-08-01 10:14:35 -04:00
Calen Pennington
384f22ff96 Add per-user metadata to course pages to make experimentation easier 2017-08-01 10:14:35 -04:00
Andy Armstrong
0f808cec78 Implement theme admin UI to support previewing
LEARNER-2017
2017-07-27 17:24:31 -04:00
Joshua Spayd
dc22ec5018 Make timer toggle accessible 2017-07-26 20:56:16 +00:00
Matt Tuchfarber
827c703d16 Change templates to use site aware email
Template were using global TECH_SUPPORT_EMAIL for error pages. This
changes them to use the site email if there is one.
2017-07-26 16:45:12 -04:00
Ari Rizzitano
3d4b2a7382 include webpack commons bundle on all pages; stub webpack_loader in python unittests
include webpack commons bundle on all pages

quotes

homegrown webpack_loader mock

toggle installed webpack_loader in test env file instead

fix test checking context
2017-07-26 11:28:30 -04:00
Joshua Spayd
db6f59987d Style timer with class rather than style attribute 2017-07-25 00:12:11 +00:00
Harry Rein
b523ac3f91 Merge pull request #15589 from edx/HarryRein/LEARNER-1894-in-course-messaging-xsy
Adding in-course messages on the home page.
2017-07-24 16:06:52 -04:00
Harry Rein
08df53e110 Adding in course messaging to the home page.
LEARNER-1894

This commit adds in course messaging for three use cases. First,
when the user is not signed in, the user is shown a message that
provides a link to sign in or register. If the user is signed in
but not enrolled, they are given a link to do so. If the user is
enrolled but the course has not yet started, they are shown a
message explaining when the course starts and shown a link (not
yet enabled) to add a reminder to their calendar.

The implementation defines a base message class and extends it
for the course home messages as well as the previously implemented
page level messages.
2017-07-24 15:17:12 -04:00
Andy Armstrong
95e47ddb02 Add basic Bootstrap theme to Studio
LEARNER-1982
2017-07-24 10:43:18 -04:00
Joshua Spayd
9da5be0298 Move JavaScript to edx-proctoring repo 2017-07-20 16:02:09 -07:00
George Song
8ec6039766 Merge pull request #15557 from edx/george/cookie-consent-message
Improve cookie consent message
2017-07-20 13:59:31 -07:00
mrey
040dfd698f Improve cookie consent message 2017-07-20 10:43:29 -07:00
Brittney Exline
6439020815 ENT-550 Display only TOS for enterprise's configured to skip registration
We have recently discovered that for any SSO Provider configured to skip
the registration form, we were auto checking the terms of service box,
which is a legal faux pas. Since IBM is planning to launch imminently and
is depending on this feature, we need to remedy this situation for enterprises
whose SSO Provider is configured to skip registration.

This PR hides all of the registration fields except TOS for this scenario
and disables the autoSubmit functionality that typically happens when skipping
registration.
2017-07-20 12:53:20 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override
Learner grade override
2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory
LEARNER-1855
2017-07-18 12:30:12 -04:00
Andy Armstrong
3e786ec6c5 Show page banner for anonymous and unenrolled users
LEARNER-1697
2017-07-17 22:19:40 -04:00
Joshua Spayd
dd6d172abe WIP: Add toggle timer functionality
JavaScript needs to be moved to edx-proctoring repo
2017-07-17 20:17:22 +00:00
Andy Armstrong
a077a5e364 Add support for page banner status messages
LEARNER-1890
2017-07-17 12:17:32 -04:00
Harry Rein
6d89cc1bd1 Updating themes for bootstrap.
LEARNER-1785

This story was to update the existing custom themes to work with the flexible bootstrap design. It also updates the red theme to more closely resemble the real implementation on openedx.
2017-07-13 15:25:40 -04:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject
Use platform_name instead of site_name in password reset email
2017-07-13 05:52:21 -07:00
Albert (AJ) St. Aubin
c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592
Staubina/ed 592
2017-07-12 17:24:53 -04:00
mrey
d682802f58 Disable view of Git Import when user is professor of course but not staff user
Reason: Before this fix, if the user is not staff (user.is_staff=0) and ENABLE_SYSADMIN_DASHBOARD=True
happens that the user can access the Git Import in Sysadmin dashboard and get to see the links in the menu
of the sysadmin dashboard (Users, Courses, Staffing and enrollment). When this user clicks on one of
these links, it gets an error from the server.
2017-07-12 10:36:35 -07:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00