Commit Graph

2340 Commits

Author SHA1 Message Date
Brian Talbot
a6f2dd67e4 Merge pull request #5105 from edx/talbs/os-ggg-a11y
LMS: Accessibility Tweaks
2014-09-05 13:57:57 -04:00
Brian Talbot
f11b44c49e LMS: revising more pronounced focus state of onboarding buttons 2014-09-05 12:50:15 -04:00
Waqas Khalid
32d9234b39 Merge pull request #3880 from mlkwaqas/waqas/lms2646-create-order-list-index-error
Handle the indexerror exception on create_order
2014-09-05 17:07:46 +05:00
Giulio Gratta
e0b7e8cfbb increase contrast of submission_feedback text 2014-09-04 17:45:47 -04:00
Giulio Gratta
e0262bd7a9 Make primary button focus state more pronounced 2014-09-04 17:45:47 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Don Mitchell
afa57f505b Remove client side parsing of module_id
in analytics dashboard.
LMS-11209
2014-09-03 21:59:29 -04:00
Greg Price
d303041c55 Fix size of endorser username in forum responses 2014-09-03 16:13:33 -04:00
Greg Price
a703cc8fa8 Fix forum nav header width 2014-09-03 15:51:12 -04:00
Renzo Lucioni
93a263b92f Correct 3rd party auth login page message and styling 2014-09-03 09:50:45 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic
Updating EX-60 logic
2014-09-02 13:03:24 -04:00
Waqas Khalid
d11aaec3a1 Handle the indexerror exception on create_order
LMS-2646
2014-09-02 19:08:53 +05:00
Julia Hansbrough
c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party
Facebook auth support.
2014-08-30 02:50:57 -04:00
Greg Price
988e4e6da5 Update UI for forum actions
The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>
2014-08-29 15:59:33 -04:00
Greg Price
80d1cae6a0 Add filter menu to forum nav sidebar
The menu allows filtering to unread, unanswered, or flagged threads.
This includes passing through the appropriate query parameters to the
comments service.
2014-08-29 15:59:33 -04:00
Greg Price
eaa93bf615 Hide comments in marked answers in forum questions
A link to show the comments appears in their place.
2014-08-29 15:59:33 -04:00
Greg Price
ec482c0dc2 Allow authors of forum questions to mark answers
Co-authored-by: jsa <jsa@edx.org>
2014-08-29 15:59:32 -04:00
Greg Price
c23a27bac4 Add post type control to forum new post form
Also change server to pass post type through to the comments service.
2014-08-29 15:59:32 -04:00
Greg Price
2e30874180 Add post type indicators to forum sidebar nav
The previously existing checkmark for threads with endorsed responses is
removed, as it is mostly redundant.
2014-08-29 15:59:32 -04:00
Greg Price
aaa2f35336 Change endorsement UI for forum question threads
Responses to question threads can be "marked as answer" instead of
"endorsed".
2014-08-29 15:59:32 -04:00
Greg Price
182ae7aeb0 Add endorsement info to marked answers in forum
Co-authored-by: jsa <jsa@edx.org>
2014-08-29 15:59:31 -04:00
Greg Price
10063a3120 Distinguish forum thread types in rendering
Each thread's type is now included in its post details, and question
threads have marked answers shown immediately below the body of the
initial post.
2014-08-29 15:59:31 -04:00
Greg Price
7470e60004 Unify forum thread views (and templates) 2014-08-29 15:59:31 -04:00
Greg Price
ab2b7f344d Clean up dead forums front-end code 2014-08-29 15:59:31 -04:00
Greg Price
854621be60 Update forum new post form
Add help text to several fields, update visual styling, and make it
appear in the right-hand pane of the discussion tab instead of sliding
down from the top.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
2014-08-29 15:59:31 -04:00
Stephen Sanchez
739ee04fad Merge pull request #4979 from edx/sanchez/update-login-button-styles
Updating LMS Login button to line up SASS with Drupal Login button
2014-08-28 10:50:54 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Waheed Ahmed
57bc5c9314 Modified request method for change enrollment and bulk beta modify access on instructor dashboard.
LMS-11266
2014-08-27 13:20:04 +05:00
Stephen Sanchez
78046b5dc0 Updating the Login button to have the same hover style as Drupal 2014-08-26 18:30:32 +00:00
Frances Botsford
b371783e63 login, registration, and dashboard page changes for third-party auth 2014-08-26 15:38:54 +00:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00:00
Stephen Sanchez
b3f4ce2312 Merge pull request #4879 from edx/sanchez/update-platform-header
Updating the platform header styles to match new site styles.
2014-08-25 09:57:14 -04:00
Stephen Sanchez
033551416b Updating the platform header styles to match new site styles.
Putting the new edx header behind a feature flag.
2014-08-22 18:25:45 +00:00
frances botsford
7260094ef3 Merge pull request #4145 from IONISx/tusbar/rewrite-password-reset-templates
Make use of django_main for password_reset templates
2014-08-22 08:06:29 -04:00
Bertrand Marron
bd1e25baff Fix 'change my password' button font size 2014-08-21 15:19:04 +02:00
Bertrand Marron
70f698267a Update password reset views style
Reuse the style from login and register views.
Remove all the specific style.
2014-08-20 14:17:55 +02:00
Braden MacDonald
dbbbe8f2cb Fix: inadvertent scroll when loading the instructor's extensions tab
(The div with id "view-extensions" conflicts with the tab JS which sets location.hash to "view-x" in order to track the current tab)
2014-08-19 23:18:31 -07:00
njdup
93d088505f Instructor Dash: Display message when there are no tasks running
This commit adds a message to the instructor dashboard that is displayed when
no instructor tasks are currently running. This message is displayed where the
instructor pending tasks table would normally be placed, and is replaced
with the table when there are running tasks.
2014-08-15 10:35:01 -07:00
Will Daly
3cd4610b5a Merge pull request #4824 from edx/will/auto-register
Auto enroll students even if there are multiple course modes
2014-08-15 11:11:19 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
njdup
55521590d1 Email content history fix and additions
This addresses a bug in the email content history table where
"Unknown" was displayed in the number of emails sent column if any sort of
failure occurred during email sending. This behavior has been editted so now
the number of emails that failed to send is displayed, along with the number
of emails that were successfully sent. If the email task is still pending,
"0 sent" is displayed.

