From f993189d505092334fc4146f3a4fce10fc3762af Mon Sep 17 00:00:00 2001 From: Luis Moreno Date: Tue, 19 May 2020 10:32:00 -0400 Subject: [PATCH 1/2] Remove waffle flag edx_discussions.use_bootstrap. Now it is enabled always --- lms/djangoapps/discussion/config/waffle.py | 12 ------------ lms/djangoapps/discussion/plugins.py | 3 +-- lms/djangoapps/discussion/views.py | 20 +++++++------------- 3 files changed, 8 insertions(+), 27 deletions(-) diff --git a/lms/djangoapps/discussion/config/waffle.py b/lms/djangoapps/discussion/config/waffle.py index e672926703..381cbb86b7 100644 --- a/lms/djangoapps/discussion/config/waffle.py +++ b/lms/djangoapps/discussion/config/waffle.py @@ -4,7 +4,6 @@ Discussion settings and flags. from openedx.core.djangoapps.waffle_utils import WaffleFlag, WaffleFlagNamespace -USE_BOOTSTRAP = 'use_bootstrap' ENABLE_FORUM_DAILY_DIGEST = 'enable_forum_daily_digest' @@ -14,12 +13,6 @@ def waffle_flags(): """ namespace = WaffleFlagNamespace(name='edx_discussions') return { - # Waffle flag to enable the use of Bootstrap - USE_BOOTSTRAP: WaffleFlag( - namespace, - USE_BOOTSTRAP, - flag_undefined_default=True - ), # By default, enable forum notifications. Can be disabled platform wide. ENABLE_FORUM_DAILY_DIGEST: WaffleFlag( namespace, @@ -29,11 +22,6 @@ def waffle_flags(): } -def use_bootstrap_flag_enabled(): - """Returns whether use of bootstrap is enabled.""" - return waffle_flags()[USE_BOOTSTRAP].is_enabled() - - def is_forum_daily_digest_enabled(): """Returns whether forum notification features should be visible""" return waffle_flags()[ENABLE_FORUM_DAILY_DIGEST].is_enabled() diff --git a/lms/djangoapps/discussion/plugins.py b/lms/djangoapps/discussion/plugins.py index c9ea2101eb..5fc8beb19b 100644 --- a/lms/djangoapps/discussion/plugins.py +++ b/lms/djangoapps/discussion/plugins.py @@ -8,7 +8,6 @@ from django.utils.translation import ugettext_noop import lms.djangoapps.discussion.django_comment_client.utils as utils from lms.djangoapps.courseware.tabs import EnrolledTab -from lms.djangoapps.discussion.config.waffle import use_bootstrap_flag_enabled from xmodule.tabs import TabFragmentViewMixin @@ -38,4 +37,4 @@ class DiscussionTab(TabFragmentViewMixin, EnrolledTab): """ Returns true if this tab is rendered with Bootstrap. """ - return use_bootstrap_flag_enabled() + return True diff --git a/lms/djangoapps/discussion/views.py b/lms/djangoapps/discussion/views.py index aac52ce560..d6a3ea6b8a 100644 --- a/lms/djangoapps/discussion/views.py +++ b/lms/djangoapps/discussion/views.py @@ -30,7 +30,7 @@ import openedx.core.djangoapps.django_comment_common.comment_client as cc from lms.djangoapps.courseware.access import has_access from lms.djangoapps.courseware.courses import get_course_with_access from lms.djangoapps.courseware.views.views import CourseTabView -from lms.djangoapps.discussion.config.waffle import is_forum_daily_digest_enabled, use_bootstrap_flag_enabled +from lms.djangoapps.discussion.config.waffle import is_forum_daily_digest_enabled from lms.djangoapps.discussion.django_comment_client.base.views import track_thread_viewed_event from lms.djangoapps.discussion.django_comment_client.constants import TYPE_ENTRY from lms.djangoapps.discussion.django_comment_client.permissions import has_permission @@ -423,7 +423,6 @@ def _create_base_discussion_view_context(request, course_key): user_info = cc_user.to_dict() course = get_course_with_access(user, 'load', course_key, check_if_enrolled=True) course_settings = make_course_settings(course, user) - uses_bootstrap = use_bootstrap_flag_enabled() return { 'csrf': csrf(request)['csrf_token'], 'course': course, @@ -440,8 +439,7 @@ def _create_base_discussion_view_context(request, course_key): ), 'course_settings': course_settings, 'disable_courseware_js': True, - 'uses_bootstrap': uses_bootstrap, - 'uses_pattern_library': not uses_bootstrap, + 'uses_bootstrap': True, } @@ -809,15 +807,11 @@ class DiscussionBoardFragmentView(EdxFragmentView): the files are loaded individually, but in production just the single bundle is loaded. """ is_right_to_left = get_language_bidi() - if use_bootstrap_flag_enabled(): - css_file = BOOTSTRAP_DISCUSSION_CSS_PATH - if is_right_to_left: - css_file = css_file.replace('.css', '-rtl.css') - return [css_file] - elif is_right_to_left: - return self.get_css_dependencies('style-discussion-main-rtl') - else: - return self.get_css_dependencies('style-discussion-main') + + css_file = BOOTSTRAP_DISCUSSION_CSS_PATH + if is_right_to_left: + css_file = css_file.replace('.css', '-rtl.css') + return [css_file] @expect_json From b6e0762d858bcc2580f49b85943d0e58dfdc7769 Mon Sep 17 00:00:00 2001 From: Luis Moreno Date: Fri, 29 May 2020 13:39:46 -0400 Subject: [PATCH 2/2] Remove references to old discussion style files --- lms/envs/common.py | 12 ------------ .../sass/discussion/lms-discussion-main-rtl.scss | 16 ---------------- .../sass/discussion/lms-discussion-main.scss | 16 ---------------- 3 files changed, 44 deletions(-) delete mode 100644 lms/static/sass/discussion/lms-discussion-main-rtl.scss delete mode 100644 lms/static/sass/discussion/lms-discussion-main.scss diff --git a/lms/envs/common.py b/lms/envs/common.py index c4d73d0d7b..74d5f8b06d 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1831,18 +1831,6 @@ PIPELINE['STYLESHEETS'] = { ], 'output_filename': 'css/lms-style-student-notes.css', }, - 'style-discussion-main': { - 'source_filenames': [ - 'css/discussion/lms-discussion-main.css', - ], - 'output_filename': 'css/discussion/lms-discussion-main.css', - }, - 'style-discussion-main-rtl': { - 'source_filenames': [ - 'css/discussion/lms-discussion-main-rtl.css', - ], - 'output_filename': 'css/discussion/lms-discussion-main-rtl.css', - }, 'style-inline-discussion': { 'source_filenames': [ 'css/discussion/inline-discussion.css', diff --git a/lms/static/sass/discussion/lms-discussion-main-rtl.scss b/lms/static/sass/discussion/lms-discussion-main-rtl.scss deleted file mode 100644 index c1585c0a7b..0000000000 --- a/lms/static/sass/discussion/lms-discussion-main-rtl.scss +++ /dev/null @@ -1,16 +0,0 @@ -// ------------------------------ -// LMS discussion main styling -// -// NOTE: This is the right-to-left (RTL) configured style compile. -// It should mirror lms-discussion-main w/ the exception of bi-app references. - -// Load the RTL version of the edX Pattern Library -$pattern-library-path: '../../edx-pattern-library' !default; - -@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-rtl'; - -// Configure RTL variables -@import 'base/variables-rtl'; - -// Load the shared build -@import 'build'; diff --git a/lms/static/sass/discussion/lms-discussion-main.scss b/lms/static/sass/discussion/lms-discussion-main.scss deleted file mode 100644 index 32b16a7b7f..0000000000 --- a/lms/static/sass/discussion/lms-discussion-main.scss +++ /dev/null @@ -1,16 +0,0 @@ -// ------------------------------ -// LMS discussion main styling -// -// NOTE: This is the left-to-right (LTR) configured style compile. -// It should mirror lms-discussion-main-rtl w/ the exception of bi-app references. - -// Load the LTR version of the edX Pattern Library -$pattern-library-path: '../../edx-pattern-library' !default; - -@import 'edx-pattern-library/pattern-library/sass/edx-pattern-library-ltr'; - -// Configure LTR variables -@import 'base/variables-ltr'; - -// Load the shared build -@import 'build';