From 0577b9d8b961c72cd74f39030d43ea7c4eff8fe6 Mon Sep 17 00:00:00 2001 From: Oleg Marshev Date: Fri, 8 Aug 2014 17:17:27 +0300 Subject: [PATCH 1/4] Allow turning off Video CDN in Studio. BLD-1207 --- CHANGELOG.rst | 2 ++ cms/djangoapps/models/settings/course_metadata.py | 1 - common/lib/xmodule/xmodule/modulestore/inheritance.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 25d7fa9c36..4ce1290b66 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes, in roughly chronological order, most recent first. Add your entries at or near the top. Include a label indicating the component affected. +Blades: Course teams can turn off Chinese Caching from Studio. BLD-1207 + LMS: Instructors can request and see content of previous bulk emails sent in the instructor dashboard. Studio: New course outline and unit/container pages with revised publishing model. STUD-1790 (part 1) diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py index 07a1d6b116..09d87a2b21 100644 --- a/cms/djangoapps/models/settings/course_metadata.py +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -27,7 +27,6 @@ class CourseMetadata(object): 'user_partitions', 'name', # from xblock 'tags', # from xblock - 'video_speed_optimizations', 'visible_to_staff_only' ] diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/common/lib/xmodule/xmodule/modulestore/inheritance.py index 4316655a7d..d305c6641c 100644 --- a/common/lib/xmodule/xmodule/modulestore/inheritance.py +++ b/common/lib/xmodule/xmodule/modulestore/inheritance.py @@ -148,7 +148,8 @@ class InheritanceMixin(XBlockMixin): scope=Scope.settings ) video_speed_optimizations = Boolean( - help="Enable Video CDN.", + display_name=_("Enable video caching system"), + help=_("Enter true or false. If true, video caching will be used for HTML5 videos."), default=True, scope=Scope.settings ) From 71e9f4488bf8b3c8b094da94cb69f0a8f141cdd7 Mon Sep 17 00:00:00 2001 From: lduarte1991 Date: Fri, 8 Aug 2014 10:56:00 -0400 Subject: [PATCH 2/4] Annotator Tools: Fix major logic bug in code --- common/static/js/vendor/ova/flagging-annotator.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/static/js/vendor/ova/flagging-annotator.js b/common/static/js/vendor/ova/flagging-annotator.js index 6c2a142a53..66f56b80b3 100644 --- a/common/static/js/vendor/ova/flagging-annotator.js +++ b/common/static/js/vendor/ova/flagging-annotator.js @@ -76,8 +76,9 @@ Annotator.Plugin.Flagging = (function(_super) { */ Flagging.prototype.updateField = function(field, annotation) { - // figure out whether annotation is of image or not - var user_email = annotation.media === "image" ? + // figure out whether annotation is of type image or if ova is not defined (meaning it + // it doesn't have a type yet, but it is still an image). + var user_email = (annotation.media === "image" || typeof ova === 'undefined') ? osda.options.optionsAnnotator.permissions.user.id: ova.options.optionsAnnotator.permissions.user.id; From 2380235fd7d502e28278d6d9ea9a0abf3c86108a Mon Sep 17 00:00:00 2001 From: Renzo Lucioni Date: Thu, 7 Aug 2014 16:53:45 -0400 Subject: [PATCH 3/4] Add Optimizely widget --- lms/envs/common.py | 5 ++++- lms/templates/main.html | 2 ++ lms/templates/mktg_iframe.html | 2 ++ lms/templates/widgets/optimizely.html | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 lms/templates/widgets/optimizely.html diff --git a/lms/envs/common.py b/lms/envs/common.py index 7ae3f8346b..b9b857c8d1 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -148,7 +148,10 @@ FEATURES = { # Staff Debug tool. 'ENABLE_STUDENT_HISTORY_VIEW': True, - # segment.io for LMS--need to explicitly turn it on for production. + # Optimizely for the LMS--need to explicitly turn on for production. + 'OPTIMIZELY_LMS': False, + + # Segment.io for LMS--need to explicitly turn on for production. 'SEGMENT_IO_LMS': False, # Provide a UI to allow users to submit feedback from the LMS (left-hand help modal) diff --git a/lms/templates/main.html b/lms/templates/main.html index 1c81419f7f..fefc4deec7 100644 --- a/lms/templates/main.html +++ b/lms/templates/main.html @@ -90,6 +90,8 @@ + <%include file="widgets/optimizely.html" /> + diff --git a/lms/templates/mktg_iframe.html b/lms/templates/mktg_iframe.html index 8ce5cc1f24..c47de902e7 100644 --- a/lms/templates/mktg_iframe.html +++ b/lms/templates/mktg_iframe.html @@ -22,6 +22,8 @@ <%block name="headextra"/> + <%include file="widgets/optimizely.html" /> + diff --git a/lms/templates/widgets/optimizely.html b/lms/templates/widgets/optimizely.html new file mode 100644 index 0000000000..e8d1b1f2c1 --- /dev/null +++ b/lms/templates/widgets/optimizely.html @@ -0,0 +1,3 @@ +% if settings.FEATURES.get('OPTIMIZELY_LMS'): + +% endif From 96431203908a0c3afd86049c30751b37678b465d Mon Sep 17 00:00:00 2001 From: Alexander Kryklia Date: Mon, 11 Aug 2014 16:41:29 +0300 Subject: [PATCH 4/4] Reenable user partition in Advanced Settings. --- cms/djangoapps/models/settings/course_metadata.py | 1 - 1 file changed, 1 deletion(-) diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py index 09d87a2b21..f716f717bc 100644 --- a/cms/djangoapps/models/settings/course_metadata.py +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -24,7 +24,6 @@ class CourseMetadata(object): 'graded', 'hide_from_toc', 'pdf_textbooks', - 'user_partitions', 'name', # from xblock 'tags', # from xblock 'visible_to_staff_only'