As a small addition, the table now also includes the authors of previously
sent emails, and the modal window for an email also displays its author.
2014-08-14 15:12:31 -07: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
Tim Babych
8d0e469cd3 Remove code and template responsible for subsection edit page 2014-08-07 12:27:25 -04:00
asadiqbal08
fc8ec1cc43 e-commerce UI suggested changes 2014-08-05 10:00:17 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
2014-08-05 10:00:13 -04:00
asadiqbal08
dc46170f36 registration code checkout flow
Redirecting to dashboard after free user enrollment.
2014-08-05 10:00:12 -04:00
Muhammad Shoaib
4333e53997 added registration-codes generation functionality
rebased and resolve conficts with cdoge/registration_codes

feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter
2014-08-05 10:00:11 -04:00
asadiqbal08
5a9fc036a6 Course Instructor as financeadmin role, will be able to download all purchase transactions in the course as a CSV file 2014-08-05 10:00:10 -04:00
njdup
5791fd1087 Instructors can view previously sent email content
Previously on the send email page of the instructor dashboard, instructors could only view
task information about emails they've sent for their course in the past.
In addition to this, I've now added the ability to see the content of all previously sent emails.

A "Sent Email History" button has been added to the page. When clicked, a table displaying the
subject line, number of emails sent, and date/time of submission for each previously sent email
is created. An instructor can then click on any subject line to see the content of that email,
displayed in a modal window that appears on the page.

The window is also equipped with a "copy email to editor" button, which copies the emails contents
to the tinyMCE editor, so that an instructor can easily resend an email that they've sent
in the past.
2014-08-04 10:08:32 -07:00
Dave St.Germain
eb1d046352 Show the enrollment counts for each mode on the instructor dashboard. 2014-08-01 12:17:36 -04:00