Commit Graph

718 Commits

Author SHA1 Message Date
Saleem Latif
ccbd88acc1 Merge pull request #11402 from edx/saleem-latif/WL-298
WL-298: Create a theme named 'stanford-style' to be used by comprehensive theming
2016-02-10 10:38:46 +05:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching
bookmark button js caching
2016-02-04 21:07:45 +05:00
muhammad-ammar
3127ac9180 bookmark button js caching
TNL-3954
2016-02-04 17:59:47 +05:00
Saleem Latif
14572c19d4 Create a theme named 'stanford-style' to be used by comprehensive theming 2016-02-04 11:17:23 +05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Peter Fogg
244843d929 Track events on the course home page.
Events are added for accessing the courseware, entering the verified
upgrade flow, and toggling a course update.

ECOM-2983
2016-02-03 13:58:24 -05:00
Peter Fogg
0c1dc272d4 Change "Go to Course" to "Resume Course" on course home page.
ECOM-2960
2016-02-03 13:58:23 -05:00
Peter Fogg
71a00bf946 Revert "Move Course Handouts to Course Resources and Tools."
This reverts commit e8909e4439f22a7568d95a7672ab60d4a36f7322.
2016-02-03 13:58:23 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests.
ECOM-2809
2016-02-03 13:58:23 -05:00
Peter Fogg
c22677c171 Move Course Handouts to Course Resources and Tools.
The existing course handouts section is moved underneath Course
Updates and News, with updated styling.

ECOM-2808
2016-02-03 13:58:22 -05:00
Peter Fogg
786c4456ea Last-accessed courseware on the home page.
ECOM-2806
2016-02-03 13:58:22 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs
ECOM-2678
2016-02-03 12:20:53 -05:00
Peter Fogg
fd397964b3 Styling and template changes for the Course Home page.
ECOM-2810
2016-02-03 12:20:53 -05:00
Douglas Hall
22eda46e5f Merge pull request #11368 from edx/hotfix/2016-01-28_release_into_master
Merging release into master
2016-01-28 14:12:29 -05:00
Douglas Hall
22430f610b Merge branch 'release' into hotfix/2016-01-28_release_into_master 2016-01-28 12:40:00 -05:00
Peter Fogg
6e6c397776 Reenable course home improvements check.
This was disabled some time ago due to PLAT-900, which caused cached
objects to be unpickled and used in new code which could expect to
find new fields that didn't exist on the old objects. That issue is
now fixed.

ECOM-2853
2016-01-28 11:33:45 -05:00
Douglas Hall
2447540d5f Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes 2016-01-28 09:40:14 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates
* mattdrayer: Updated get_themed_template_path
2016-01-22 14:27:58 -05:00
Saleem Latif
6c8c67cad5 Remove microsite_configuration/templatetags/microsite.py references from individual templates. 2016-01-20 14:36:07 +05:00
Awais Jibran
a72d4a04e8 Enable MathJax in Course Pages
TNL-3968
2016-01-12 13:49:30 +05:00
Ayub-Khan
96e64464b5 -fix TNL-3556 Instructor tool "View as Specific Student" doesn't work on the course updates page.
-Added test for TNL-3556.
2016-01-05 17:50:23 +05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
2015-12-22 11:52:04 -05:00
Usman Khalid
5e972b2a66 Merge pull request #11022 from edx/bookmarking
Bookmarking
2015-12-22 18:25:48 +05:00
David Ormsbee
88c7d58313 Modify CourseOverviews to create course image thumbnails.
Course teams occasionally upload very large files as their course
image. Before this commit, those images would be used directly in
the student's dashboard, sometimes leading to MBs worth of image
data on that page. With this commit, we now auto-generate small
and large thumbnails of configurable size. The Student Dashboard
and Course About pages will make use of this new functionality
(CourseOverview.image_urls), but the behavior of
CourseOverview.course_image_url will not change.

Note that the thumbnails are still created in the contentstore,
and sit alongside their originals.

What's included:

1. Multiple sizes, currently starting with "raw", "small", and
   "large". This falls back to the current behavior automatically in
   the case where thumbnails don't exist or this feature has been
   disabled in configuration.

2. Django admin based configuration for image sizes and whether
   to enable the functionality at all. Note that to regenerate
   images, you'd need to wipe the CourseOverviewImageSet model
   rows -- it doesn't do that automatically. This is partly because
   it's a very rare operation, and partly because I'm not entirely
   sure what the longer term invalidation strategy should be in a
   world where we might potentially have multiple themes. The
   flexible configuration was intended to allow better customization
   and theming.

