From c6b36a8558d3a31b82930eea0ffda1c6b2e1a156 Mon Sep 17 00:00:00 2001 From: Ahtisham Shahid Date: Thu, 16 Nov 2023 14:56:08 +0500 Subject: [PATCH] feat: added beamer to edx-platform (#33701) --- cms/envs/common.py | 1 + cms/envs/production.py | 1 + cms/templates/base.html | 6 ++++++ lms/envs/common.py | 1 + lms/envs/production.py | 1 + .../instructor_dashboard_2.html | 12 ++++++++++++ 6 files changed, 22 insertions(+) diff --git a/cms/envs/common.py b/cms/envs/common.py index 917f6859a613..0cc988657868 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -2859,3 +2859,4 @@ def _should_send_xblock_events(settings): 'course-authoring-xblock-lifecycle', 'enabled') derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.content_authoring.xblock.deleted.v1', 'course-authoring-xblock-lifecycle', 'enabled') +BEAMER_PRODUCT_ID = "" diff --git a/cms/envs/production.py b/cms/envs/production.py index d78971882e54..2a77d75d50fc 100644 --- a/cms/envs/production.py +++ b/cms/envs/production.py @@ -678,3 +678,4 @@ def get_env_setting(setting): ############## Event bus producer ############## EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs(EVENT_BUS_PRODUCER_CONFIG, ENV_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {})) +BEAMER_PRODUCT_ID = ENV_TOKENS.get('BEAMER_PRODUCT_ID', BEAMER_PRODUCT_ID) diff --git a/cms/templates/base.html b/cms/templates/base.html index e910cac83969..6907161fff54 100644 --- a/cms/templates/base.html +++ b/cms/templates/base.html @@ -188,4 +188,10 @@ <%include file="widgets/segment-io-footer.html" /> + + diff --git a/lms/envs/common.py b/lms/envs/common.py index b4ae77d78409..284156326089 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -5421,3 +5421,4 @@ def _should_send_certificate_events(settings): 'learning-certificate-lifecycle', 'enabled') derived_collection_entry('EVENT_BUS_PRODUCER_CONFIG', 'org.openedx.learning.certificate.revoked.v1', 'learning-certificate-lifecycle', 'enabled') +BEAMER_PRODUCT_ID = "" diff --git a/lms/envs/production.py b/lms/envs/production.py index 9fc0bd54fba4..c846c6d377cd 100644 --- a/lms/envs/production.py +++ b/lms/envs/production.py @@ -1142,3 +1142,4 @@ def get_env_setting(setting): ############## Event bus producer ############## EVENT_BUS_PRODUCER_CONFIG = merge_producer_configs(EVENT_BUS_PRODUCER_CONFIG, ENV_TOKENS.get('EVENT_BUS_PRODUCER_CONFIG', {})) +BEAMER_PRODUCT_ID = ENV_TOKENS.get('BEAMER_PRODUCT_ID', BEAMER_PRODUCT_ID) diff --git a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html index c0392f32933a..6fe80e7fdea0 100644 --- a/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html +++ b/lms/templates/instructor/instructor_dashboard_2/instructor_dashboard_2.html @@ -6,6 +6,10 @@ from django.utils.translation import gettext as _ from django.urls import reverse from openedx.core.djangolib.markup import HTML +from django.conf import settings +from openedx.core.djangolib.js_utils import ( + js_escaped_string +) %> <%block name="bodyclass">view-in-course view-instructordash @@ -77,6 +81,13 @@ ${HTML(section_data['fragment'].foot_html())} % endif % endfor + + + ## Include Underscore templates @@ -137,6 +148,7 @@

${ section_data + <%static:require_module_async module_name="js/dateutil_factory" class_name="DateUtilFactory">