Commit Graph

13048 Commits

Author SHA1 Message Date
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
David Ormsbee
7a287dc65f Merge pull request #10970 from open-craft/staff-debug-everywhere-fix
Disable staff markup on 'detached' blocks.
2015-12-18 17:47:59 -05:00
Sarina Canelake
ee4ab20500 Merge pull request #10986 from edx/sc/pylint
Remove Pylint violations
2015-12-18 09:28:48 -05:00
umar-nawaz
132068eafb Merge pull request #10998 from edx/unawaz/swat-97-align
[SWAT-97] Logistration alignment and padding.
2015-12-18 15:58:53 +05:00
Matjaz Gregoric
585c64f282 Enable staff debug everywhere except on detached blocks.
Staff markup was enabled on all block types in
https://github.com/edx/edx-platform/pull/10903

This works well inside the courseware, but it breaks layout of the course about
page, which is also an XModule, see:
https://github.com/edx/edx-platform/pull/10903#issuecomment-164266342

This commit disables staff markup/staff debug on all blocks except
blocks tagged with 'detached'. Detached blocks include course about
and info pages, static tabs.
2015-12-18 08:19:57 +01:00
Sarina Canelake
96ddf544ff Remove Pylint violations 2015-12-17 16:29:28 -05:00
Jesse Zoldak
0aa196c48b Revert "Edited the text strings in the default template for web certificates to remove wording specific to edx.org" 2015-12-17 16:10:05 -05:00
Peter Desjardins
ee4300dd7b Merge pull request #11024 from edx/pdesjardins/DOC-2543
Edited the text strings in the default template for web certificates to remove wording specific to edx.org
2015-12-17 15:42:32 -05:00
Christine Lytwynec
5a4ccabeaf Merge pull request #11011 from edx/clytwynec/ac-156
leanModal fixes
2015-12-17 15:17:51 -05:00
Peter Desjardins
a26da6e676 Edited the text strings in the default template for web certificates. Removed wording that applied specifically to edx.org. Reworded strings so that they will read correctly when the value of platform_name or cert_type requires the a or an article. Addresses DOC-254. 2015-12-17 14:31:06 -05:00
Sarina Canelake
2bc7b954ab Remove the graphical slider tool 2015-12-17 13:24:00 -05:00
Christine Lytwynec
ba53f97bf1 prevent duplicate #lean_overlay elements 2015-12-17 12:16:12 -05:00
Peter Fogg
283623ab35 Merge pull request #11019 from edx/peter-fogg/add-ungenerated-migrations
Add autogenerated migrations due to field default changes.
2015-12-17 11:55:55 -05:00
Bill DeRusha
d9f6f90c3d Merge pull request #11010 from edx/bderusha/auto-deadlines
Fix auto set deadlines on publish
2015-12-17 11:28:46 -05:00
unawaz
a585fc7935 [SWAT-97] Logistration alignment and padding. 2015-12-17 16:07:42 +00:00
Peter Fogg
24edef8998 Add ungenerated migrations due to field default changes. 2015-12-17 10:18:51 -05:00
Matt Drayer
63d0c74439 Merge pull request #11018 from edx/saleem-latif/SOL-1528
SOL-1528: Generate Certificates for whitelisted students even if they have existing (notpassing, error etc.) certificates
2015-12-17 09:43:48 -05:00
wajeeha-khalid
e37f8ff767 Merge pull request #10905 from edx/jia/MA-1051
MA-1051 - DiscussionAPI: Remove http errors from api.py
2015-12-17 15:42:40 +05:00
Saleem Latif
fb0fbbbaa4 skip 'filtering students' only when students are given and statuses to regenerate are not 2015-12-17 12:25:42 +05:00
Matt Drayer
abb8484ec2 Merge pull request #10974 from edx/saleem-latif/SOL-1418-review-changes
SOL-1418: display certificate generate history in reverse chronological order
2015-12-17 00:02:13 -05:00
frances botsford
7c017969ca Merge pull request #10997 from edx/frances/lms-pagination-sass
Make pagination pattern sass globally available in LMS
2015-12-16 15:47:36 -05:00
clrux
3275b9d605 Merge pull request #10913 from edx/clrux/ac-177
LMS: addressing contrast issues on the Progress page
2015-12-16 15:12:42 -05:00
Peter Fogg
cb1aa0617d Merge pull request #10966 from edx/peter-fogg/fa-support-tool
WIP for financial support tool.
2015-12-16 15:08:59 -05:00
Peter Fogg
a680919e8c Support tool for changing enrollments.
Allows support staff or global staff to view a list of a learner's
enrollments, and change enrollment modes. We generate a
ManualEnrollmentAudit record for these enrollment changes in order to
track updates. Additionally, enrollment changes are handled through
the enrollment API, which handles bookkeeping such as granting refunds
where appropriate.