3. The Course About pages also use the new thumbnail functionality,
   as an example of "large". This is in addition to the "small"
   used on the student dashboard.

Things I'm punting on for now (followup PRs welcome!):

1. Bringing the thumbnails to course discovery. A quick attempt
   to do so showed that it wasn't getting properly invalidated
   and updated when publishes happen (so the old image still showed
   up). It probably has something to do with when we do the
   re-indexing because it stores this data in elasticsearch, but
   I'm not going to chase it down right now.

2. Center-cropping. While this is a nice-to-have feature, the
   behavior in this PR is no worse than what already exists in
   master in terms of image distortion (letting the browser handle
   it).

3. Automated invalidation of the images when a new config is
   created.
2015-12-18 20:03:09 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Usman Khalid
8bdc097293 Fixes after rebase to Django 1.8 2015-12-17 22:10:21 +05:00
muhammad-ammar
fcbe595c8a Bookmarks List Pagination
TNL-2490
2015-12-17 22:07:34 +05:00
muzaffaryousaf
3cbbb8f3b1 Add/Remove Bookmark button to each unit in LMS courseware.
TNL-1957
2015-12-17 22:07:32 +05:00
muhammad-ammar
c9b87aa099 Unit Bookmarks List View
TNL-1958
2015-12-17 22:07:31 +05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Sarina Canelake
2431baff8f Remove notification_image_for_tab logic (ORA1) 2015-12-11 15:07:08 -05:00
Nimisha Asthagiri
2b8441a072 Update Course Catalog to use CourseOverview 2015-12-10 20:37:50 -05:00
chrisndodge
4334eb9bd1 Merge pull request #10885 from edx/release
Release
2015-12-08 15:21:48 -05:00
David Baumgold
1a2ffbda68 Disable footer for courseware-chromeless.html 2015-12-07 13:54:23 -05:00
Sarina Canelake
2cfeb34f45 Merge pull request #10825 from edx/kill-psycho
Remove psychometrics app
2015-12-04 17:23:20 -05:00
Sarina Canelake
e932632b49 Remove psychometrics app 2015-12-04 16:37:34 -05:00
Nimisha Asthagiri
d170c92f3b Refactor course_image_url 2015-12-04 11:25:40 -05:00
David Baumgold
58daa365cd re-enable edx.org comprehensive theme 2015-12-03 17:18:55 -05:00
Michael Frey
29b6ccf5e4 Added new Course List API. 2015-11-24 15:54:03 +00:00
Peter Pinch
fd8b757c90 Merge pull request #10250 from mitocw/feature/aq/add_pagination_gradebook
Added pagination on grade book.
2015-11-13 12:37:34 -05:00
David Baumgold
685572cbee Merge pull request #10581 from open-craft/courseware-error-stray-quotemark
Remove stray quotation mark from courseware-error text.
2015-11-12 14:58:21 -05:00
Matjaz Gregoric
fc2594e37b Remove stray quotation mark from courseware-error text. 2015-11-11 09:02:50 +01:00
Amir Qayyum Khan
44b409ebff Added pagination on grade book. 2015-11-10 15:18:15 +05:00
Peter Fogg
7b801c66ca Remove check for course home page improvements. 2015-11-09 14:43:53 -05:00
Robert Raposa
3682fac832 Add json escaping to Studio
Make escaping for json simpler and more consistent in Mako templates
- add escape_json_dumps to escape and json.dumps
- add escape_js_str to escape javascript string
- refactor Studio to use escape_json_dumps in Mako templates

TNL-2646: Escape json.dumps
2015-11-04 13:34:42 -05:00
stv
3a2c0e37dc Remove chat feature
This was originally contributed upstream by Stanford, circa 2013.

We neither use nor support this feature in its current implementation,
and in fact, we may never have used this production. Until recently, we
had additional chat/Jabber code [1] (in the form of a Jabber djangoapp in
LMS); context there suggests this feature may have never been more than
a prototype. The original author is no longer on the team, so I can't directly
confirm this on our end.

Do you use this feature?

Stanford had already abandoned this Jabber-backed chat implementation,
in favor of an IRC backend, by the time I joined the team in early 2014.

[1] dbe52a6b13
2015-11-02 14:08:58 -08:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page.
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
2015-11-02 10:49:18 -05:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams
Timed Exams
2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
Tasawer
cc6b498228 remove escaping html for dashboard link
ECOM-2554
2015-10-20 13:16:18 +05:00