ECOM-2825
2015-12-16 14:17:19 -05:00
Bill DeRusha
1846353a1f Fix auto set deadlines on publish 2015-12-16 13:58:13 -05:00
Frances Botsford
e18a6e28ca make pagination pattern sass globally available in LMS 2015-12-16 12:58:16 -05:00
Diana Huang
ba526f4f39 Merge pull request #11008 from edx/release
Release
2015-12-16 12:05:20 -05:00
wajeeha-khalid
588833ff43 MA-1051: DiscussionAPI - Removed http errors from api.py and refactored to more specific errors 2015-12-16 21:23:51 +05:00
wajeeha-khalid
6bc6b3f001 Merge pull request #10989 from edx/jia/MA-1046
MA-1046 added valid form field test
2015-12-16 21:22:26 +05:00
Chris Rodriguez
8de5529ca4 LMS: addressing contrast issues on the Progress page 2015-12-16 11:09:27 -05:00
Renzo Lucioni
a8a88390eb Merge pull request #11000 from edx/renzo/kill-it-with-fire
Delete dead SUBDOMAIN_BRANDING setting.
2015-12-16 11:09:12 -05:00
clrux
d8423a9018 Merge pull request #10914 from edx/clrux/ac-178
LMS: addressing contrast on the Instructor dashboard
2015-12-16 11:08:49 -05:00
wajeeha-khalid
0847183458 MA-1046 added valid form field test 2015-12-16 19:06:35 +05:00
Saleem Latif
22653b18d9 Disable 'Generate Exception Certificates' button when there are no certificate exceptions. 2015-12-16 10:30:02 +05:00
Saleem Latif
300825efc2 Remove unused imports 2015-12-16 10:27:24 +05:00
Saleem Latif
da0664c5fe Add i18n to strings 2015-12-16 10:26:23 +05:00
Saleem Latif
8b2c4994fa display certificate generate history in reverse chronological order 2015-12-16 10:22:56 +05:00
Renzo Lucioni
23c582d01d Delete dead SUBDOMAIN_BRANDING setting. 2015-12-15 14:42:09 -05:00
David Ormsbee
e15907c76f Revert "Remove staff debug category type whitelist."
This reverts commit bb25473a7c.

Reason for revert: Was breaking display on Course About and Info
pages.
2015-12-15 10:06:40 -05:00
Renzo Lucioni
da16b3da22 Remove dead code
Deletes unused code from an old implementation of microsites.
2015-12-14 16:38:14 -05:00
Renzo Lucioni
bdea61c848 Merge pull request #10960 from edx/renzo/run-org-filtering
Modify Course API to filter visible courses by org
2015-12-14 16:35:18 -05:00
Renzo Lucioni
2cee39d535 Modify Course API to filter visible courses by org
Org to filter by is provided to the Course API list view using a querystring argument. Filtering ultimately occurs at the database layer. ECOM-2761.
2015-12-14 15:32:46 -05:00
Sarina Canelake
4385cc507e Merge pull request #10942 from edx/kill-legacy-dash
Remove Legacy Instructor Dashboard
2015-12-14 15:27:50 -05:00
clrux
a6e8383489 Merge pull request #10706 from edx/clrux/ac-188-no-draggabilly
Video: Adding closed captioning to the video player (not draggable)
2015-12-14 11:07:12 -05:00
chrisndodge
ac1ee17e44 Merge pull request #10555 from edx/cdodge/microsites-id-verification-status
Add support for microsite overrides (template & configuration) for th…
2015-12-14 10:34:21 -05:00
Chris Rodriguez
b883d52722 Adding closed captions (not draggable) 2015-12-14 10:19:11 -05:00
Sarina Canelake
a9fc7aca69 Remove Legacy Instructor Dashboard 2015-12-14 10:12:38 -05:00
Nimisha Asthagiri
160f391408 Merge pull request #10959 from edx/course_overview/manual_seeding
Course Overview - require manual seeding of the table
2015-12-14 08:39:03 -05:00
Bill DeRusha
67c322e77e Merge pull request #10946 from edx/bderusha/fa-require-country
Validate country on FA form
2015-12-14 08:36:40 -05:00
Nimisha Asthagiri
d6364312f4 Course Overview - require manual seeding of the table. 2015-12-13 23:35:46 -05:00